X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_tax.cgi;h=8184a4f1af4d067543b38127e4d418e3cf7702cc;hb=c267c8720955c9af057343ba81c3f97e37568479;hp=4f3ba1a17fa72f8e92cd079e5fc2103897086aec;hpb=2ae814e9979d5a600e4c416626a5c3df418a3831;p=freeside.git

diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index 4f3ba1a17..8184a4f1a 100755
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -34,7 +34,9 @@ foreach my $r ( qsearch('cust_main_county', {}) ) {
       JOIN cust_bill USING ( invnum ) 
       JOIN cust_main USING ( custnum )
     WHERE _date >= $beginning AND _date <= $ending
-      AND county = ? AND state = ? AND country = ?
+      AND ( county  = ? OR ( ? = '' AND county  IS NULL ) )
+      AND ( state   = ? OR ( ? = '' AND state   IS NULL ) )
+      AND ( country = ? OR ( ? = '' AND country IS NULL ) )
   ";
   my $nottax = 'pkgnum != 0';
 
@@ -81,7 +83,7 @@ foreach my $r ( qsearch('cust_main_county', {}) ) {
 
 #ordering
 my @regions = map $regions{$_},
-              sort { ( $b eq $out cmp $a eq $out ) || ( $a cmp $b ) }
+              sort { ( ($a eq $out) cmp ($b eq $out) ) || ($b cmp $a) }
               keys %regions;
 
 push @regions, {
@@ -100,7 +102,7 @@ push @regions, {
 sub scalar_sql {
   my( $r, $sql ) = @_;
   my $sth = dbh->prepare($sql) or die dbh->errstr;
-  $sth->execute( map $r->$_(), qw( county state country ) )
+  $sth->execute( map $r->$_(), map { $_, $_ } qw( county state country ) )
     or die "Unexpected error executing statement $sql: ". $sth->errstr;
   $sth->fetchrow_arrayref->[0] || 0;
 }
@@ -124,11 +126,11 @@ sub scalar_sql {
   <% foreach my $region ( @regions ) { %>
     <TR>
       <TD><%= $region->{'label'} %></TD>
-      <TD ALIGN="right">$<%= $region->{'total'} %></TD>
-      <TD ALIGN="right">$<%= $region->{'exempt'} %></TD>
-      <TD ALIGN="right">$<%= $region->{'taxable'} %></TD>
+      <TD ALIGN="right">$<%= sprintf('%.2f', $region->{'total'} ) %></TD>
+      <TD ALIGN="right">$<%= sprintf('%.2f', $region->{'exempt'} ) %></TD>
+      <TD ALIGN="right">$<%= sprintf('%.2f', $region->{'taxable'} ) %></TD>
       <TD ALIGN="right"><%= $region->{'rate'} %></TD>
-      <TD ALIGN="right">$<%= $region->{'tax'} %></TD>
+      <TD ALIGN="right">$<%= sprintf('%.2f', $region->{'tax'} ) %></TD>
     </TR>
   <% } %>