diff options
author | Ivan Kohler <ivan@freeside.biz> | 2015-07-01 15:46:31 -0700 |
---|---|---|
committer | Ivan Kohler <ivan@freeside.biz> | 2015-07-01 15:46:31 -0700 |
commit | 4cb2f71d4fada35301898b8611e17e317e0bede2 (patch) | |
tree | 646e2205854fd6a941c678d352dc79ca9983e364 /FS | |
parent | 5f724e96c2a71289c19170436c52bff85d82d0d8 (diff) |
payment total on quotes: not when recur_method eq prorate, and be more refined about disabling with sync_bill-date
Diffstat (limited to 'FS')
-rw-r--r-- | FS/FS/quotation.pm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/FS/FS/quotation.pm b/FS/FS/quotation.pm index 7bf5ecb61..f82051066 100644 --- 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 - 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 }; |