From b02738fceb2de16b23fb22a70350b19ee88a214c Mon Sep 17 00:00:00 2001
From: Jonathan Prykop <jonathan@freeside.biz>
Date: Tue, 30 Jun 2015 22:30:56 -0500
Subject: [PATCH] RT#20687: Future package change [bug fix]

---
 FS/FS/cust_pkg.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 8e8872871..b97587c2c 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -2442,8 +2442,9 @@ sub change_later {
 
         $error = $self->replace       ||
                  $err_or_pkg->replace ||
-                 $change_to->cancel('no_delay_cancel' => 1) ||
-                 $change_to->delete;
+                 (($err_or_pkg->pkgnum == $change_to->pkgnum) ? '' :
+                  $change_to->cancel('no_delay_cancel' => 1) ||
+                  $change_to->delete);
       } else {
         $error = $err_or_pkg;
       }
-- 
2.11.0