[freeside-commits] branch FREESIDE_3_BRANCH updated. fad6e3456699062c05301bff45243a88df93e312

[Christopher Burger]

The branch, FREESIDE_3_BRANCH has been updated
       via  fad6e3456699062c05301bff45243a88df93e312 (commit)
      from  6b7a7b26239e9bdb02931242c321afd6e2fd9b39 (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 fad6e3456699062c05301bff45243a88df93e312
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Mon May 7 10:31:12 2018 -0400

    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

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

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