[freeside-commits] branch master updated. d947f2b79c85632487c96731a4f05b32b757ea95

[Ivan]

The branch, master has been updated
       via  d947f2b79c85632487c96731a4f05b32b757ea95 (commit)
      from  6f2740efafc72c4a13d0670a76201eaa22784abe (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 d947f2b79c85632487c96731a4f05b32b757ea95
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Jun 12 01:29:31 2012 -0700

    fix discount-show_avail without invoice_sections from hiding previous balances, RT#15159

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index a70f975..5b41d4b 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -2985,6 +2985,12 @@ sub print_generic {
   my $late_sections = [];
   my $extra_sections = [];
   my $extra_lines = ();
+
+  my $default_section = { 'description' => '',
+                          'subtotal'    => '', 
+                          'no_subtotal' => 1,
+                        };
+
   if ( $multisection ) {
     ($extra_sections, $extra_lines) =
       $self->_items_extra_usage_sections($escape_function_nonbsp, $format)
@@ -3016,8 +3022,7 @@ sub print_generic {
     }
   } else {# not multisection
     # make a default section
-    push @sections, { 'description' => '', 'subtotal' => '', 
-      'no_subtotal' => 1 };
+    push @sections, $default_section;
     # and calculate the finance charge total, since it won't get done otherwise.
     # XXX possibly other totals?
     # XXX possibly finance_pkgclass should not be used in this manner?
@@ -3050,7 +3055,8 @@ sub print_generic {
       };
       $detail->{'ref'} = $line_item->{'pkgnum'};
       $detail->{'quantity'} = 1;
-      $detail->{'section'} = $previous_section;
+      $detail->{'section'} = $multisection ? $previous_section
+                                           : $default_section;
       $detail->{'description'} = &$escape_function($line_item->{'description'});
       if ( exists $line_item->{'ext_description'} ) {
         @{$detail->{'ext_description'}} = map {

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

Summary of changes:
 FS/FS/cust_bill.pm |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)