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

1 files changed, 7 insertions, 5 deletions

diff --git a/FS/FS/quotation.pm b/FS/FS/quotation.pm
index 0e6b4e7d0..669a25417 100644
--- a/FS/FS/quotation.pm
+++ b/FS/FS/quotation.pm
@@ -347,11 +347,13 @@ sub _items_total {
     my $disable_total = 0;
     foreach my $quotation_pkg ($self->quotation_pkg) {
       my $part_pkg = $quotation_pkg->part_pkg;
-      if (   $part_pkg->plan =~ /^prorate/
-          or $part_pkg->plan eq 'agent'
-          or $part_pkg->plan =~ /^torrus/
-          or $part_pkg->option('sync_bill_date')
-          or $part_pkg->option('recur_method') eq 'prorate' ) {
+      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
+              )
+      ) {
         $disable_total = 1;
         last;
       }