diff options
author | Mark Wells <mark@freeside.biz> | 2014-10-03 17:21:53 -0700 |
---|---|---|
committer | Mark Wells <mark@freeside.biz> | 2014-10-03 17:21:53 -0700 |
commit | f31bdd8e04ddd743cd7e89b59e83dde2afc3aea0 (patch) | |
tree | 39284c56998fe7a4ac7c2bc2ef13fb624ec9dfe3 /FS | |
parent | 7881e580b28afaa178e6834a1b8a43730b26d027 (diff) |
fix display of zero-amount line items in some cases, #30821
Diffstat (limited to 'FS')
-rw-r--r-- | FS/FS/Template_Mixin.pm | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm index 06b3d9e7b..d652d5349 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; } } |