From 60c34bd328a404008313d4ab78d25152ebdb9226 Mon Sep 17 00:00:00 2001
From: Christopher Burger <burgerc@freeside.biz>
Date: Tue, 15 May 2018 10:19:33 -0400
Subject: [PATCH] RT# 77964 - Fixed error where deferring date did not work
 when waive setup fee was set.

---
 FS/FS/cust_main/Billing.pm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/FS/FS/cust_main/Billing.pm b/FS/FS/cust_main/Billing.pm
index 08b10c1ff..51b49e4f0 100644
--- a/FS/FS/cust_main/Billing.pm
+++ b/FS/FS/cust_main/Billing.pm
@@ -1052,6 +1052,11 @@ sub _make_lines {
         }
     }
 
+    if ($cust_pkg->waive_setup && $part_pkg->plan eq "prorate") {
+      $lineitems++;
+      $setup = 0 if $part_pkg->prorate_setup($cust_pkg, $time);
+    }
+
     if ( $cust_pkg->get('setup') ) {
       # don't change it
     } elsif ( $cust_pkg->get('start_date') ) {
-- 
2.11.0