proceed with a CCH update even if some GEOCODE/tax_rate_location deletions can't...

[freeside.git] / FS / FS / tax_rate_location.pm

diff --git a/FS/FS/tax_rate_location.pm b/FS/FS/tax_rate_location.pm
index 1a6c47d..aeb14d3 100644 (file)
--- 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);
       }
@@ -301,7 +302,7 @@ sub batch_import {
     }
     if ( scalar( @columns ) ) {
       $dbh->rollback if $oldAutoCommit;
-      return "Unexpected trailing columns in line (wrong format?): $line";
+      return "Unexpected trailing columns in line (wrong format?) importing tax-rate_location: $line";
     }
 
     my $error = &{$hook}(\%tax_rate_location);