From 7358c407cc5fd795e145d9fc0de1d784c1690e55 Mon Sep 17 00:00:00 2001 From: Jonathan Prykop Date: Tue, 26 Apr 2016 15:29:51 -0500 Subject: [PATCH] RT#39819: Packages with Show zero setup/recurring do not print on quotations [use quotation_pkg methods, v4+ only] --- FS/FS/quotation.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/FS/FS/quotation.pm b/FS/FS/quotation.pm index f3bfc27f1..054985390 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 or $part_pkg->recur_show_zero; - $show{0} = 1 if $pkg->unitsetup > 0 or $part_pkg->setup_show_zero; + $show{$recur_freq} = 1 if $pkg->unitrecur > 0 or $pkg->recur_show_zero; + $show{0} = 1 if $pkg->unitsetup > 0 or $pkg->setup_show_zero; ($subtotals{0} ||= 0) += $pkg->setup + $pkg->setup_tax; ($subtotals{$recur_freq} ||= 0) += $pkg->recur + $pkg->recur_tax; @@ -1055,8 +1055,8 @@ sub _items_pkg { * $quotation_pkg->quantity); next if $this_item->{'amount'} == 0 and !( $setuprecur eq 'setup' - ? $part_pkg->setup_show_zero - : $part_pkg->recur_show_zero + ? $quotation_pkg->setup_show_zero + : $quotation_pkg->recur_show_zero ); if ( $preref ) { -- 2.11.0