diff options
| author | Jonathan Prykop <jonathan@freeside.biz> | 2015-06-30 22:30:56 -0500 |
|---|---|---|
| committer | Jonathan Prykop <jonathan@freeside.biz> | 2015-06-30 22:30:56 -0500 |
| commit | b02738fceb2de16b23fb22a70350b19ee88a214c (patch) | |
| tree | f9b85b6d29efb94101fda6121f595f1bbd4c820f /FS | |
| parent | 3f11e4f54ca1ab9506884c32fc5f5dfb07db26f4 (diff) | |
RT#20687: Future package change [bug fix]
Diffstat (limited to 'FS')
| -rw-r--r-- | FS/FS/cust_pkg.pm | 5 |
1 files 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; } |