diff options
| -rw-r--r-- | FS/FS/tax_rate_location.pm | 15 |
1 files changed, 7 insertions, 8 deletions
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); } |