[freeside-commits] branch FREESIDE_3_BRANCH updated. 8286d9921bf88afd0ddd367f3894f12fc2347f09

[Christopher Burger]

The branch, FREESIDE_3_BRANCH has been updated
       via  8286d9921bf88afd0ddd367f3894f12fc2347f09 (commit)
      from  93cd3a291f74744fbba0a6eafda142ed069ce58e (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 8286d9921bf88afd0ddd367f3894f12fc2347f09
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Tue May 15 09:44:53 2018 -0400

    Revert "RT# 77964 - Added check for prorate package in billing.pm fix for V3 backport"
    
    This reverts commit fad6e3456699062c05301bff45243a88df93e312.

diff --git a/FS/FS/cust_main/Billing.pm b/FS/FS/cust_main/Billing.pm
index 8a6056b67..debff8a53 100644
--- a/FS/FS/cust_main/Billing.pm
+++ b/FS/FS/cust_main/Billing.pm
@@ -1253,11 +1253,6 @@ 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

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

Summary of changes:
 FS/FS/cust_main/Billing.pm | 5 -----
 1 file changed, 5 deletions(-)