[freeside-commits] branch master updated. 59a65c70ed02c784557dde37392752689efed668

[Christopher Burger]

The branch, master has been updated
       via  59a65c70ed02c784557dde37392752689efed668 (commit)
      from  2902ae7bd3efe461d03953c028892298e3789997 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 59a65c70ed02c784557dde37392752689efed668
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Mon Dec 11 17:20:56 2017 -0500

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

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/part_pkg/prorate_Mixin.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)