diff options
| -rw-r--r-- | FS/FS/cust_location.pm | 2 | ||||
| -rw-r--r-- | FS/FS/geocode_Mixin.pm | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/FS/FS/cust_location.pm b/FS/FS/cust_location.pm index a9660d8..e1b8533 100644 --- a/FS/FS/cust_location.pm +++ b/FS/FS/cust_location.pm @@ -937,7 +937,7 @@ sub _upgrade_data { next if $field eq 'disabled'; foreach my $location (qsearch({ table => 'cust_location', - extra_sql => " WHERE $field LIKE ' %' OR $field LIKE '% '" + extra_sql => " WHERE disabled IS NULL AND ($field LIKE ' %' OR $field LIKE '% ')" })) { my $error = $location->replace; die "$error (fixing whitespace in $field, locationnum ".$location->locationnum.')' diff --git a/FS/FS/geocode_Mixin.pm b/FS/FS/geocode_Mixin.pm index ef16e74..b999be0 100644 --- a/FS/FS/geocode_Mixin.pm +++ b/FS/FS/geocode_Mixin.pm @@ -265,6 +265,7 @@ sub process_district_update { my $method = $conf->config('tax_district_method') or return; #nothing to do if null my $self = $class->by_key($id) or die "object $id not found"; + return if $self->disabled; # dies on error, fine my $tax_info = get_district({ $self->location_hash }, $method); |