[freeside-commits] freeside/FS/FS tax_rate.pm,1.43.4.6,1.43.4.7

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv18110/FS/FS

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

Index: tax_rate.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/tax_rate.pm,v
retrieving revision 1.43.4.6
retrieving revision 1.43.4.7
diff -u -w -d -r1.43.4.6 -r1.43.4.7
--- tax_rate.pm	15 Apr 2011 22:52:30 -0000	1.43.4.6
+++ tax_rate.pm	15 Apr 2011 22:54:58 -0000	1.43.4.7
@@ -1904,7 +1904,7 @@
 
       my $sql = "SELECT SUM(amount) $taxwhere AND cust_bill_pkg.pkgnum = 0";
 
-      my $x = &{$scalar_sql}($t, [], $sql );
+      my $x = &{$scalar_sql}($t, [ $itemdesc, $itemdesc ], $sql );
       $tax += $x;
       $taxes{$label}->{'tax'} += $x;
 
@@ -1916,7 +1916,7 @@
       $sql = "SELECT SUM(cust_credit_bill_pkg.amount) ".
              " $creditwhere AND cust_bill_pkg.pkgnum = 0";
 
-      my $y = &{$scalar_sql}($t, [], $sql );
+      my $y = &{$scalar_sql}($t, [ $Itemdesc, $itemdesc ], $sql );
       $credit += $y;
       $taxes{$label}->{'credit'} += $y;