projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT#30613: Can't Send E-mail
[freeside.git]
/
FS
/
FS
/
cust_bill.pm
diff --git
a/FS/FS/cust_bill.pm
b/FS/FS/cust_bill.pm
index
eff4791
..
1af1028
100644
(file)
--- a/
FS/FS/cust_bill.pm
+++ b/
FS/FS/cust_bill.pm
@@
-1066,7
+1066,7
@@
sub send {
$self->email($opt)
if ( grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list or !@invoicing_list )
$self->email($opt)
if ( grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list or !@invoicing_list )
- && ! $
self
->invoice_noemail;
+ && ! $
cust_main
->invoice_noemail;
$self->print($opt)
if grep { $_ eq 'POST' } @invoicing_list; #postal
$self->print($opt)
if grep { $_ eq 'POST' } @invoicing_list; #postal
@@
-1092,7
+1092,7
@@
sub email {
# this is where we set the From: address
$from ||= $self->_agent_invoice_from || #XXX should go away
# this is where we set the From: address
$from ||= $self->_agent_invoice_from || #XXX should go away
- $conf->
config('invoice_from',
$self->cust_main->agentnum );
+ $conf->
invoice_from_full(
$self->cust_main->agentnum );
my @invoicing_list = $self->cust_main->invoicing_list_emailonly;
my @invoicing_list = $self->cust_main->invoicing_list_emailonly;