X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fquotation.pm;h=0549853902a0d6871848e7c87be0aa8f9471112e;hb=e9e5876a8a38456da236f360fd200621029bb153;hp=f3bfc27f161a4a99d2083a3fe3e8286bf3935329;hpb=9fe9b2f47608e1ea7387539a77a95023f9872bdf;p=freeside.git 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 ) {