X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fmsg_template.pm;h=f45fb2aef0a7f71bfb915e038f42cd3229b7610f;hb=f79a7ca7e5b3e484646190e15f995b9779089ff0;hp=70a8e49eaf0e97c6ad1ba714db7fb2a9ed83c3e7;hpb=0b07929c5a6f2654d91db7f7ba8951e3c2a46093;p=freeside.git

diff --git a/FS/FS/msg_template.pm b/FS/FS/msg_template.pm
index 70a8e49ea..f45fb2aef 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'} ) {