fix new tax report w/FS::tax_rate_location->location_sql, RT#12332

diff --git a/FS/FS/tax_rate.pm b/FS/FS/tax_rate.pm
index 43f8bbb..76631d7 100644 (file)
--- 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 8f00ebe..dca78c3 100755 (executable)
--- 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;