my $payby_itemdesc_loc =
" payby != 'COMP' ".
- "AND itemdesc = ? OR ? = '' AND itemdesc IS NULL ".
+ "AND ( itemdesc = ? OR ? = '' AND itemdesc IS NULL ) ".
"AND ". FS::tax_rate_location->location_sql( map { $_ => $t->$_ }
@taxparams
);
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, [ 'itemdesc', '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, [ 'itemdesc', 'itemdesc' ], $sql );
$credit += $y;
$taxes{$label}->{'credit'} += $y;