[freeside-commits] branch FREESIDE_4_BRANCH updated. 434c049763741ac36f9b41df8102c6dd2eaf0fb0

[Ivan Kohler]

The branch, FREESIDE_4_BRANCH has been updated
       via  434c049763741ac36f9b41df8102c6dd2eaf0fb0 (commit)
      from  25378ab2e1772717162e406e9ffd91e2025f7b92 (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 434c049763741ac36f9b41df8102c6dd2eaf0fb0
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Nov 12 18:48:10 2018 -0800

    delete fees, RT#81713

diff --git a/FS/FS/cust_bill_pkg.pm b/FS/FS/cust_bill_pkg.pm
index d0d62bd6a..305ad63a6 100644
--- a/FS/FS/cust_bill_pkg.pm
+++ b/FS/FS/cust_bill_pkg.pm
@@ -499,13 +499,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(-)