X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_tax.cgi;h=a98d36f3c50d7f3ce6904e88a456dd64ca027797;hp=08b6d079698e9521675788b5016ba0a272a933e6;hb=83ce2076d59c3c27beb78dd5892b2da99fd60ec1;hpb=8f6a34b553a7ca9b7fc9c9cf5802ce418e3a5296

diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index 08b6d0796..a98d36f3c 100755
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -5,16 +5,30 @@ my $user = getotaker;
 
 $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/;
 my $pbeginning = $1;
-my $beginning = str2time($1) || 0;
+my $beginning = $1 ? str2time($1) : 0;
 
 $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/;
 my $pending = $1;
-my $ending = ( str2time($1) || 4294880896 ) + 86399;
+my $ending = ( $1 ? str2time($1) : 4294880896 ) + 86399;
 
 my($total, $exempt, $taxable, $tax) = ( 0, 0, 0, 0 );
 my $out = 'Out of taxable region(s)';
 my %regions;
-foreach my $r ( qsearch('cust_main_county', {}) ) {
+foreach my $r (
+  qsearch('cust_main_county', {}, '',
+          "WHERE 0 < ( SELECT COUNT(*) FROM cust_main
+                       WHERE ( cust_main.county  = cust_main_county.county
+                               OR cust_main_county.county = ''
+                               OR cust_main_county.county IS NULL )
+                         AND ( cust_main.state   = cust_main_county.state
+                               OR cust_main_county.state = ''
+                               OR cust_main_county.state IS NULL )
+                         AND ( cust_main.country = cust_main_county.country )
+                       LIMIT 1
+                     )"
+         )
+) {
+  #warn $r->county. ' '. $r->state. ' '. $r->country. "\n";
   my $label;
   if ( $r->tax == 0 ) {
     $label = $out;
@@ -26,24 +40,29 @@ foreach my $r ( qsearch('cust_main_county', {}) ) {
     $label = $r->county." county, $label" if $r->county;
   }
 
-  #match taxclass too?
-
   my $fromwhere = "
     FROM cust_bill_pkg
       JOIN cust_bill USING ( invnum ) 
       JOIN cust_main USING ( custnum )
+      JOIN cust_pkg USING ( pkgnum )
+      JOIN part_pkg USING ( pkgpart )
     WHERE _date >= $beginning AND _date <= $ending
-      AND county = ? AND state = ? AND country = ?
+      AND ( county  = ? OR ? = '' )
+      AND ( state   = ? OR ? = '' )
+      AND ( country = ? )
+      AND ( taxclass = ? OR ? = '' )
+      AND payby != 'COMP'
   ";
   my $nottax = 'pkgnum != 0';
 
   my $a = scalar_sql($r,
-    "SELECT SUM(setup+recur) $fromwhere AND $nottax"
+    "SELECT SUM(cust_bill_pkg.setup+cust_bill_pkg.recur) $fromwhere AND $nottax"
   );
   $total += $a;
   $regions{$label}->{'total'} += $a;
 
-  foreach my $e ( grep { $r->get($_.'tax') =~ /^Y/i } qw( setup recur ) ) {
+  foreach my $e ( grep { $r->get($_.'tax') =~ /^Y/i }
+                       qw( cust_bill_pkg.setup cust_bill_pkg.recur ) ) {
     my $x = scalar_sql($r,
       "SELECT SUM($e) $fromwhere AND $nottax"
     );
@@ -51,12 +70,19 @@ foreach my $r ( qsearch('cust_main_county', {}) ) {
     $regions{$label}->{'exempt'} += $x;
   }
 
-  foreach my $e ( grep { $r->get($_.'tax') !~ /^Y/i } qw( setup recur ) ) {
+  foreach my $e ( grep { $r->get($_.'tax') !~ /^Y/i }
+                       qw( cust_bill_pkg.setup cust_bill_pkg.recur ) ) {
+    my $t = scalar_sql($r,
+      "SELECT SUM($e) $fromwhere AND $nottax AND ( tax != 'Y' OR tax IS NULL )"
+    );
+    $taxable += $t;
+    $regions{$label}->{'taxable'} += $t;
+
     my $x = scalar_sql($r,
-      "SELECT SUM($e) $fromwhere AND $nottax"
+      "SELECT SUM($e) $fromwhere AND $nottax AND tax = 'Y'"
     );
-    $taxable += $x;
-    $regions{$label}->{'taxable'} += $x;
+    $exempt += $x;
+    $regions{$label}->{'exempt'} += $x;
   }
 
   if ( defined($regions{$label}->{'rate'})
@@ -69,7 +95,8 @@ foreach my $r ( qsearch('cust_main_county', {}) ) {
   #match itemdesc if necessary!
   my $named_tax = $r->taxname ? 'AND itemdesc = '. dbh->quote($r->taxname) : '';
   my $x = scalar_sql($r,
-    "SELECT SUM(setup+recur) $fromwhere AND pkgnum = 0 $named_tax",
+    "SELECT SUM(cust_bill_pkg.setup+cust_bill_pkg.recur) $fromwhere ".
+    "AND pkgnum = 0 $named_tax",
   );
   $tax += $x;
   $regions{$label}->{'tax'} += $x;
@@ -80,7 +107,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, {
@@ -98,8 +125,10 @@ push @regions, {
 #to FS::Report or FS::Record or who the fuck knows where)
 sub scalar_sql {
   my( $r, $sql ) = @_;
+  #warn "$sql\n";
   my $sth = dbh->prepare($sql) or die dbh->errstr;
-  $sth->execute( map $r->$_(), qw( county state country ) )
+  $sth->execute( map $r->$_(),
+                     qw( county county state state country taxclass taxclass ) )
     or die "Unexpected error executing statement $sql: ". $sth->errstr;
   $sth->fetchrow_arrayref->[0] || 0;
 }
@@ -123,11 +152,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>
   <% } %>