diff options
Diffstat (limited to 'FS/FS/msg_template.pm')
| -rw-r--r-- | FS/FS/msg_template.pm | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/FS/FS/msg_template.pm b/FS/FS/msg_template.pm index 70a8e49..f45fb2a 100644 --- a/FS/FS/msg_template.pm +++ b/FS/FS/msg_template.pm @@ -398,10 +398,7 @@ sub prepare { $from_addr = scalar( $conf->config($opt{'from_config'}, $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); + $from_addr ||= $conf->invoice_from_full($cust_main->agentnum); } # my @cust_msg = (); # if ( $conf->exists('log_sent_mail') and !$opt{'preview'} ) { |