summaryrefslogtreecommitdiff
path: root/FS
diff options
context:
space:
mode:
authorMark Wells <mark@freeside.biz>2014-11-05 16:21:09 -0800
committerMark Wells <mark@freeside.biz>2014-11-05 16:21:09 -0800
commitbee4494248009b7b998391bc68c5d10a31220057 (patch)
tree54dd63bfd88ee9f90413ebf18136222031fa9ab2 /FS
parent564cd53efd7eee7c2ecd2d07ba212419f04cb017 (diff)
sales tax report: detail link and better accuracy for "out of taxable" calculation, #25935
Diffstat (limited to 'FS')
-rw-r--r--FS/FS/Report/Tax.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/FS/FS/Report/Tax.pm b/FS/FS/Report/Tax.pm
index acf9f4428..713be02df 100644
--- a/FS/FS/Report/Tax.pm
+++ b/FS/FS/Report/Tax.pm
@@ -358,13 +358,13 @@ sub report_internal {
SELECT 1 FROM cust_tax_exempt_pkg
JOIN cust_main_county USING (taxnum)
WHERE cust_tax_exempt_pkg.billpkgnum = cust_bill_pkg.billpkgnum
- AND cust_main_county.taxname = '$taxname'
+ AND COALESCE(cust_main_county.taxname,'Tax') = '$taxname'
)
AND NOT EXISTS(
SELECT 1 FROM cust_bill_pkg_tax_location
JOIN cust_main_county USING (taxnum)
WHERE cust_bill_pkg_tax_location.taxable_billpkgnum = cust_bill_pkg.billpkgnum
- AND cust_main_county.taxname = '$taxname'
+ AND COALESCE(cust_main_county.taxname,'Tax') = '$taxname'
)
";
warn "\nOUTSIDE:\n$sql_outside\n" if $DEBUG;