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

[freeside.git] / FS / FS / tax_rate.pm

diff --git a/FS/FS/tax_rate.pm b/FS/FS/tax_rate.pm
index c0e8c89..ea605fe 100644 (file)
--- a/FS/FS/tax_rate.pm
+++ b/FS/FS/tax_rate.pm
@@ -1904,19 +1904,19 @@ sub generate_liability_report {
 
       my $sql = "SELECT SUM(amount) $taxwhere AND cust_bill_pkg.pkgnum = 0";
 
-      my $x = &{$scalar_sql}($t, [], $sql );
+      my $x = &{$scalar_sql}($t, [ $t->itemdesc, $t->itemdesc ], $sql );
       $tax += $x;
       $taxes{$label}->{'tax'} += $x;
 
       my $creditfrom =
        "JOIN cust_credit_bill_pkg USING (billpkgnum,billpkgtaxratelocationnum)";
       my $creditwhere =
-        "FROM cust_bill_pkg $addl_from $creditfrom $where $payby_itemdesc_loc";
+        "FROM cust_bill_pkg $addl_from $creditfrom $where AND $payby_itemdesc_loc";
 
       $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, [ $t->itemdesc, $t->itemdesc ], $sql );
       $credit += $y;
       $taxes{$label}->{'credit'} += $y;