diff options
| author | Christopher Burger <burgerc@freeside.biz> | 2017-12-11 17:20:56 -0500 |
|---|---|---|
| committer | Christopher Burger <burgerc@freeside.biz> | 2017-12-11 19:51:15 -0500 |
| commit | d63804c9b722e4acccf4bac4b01afc54af74240f (patch) | |
| tree | 1cef3535e80abbd8ca7f11aa39271650b13cae81 /FS | |
| parent | a163da598b28907fc8e0d6d8ba8bb773301baa12 (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')
| -rw-r--r-- | FS/FS/part_pkg/prorate_Mixin.pm | 3 |
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 beae6d805..5690bbf29 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; } |