summaryrefslogtreecommitdiff
path: root/FS/FS/part_pkg
diff options
context:
space:
mode:
authorChristopher Burger <burgerc@freeside.biz>2017-12-11 17:20:56 -0500
committerChristopher Burger <burgerc@freeside.biz>2017-12-12 09:32:43 -0500
commit078809276a1904c19fd015423a4d2b94f80fbdca (patch)
treeacf9f9e0bcbbc0115ad16d54ea1dbf51a3ce7865 /FS/FS/part_pkg
parent59066550d19fb8797f20bd989f9c5af06b42f0f6 (diff)
RT# 78681 - fixed error where setup fee was being charged when prorate_defer_bill was set even though wave setup fee was selected.
Diffstat (limited to 'FS/FS/part_pkg')
-rw-r--r--FS/FS/part_pkg/prorate_Mixin.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/FS/FS/part_pkg/prorate_Mixin.pm b/FS/FS/part_pkg/prorate_Mixin.pm
index beae6d8..5690bbf 100644
--- a/FS/FS/part_pkg/prorate_Mixin.pm
+++ b/FS/FS/part_pkg/prorate_Mixin.pm
@@ -107,7 +107,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;
}