[freeside-commits] branch master updated. d2714607b1002c73a7e5c624de985c7b60d20338

[Ivan]

The branch, master has been updated
       via  d2714607b1002c73a7e5c624de985c7b60d20338 (commit)
      from  66720bf1f5bae4b1d4022eabff456c247447fbc1 (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 d2714607b1002c73a7e5c624de985c7b60d20338
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed May 8 13:38:38 2013 -0700

    fix cch update removal of PLUS4/ZIP and TXMATRIX, RT#21687

diff --git a/FS/FS/cust_tax_location.pm b/FS/FS/cust_tax_location.pm
index aec9410..4293b2c 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);
       }

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cust_tax_location.pm |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)