From: Christopher Burger <burgerc@freeside.biz>
Date: Mon, 7 May 2018 14:31:12 +0000 (-0400)
Subject: RT# 77964 - Added check for prorate package in billing.pm fix for V3 backport
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=fad6e3456699062c05301bff45243a88df93e312

RT# 77964 - Added check for prorate package in billing.pm fix for V3 backport
---

diff --git a/FS/FS/cust_main/Billing.pm b/FS/FS/cust_main/Billing.pm
index debff8a53..8a6056b67 100644
--- a/FS/FS/cust_main/Billing.pm
+++ b/FS/FS/cust_main/Billing.pm
@@ -1253,6 +1253,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);
+    }
+
     $cust_pkg->setfield('setup', $time)
       unless $cust_pkg->setup;
           #do need it, but it won't get written to the db