From: Christopher Burger <burgerc@freeside.biz>
Date: Mon, 11 Dec 2017 22:20:56 +0000 (-0500)
Subject: RT# 78681 - fixed error where setup fee was being charged when prorate_defer_bill... 
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=59a65c70ed02c784557dde37392752689efed668

RT# 78681 - fixed error where setup fee was being charged when prorate_defer_bill was set even though wave setup fee was selected.
---

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;
   }