From 5b193ee2c5fae0743699adb1a28591f2a1735eb7 Mon Sep 17 00:00:00 2001
From: Mark Wells <mark@freeside.biz>
Date: Fri, 10 Jul 2015 18:14:40 -0700
Subject: avoid generating spurious zero-amount bills on cancellation, #37229,
 from #16066

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

(limited to 'FS/FS/cust_main/Billing.pm')

diff --git a/FS/FS/cust_main/Billing.pm b/FS/FS/cust_main/Billing.pm
index f4c8045..87be4e6 100644
--- a/FS/FS/cust_main/Billing.pm
+++ b/FS/FS/cust_main/Billing.pm
@@ -1107,6 +1107,14 @@ sub _make_lines {
     return "$@ running $method for $cust_pkg\n"
       if ( $@ );
 
+    if ($recur eq 'NOTHING') {
+      # then calc_cancel (or calc_recur but that's not used) has declined to
+      # generate a recurring lineitem at all. treat this as zero, but also 
+      # try not to generate a lineitem.
+      $recur = 0;
+      $lineitems--;
+    }
+
     #base_cancel???
     $unitrecur = $cust_pkg->base_recur( \$sdate ) || $recur; #XXX uuh, better
 
-- 
cgit v1.1