From 078809276a1904c19fd015423a4d2b94f80fbdca Mon Sep 17 00:00:00 2001
From: Christopher Burger <burgerc@freeside.biz>
Date: Mon, 11 Dec 2017 17:20:56 -0500
Subject: 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(-)

(limited to 'FS/FS/part_pkg')

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;
   }
-- 
cgit v1.1