From: ivan Date: Mon, 7 Jul 2008 23:47:16 +0000 (+0000) Subject: should be a proper fix for edge cases where you have taxclass and empty-taxclass... X-Git-Tag: freeside_1_7_4rc1~258 X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=943f2a2cdc918b37ed5b79e32d5fdbed8edc1918;p=freeside.git should be a proper fix for edge cases where you have taxclass and empty-taxclass rates for a region, whew --- diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi index 62ba08702..a49c8506d 100755 --- a/httemplate/search/report_tax.cgi +++ b/httemplate/search/report_tax.cgi @@ -327,7 +327,7 @@ foreach my $r (qsearch('cust_main_county', {}, '', $gotcust) ) { if ( scalar(@taxclasses) ) { $mywhere .= ' AND '. join(' AND ', map ' taxclass != ? ', @taxclasses ); - push @param, @taxclasses; + push @param, map \$_, @taxclasses; } } @@ -559,7 +559,7 @@ sub scalar_sql { my( $r, $param, $sql ) = @_; #warn "$sql\n"; my $sth = dbh->prepare($sql) or die dbh->errstr; - $sth->execute( map $r->$_(), @$param ) + $sth->execute( map { ref($_) ? ${$_} : $r->$_() } @$param ) or die "Unexpected error executing statement $sql: ". $sth->errstr; $sth->fetchrow_arrayref->[0] || 0; }