summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Burger <burgerc@freeside.biz>2018-05-15 10:19:33 -0400
committerChristopher Burger <burgerc@freeside.biz>2018-05-21 11:24:51 -0400
commitf1205344753e1b44945ccc0daa1c78d0f7fa7c45 (patch)
tree046b7f42d7705cd0efcb81e2e398a0617fb2e80b
parentc2bcd30a9cf76008d21706bab99b6209f76a9f5a (diff)
RT# 77964 - Fixed error where deferring date did not work when waive setup fee was set.
Conflicts: FS/FS/cust_main/Billing.pm
-rw-r--r--FS/FS/cust_main/Billing.pm5
1 files changed, 5 insertions, 0 deletions
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