projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d2b1f8e
)
RT#39819: Packages with Show zero setup/recurring do not print on quotations [use...
author
Jonathan Prykop
<jonathan@freeside.biz>
Tue, 26 Apr 2016 20:29:51 +0000
(15:29 -0500)
committer
Jonathan Prykop
<jonathan@freeside.biz>
Tue, 26 Apr 2016 20:29:51 +0000
(15:29 -0500)
FS/FS/quotation.pm
patch
|
blob
|
history
diff --git
a/FS/FS/quotation.pm
b/FS/FS/quotation.pm
index
f3bfc27
..
0549853
100644
(file)
--- 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;
my $part_pkg = $pkg->part_pkg;
my $recur_freq = $part_pkg->freq;
- $show{$recur_freq} = 1 if $pkg->unitrecur > 0 or $p
art_p
kg->recur_show_zero;
- $show{0} = 1 if $pkg->unitsetup > 0 or $p
art_p
kg->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;
($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'
* $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 ) {
);
if ( $preref ) {