From 59a65c70ed02c784557dde37392752689efed668 Mon Sep 17 00:00:00 2001 From: Christopher Burger Date: Mon, 11 Dec 2017 17:20:56 -0500 Subject: [PATCH] RT# 78681 - fixed error where setup fee was being charged when prorate_defer_bill was set even though wave setup fee was selected. --- FS/FS/part_pkg/prorate_Mixin.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/FS/FS/part_pkg/prorate_Mixin.pm b/FS/FS/part_pkg/prorate_Mixin.pm index a89b54d2c..1a7b1efc0 100644 --- a/FS/FS/part_pkg/prorate_Mixin.pm +++ b/FS/FS/part_pkg/prorate_Mixin.pm @@ -108,7 +108,8 @@ sub calc_prorate { ) { #warn "[calc_prorate] #".$cust_pkg->pkgnum.": running deferred setup\n"; - $param->{'setup_fee'} = $self->calc_setup($cust_pkg, $$sdate, $details); + $param->{'setup_fee'} = $self->calc_setup($cust_pkg, $$sdate, $details) + unless $cust_pkg->{'Hash'}->{'waive_setup'}; $mnow = $cust_pkg->setup; $add_period = 1; } -- 2.11.0