projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT#6223: Billing process - pending packages - feature request [order quotation on...
[freeside.git]
/
httemplate
/
search
/
report_newtax.cgi
diff --git
a/httemplate/search/report_newtax.cgi
b/httemplate/search/report_newtax.cgi
index
0961bbb
..
09c56ab
100755
(executable)
--- a/
httemplate/search/report_newtax.cgi
+++ b/
httemplate/search/report_newtax.cgi
@@
-121,7
+121,7
@@
foreach my $t (qsearch({ table => 'cust_bill_pkg',
my $payby_itemdesc_loc =
" payby != 'COMP' ".
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
);
"AND ". FS::tax_rate_location->location_sql( map { $_ => $t->$_ }
@taxparams
);
@@
-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 $sql = "SELECT SUM(amount) $taxwhere AND cust_bill_pkg.pkgnum = 0";
- my $x = scalar_sql($t, [
$t->itemdesc, $t->itemdesc
], $sql );
+ my $x = scalar_sql($t, [
'itemdesc', 'itemdesc'
], $sql );
$tax += $x;
$taxes{$label}->{'tax'} += $x;
$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";
$sql = "SELECT SUM(cust_credit_bill_pkg.amount) ".
" $creditwhere AND cust_bill_pkg.pkgnum = 0";
- my $y = scalar_sql($t, [
$t->itemdesc, $t->itemdesc
], $sql );
+ my $y = scalar_sql($t, [
'itemdesc', 'itemdesc'
], $sql );
$credit += $y;
$taxes{$label}->{'credit'} += $y;
$credit += $y;
$taxes{$label}->{'credit'} += $y;