projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bba2d3e
)
payment total on quotes: not when recur_method eq prorate, and be more refined about...
author
Ivan Kohler
<ivan@freeside.biz>
Wed, 1 Jul 2015 22:46:29 +0000
(15:46 -0700)
committer
Ivan Kohler
<ivan@freeside.biz>
Wed, 1 Jul 2015 22:46:29 +0000
(15:46 -0700)
FS/FS/quotation.pm
patch
|
blob
|
history
diff --git
a/FS/FS/quotation.pm
b/FS/FS/quotation.pm
index
7bf5ecb
..
f820510
100644
(file)
--- a/
FS/FS/quotation.pm
+++ b/
FS/FS/quotation.pm
@@
-274,10
+274,12
@@
sub _items_sections {
# but its good enough for the 99% common case of preventing totals from
# displaying for prorate packages
$disable_total = 1
# but its good enough for the 99% common case of preventing totals from
# displaying for prorate packages
$disable_total = 1
- if $part_pkg->plan =~ /^prorate/
- || $part_pkg->plan eq 'agent'
- || $part_pkg->plan =~ /^torrus/
- || $part_pkg->option('sync_bill_date');
+ if $part_pkg->plan =~ /^(prorate|torrus|agent$)/
+ || $part_pkg->option('recur_method') eq 'prorate'
+ || ( $part_pkg->option('sync_bill_date')
+ && $self->custnum
+ && $self->cust_main->billing_pkgs #num_billing_pkgs when we have it
+ );
}
my @pkg_freq_order = keys %{ FS::Misc->pkg_freqs };
}
my @pkg_freq_order = keys %{ FS::Misc->pkg_freqs };