[freeside-commits] branch master updated. b5876680bf13c72fc9ba00e0ad3b87967b69005c

[Christopher Burger]

The branch, master has been updated
       via  b5876680bf13c72fc9ba00e0ad3b87967b69005c (commit)
      from  c34212f6b04a6796467ad1fb5d32154eae1ea40d (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 b5876680bf13c72fc9ba00e0ad3b87967b69005c
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Mon May 21 09:44:55 2018 -0400

    RT# 77964 - refined code to defer dates when waiving setup fee for prorated packages.

diff --git a/FS/FS/cust_main/Billing.pm b/FS/FS/cust_main/Billing.pm
index 51b49e4f0..9cf9b56c6 100644
--- a/FS/FS/cust_main/Billing.pm
+++ b/FS/FS/cust_main/Billing.pm
@@ -1052,10 +1052,8 @@ sub _make_lines {
         }
     }
 
-    if ($cust_pkg->waive_setup && $part_pkg->plan eq "prorate") {
-      $lineitems++;
-      $setup = 0 if $part_pkg->prorate_setup($cust_pkg, $time);
-    }
+    $lineitems++
+    if $cust_pkg->waive_setup && $part_pkg->can('prorate_setup') && $part_pkg->prorate_setup($cust_pkg, $time);
 
     if ( $cust_pkg->get('setup') ) {
       # don't change it

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

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