summaryrefslogtreecommitdiff
path: root/httemplate/search/report_newtax.cgi
diff options
context:
space:
mode:
authorivan <ivan>2011-02-10 01:03:58 +0000
committerivan <ivan>2011-02-10 01:03:58 +0000
commit64ccb0c8d26c387b323fb34e671b34c62d2c0c81 (patch)
tree030a1a30461ac8c5e941c12fb7615795fcb8147b /httemplate/search/report_newtax.cgi
parent83b363898f0f95a4e85d44b88cba2f0751c27361 (diff)
fix cch tax report for more than one cust_bill_pkg_tax_rate_location per line item, RT#11483
Diffstat (limited to 'httemplate/search/report_newtax.cgi')
-rwxr-xr-xhttemplate/search/report_newtax.cgi2
1 files changed, 1 insertions, 1 deletions
diff --git a/httemplate/search/report_newtax.cgi b/httemplate/search/report_newtax.cgi
index 6a2cbb0d1..78514624c 100755
--- a/httemplate/search/report_newtax.cgi
+++ b/httemplate/search/report_newtax.cgi
@@ -123,7 +123,7 @@ foreach my $t (qsearch({ table => 'cust_bill_pkg',
my $taxwhere = "FROM cust_bill_pkg $addl_from $where AND payby != 'COMP' ".
"AND ". join( ' AND ', map { "( $_ = ? OR ? = '' AND $_ IS NULL)" } @taxparam );
- my $sql = "SELECT SUM(cust_bill_pkg.setup+cust_bill_pkg.recur) ".
+ my $sql = "SELECT SUM(COALESCE(amount, cust_bill_pkg.setup+cust_bill_pkg.recur)) ".
" $taxwhere AND cust_bill_pkg.pkgnum = 0";
my $x = scalar_sql($t, [ map { $_, $_ } @params ], $sql );