From 598f5364ffaab833463442f910fc9c533975e317 Mon Sep 17 00:00:00 2001
From: Jonathan Prykop <jonathan@freeside.biz>
Date: Mon, 16 Feb 2015 15:30:37 -0600
Subject: [PATCH] RT#14671: Usage for current day when billing outstanding
 usage (for cancelling customers) [better supplemental package handling]

---
 FS/FS/cust_pkg.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 079a8657a..69f7bc0a8 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -949,7 +949,11 @@ sub cancel {
   }
 
   foreach my $supp_pkg ( $self->supplemental_pkgs ) {
-    $error = $supp_pkg->cancel(%options, 'from_main' => 1);
+    if ($delay_cancel) {
+        $error = $supp_pkg->suspend(%options, 'from_main' => 1, 'reason' => undef);
+    } else {
+        $error = $supp_pkg->cancel(%options, 'from_main' => 1);
+    }
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
       return "canceling supplemental pkg#".$supp_pkg->pkgnum.": $error";
-- 
2.20.1