[freeside-commits] branch FREESIDE_4_BRANCH updated. c50ee92315717c5e82a1cfec9f3b6305f24365a5

[Jonathan Prykop]

The branch, FREESIDE_4_BRANCH has been updated
       via  c50ee92315717c5e82a1cfec9f3b6305f24365a5 (commit)
       via  d86f87337be3d0ff8c77fb490d8d72c987d95fda (commit)
      from  0f8df0c70fb115c50f8c68654f01f8ad7676cda7 (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 c50ee92315717c5e82a1cfec9f3b6305f24365a5
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Tue Jun 30 22:49:28 2015 -0500

    RT#20687: Future package change [comment about bug fix]

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index b97587c..950d348 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -2442,6 +2442,7 @@ sub change_later {
 
         $error = $self->replace       ||
                  $err_or_pkg->replace ||
+                 #because change() might've edited existing scheduled change in place
                  (($err_or_pkg->pkgnum == $change_to->pkgnum) ? '' :
                   $change_to->cancel('no_delay_cancel' => 1) ||
                   $change_to->delete);

commit d86f87337be3d0ff8c77fb490d8d72c987d95fda
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 |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)