From 087a9d9fbaea3a89db3f93f50fef580a388ce573 Mon Sep 17 00:00:00 2001 From: Mark Wells Date: Mon, 21 Mar 2016 15:54:24 -0700 Subject: detect and fix duplicate taxes in Washington sales tax lookup, #40645, #40144 --- FS/bin/freeside-tax-district-update | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'FS/bin/freeside-tax-district-update') diff --git a/FS/bin/freeside-tax-district-update b/FS/bin/freeside-tax-district-update index e32bc9df5..af43130d5 100644 --- a/FS/bin/freeside-tax-district-update +++ b/FS/bin/freeside-tax-district-update @@ -23,8 +23,7 @@ my $method = $conf->config('tax_district_method') my %limit; %limit = ( district => '' ) if $opt{'n'}; -my @location = qsearch( 'cust_main', \%limit ), - qsearch( 'cust_location', { disabled => '', %limit } ); +my @location = qsearch( 'cust_location', { disabled => '', %limit } ); # breaking the rules somewhat by modifying cust_location records in place # instead of doing a proper package change, but we're not changing the @@ -36,10 +35,8 @@ foreach my $location (@location) { my $job = FS::queue->new({ job => 'FS::geocode_Mixin::process_district_update' }); - my $class = ref($location); - my $id = $class eq 'FS::cust_main' ? - $location->custnum : - $location->locationnum; + my $class = 'FS::cust_location'; + my $id = $location->locationnum; $error = $job->insert($class, $id); if ( $error ) { $dbh->rollback; -- cgit v1.2.1