From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 24 Oct 2015 22:24:42 +0000 (-0700)
Subject: Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE... 
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=d3016d1b54fdc46a10a2dfd6b78ad65c2dc71e5e;hp=662a999d1951e68cd3e9471353545adc8e12222f;p=freeside.git

Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_4_BRANCH
---

diff --git a/FS/FS/Report/Tax.pm b/FS/FS/Report/Tax.pm
index a892a6b87..93fc64435 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