summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorivan <ivan>2011-04-15 22:54:56 +0000
committerivan <ivan>2011-04-15 22:54:56 +0000
commitd1eb981dfbf03363513be788e9166e50794b6e1e (patch)
tree4ddb33f6eb6cc06eaa6edfe4c751dce639582063
parente92fa2f0535551a4e4cd92d10ccbcf930a5e5e62 (diff)
fix new tax report w/FS::tax_rate_location->location_sql, RT#12332
-rw-r--r--FS/FS/tax_rate.pm4
-rwxr-xr-xhttemplate/search/report_newtax.cgi2
2 files changed, 3 insertions, 3 deletions
diff --git a/FS/FS/tax_rate.pm b/FS/FS/tax_rate.pm
index c0e8c890e..43f8bbbf5 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, [], $sql );
+ my $x = &{$scalar_sql}($t, [ $itemdesc, $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, [], $sql );
+ my $y = &{$scalar_sql}($t, [ $Itemdesc, $itemdesc ], $sql );
$credit += $y;
$taxes{$label}->{'credit'} += $y;
diff --git a/httemplate/search/report_newtax.cgi b/httemplate/search/report_newtax.cgi
index b5371a642..8f00ebe5d 100755
--- a/httemplate/search/report_newtax.cgi
+++ b/httemplate/search/report_newtax.cgi
@@ -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, [], $sql );
+ my $y = scalar_sql($t, [ $itemdesc, $itemdesc ], $sql );
$credit += $y;
$taxes{$label}->{'credit'} += $y;