X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_newtax.cgi;h=09c56ab3b5389334b86f6e31fa8734c48098c187;hb=a989f40712bcbef325a566802118432063315240;hp=0961bbb4cabc9264470cad232275e5b03685dcb6;hpb=67c32759b3f821277033c2abcb8e5a13877a2ac7;p=freeside.git diff --git a/httemplate/search/report_newtax.cgi b/httemplate/search/report_newtax.cgi index 0961bbb4c..09c56ab3b 100755 --- 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' ". - "AND itemdesc = ? OR ? = '' AND itemdesc IS NULL ". + "AND ( itemdesc = ? OR ? = '' AND itemdesc IS NULL ) ". "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 $x = scalar_sql($t, [ $t->itemdesc, $t->itemdesc ], $sql ); + my $x = scalar_sql($t, [ 'itemdesc', 'itemdesc' ], $sql ); $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"; - my $y = scalar_sql($t, [ $t->itemdesc, $t->itemdesc ], $sql ); + my $y = scalar_sql($t, [ 'itemdesc', 'itemdesc' ], $sql ); $credit += $y; $taxes{$label}->{'credit'} += $y;