From 5a4db25ecf6a56c0777c52c4d172c675dad0791b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 10 Feb 2011 01:20:03 +0000
Subject: fix cch tax report for more than one cust_bill_pkg_tax_rate_location
 per line item, RT#11483

---
 httemplate/search/report_newtax.cgi | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'httemplate/search')

diff --git a/httemplate/search/report_newtax.cgi b/httemplate/search/report_newtax.cgi
index 78514624c..559d89ded 100755
--- a/httemplate/search/report_newtax.cgi
+++ b/httemplate/search/report_newtax.cgi
@@ -123,8 +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(COALESCE(amount, cust_bill_pkg.setup+cust_bill_pkg.recur)) ".
-              " $taxwhere AND cust_bill_pkg.pkgnum = 0";
+    my $sql = "SELECT SUM(amount) $taxwhere AND cust_bill_pkg.pkgnum = 0";
 
     my $x = scalar_sql($t, [ map { $_, $_ } @params ], $sql );
     $tax += $x;
-- 
cgit v1.2.1