diff options
author | Jonathan Prykop <jonathan@freeside.biz> | 2016-04-25 19:45:29 -0500 |
---|---|---|
committer | Jonathan Prykop <jonathan@freeside.biz> | 2016-04-25 19:45:29 -0500 |
commit | 9fe9b2f47608e1ea7387539a77a95023f9872bdf (patch) | |
tree | 15390f76175e23730e4374c001c815b0e7830b59 /FS/FS | |
parent | 940da07a1b4a80bab5b2b9c9b893bfaa350bc32d (diff) |
RT#39819: Packages with Show zero setup/recurring do not print on quotations
Diffstat (limited to 'FS/FS')
-rw-r--r-- | FS/FS/quotation.pm | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/FS/FS/quotation.pm b/FS/FS/quotation.pm index 8e32eff29..f3bfc27f1 100644 --- a/FS/FS/quotation.pm +++ b/FS/FS/quotation.pm @@ -280,8 +280,8 @@ sub _items_sections { my $part_pkg = $pkg->part_pkg; my $recur_freq = $part_pkg->freq; - $show{$recur_freq} = 1 if $pkg->unitrecur > 0; - $show{0} = 1 if $pkg->unitsetup > 0; + $show{$recur_freq} = 1 if $pkg->unitrecur > 0 or $part_pkg->recur_show_zero; + $show{0} = 1 if $pkg->unitsetup > 0 or $part_pkg->setup_show_zero; ($subtotals{0} ||= 0) += $pkg->setup + $pkg->setup_tax; ($subtotals{$recur_freq} ||= 0) += $pkg->recur + $pkg->recur_tax; @@ -1053,7 +1053,11 @@ sub _items_pkg { $quotation_pkg->get('unit'.$setuprecur)); $this_item->{'amount'} = sprintf('%.2f', $this_item->{'unit_amount'} * $quotation_pkg->quantity); - next if $this_item->{'amount'} == 0; + next if $this_item->{'amount'} == 0 and !( + $setuprecur eq 'setup' + ? $part_pkg->setup_show_zero + : $part_pkg->recur_show_zero + ); if ( $preref ) { $this_item->{'preref_html'} = &$preref($quotation_pkg); |