[freeside-commits] branch FREESIDE_3_BRANCH updated. 8ec8ca19c8554c06d3bfd33fda4c077b6807697c

[Mark Wells]

The branch, FREESIDE_3_BRANCH has been updated
       via  8ec8ca19c8554c06d3bfd33fda4c077b6807697c (commit)
      from  07ddea7966d85872a1a80044cfa594148d97285b (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 8ec8ca19c8554c06d3bfd33fda4c077b6807697c
Author: Mark Wells <mark at freeside.biz>
Date:   Fri Oct 3 17:21:37 2014 -0700

    fix display of zero-amount line items in some cases, #30821

diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm
index 06b3d9e..d652d53 100644
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -2031,27 +2031,20 @@ sub _items_sections {
                   ! $cust_bill_pkg->feepart   and
                   ! $section;
 
-          if (! $type || $type eq 'S') {
+          if ( $type eq 'S' ) {
             $subtotal{$locationnum}{$section} += $cust_bill_pkg->setup
               if $cust_bill_pkg->setup != 0
               || $cust_bill_pkg->setup_show_zero;
-          }
-
-          if (! $type) {
-            $subtotal{$locationnum}{$section} += $cust_bill_pkg->recur
-              if $cust_bill_pkg->recur != 0
-              || $cust_bill_pkg->recur_show_zero;
-          }
-
-          if ($type && $type eq 'R') {
+          } elsif ( $type eq 'R' ) {
             $subtotal{$locationnum}{$section} += $cust_bill_pkg->recur - $usage
               if $cust_bill_pkg->recur != 0
               || $cust_bill_pkg->recur_show_zero;
-          }
-          
-          if ($type && $type eq 'U') {
+          } elsif ( $type eq 'U' ) {
             $subtotal{$locationnum}{$section} += $usage
               unless scalar(@extra_sections);
+          } elsif ( !$type ) {
+            $subtotal{$locationnum}{$section} += $cust_bill_pkg->setup
+                                               + $cust_bill_pkg->recur;
           }
 
         }

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

Summary of changes:
 FS/FS/Template_Mixin.pm |   19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)