X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_tax.cgi;h=aa9ed6f11c587b1bd30f790521444f2749cd3eb2;hb=fc1979c359ec54f2270f09480a9064e7b68019fe;hp=f37e1275d9a4497cd1d44b8e1b29f643bd313d48;hpb=0c84048cb76f67fea02b1d6f86c850b26f70bdc2;p=freeside.git

diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index f37e1275d..aa9ed6f11 100755
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -11,61 +11,50 @@ $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/;
 my $pending = $1;
 my $ending = ( $1 ? str2time($1) : 4294880896 ) + 86399;
 
+my $from_join_cust = "
+  FROM cust_bill_pkg
+    JOIN cust_bill USING ( invnum ) 
+    JOIN cust_main USING ( custnum )
+";
+my $join_pkg = "
+    JOIN cust_pkg USING ( pkgnum )
+    JOIN part_pkg USING ( pkgpart )
+";
+my $where = "
+  WHERE _date >= $beginning AND _date <= $ending
+    AND ( county  = ? OR ? = '' )
+    AND ( state   = ? OR ? = '' )
+    AND ( country = ? )
+    AND payby != 'COMP'
+";
+my @base_param = qw( county county state state country );
+
+my $gotcust = "
+  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
+            )
+";
+
 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', {}, '',
-          "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
-                     )"
-         )
-) {
+foreach my $r (qsearch('cust_main_county', {}, '', $gotcust) ) {
   #warn $r->county. ' '. $r->state. ' '. $r->country. "\n";
-  my $label;
-  if ( $r->tax == 0 ) {
-    $label = $out;
-  } elsif ( $r->taxname ) {
-    $label = $r->taxname;
-  } else {
-    $label = $r->country;
-    $label = $r->state.", $label" if $r->state;
-    $label = $r->county." county, $label" if $r->county;
-  }
 
-  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  = ? OR ? = '' )
-      AND ( state   = ? OR ? = '' )
-      AND ( country = ? )
-      AND payby != 'COMP'
-  ";
-  my @param = qw( county county state state country ); # taxclass);
-
-  my $num_others = 
-    scalar_sql( $r, [qw( country state state county county taxname taxname )], 
-      "SELECT COUNT(*) FROM cust_main_county
-         WHERE country = ?
-         AND ( state = ? OR ( state IS NULL AND ? = '' ) )
-         AND ( county = ? OR ( county IS NULL AND ? = '' ) )
-         AND ( taxname = ? OR ( taxname IS NULL AND ? = '' ) ) "
-    );
+  my $label = getlabel($r);
+  $regions{$label}->{'label'} = $label;
 
-  die "didn't even find self?" unless $num_others;
+  my $fromwhere = $from_join_cust. $join_pkg. $where;
+  my @param = @base_param; 
 
-  if ( $num_others > 1 ) {
+  if ( $r->taxclass ) {
     $fromwhere .= " AND ( taxclass = ?  ) ";
     push @param, 'taxclass';
   }
@@ -94,6 +83,8 @@ foreach my $r (
     );
     $taxable += $t;
     $regions{$label}->{'taxable'} += $t;
+    $owed += $t * ($r->tax/100);
+    $regions{$label}->{'owed'} += $t * ($r->tax/100);
 
     my $x = scalar_sql($r, \@param, 
       "SELECT SUM($e) $fromwhere AND $nottax AND tax = 'Y'"
@@ -109,17 +100,39 @@ foreach my $r (
     $regions{$label}->{'rate'} = $r->tax.'%';
   }
 
+}
+
+my $taxwhere = "$from_join_cust $where";
+my @taxparam = @base_param;
+
+#foreach my $label ( keys %regions ) {
+foreach my $r (
+  qsearch( 'cust_main_county',
+           {},
+           'DISTINCT ON (country, state, county, taxname) *',
+           $gotcust
+         )
+) {
+
+  #warn join('-', map { $r->$_() } qw( country state county taxname ) )."\n";
+
+  my $label = getlabel($r);
+
+  my $fromwhere = $join_pkg. $where;
+  my @param = @base_param; 
+
   #match itemdesc if necessary!
-  my $named_tax = $r->taxname ? 'AND itemdesc = '. dbh->quote($r->taxname) : '';
-  my $x = scalar_sql($r, \@param,
-    "SELECT SUM(cust_bill_pkg.setup+cust_bill_pkg.recur) $fromwhere ".
+  my $named_tax =
+    $r->taxname
+      ? 'AND itemdesc = '. dbh->quote($r->taxname)
+      : "AND itemdesc IS NULL or itemdesc = ''";
+  my $x = scalar_sql($r, \@taxparam,
+    "SELECT SUM(cust_bill_pkg.setup+cust_bill_pkg.recur) $taxwhere ".
     "AND pkgnum = 0 $named_tax",
   );
   $tax += $x;
   $regions{$label}->{'tax'} += $x;
 
-  $regions{$label}->{'label'} = $label;
-
 }
 
 #ordering
@@ -138,6 +151,23 @@ push @regions, {
 
 #-- 
 
+sub getlabel {
+  my $r = shift;
+  if ( $r->tax == 0 ) {
+    $label = $out;
+  } elsif ( $r->taxname ) {
+    $label = $r->taxname;
+#    $regions{$label}->{'taxname'} = $label;
+#    push @{$regions{$label}->{$_}}, $r->$_() foreach qw( county state country );
+  } else {
+    $label = $r->country;
+    $label = $r->state.", $label" if $r->state;
+    $label = $r->county." county, $label" if $r->county;
+    #$label = $r->taxname. " ($label)" if $r->taxname;
+  }
+  return $label;
+}
+
 #false laziness w/FS::Report::Table::Monthly (sub should probably be moved up
 #to FS::Report or FS::Record or who the fuck knows where)
 sub scalar_sql {
@@ -158,7 +188,8 @@ sub scalar_sql {
     <TH ROWSPAN=2></TH>
     <TH COLSPAN=3>Sales</TH>
     <TH ROWSPAN=2>Rate</TH>
-    <TH ROWSPAN=2>Tax</TH>
+    <TH ROWSPAN=2>Tax owed</TH>
+    <TH ROWSPAN=2>Tax invoiced</TH>
   </TR>
   <TR>
     <TH>Total</TH>
@@ -172,6 +203,7 @@ sub scalar_sql {
       <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">$<%= sprintf('%.2f', $region->{'owed'} ) %></TD>
       <TD ALIGN="right">$<%= sprintf('%.2f', $region->{'tax'} ) %></TD>
     </TR>
   <% } %>