[freeside-commits] freeside/httemplate/search report_newtax.cgi, 1.3.4.1, 1.3.4.2

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail.420.am:/tmp/cvs-serv11647

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	report_newtax.cgi 
Log Message:
fix cch tax report for more than one cust_bill_pkg_tax_rate_location per line item, RT#11483

Index: report_newtax.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_newtax.cgi,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -w -d -r1.3.4.1 -r1.3.4.2
--- report_newtax.cgi	10 Feb 2011 01:03:59 -0000	1.3.4.1
+++ report_newtax.cgi	10 Feb 2011 01:17:17 -0000	1.3.4.2
@@ -123,8 +123,7 @@
     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;