projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
351a905
)
when un-cancelling a package, errors re-provisioning services are not fatal, RT#17518
author
Ivan Kohler
<ivan@freeside.biz>
Thu, 3 May 2012 20:57:55 +0000
(13:57 -0700)
committer
Ivan Kohler
<ivan@freeside.biz>
Thu, 3 May 2012 20:57:55 +0000
(13:57 -0700)
FS/FS/cust_pkg.pm
patch
|
blob
|
history
diff --git
a/FS/FS/cust_pkg.pm
b/FS/FS/cust_pkg.pm
index
f01c5c3
..
9d81c67
100644
(file)
--- a/
FS/FS/cust_pkg.pm
+++ b/
FS/FS/cust_pkg.pm
@@
-889,7
+889,9
@@
sub cancel_if_expired {
locationnum, (other fields?). Attempts to re-provision cancelled services
using history information (errors at this stage are not fatal).
locationnum, (other fields?). Attempts to re-provision cancelled services
using history information (errors at this stage are not fatal).
-cust_pkg: pass a scalar reference, will be filled in with
+cust_pkg: pass a scalar reference, will be filled in with the new cust_pkg object
+
+svc_fatal: service provisioning errors are fatal
svc_errors: pass an array reference, will be filled in with any provisioning errors
svc_errors: pass an array reference, will be filled in with any provisioning errors
@@
-972,7
+974,7
@@
sub uncancel {
}
my $svc_error = $svc_x->insert;
}
my $svc_error = $svc_x->insert;
- if ( $svc_error
) { #
&& $options{svc_fatal} ) {
+ if ( $svc_error && $options{svc_fatal} ) {
$dbh->rollback if $oldAutoCommit;
return $error;
}
$dbh->rollback if $oldAutoCommit;
return $error;
}