diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2015-10-24 15:24:42 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2015-10-24 15:24:42 -0700 |
| commit | d3016d1b54fdc46a10a2dfd6b78ad65c2dc71e5e (patch) | |
| tree | 4c81849d6bf7558b90fc03dc681ba5a6964de4d4 | |
| parent | 662a999d1951e68cd3e9471353545adc8e12222f (diff) | |
| parent | 25a4d91b9a95b2cdc20ff440dd06f355f541249b (diff) | |
Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_4_BRANCH
| -rw-r--r-- | FS/FS/Report/Tax.pm | 4 |
1 files changed, 2 insertions, 2 deletions
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 |