tax report update, link to new line item report, per-agent tax reporting

1 files changed, 143 insertions, 55 deletions

diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index 587665740..4edd08449 100755
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -1,15 +1,8 @@
-<!-- mason kludge -->
 <%
 
 my $user = getotaker;
 
-$cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/;
-my $pbeginning = $1;
-my $beginning = $1 ? str2time($1) : 0;
-
-$cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/;
-my $pending = $1;
-my $ending = ( $1 ? str2time($1) : 4294880896 ) + 86399;
+my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
 
 my $from_join_cust = "
   FROM cust_bill_pkg
@@ -24,11 +17,19 @@ my $where = "
   WHERE _date >= $beginning AND _date <= $ending
     AND ( county  = ? OR ? = '' )
     AND ( state   = ? OR ? = '' )
-    AND ( country = ? )
+    AND   country = ?
     AND payby != 'COMP'
 ";
 my @base_param = qw( county county state state country );
 
+my $agentname = '';
+if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
+  my $agent = qsearchs('agent', { 'agentnum' => $1 } );
+  die "agent not found" unless $agent;
+  $agentname = $agent->agent;
+  $where .= ' AND agentnum = '. $agent->agentnum;
+}
+
 my $gotcust = "
   WHERE 0 < ( SELECT COUNT(*) FROM cust_main
               WHERE ( cust_main.county  = cust_main_county.county
@@ -43,52 +44,70 @@ my $gotcust = "
 ";
 
 my $monthly_exempt_warning = 0;
-my($total, $exempt, $taxable, $owed, $tax) = ( 0, 0, 0, 0, 0 );
+my($total, $taxable, $owed, $tax) = ( 0, 0, 0, 0, 0 );
+my( $exempt_cust, $exempt_pkg, $exempt_monthly ) = ( 0, 0 );
 my $out = 'Out of taxable region(s)';
-my %regions;
+my %regions = ();
 foreach my $r (qsearch('cust_main_county', {}, '', $gotcust) ) {
   #warn $r->county. ' '. $r->state. ' '. $r->country. "\n";
 
   my $label = getlabel($r);
   $regions{$label}->{'label'} = $label;
 
+  $regions{$label}->{'url_param'} = join(';', map "$_=".$r->$_(), qw( county state country ) );
+
   my $fromwhere = $from_join_cust. $join_pkg. $where;
-  my @param = @base_param; 
+  my @param = @base_param;
 
   if ( $r->taxclass ) {
-    $fromwhere .= " AND ( taxclass = ?  ) ";
+    $fromwhere .= " AND taxclass = ? ";
     push @param, 'taxclass';
+    $regions{$label}->{'url_param'} .= ';taxclass='. $r->taxclass;
   }
 
+#  my $label = getlabel($r);
+#  $regions{$label}->{'label'} = $label;
+
   my $nottax = 'pkgnum != 0';
 
-  my $a = scalar_sql($r, \@param,
+  ## calculate total for this region
+
+  my $t = scalar_sql($r, \@param,
     "SELECT SUM(cust_bill_pkg.setup+cust_bill_pkg.recur) $fromwhere AND $nottax"
   );
-  $total += $a;
-  $regions{$label}->{'total'} += $a;
+  $total += $t;
+  $regions{$label}->{'total'} += $t;
+
+  ## calculate package-exemption for this region
 
   foreach my $e ( grep { $r->get($_.'tax') =~ /^Y/i }
                        qw( cust_bill_pkg.setup cust_bill_pkg.recur ) ) {
     my $x = scalar_sql($r, \@param,
       "SELECT SUM($e) $fromwhere AND $nottax"
     );
-    $exempt += $x;
-    $regions{$label}->{'exempt'} += $x;
+    $exempt_pkg += $x;
+    $regions{$label}->{'exempt_pkg'} += $x;
   }
 
-  my($t, $x) = (0, 0);
+  ## calculate customer-exemption for this region
+
+  my($t, $x_cust) = (0, 0);
   foreach my $e ( grep { $r->get($_.'tax') !~ /^Y/i }
                        qw( cust_bill_pkg.setup cust_bill_pkg.recur ) ) {
     $t += scalar_sql($r, \@param, 
       "SELECT SUM($e) $fromwhere AND $nottax AND ( tax != 'Y' OR tax IS NULL )"
     );
 
-    $x += scalar_sql($r, \@param, 
+    $x_cust += scalar_sql($r, \@param, 
       "SELECT SUM($e) $fromwhere AND $nottax AND tax = 'Y'"
     );
   }
 
+  $exempt_cust += $x_cust;
+  $regions{$label}->{'exempt_cust'} += $x_cust;
+
+  ## calculate monthly exemption (texas tax) for this region
+
   my($sday,$smon,$syear) = (localtime($beginning) )[ 3, 4, 5 ];
   $monthly_exempt_warning=1 if $sday != 1 && $beginning;
   $smon++; $syear+=1900;
@@ -97,23 +116,22 @@ foreach my $r (qsearch('cust_main_county', {}, '', $gotcust) ) {
   my($eday,$emon,$eyear) = (localtime($eending) )[ 3, 4, 5 ];
   $emon++; $eyear+=1900;
 
-  my $monthly_exemption = scalar_sql($r, [ 'taxnum' ],
+  my $x_monthly = scalar_sql($r, [ 'taxnum' ],
     "SELECT SUM(amount) FROM cust_tax_exempt where taxnum = ? ".
     "  AND ( year > $syear OR ( year = $syear and month >= $smon ) )".
     "  AND ( year < $eyear OR ( year = $eyear and month <= $emon ) )"
   );
-  #warn $r->taxnum(). ": $monthly_exemption\n";
-  if ( $monthly_exemption ) {
-    $t -= $monthly_exemption;
-    $x += $monthly_exemption;
+  if ( $x_monthly ) {
+    warn $r->taxnum(). ": $x_monthly\n";
+    $t -= $x_monthly;
   }
 
+  $exempt_monthly += $x_monthly;
+  $regions{$label}->{'exempt_monthly'} += $x_monthly;
+
   $taxable += $t;
   $regions{$label}->{'taxable'} += $t;
 
-  $exempt += $x;
-  $regions{$label}->{'exempt'} += $x;
-
   $owed += $t * ($r->tax/100);
   $regions{$label}->{'owed'} += $t * ($r->tax/100);
 
@@ -165,13 +183,16 @@ my @regions = map $regions{$_},
               keys %regions;
 
 push @regions, {
-  'label'     => 'Total',
-  'total'     => $total,
-  'exempt'    => $exempt,
-  'taxable'   => $taxable,
-  'rate'      => '',
-  'owed'      => $owed,
-  'tax'       => $tax,
+  'label'          => 'Total',
+  'url_param'      => '',
+  'total'          => $total,
+  'exempt_cust'    => $exempt_cust,
+  'exempt_pkg'     => $exempt_pkg,
+  'exempt_monthly' => $exempt_monthly,
+  'taxable'        => $taxable,
+  'rate'           => '',
+  'owed'           => $owed,
+  'tax'            => $tax,
 };
 
 #-- 
@@ -180,7 +201,17 @@ sub getlabel {
   my $r = shift;
 
   my $label;
-  if ( $r->tax == 0 ) {
+  if (
+    $r->tax == 0 
+    && ! scalar( qsearch('cust_main_county', { 'state'   => $r->state,
+                                               'county'  => $r->county,
+                                               'country' => $r->country,
+                                               'tax' => { op=>'>', value=>0 },
+                                             }
+                        )
+               )
+
+  ) {
     #kludge to avoid "will not stay shared" warning
     my $out = 'Out of taxable region(s)';
     $label = $out;
@@ -192,6 +223,7 @@ sub getlabel {
     $label = $r->country;
     $label = $r->state.", $label" if $r->state;
     $label = $r->county." county, $label" if $r->county;
+    $label = "$label (". $r->taxclass. ")" if $r->taxclass;
     #$label = $r->taxname. " ($label)" if $r->taxname;
   }
   return $label;
@@ -210,30 +242,86 @@ sub scalar_sql {
 
 %>
 
-<%= header( "Sales Tax Report - $pbeginning through ".($pending||'now'),
-            menubar( 'Main Menu'=>$p, ) )               %>
-<%= table() %>
+<%
+
+my $baselink = $p. "search/cust_bill_pkg.cgi?begin=$beginning;end=$ending";
+
+%>
+
+
+<%= header( "$agentname Sales Tax Report - ".
+              time2str('%h %o %Y through ', $beginning ).
+              ( $cgi->param('ending') == 4294967295
+                  ? 'now'
+                  : time2str('%h %o %Y', $ending )
+              ),
+            menubar( 'Main Menu'=>$p, )
+          )
+%>
+
+<%= include('/elements/table-grid.html') %>
+
   <TR>
-    <TH ROWSPAN=2></TH>
-    <TH COLSPAN=3>Sales</TH>
-    <TH ROWSPAN=2>Rate</TH>
-    <TH ROWSPAN=2>Tax owed</TH>
-    <TH ROWSPAN=2>Tax invoiced</TH>
+    <TH CLASS="grid" BGCOLOR="#cccccc"ROWSPAN=2></TH>
+    <TH CLASS="grid" BGCOLOR="#cccccc"COLSPAN=5>Sales</TH>
+    <TH CLASS="grid" BGCOLOR="#cccccc"ROWSPAN=2>Rate</TH>
+    <TH CLASS="grid" BGCOLOR="#cccccc"ROWSPAN=2>Tax owed</TH>
+    <TH CLASS="grid" BGCOLOR="#cccccc"ROWSPAN=2>Tax invoiced</TH>
   </TR>
   <TR>
-    <TH>Total</TH>
-    <TH>Non-taxable</TH>
-    <TH>Taxable</TH>
+    <TH CLASS="grid" BGCOLOR="#cccccc">Total</TH>
+    <TH CLASS="grid" BGCOLOR="#cccccc">Non-taxable<BR><FONT SIZE=-1>(tax-exempt customer)</FONT></TH>
+    <TH CLASS="grid" BGCOLOR="#cccccc">Non-taxable<BR><FONT SIZE=-1>(tax-exempt package)</FONT></TH>
+    <TH CLASS="grid" BGCOLOR="#cccccc">Non-taxable<BR><FONT SIZE=-1>(monthly exemption)</FONT></TH>
+    <TH CLASS="grid" BGCOLOR="#cccccc">Taxable</TH>
   </TR>
-  <% foreach my $region ( @regions ) { %>
+
+<% my $bgcolor1 = '#eeeeee';
+   my $bgcolor2 = '#ffffff';
+   my $bgcolor;
+%>
+
+  <% foreach my $region ( @regions ) {
+
+       if ( $bgcolor eq $bgcolor1 ) {
+         $bgcolor = $bgcolor2;
+       } else {
+         $bgcolor = $bgcolor1;
+       }
+
+       my $link = $baselink;
+       if ( $region->{'label'} ne 'Total' ) {
+         if ( $region->{'label'} eq $out ) {
+           $link .= ';out=1';
+         } else {
+           $link .= ';'. $region->{'url_param'};
+         }
+       }
+  %>
     <TR>
-      <TD><%= $region->{'label'} %></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">$<%= sprintf('%.2f', $region->{'owed'} ) %></TD>
-      <TD ALIGN="right">$<%= sprintf('%.2f', $region->{'tax'} ) %></TD>
+      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><%= $region->{'label'} %></TD>
+      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right">
+        <A HREF="<%= $link %>;nottax=1">$<%= sprintf('%.2f', $region->{'total'} ) %></A>
+      </TD>
+      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right">
+        <A HREF="<%= $link %>;nottax=1;cust_tax=Y">$<%= sprintf('%.2f', $region->{'exempt_cust'} ) %></A>
+      </TD>
+      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right">
+        <A HREF="<%= $link %>;nottax=1;pkg_tax=Y">$<%= sprintf('%.2f', $region->{'exempt_pkg'} ) %></A>
+      </TD>
+      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right">
+        $<%= sprintf('%.2f', $region->{'exempt_monthly'} ) %></A>
+        </TD>
+      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right">
+        $<%= sprintf('%.2f', $region->{'taxable'} ) %></A>
+      </TD>
+      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right"><%= $region->{'rate'} %></TD>
+      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right">
+        $<%= sprintf('%.2f', $region->{'owed'} ) %>
+      </TD>
+      <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right">
+        <A HREF="<%= $link %>;istax=1">$<%= sprintf('%.2f', $region->{'tax'} ) %></A>
+      </TD>
     </TR>
   <% } %>