diff options
| -rw-r--r-- | FS/FS/tax_rate.pm | 4 | ||||
| -rwxr-xr-x | httemplate/search/report_newtax.cgi | 2 |
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; |