[freeside-commits] branch master updated. b02738fceb2de16b23fb22a70350b19ee88a214c

[Jonathan Prykop]

The branch, master has been updated
       via  b02738fceb2de16b23fb22a70350b19ee88a214c (commit)
      from  3f11e4f54ca1ab9506884c32fc5f5dfb07db26f4 (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 b02738fceb2de16b23fb22a70350b19ee88a214c
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Tue Jun 30 22:30:56 2015 -0500

    RT#20687: Future package change [bug fix]

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 8e88728..b97587c 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;
       }

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

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