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/msg_template.pm | |
| parent | 412bc43b866761bbdf5db3833960ebe6db1cac18 (diff) | |
Ticket #30613: Can't Send E-mail
Diffstat (limited to 'FS/FS/msg_template.pm')
| -rw-r--r-- | FS/FS/msg_template.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/FS/FS/msg_template.pm b/FS/FS/msg_template.pm index 65890e1..70a8e49 100644 --- a/FS/FS/msg_template.pm +++ b/FS/FS/msg_template.pm @@ -398,8 +398,10 @@ sub prepare { $from_addr = scalar( $conf->config($opt{'from_config'}, $cust_main->agentnum) ); } - $from_addr ||= scalar( $conf->config('invoice_from', - $cust_main->agentnum) ); + $from_addr ||= $conf->config('invoice_from_name', $cust_main->agentnum) ? + $conf->config('invoice_from_name', $cust_main->agentnum) . ' <' . + $conf->config('invoice_from', $cust_main->agentnum) . '>' : + $conf->config('invoice_from', $cust_main->agentnum); } # my @cust_msg = (); # if ( $conf->exists('log_sent_mail') and !$opt{'preview'} ) { |