From: Christopher Burger <burgerc@freeside.biz>
Date: Tue, 15 May 2018 14:19:33 +0000 (-0400)
Subject: RT# 77964 - Fixed error where deferring date did not work when waive setup fee was... 
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=a37042cb6ab64f04a60ab601911c38c2e490dbbc;p=freeside.git

RT# 77964 - Fixed error where deferring date did not work when waive setup fee was set.
---

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