[freeside-commits] branch master updated. 79ca46c249e58be3b7c70df57a8fc75a60ceb622

[Ivan]

The branch, master has been updated
       via  79ca46c249e58be3b7c70df57a8fc75a60ceb622 (commit)
      from  6aa1a0eeb1c28caf6af94a1323f69f3bb4256302 (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 79ca46c249e58be3b7c70df57a8fc75a60ceb622
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu May 3 13:57:54 2012 -0700

    when un-cancelling a package, errors re-provisioning services are not fatal, RT#17518

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 5ccdb35..1cca10b 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;
     }

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cust_pkg.pm |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)