diff options
author | Jonathan Prykop <jonathan@freeside.biz> | 2015-01-27 16:25:18 -0600 |
---|---|---|
committer | Jonathan Prykop <jonathan@freeside.biz> | 2015-01-27 16:25:18 -0600 |
commit | f13c9d8580d02851b150e21ea9beb6fc1dfbd3c8 (patch) | |
tree | 0d3c6ad7f0e7a5dd3068d34fb90f996fc2aadd02 /FS/FS/cust_main.pm | |
parent | 412bc43b866761bbdf5db3833960ebe6db1cac18 (diff) |
Ticket #30613: Can't Send E-mail
Diffstat (limited to 'FS/FS/cust_main.pm')
-rw-r--r-- | FS/FS/cust_main.pm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm index 9f95620..e4766f5 100644 --- a/FS/FS/cust_main.pm +++ b/FS/FS/cust_main.pm @@ -4327,7 +4327,10 @@ sub notify { return unless $conf->exists($template); - my $from = $conf->config('invoice_from', $self->agentnum) + my $from = $conf->config('invoice_from_name', $self->agentnum) ? + $conf->config('invoice_from_name', $self->agentnum) . ' <' . + $conf->config('invoice_from', $self->agentnum) . '>' : + $conf->config('invoice_from', $self->agentnum) if $conf->exists('invoice_from', $self->agentnum); $from = $options{from} if exists($options{from}); |