projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b74b684
)
fix totals of credited amounts on tax report, #37088
author
Mark Wells
<mark@freeside.biz>
Fri, 23 Oct 2015 23:27:29 +0000
(16:27 -0700)
committer
Mark Wells
<mark@freeside.biz>
Fri, 23 Oct 2015 23:28:05 +0000
(16:28 -0700)
FS/FS/Report/Tax.pm
patch
|
blob
|
history
diff --git
a/FS/FS/Report/Tax.pm
b/FS/FS/Report/Tax.pm
index
a892a6b
..
93fc644
100644
(file)
--- a/
FS/FS/Report/Tax.pm
+++ b/
FS/FS/Report/Tax.pm
@@
-237,7
+237,7
@@
sub report_internal {
LEFT JOIN ($sales_credit) AS sales_credit USING (billpkgnum)
LEFT JOIN ($exempt_credit) AS exempt_credit USING (billpkgnum, taxnum)
$join_cust_pkg $where AND $nottax
LEFT JOIN ($sales_credit) AS sales_credit USING (billpkgnum)
LEFT JOIN ($exempt_credit) AS exempt_credit USING (billpkgnum, taxnum)
$join_cust_pkg $where AND $nottax
- $group
+ $group
_all
";
# also include the exempt-sales credit amount, for the credit report
";
# also include the exempt-sales credit amount, for the credit report
@@
-256,7
+256,7
@@
sub report_internal {
LEFT JOIN ($exempt_credit) AS exempt_credit USING (taxnum)
JOIN cust_bill_pkg USING (billpkgnum)
$join_cust_pkg $where AND $nottax
LEFT JOIN ($exempt_credit) AS exempt_credit USING (taxnum)
JOIN cust_bill_pkg USING (billpkgnum)
$join_cust_pkg $where AND $nottax
- $group
+ $group
_all
";
# taxable sales
";
# taxable sales