projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
optimize legacy CCH taxation, RT#74494
[freeside.git]
/
FS
/
FS
/
tax_rate.pm
diff --git
a/FS/FS/tax_rate.pm
b/FS/FS/tax_rate.pm
index
de60cff
..
8c08f42
100644
(file)
--- a/
FS/FS/tax_rate.pm
+++ b/
FS/FS/tax_rate.pm
@@
-726,7
+726,9
@@
sub tax_on_tax {
"AND (". join(' OR ', map { "taxclassnum = $_" } @taxclassnums ). ")";
qsearch({ 'table' => 'tax_rate',
"AND (". join(' OR ', map { "taxclassnum = $_" } @taxclassnums ). ")";
qsearch({ 'table' => 'tax_rate',
- 'hashref' => { 'geocode' => $geocode, },
+ 'hashref' => { 'data_vendor' => $self->data_vendor,
+ 'geocode' => $geocode,
+ },
'extra_sql' => $extra_sql,
})
'extra_sql' => $extra_sql,
})
@@
-2287,7
+2289,7
@@
EOF
my $dropstring = '%%%FREESIDE_CACHE%%%/cache.'. $FS::UID::datasrc. '/report.';
$reportname =~ s/^$dropstring//;
my $dropstring = '%%%FREESIDE_CACHE%%%/cache.'. $FS::UID::datasrc. '/report.';
$reportname =~ s/^$dropstring//;
- my $reporturl = "%%%ROOTURL%%%/misc/queued_report?report=$reportname";
+ my $reporturl = "%%%ROOTURL%%%/misc/queued_report
.html
?report=$reportname";
die "<a href=$reporturl>view</a>\n";
}
die "<a href=$reporturl>view</a>\n";
}