[freeside-commits] branch FREESIDE_2_3_BRANCH updated. 06422a407f63b8e2876e0ea8be39c8991d85af57

[Ivan]

The branch, FREESIDE_2_3_BRANCH has been updated
       via  06422a407f63b8e2876e0ea8be39c8991d85af57 (commit)
       via  e151d7233a75c942a4a6cc57a4804d29c897aa33 (commit)
      from  58278bb4f84a00eacbf8bd706149b5c77d6436ee (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 06422a407f63b8e2876e0ea8be39c8991d85af57
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sun Jun 3 23:28:47 2012 -0700

    fix explicitly shown $0 line items (setup_show_zero / recur_show_zero) with invoice_sections, RT#17969

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 1f4943a..8cd508c 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -3885,17 +3885,20 @@ sub _items_sections {
         if ( $display->post_total && !$summarypage ) {
           if (! $type || $type eq 'S') {
             $late_subtotal{$section} += $cust_bill_pkg->setup
-              if $cust_bill_pkg->setup != 0;
+              if $cust_bill_pkg->setup != 0
+              || $cust_bill_pkg->setup_show_zero;
           }
 
           if (! $type) {
             $late_subtotal{$section} += $cust_bill_pkg->recur
-              if $cust_bill_pkg->recur != 0;
+              if $cust_bill_pkg->recur != 0
+              || $cust_bill_pkg->recur_show_zero;
           }
 
           if ($type && $type eq 'R') {
             $late_subtotal{$section} += $cust_bill_pkg->recur - $usage
-              if $cust_bill_pkg->recur != 0;
+              if $cust_bill_pkg->recur != 0
+              || $cust_bill_pkg->recur_show_zero;
           }
           
           if ($type && $type eq 'U') {
@@ -3909,17 +3912,20 @@ sub _items_sections {
 
           if (! $type || $type eq 'S') {
             $subtotal{$section} += $cust_bill_pkg->setup
-              if $cust_bill_pkg->setup != 0;
+              if $cust_bill_pkg->setup != 0
+              || $cust_bill_pkg->setup_show_zero;
           }
 
           if (! $type) {
             $subtotal{$section} += $cust_bill_pkg->recur
-              if $cust_bill_pkg->recur != 0;
+              if $cust_bill_pkg->recur != 0
+              || $cust_bill_pkg->recur_show_zero;
           }
 
           if ($type && $type eq 'R') {
             $subtotal{$section} += $cust_bill_pkg->recur - $usage
-              if $cust_bill_pkg->recur != 0;
+              if $cust_bill_pkg->recur != 0
+              || $cust_bill_pkg->recur_show_zero;
           }
           
           if ($type && $type eq 'U') {
@@ -4912,6 +4918,8 @@ sub _items_cust_bill_pkg {
       }
     }
 
+    my @cust_bill_pkg_display = $cust_bill_pkg->cust_bill_pkg_display;
+
     warn "$me _items_cust_bill_pkg considering cust_bill_pkg ".
          $cust_bill_pkg->billpkgnum. ", pkgnum ". $cust_bill_pkg->pkgnum. "\n"
       if $DEBUG > 1;
@@ -4922,7 +4930,7 @@ sub _items_cust_bill_pkg {
                                }
                           #grep { !$_->summary || !$summary_page } # bunk!
                           grep { !$_->summary || $multisection }
-                          $cust_bill_pkg->cust_bill_pkg_display
+                          @cust_bill_pkg_display
                         )
     {
 

commit e151d7233a75c942a4a6cc57a4804d29c897aa33
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sun Jun 3 13:37:16 2012 -0700

    2.3.3 happened

diff --git a/FS/FS.pm b/FS/FS.pm
index 1aa10c1..f903b40 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -3,7 +3,7 @@ package FS;
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '2.3.3';
+$VERSION = '2.3.4git';
 
 #find missing entries in this file with:
 # for a in `ls *pm | cut -d. -f1`; do grep 'L<FS::'$a'>' ../FS.pm >/dev/null || echo "missing $a" ; done

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

Summary of changes:
 FS/FS.pm           |    2 +-
 FS/FS/cust_bill.pm |   22 +++++++++++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)