[freeside-commits] branch FREESIDE_3_BRANCH updated. 9313346347265c5a1ad3e1da8f2fcbb965a9d6cd

[Jonathan Prykop]

The branch, FREESIDE_3_BRANCH has been updated
       via  9313346347265c5a1ad3e1da8f2fcbb965a9d6cd (commit)
       via  346c32b847002357ecf79503d153186d0627aaa1 (commit)
      from  02b3110eb22945351c1b840a6686b9ad6541be0b (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 9313346347265c5a1ad3e1da8f2fcbb965a9d6cd
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 e65672e..dcbcfeb 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -2415,6 +2415,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 346c32b847002357ecf79503d153186d0627aaa1
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 14555dd..e65672e 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -2415,8 +2415,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(-)