[freeside-commits] branch master updated. beb4c90e57b8063677a556a1a0bf10395ca49d4e
Mark Wells
mark at 420.am
Fri Oct 23 16:43:09 PDT 2015
The branch, master has been updated
via beb4c90e57b8063677a556a1a0bf10395ca49d4e (commit)
from 49ba2ca1d1b5e642f0f988e849ca7d1ea89b4dd6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit beb4c90e57b8063677a556a1a0bf10395ca49d4e
Author: Mark Wells <mark at freeside.biz>
Date: Fri Oct 23 16:27:29 2015 -0700
fix totals of credited amounts on tax report, #37088
diff --git a/FS/FS/Report/Tax.pm b/FS/FS/Report/Tax.pm
index a892a6b..93fc644 100644
--- 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
- $group
+ $group_all
";
# 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
- $group
+ $group_all
";
# taxable sales
-----------------------------------------------------------------------
Summary of changes:
FS/FS/Report/Tax.pm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
More information about the freeside-commits
mailing list