From: Ivan Kohler <ivan@freeside.biz>
Date: Tue, 13 Nov 2018 02:48:14 +0000 (-0800)
Subject: delete fees, RT#81713
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=5865a3fa94a6e7ed1183cff72de0c5948808001d

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;