[freeside-commits] branch master updated. bfba4dcd1478d5ace640464b3e2e05531f3db5e0

Ivan Kohler ivan at freeside.biz
Mon Nov 12 18:48:08 PST 2018


The branch, master has been updated
       via  bfba4dcd1478d5ace640464b3e2e05531f3db5e0 (commit)
      from  4346f152b8d5376b3f5e09c1035cf16be3d9892f (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 bfba4dcd1478d5ace640464b3e2e05531f3db5e0
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Nov 12 18:48:07 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(-)




More information about the freeside-commits mailing list