X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_tax.cgi;h=803b7d48f92c52ebc2f6d5f765acd83db17d56a7;hb=b1d445f94514a29e5d4753839798b0291d89aee3;hp=557c29cfa18f2fdb078425e162897738b8a28911;hpb=64fcb43c61c196766260319cd9219eb70ea27767;p=freeside.git

diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index 557c29cfa..803b7d48f 100755
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -22,7 +22,10 @@
     <TH CLASS="grid" BGCOLOR="#cccccc" ROWSPAN=2>Tax owed</TH>
 % unless ( $cgi->param('show_taxclasses') ) { 
       <TH CLASS="grid" BGCOLOR="#cccccc" ROWSPAN=2>Tax invoiced</TH>
+      <TH CLASS="grid" BGCOLOR="#cccccc" ROWSPAN=2></TH>
       <TH CLASS="grid" BGCOLOR="#cccccc" ROWSPAN=2>Tax credited</TH>
+      <TH CLASS="grid" BGCOLOR="#cccccc" ROWSPAN=2></TH>
+      <TH CLASS="grid" BGCOLOR="#cccccc" ROWSPAN=2>Tax collected</TH>
 % } 
   </TR>
 
@@ -119,10 +122,15 @@
           <A HREF="<% $baselink. $invlink %>;istax=1"
           ><% &$money_sprintf( $region->{'tax'} ) %></A>
         </TD>
+        <<%$tdh%>><FONT SIZE="+1"><B> - </B></FONT></TD>
         <<%$tdh%> ALIGN="right">
-          <A HREF="<% $baselink. $invlink %>;istax=1;iscredit=1"
+          <A HREF="<% $creditlink. $invlink %>;istax=1"
           ><% &$money_sprintf( $region->{'credit'} ) %></A>
         </TD>
+        <<%$tdh%>><FONT SIZE="+1"><B> = </B></FONT></TD>
+        <<%$tdh%> ALIGN="right">
+          <% &$money_sprintf( $region->{'tax'} - $region->{'credit'} ) %>
+        </TD>
 % } 
 
     </TR>
@@ -137,7 +145,10 @@
     <TR>
       <TH CLASS="grid" BGCOLOR="#cccccc"></TH>
       <TH CLASS="grid" BGCOLOR="#cccccc">Tax invoiced</TH>
+      <TH CLASS="grid" BGCOLOR="#cccccc"></TH>
       <TH CLASS="grid" BGCOLOR="#cccccc">Tax credited</TH>
+      <TH CLASS="grid" BGCOLOR="#cccccc"></TH>
+      <TH CLASS="grid" BGCOLOR="#cccccc">Tax collected</TH>
     </TR>
 
 %   #some false laziness w/above
@@ -160,6 +171,12 @@
 %       $bgcolor = $bgcolor1;
 %     }
 %     my $td = qq(TD CLASS="grid" BGCOLOR="$bgcolor");
+%     my $tdh = qq(TD CLASS="grid" BGCOLOR="$bgcolor");
+%
+%     #?
+%     my $invlink = $region->{'url_param_inv'}
+%                     ? ';'. $region->{'url_param_inv'}
+%                     : $link;
 
       <TR>
         <<%$td%>><% $region->{'label'} %></TD>
@@ -167,6 +184,15 @@
           <A HREF="<% $baselink. $link %>;istax=1"
           ><% &$money_sprintf( $region->{'tax'} ) %></A>
         </TD>
+        <<%$td%>><FONT SIZE="+1"><B> - </B></FONT></TD>
+        <<%$tdh%> ALIGN="right">
+          <A HREF="<% $creditlink. $invlink %>;istax=1"
+          ><% &$money_sprintf( $region->{'credit'} ) %></A>
+        </TD>
+        <<%$td%>><FONT SIZE="+1"><B> = </B></FONT></TD>
+        <<%$tdh%> ALIGN="right">
+          <% &$money_sprintf( $region->{'tax'} - $region->{'credit'} ) %>
+        </TD>
       </TR>
 
 % } 
@@ -184,6 +210,15 @@
      <A HREF="<% $baselink %>;istax=1"
      ><% &$money_sprintf( $tot_tax ) %></A>
    </TD>
+        <<%$td%>><FONT SIZE="+1"><B> - </B></FONT></TD>
+   <<%$td%> ALIGN="right">
+     <A HREF="<% $creditlink %>;istax=1"
+     ><% &$money_sprintf( $tot_credit ) %></A>
+   </TD>
+        <<%$td%>><FONT SIZE="+1"><B> = </B></FONT></TD>
+   <<%$td%> ALIGN="right">
+     <% &$money_sprintf( $tot_tax - $tot_credit ) %>
+   </TD>
   </TR>
 
   </TABLE>
@@ -230,7 +265,10 @@ sub gotcust {
   my $table = shift;
   my $prefix = @_ ? shift : '';
   "
-        ( $table.${prefix}county  = cust_main_county.county
+        ( $table.${prefix}city  = cust_main_county.city
+          OR cust_main_county.city = ''
+          OR cust_main_county.city IS NULL )
+    AND ( $table.${prefix}county  = cust_main_county.county
           OR cust_main_county.county = ''
           OR cust_main_county.county IS NULL )
     AND ( $table.${prefix}state   = cust_main_county.state
@@ -298,10 +336,11 @@ foreach my $r ( qsearch({ 'table'     => 'cust_main_county',
 
   $regions{$label}->{$_} = $r->$_() for (qw( county state country )); #taxname?
 
+  my @url_param = qw( county state country taxname );
+  push @url_param, 'city' if $cgi->param('show_cities') && $r->city();
+
   $regions{$label}->{'url_param'} =
-    join(';', map "$_=".uri_escape($r->$_()),
-                  qw( county state country taxname )
-        );
+    join(';', map "$_=".uri_escape($r->$_()), @url_param );
 
   my @param = @base_param;
   my $mywhere = $where;
@@ -439,7 +478,7 @@ foreach my $r ( qsearch({ 'table'     => 'cust_main_county',
 
 }
 
-my $distinct = "country, state, county,
+my $distinct = "country, state, county, city, 
                 CASE WHEN taxname IS NULL THEN '' ELSE taxname END AS taxname";
 my $taxclass_distinct = 
   #a little bit unsure of this part... test?
@@ -684,8 +723,9 @@ sub getlabel {
   my $label;
   if (
     $r->tax == 0 
-    && ! scalar( qsearch('cust_main_county', { 'state'   => $r->state,
+    && ! scalar( qsearch('cust_main_county', { 'city'    => $r->city,
                                                'county'  => $r->county,
+                                               'state'   => $r->state,
                                                'country' => $r->country,
                                                'tax' => { op=>'>', value=>0 },
                                              }
@@ -704,6 +744,7 @@ sub getlabel {
     $label = $r->country;
     $label = $r->state.", $label" if $r->state;
     $label = $r->county." county, $label" if $r->county;
+    $label = $r->city. ", $label" if $r->city && $cgi->param('show_cities');
     $label = "$label (". $r->taxclass. ")"
       if $r->taxclass
       && $cgi->param('show_taxclasses')
@@ -740,5 +781,6 @@ $dateagentlink .= ';agentnum='. $cgi->param('agentnum')
   if length($agentname);
 my $baselink   = $p. "search/cust_bill_pkg.cgi?$dateagentlink";
 my $exemptlink = $p. "search/cust_tax_exempt_pkg.cgi?$dateagentlink";
+my $creditlink = $p. "search/cust_credit_bill_pkg.html?$dateagentlink";
 
 </%init>