From d2714607b1002c73a7e5c624de985c7b60d20338 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Wed, 8 May 2013 13:38:38 -0700 Subject: [PATCH] fix cch update removal of PLUS4/ZIP and TXMATRIX, RT#21687 --- FS/FS/cust_tax_location.pm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/FS/FS/cust_tax_location.pm b/FS/FS/cust_tax_location.pm index aec941045..4293b2c90 100644 --- a/FS/FS/cust_tax_location.pm +++ b/FS/FS/cust_tax_location.pm @@ -199,13 +199,15 @@ sub batch_import { if (exists($hash->{actionflag}) && $hash->{actionflag} eq 'D') { delete($hash->{actionflag}); - my $cust_tax_location = qsearchs('cust_tax_location', $hash); + my @cust_tax_location = qsearch('cust_tax_location', $hash); return "Can't find cust_tax_location to delete: ". join(" ", map { "$_ => ". $hash->{$_} } @fields) - unless $cust_tax_location; + unless scalar(@cust_tax_location) || $param->{'delete_only'} ; - my $error = $cust_tax_location->delete; - return $error if $error; + foreach my $cust_tax_location (@cust_tax_location) { + my $error = $cust_tax_location->delete; + return $error if $error; + } delete($hash->{$_}) foreach (keys %$hash); } -- 2.11.0