[freeside-commits] freeside/httemplate/search report_tax.cgi, 1.39, 1.40

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail.420.am:/tmp/cvs-serv2733

Modified Files:
	report_tax.cgi 
Log Message:
should be a proper fix for edge cases where you have taxclass and empty-taxclass rates for a region, whew

Index: report_tax.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_tax.cgi,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- report_tax.cgi	13 Jan 2008 20:57:36 -0000	1.39
+++ report_tax.cgi	7 Jul 2008 23:47:15 -0000	1.40
@@ -327,7 +327,7 @@
 
     if ( scalar(@taxclasses) ) {
       $mywhere .= ' AND '. join(' AND ', map ' taxclass != ? ', @taxclasses );
-      push @param, @taxclasses;
+      push @param, map \$_, @taxclasses;
     }
   
   }
@@ -559,7 +559,7 @@
   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;
 }