[freeside-commits] branch FREESIDE_4_BRANCH updated. 9886f9a440019c5424cec7fc254c9dcc777798f5

[Ivan]

The branch, FREESIDE_4_BRANCH has been updated
       via  9886f9a440019c5424cec7fc254c9dcc777798f5 (commit)
      from  ff33ea425a4e23bf4a1d959b268382ade6631dba (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9886f9a440019c5424cec7fc254c9dcc777798f5
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Mar 6 20:28:02 2017 -0800

    fix agent-virt of invoice_from and company_name on statement send, RT#74943, RT#34078

diff --git a/httemplate/misc/email-customer-statement.html b/httemplate/misc/email-customer-statement.html
index 7ed380b..6b88f79 100644
--- a/httemplate/misc/email-customer-statement.html
+++ b/httemplate/misc/email-customer-statement.html
@@ -53,7 +53,7 @@ my $post_search_hook = sub {
   # set from/subject/html_body based on date range
 
   $cgi->param('from',
-    $opt{'conf'}->config('invoice_from')
+    $opt{'conf'}->config('invoice_from', $cust_main->agentnum)
   );
 
   # shortcut for common text
@@ -63,18 +63,13 @@ my $post_search_hook = sub {
     ($cgi->param('end_date') ? ' through ' : '') .
     $cgi->param('end_date');
 
-  $cgi->param('subject',
-    $opt{'conf'}->config('company_name') . 
-    ' statement for ' .
-    $summary_text
-  );
+  my $company_name = $opt{'conf'}->config('company_name', $cust_main->agentnum);
+  my $subject = "$company_name statement for $summary_text";
+
+  $cgi->param('subject', $subject);
 
   $cgi->param('body',
-    '<P>' .
-    $opt{'conf'}->config('company_name') . 
-    ' statement of charges and payments for ' .
-    $summary_text . 
-    "</P>" .
+    "<P>$subject</P>".
     include('/elements/customer-statement.html',
       'history' => [ 
         $cust_main->payment_history(

-----------------------------------------------------------------------

Summary of changes:
 httemplate/misc/email-customer-statement.html |   17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)