[freeside-commits] branch FREESIDE_3_BRANCH updated. 5865a3fa94a6e7ed1183cff72de0c5948808001d

[Ivan Kohler]

The branch, FREESIDE_3_BRANCH has been updated
       via  5865a3fa94a6e7ed1183cff72de0c5948808001d (commit)
      from  31da5dde3920cefff7ec7855f42105e1bfc6d2ef (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 5865a3fa94a6e7ed1183cff72de0c5948808001d
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Nov 12 18:48:14 2018 -0800

    delete fees, RT#81713

diff --git a/FS/FS/cust_bill_pkg.pm b/FS/FS/cust_bill_pkg.pm
index 70dbcde2a..de76b0a29 100644
--- a/FS/FS/cust_bill_pkg.pm
+++ b/FS/FS/cust_bill_pkg.pm
@@ -459,13 +459,8 @@ sub delete {
   #not adding a cc surcharge, but this override lets us modify charged
   $cust_bill->{'Hash'}{'cc_surcharge_replace_hack'} = 1;
 
-  my $error = $cust_bill->replace;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  my $error = $self->SUPER::delete(@_);
+  my $error =  $cust_bill->replace
+            || $self->SUPER::delete(@_);
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
     return $error;

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

Summary of changes:
 FS/FS/cust_bill_pkg.pm | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)