summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Kohler <ivan@freeside.biz>2018-11-12 18:48:14 -0800
committerIvan Kohler <ivan@freeside.biz>2018-11-12 18:48:14 -0800
commit5865a3fa94a6e7ed1183cff72de0c5948808001d (patch)
tree90835c64b00117d4065ad43b71c8be10b5773e87
parent31da5dde3920cefff7ec7855f42105e1bfc6d2ef (diff)
delete fees, RT#81713
-rw-r--r--FS/FS/cust_bill_pkg.pm9
1 files changed, 2 insertions, 7 deletions
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;