From 79ca46c249e58be3b7c70df57a8fc75a60ceb622 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Thu, 3 May 2012 13:57:54 -0700 Subject: [PATCH] when un-cancelling a package, errors re-provisioning services are not fatal, RT#17518 --- FS/FS/cust_pkg.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm index 5ccdb354c..1cca10bc4 100644 --- a/FS/FS/cust_pkg.pm +++ b/FS/FS/cust_pkg.pm @@ -885,7 +885,9 @@ sub cancel_if_expired { 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 @@ -968,7 +970,7 @@ sub uncancel { } my $svc_error = $svc_x->insert; - if ( $svc_error ) { #&& $options{svc_fatal} ) { + if ( $svc_error && $options{svc_fatal} ) { $dbh->rollback if $oldAutoCommit; return $error; } -- 2.11.0