X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fmsg_template.pm;h=2826086fc04baf111a49710b4852a3cc3bdafab9;hb=46ca67d352957406bedb44680a9266e20f3cfd2c;hp=bc2b3827c2cfc742544e08902b31e78ab0a99c0e;hpb=c9450c02f7ac2f904a6ffabb07b6b2d5bca1fd4a;p=freeside.git

diff --git a/FS/FS/msg_template.pm b/FS/FS/msg_template.pm
index bc2b3827c..2826086fc 100644
--- a/FS/FS/msg_template.pm
+++ b/FS/FS/msg_template.pm
@@ -397,8 +397,7 @@ 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->invoice_from_full($cust_main->agentnum);
   }
 #  my @cust_msg = ();
 #  if ( $conf->exists('log_sent_mail') and !$opt{'preview'} ) {
@@ -595,6 +594,9 @@ sub substitutions {
     'cust_bill' => [qw(
       invnum
       _date
+      _date_pretty
+      due_date
+      due_date2str
     )],
     #XXX not really thinking about cust_bill substitutions quite yet