[freeside-commits] branch master updated. 1004de872b685fefcc543f16b5c0f23b289b9d80

[Ivan]

The branch, master has been updated
       via  1004de872b685fefcc543f16b5c0f23b289b9d80 (commit)
      from  bba2d3e97b173983eebc9ade920ac0a0468c16d7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1004de872b685fefcc543f16b5c0f23b289b9d80
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Jul 1 15:46:29 2015 -0700

    payment total on quotes: not when recur_method eq prorate, and be more refined about disabling with sync_bill-date

diff --git a/FS/FS/quotation.pm b/FS/FS/quotation.pm
index 7bf5ecb..f820510 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 };

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/quotation.pm |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)