From 8239b044a13759ff4df2e0cebcec54f0d2751f35 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 15 Apr 2011 23:02:20 +0000
Subject: [PATCH] fix new tax report w/FS::tax_rate_location->location_sql,
 RT#12332

---
 FS/FS/tax_rate.pm                   | 4 ++--
 httemplate/search/report_newtax.cgi | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/FS/FS/tax_rate.pm b/FS/FS/tax_rate.pm
index 43f8bbbf5..76631d7a6 100644
--- a/FS/FS/tax_rate.pm
+++ b/FS/FS/tax_rate.pm
@@ -1904,7 +1904,7 @@ sub generate_liability_report {
 
       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;
 
@@ -1916,7 +1916,7 @@ sub generate_liability_report {
       $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;
 
diff --git a/httemplate/search/report_newtax.cgi b/httemplate/search/report_newtax.cgi
index 8f00ebe5d..dca78c35b 100755
--- a/httemplate/search/report_newtax.cgi
+++ b/httemplate/search/report_newtax.cgi
@@ -131,7 +131,7 @@ foreach my $t (qsearch({ table     => 'cust_bill_pkg',
 
     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 @@ foreach my $t (qsearch({ table     => 'cust_bill_pkg',
     $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;
 
-- 
2.11.0