From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 8 May 2013 11:35:35 +0000 (-0700)
Subject: revert: proceed with a CCH update even if some GEOCODE/tax_rate_location deletions... 
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=fc8def113cc11ef4572b45100c37ff2b37bb7a3d

revert: proceed with a CCH update even if some GEOCODE/tax_rate_location deletions can't be found, RT#21687
---

diff --git a/FS/FS/tax_rate_location.pm b/FS/FS/tax_rate_location.pm
index aeb14d31a..b4be8b90e 100644
--- a/FS/FS/tax_rate_location.pm
+++ b/FS/FS/tax_rate_location.pm
@@ -234,14 +234,13 @@ sub batch_import {
 
         $hash->{disabled} = '';
         my $tax_rate_location = qsearchs('tax_rate_location', $hash);
-        if ( $tax_rate_location ) {
-          $tax_rate_location->disabled('Y');
-          my $error = $tax_rate_location->replace;
-          return $error if $error;
-        } else {
-          warn "WARNING: Can't find tax_rate_location to delete, continuing update anyway: ".
-                 join(" ", map { "$_ => ". $hash->{$_} } @fields);
-        }
+        return "Can't find tax_rate_location to delete: ".
+               join(" ", map { "$_ => ". $hash->{$_} } @fields)
+          unless $tax_rate_location;
+
+        $tax_rate_location->disabled('Y');
+        my $error = $tax_rate_location->replace;
+        return $error if $error;
 
         delete($hash->{$_}) foreach (keys %$hash);
       }