From 7685d697180f48048b8a98de84718a26d8fb58b7 Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 8 May 2013 04:10:46 -0700
Subject: [PATCH] proceed with a CCH update even if some
 GEOCODE/tax_rate_location deletions can't be found, RT#21687

---
 FS/FS/tax_rate_location.pm | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/FS/FS/tax_rate_location.pm b/FS/FS/tax_rate_location.pm
index b4be8b90e..aeb14d31a 100644
--- a/FS/FS/tax_rate_location.pm
+++ b/FS/FS/tax_rate_location.pm
@@ -234,13 +234,14 @@ sub batch_import {
 
         $hash->{disabled} = '';
         my $tax_rate_location = qsearchs('tax_rate_location', $hash);
-        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;
+        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);
+        }
 
         delete($hash->{$_}) foreach (keys %$hash);
       }
-- 
2.11.0