projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ticket #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
bcfbbc7
..
6ded57f
100644
(file)
--- a/
FS/FS/cust_bill.pm
+++ b/
FS/FS/cust_bill.pm
@@
-1085,6
+1085,9
@@
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_name', $self->cust_main->agentnum ) ?
+ $conf->config('invoice_from_name', $self->cust_main->agentnum ) . ' <' .
+ $conf->config('invoice_from', $self->cust_main->agentnum ) . '>' :
$conf->config('invoice_from', $self->cust_main->agentnum );
my @invoicing_list = $self->cust_main->invoicing_list_emailonly;
$conf->config('invoice_from', $self->cust_main->agentnum );
my @invoicing_list = $self->cust_main->invoicing_list_emailonly;