From b5876680bf13c72fc9ba00e0ad3b87967b69005c Mon Sep 17 00:00:00 2001
From: Christopher Burger <burgerc@freeside.biz>
Date: Mon, 21 May 2018 09:44:55 -0400
Subject: [PATCH] RT# 77964 - refined code to defer dates when waiving setup
 fee for prorated packages.

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

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
-- 
2.11.0