[freeside-commits] freeside/httemplate/search report_newtax.cgi, 1.3.4.6, 1.3.4.7

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	report_newtax.cgi 
Log Message:
fix new tax report w/FS::tax_rate_location->location_sql, RT#12332

Index: report_newtax.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_newtax.cgi,v
retrieving revision 1.3.4.6
retrieving revision 1.3.4.7
diff -u -w -d -r1.3.4.6 -r1.3.4.7
--- report_newtax.cgi	15 Apr 2011 22:54:58 -0000	1.3.4.6
+++ report_newtax.cgi	15 Apr 2011 23:02:22 -0000	1.3.4.7
@@ -131,7 +131,7 @@
 
     my $sql = "SELECT SUM(amount) $taxwhere AND cust_bill_pkg.pkgnum = 0";
 
-    my $x = scalar_sql($t, [ $itemdesc, $itemdesc ], $sql );
+    my $x = scalar_sql($t, [ $t->itemdesc, $t->itemdesc ], $sql );
     $tax += $x;
     $taxes{$label}->{'tax'} += $x;
 
@@ -143,7 +143,7 @@
     $sql = "SELECT SUM(cust_credit_bill_pkg.amount) ".
            " $creditwhere AND cust_bill_pkg.pkgnum = 0";
 
-    my $y = scalar_sql($t, [ $itemdesc, $itemdesc ], $sql );
+    my $y = scalar_sql($t, [ $t->itemdesc, $t->itemdesc ], $sql );
     $credit += $y;
     $taxes{$label}->{'credit'} += $y;