projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
02b3110
)
RT#20687: Future package change [bug fix]
author
Jonathan Prykop
<jonathan@freeside.biz>
Wed, 1 Jul 2015 03:30:56 +0000
(22:30 -0500)
committer
Jonathan Prykop
<jonathan@freeside.biz>
Wed, 1 Jul 2015 03:59:02 +0000
(22:59 -0500)
FS/FS/cust_pkg.pm
patch
|
blob
|
history
diff --git
a/FS/FS/cust_pkg.pm
b/FS/FS/cust_pkg.pm
index
14555dd
..
e65672e
100644
(file)
--- 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 ||
$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;
}
} else {
$error = $err_or_pkg;
}