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

14 files changed, 428 insertions, 279 deletions

diff --git a/FS/FS/cust_bill_pkg.pm b/FS/FS/cust_bill_pkg.pm
index 77429f2..d718b05 100644
--- a/FS/FS/cust_bill_pkg.pm
+++ b/FS/FS/cust_bill_pkg.pm
@@ -3,11 +3,12 @@ package FS::cust_bill_pkg;
 use strict;
 use vars qw( @ISA );
 use FS::Record qw( qsearch qsearchs dbdef dbh );
+use FS::cust_main_Mixin;
 use FS::cust_pkg;
 use FS::cust_bill;
 use FS::cust_bill_pkg_detail;
 
-@ISA = qw( FS::Record );
+@ISA = qw( FS::cust_main_Mixin FS::Record );
 
 =head1 NAME
 
@@ -225,6 +226,14 @@ sub desc {
 
 =back
 
+=head1 CLASS METHODS
+
+=over 4
+
+=item  
+
+=back
+
 =head1 BUGS
 
 =head1 SEE ALSO
diff --git a/httemplate/elements/select-agent.html b/httemplate/elements/select-agent.html
new file mode 100644
index 0000000..c2a5e4b
--- /dev/null
+++ b/httemplate/elements/select-agent.html
@@ -0,0 +1,24 @@
+<%
+  my( $agentnum, %opt ) = @_;
+
+  my @agents;
+  if ( $opt{'agents'} ) {
+    @agents = @{ $opt{'agents'} };
+  } else {
+    @agents = qsearch( 'agent', { disabled=>'' } );
+  }
+
+%>
+
+<SELECT NAME="agentnum">
+
+  <OPTION VALUE="">all</OPTION>
+
+  <% foreach my $agent ( sort { $a->agent cmp $b->agent } @agents ) { %>
+
+    <OPTION VALUE="<%= $agent->agentnum %>"<%= $agentnum == $agent->agentnum ? ' SELECTED' : '' %>><%= $agent->agent %>
+
+  <% } %>
+
+</SELECT>
+
diff --git a/httemplate/elements/table-grid.html b/httemplate/elements/table-grid.html
new file mode 100644
index 0000000..80611f5
--- /dev/null
+++ b/httemplate/elements/table-grid.html
@@ -0,0 +1,8 @@
+<STYLE TYPE="text/css">
+.grid table { border: solid; empty-cells: show }
+.grid TH { padding-left: 3px; padding-right: 3px; border: 1px solid #dddddd; border-bottom: dashed 1px black; border-right: none }
+.grid TD { padding-left: 3px; padding-right: 3px; empty-cells: show; border: 1px solid #cccccc; border-bottom: none; border-right: none }
+</STYLE>
+
+<TABLE CLASS="grid" CELLSPACING=0 CELLPADDING=0 BORDER=1 BORDERCOLOR="#000000" STYLE="border: solid 1px black; empty-cells: show">
+
diff --git a/httemplate/elements/tr-input-beginning_ending.html b/httemplate/elements/tr-input-beginning_ending.html
new file mode 100644
index 0000000..9fa936b
--- /dev/null
+++ b/httemplate/elements/tr-input-beginning_ending.html
@@ -0,0 +1,39 @@
+<LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
+<SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
+
+
+<TR>
+  <TD ALIGN="right">From: </TD>
+  <TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
+<SCRIPT TYPE="text/javascript">
+  Calendar.setup({
+    inputField: "beginning_text",
+    ifFormat:   "%m/%d/%Y",
+    button:     "beginning_button",
+    align:      "BR"
+  });
+</SCRIPT>
+</TR>
+
+<TR>
+  <TD ALIGN="right">To: </TD>
+  <TD><INPUT TYPE="text" NAME="ending" ID="ending_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="ending_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
+<SCRIPT TYPE="text/javascript">
+  Calendar.setup({
+    inputField: "ending_text",
+    ifFormat:   "%m/%d/%Y",
+    button:     "ending_button",
+    align:      "BR"
+  });
+</SCRIPT>
+</TR>
+
+<TR>
+  <TD></TD>
+  <TD>
+    <FONT SIZE="-1">(leave one or both dates blank for an open-ended search)</FONT>
+  </TD>
+</TR>
+
diff --git a/httemplate/elements/tr-select-agent.html b/httemplate/elements/tr-select-agent.html
new file mode 100644
index 0000000..2227262
--- /dev/null
+++ b/httemplate/elements/tr-select-agent.html
@@ -0,0 +1,29 @@
+<%
+  my( $agentnum, %opt ) = @_;
+
+  my @agents;
+  if ( $opt{'agents'} ) {
+    @agents = @{ $opt{'agents'} };
+  } else {
+    @agents = qsearch( 'agent', { disabled=>'' } );
+  }
+
+%>
+
+<% if ( scalar(@agents) == 1 ) { %>
+
+  <INPUT TYPE="hidden" NAME="agentnum" VALUE="<%= $agents[0]->agentnum %>">
+
+<% } else { %>
+
+  <TR>
+    <TD ALIGN="right"><%= $opt{'label'} || 'Agent: ' %></TD>
+    <TD>
+      <%= include( '/elements/select-agent.html', $agentnum,
+                     'agents' => \@agents,
+                 )
+      %>
+    </TD>
+  </TR>
+
+<% } %>
diff --git a/httemplate/search/cust_bill_event.html b/httemplate/search/cust_bill_event.html
index 7bc428f..197f280 100755
--- a/httemplate/search/cust_bill_event.html
+++ b/httemplate/search/cust_bill_event.html
@@ -7,10 +7,6 @@
 
     )
 %>
-    <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
 
     <FORM ACTION="cust_bill_event.cgi" METHOD="GET">
     <INPUT TYPE="hidden" NAME="failed" VALUE="<%= $cgi->param('failed') %>">
@@ -27,30 +23,7 @@
         </TD>
       </TR>
       -->
-      <TR>
-        <TD ALIGN="right">From: </TD>
-        <TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
-<SCRIPT TYPE="text/javascript">
-  Calendar.setup({
-    inputField: "beginning_text",
-    ifFormat:   "%m/%d/%Y",
-    button:     "beginning_button",
-    align:      "BR"
-  });
-</SCRIPT>
-      </TR>
-      <TR>
-        <TD ALIGN="right">To: </TD>
-        <TD><INPUT TYPE="text" NAME="ending" ID="ending_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="ending_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
-<SCRIPT TYPE="text/javascript">
-  Calendar.setup({
-    inputField: "ending_text",
-    ifFormat:   "%m/%d/%Y",
-    button:     "ending_button",
-    align:      "BR"
-  });
-</SCRIPT>
-      </TR>
+      <%= include( '/elements/tr-input-beginning_ending.html' ) %>
       <!--
       <TR>
         <TD ALIGN="right">Events: </TD>
diff --git a/httemplate/search/cust_bill_pkg.cgi b/httemplate/search/cust_bill_pkg.cgi
new file mode 100644
index 0000000..875cbc3
--- /dev/null
+++ b/httemplate/search/cust_bill_pkg.cgi
@@ -0,0 +1,145 @@
+<%
+
+my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
+
+my $join_cust = "
+    JOIN cust_bill USING ( invnum ) 
+    JOIN cust_main USING ( custnum )
+";
+
+my $join_pkg = "
+    LEFT JOIN cust_pkg USING ( pkgnum )
+    LEFT JOIN part_pkg USING ( pkgpart )
+";
+
+my $where = "
+  WHERE _date >= $beginning AND _date <= $ending
+    AND payby != 'COMP'
+";
+
+if ( $cgi->param('out') ) {
+
+  $where .= "
+    AND 0 = ( SELECT COUNT(*) FROM cust_main_county
+               WHERE (    cust_main_county.county  = cust_main.county
+                       OR cust_main_county.county IS NULL AND cust_main.county  =  ''
+                       OR cust_main_county.county  =  ''  AND cust_main.county IS NULL
+                     )
+                 AND (    cust_main_county.state   = cust_main.state
+                       OR cust_main_county.state  IS NULL AND cust_main.state  =  ''
+                       OR cust_main_county.state   =  ''  AND cust_main.state IS NULL
+                     )
+                 AND cust_main_county.country = cust_main.country
+                 AND cust_main_county.tax > 0
+            )
+  ";
+
+} elsif ( $cgi->param('country' ) ) {
+
+  my $county  = dbh->quote( $cgi->param('county')  );
+  my $state   = dbh->quote( $cgi->param('state')   );
+  my $country = dbh->quote( $cgi->param('country') );
+  $where .= "
+    AND ( county  = $county OR $county = '' )
+    AND ( state   = $state  OR $state = '' )
+    AND   country = $country
+  ";
+  $where .= ' AND taxclass = '. dbh->quote( $cgi->param('taxclass') )
+    if $cgi->param('taxclass');
+
+}
+
+$where .= ' AND pkgnum != 0' if $cgi->param('nottax');
+
+$where .= ' AND pkgnum = 0' if $cgi->param('istax');
+
+$where .= " AND tax = 'Y'" if $cgi->param('cust_tax');
+
+my $count_query;
+if ( $cgi->param('pkg_tax') ) {
+
+  $count_query =
+    "SELECT COUNT(*), SUM( ( CASE WHEN part_pkg.setuptax = 'Y'
+                                 THEN cust_bill_pkg.setup
+                                 ELSE 0 )
+                          +
+                          ( CASE WHEN part_pkg.recurtax = 'Y'
+                                 THEN cust_bill_pkg.recur
+                                 ELSE 0 )
+                        )";
+
+  $where .= " AND (
+                       ( part_pkg.setuptax = 'Y' AND cust_bill_pkg.setup > 0 )
+                    OR ( part_pkg.recurtax = 'Y' AND cust_bill_pkg.recur > 0 )
+                  )";
+
+} else {
+
+  $count_query =
+    "SELECT COUNT(*), SUM(cust_bill_pkg.setup + cust_bill_pkg.recur)";
+
+}
+$count_query += " FROM cust_bill_pkg $join_cust  $join_pkg $where";
+
+my $query = {
+  'table'     => 'cust_bill_pkg',
+  'addl_from' => "$join_cust $join_pkg",
+  'hashref'   => {},
+  'select'    => join(', ',
+                   'cust_bill_pkg.*',
+                   'cust_bill._date',
+                   'part_pkg.pkg',
+                   'cust_main.custnum',
+                   FS::UI::Web::cust_sql_fields(),
+                 ),
+  'extra_sql' => $where,
+};
+
+my $ilink = [ "${p}view/cust_bill.cgi?", 'invnum' ];
+my $clink = [ "${p}view/cust_main.cgi?", 'custnum' ];
+
+my $conf = new FS::Conf;
+my $money_char = $conf->config('money_char') || '$';
+
+%><%= include( 'elements/search.html',
+                 'title'       => 'Line items',
+                 'name'        => 'line items',
+                 'query'       => $query,
+                 'count_query' => $count_query,
+                 'count_addl'  => [ $money_char. '%.2f total', ],
+                 'header'      => [
+                   '#',
+                   'Description',
+                   'Setup charge',
+                   'Recurring charge',
+                   'Invoice',
+                   'Date',
+                   FS::UI::Web::cust_header(),
+                 ],
+                 'fields'      => [
+                   'billpkgnum',
+                   sub { $_[0]->pkgnum > 0
+                           ? $_[0]->get('pkg')
+                           : $_[0]->get('itemdesc')
+                       },
+                   #strikethrough or "N/A ($amount)" or something these when
+                   # they're not applicable to pkg_tax search
+                   sub { sprintf($money_char.'%.2f', shift->setup ) },
+                   sub { sprintf($money_char.'%.2f', shift->recur ) },
+                   'invnum',
+                   sub { time2str('%b %d %Y', shift->_date ) },
+                   \&FS::UI::Web::cust_fields,
+                 ],
+                 'links'       => [
+                   '',
+                   '',
+                   '',
+                   '',
+                   $ilink,
+                   $ilink,
+                   ( map { $clink } FS::UI::Web::cust_header() ),
+                 ],
+                 'align' => 'rlrrrc',
+           )
+%>
+
diff --git a/httemplate/search/cust_pkg_report.cgi b/httemplate/search/cust_pkg_report.cgi
index 6bd9189..412c3f7 100755
--- a/httemplate/search/cust_pkg_report.cgi
+++ b/httemplate/search/cust_pkg_report.cgi
@@ -1,10 +1,6 @@
 <HTML>
   <HEAD>
     <TITLE>Packages</TITLE>
-    <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
   </HEAD>
   <BODY BGCOLOR="#e8e8e8">
     <H1>Packages</H1>
@@ -12,47 +8,11 @@
     <INPUT TYPE="hidden" NAME="magic" VALUE="bill">
       Return packages with next bill date:<BR><BR>
       <TABLE>
-        <TR>
-          <TD ALIGN="right">From: </TD>
-          <TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><I>m/d/y</I></TD>
-<SCRIPT TYPE="text/javascript">
-  Calendar.setup({
-    inputField: "beginning_text",
-    ifFormat:   "%m/%d/%Y",
-    button:     "beginning_button",
-    align:      "BR"
-  });
-</SCRIPT>
-        </TR>
-        <TR>
-          <TD ALIGN="right">To: </TD>
-          <TD><INPUT TYPE="text" NAME="ending" ID="ending_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="ending_button" STYLE="cursor: pointer" TITLE="Select date"><BR><I>m/d/y</I></TD>
-<SCRIPT TYPE="text/javascript">
-  Calendar.setup({
-    inputField: "ending_text",
-    ifFormat:   "%m/%d/%Y",
-    button:     "ending_button",
-    align:      "BR"
-  });
-</SCRIPT>
-        </TR>
-<% my %agent_search = dbdef->table('agent')->column('disabled')
-                        ? ( 'disabled' => '' ) : ();
-   my @agents = qsearch( 'agent', \%agent_search );
-   if ( scalar(@agents) == 1 ) {
-%>
-     <INPUT TYPE="hidden" NAME="agentnum" VALUE="<%= $agents[0]->agentnum %>">
-<% } else { %>
-
-        <TR>
-          <TD ALIGN="right">Agent: </TD>
-          <TD><SELECT NAME="agentnum"><OPTION VALUE="">(all)
-          <% foreach my $agent ( sort { $a->agent cmp $b->agent; } @agents) { %>
-            <OPTION VALUE="<%= $agent->agentnum %>"><%= $agent->agent %>
-          <% } %>
-          </TD>
-        </TR>
-<% } %>
+        <%= include( '/elements/tr-input-beginning_ending.html' ) %>
+        <%= include( '/elements/tr-select-agent.html',
+                       $cgi->param('agentnum'),
+                   )
+        %>
       </TABLE>
       <BR><INPUT TYPE="submit" VALUE="Get Report">
 
diff --git a/httemplate/search/elements/search.html b/httemplate/search/elements/search.html
index 7882bbf..d19fb4a 100644
--- a/httemplate/search/elements/search.html
+++ b/httemplate/search/elements/search.html
@@ -234,14 +234,10 @@
       </TR>
       <TR>
         <TD COLSPAN=2>
-  
             <%= $pager %>
-            <STYLE TYPE="text/css">
-            .grid table { border: solid; empty-cells: show }
-            .grid TH { padding-left: 3px; padding-right: 3px; border: 1px solid #dddddd; border-bottom: dashed 1px black; border-right: none }
-            .grid TD { padding-left: 3px; padding-right: 3px; empty-cells: show; border: 1px solid #cccccc; border-bottom: none; border-right: none }
-            </STYLE>
-            <TABLE CLASS="grid" CELLSPACING=0 CELLPADDING=0 BORDER=1 BORDERCOLOR="#000000" STYLE="border: solid 1px black; empty-cells: show">
+
+            <%= include('/elements/table-grid.html') %>
+
               <TR>
               <% foreach my $header ( @$header ) { %>
                    <TH CLASS="grid" BGCOLOR="#cccccc"><%= $header %></TH>
diff --git a/httemplate/search/report_cust_bill.html b/httemplate/search/report_cust_bill.html
index 0f6e681..a7be766 100644
--- a/httemplate/search/report_cust_bill.html
+++ b/httemplate/search/report_cust_bill.html
@@ -1,49 +1,17 @@
   <HEAD>
     <TITLE>Invoice report criteria</TITLE>
-    <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
   </HEAD>
   <BODY BGCOLOR="#e8e8e8">
     <H1>Invoice report criteria</H1>
     <FORM ACTION="cust_bill.html" METHOD="GET">
     <INPUT TYPE="hidden" NAME="magic" VALUE="_date">
     <TABLE>
-      <TR>
-        <TD ALIGN="right">for agent: </TD>
-        <TD><SELECT NAME="agentnum">
-              <OPTION VALUE="">all</OPTION>
-              <% foreach my $agent ( qsearch('agent', { disabled=>'' } ) ) { %>
-                <OPTION VALUE="<%= $agent->agentnum %>"<%= $cgi->param('agentnum') == $agent->agentnum ? ' SELECTED' : '' %>><%= $agent->agent %>
-              <% } %>
-            </SELECT>
-        </TD>
-      </TR>
-      <TR>
-        <TD ALIGN="right">From: </TD>
-        <TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
-<SCRIPT TYPE="text/javascript">
-  Calendar.setup({
-    inputField: "beginning_text",
-    ifFormat:   "%m/%d/%Y",
-    button:     "beginning_button",
-    align:      "BR"
-  });
-</SCRIPT>
-      </TR>
-      <TR>
-        <TD ALIGN="right">To: </TD>
-        <TD><INPUT TYPE="text" NAME="ending" ID="ending_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="ending_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
-<SCRIPT TYPE="text/javascript">
-  Calendar.setup({
-    inputField: "ending_text",
-    ifFormat:   "%m/%d/%Y",
-    button:     "ending_button",
-    align:      "BR"
-  });
-</SCRIPT>
-      </TR>
+      <%= include( '/elements/tr-select-agent.html',
+                     $cgi->param('agentnum'),
+                     'label' => 'Invoices for agent: ',
+                 )
+      %>
+      <%= include( '/elements/tr-input-beginning_ending.html' ) %>
       <TR>
         <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="open" VALUE="1" CHECKED></TD>
         <TD>Show only open invoices</TD>
diff --git a/httemplate/search/report_cust_credit.html b/httemplate/search/report_cust_credit.html
index 3a14f44..56bbd0a 100644
--- a/httemplate/search/report_cust_credit.html
+++ b/httemplate/search/report_cust_credit.html
@@ -1,10 +1,6 @@
 <HTML>
   <HEAD>
     <TITLE>Credit report criteria</TITLE>
-    <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
   </HEAD>
   <BODY BGCOLOR="#e8e8e8">
     <H1>Credit report criteria</H1>
@@ -27,40 +23,12 @@
             </SELECT>
         </TD>
       </TR>
-      <TR>
-        <TD ALIGN="right">for agent: </TD>
-        <TD><SELECT NAME="agentnum">
-              <OPTION VALUE="">all</OPTION>
-              <% foreach my $agent ( qsearch('agent', { disabled=>'' } ) ) { %>
-                <OPTION VALUE="<%= $agent->agentnum %>"<%= $cgi->param('agentnum') == $agent->agentnum ? ' SELECTED' : '' %>><%= $agent->agent %>
-              <% } %>
-            </SELECT>
-        </TD>
-      </TR>
-      <TR>
-        <TD ALIGN="right">From: </TD>
-        <TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
-<SCRIPT TYPE="text/javascript">
-  Calendar.setup({
-    inputField: "beginning_text",
-    ifFormat:   "%m/%d/%Y",
-    button:     "beginning_button",
-    align:      "BR"
-  });
-</SCRIPT>
-      </TR>
-      <TR>
-        <TD ALIGN="right">To: </TD>
-        <TD><INPUT TYPE="text" NAME="ending" ID="ending_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="ending_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
-<SCRIPT TYPE="text/javascript">
-  Calendar.setup({
-    inputField: "ending_text",
-    ifFormat:   "%m/%d/%Y",
-    button:     "ending_button",
-    align:      "BR"
-  });
-</SCRIPT>
-      </TR>
+      <%= include( '/elements/tr-select-agent.html',
+                     $cgi->param('agentnum'),
+                     'label' => 'for agent: ',
+                 )
+      %>
+      <%= include( '/elements/tr-input-beginning_ending.html' ) %>
     </TABLE>
     <BR><INPUT TYPE="submit" VALUE="Get Report">
     </FORM>
diff --git a/httemplate/search/report_cust_pay.html b/httemplate/search/report_cust_pay.html
index a28ead9..5d8b74e 100644
--- a/httemplate/search/report_cust_pay.html
+++ b/httemplate/search/report_cust_pay.html
@@ -1,10 +1,6 @@
 <HTML>
   <HEAD>
     <TITLE>Payment report criteria</TITLE>
-    <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
   </HEAD>
   <BODY BGCOLOR="#e8e8e8">
     <H1>Payment report criteria</H1>
@@ -29,40 +25,12 @@
             </SELECT>
         </TD>
       </TR>
-      <TR>
-        <TD ALIGN="right">for agent: </TD>
-        <TD><SELECT NAME="agentnum">
-              <OPTION VALUE="">all</OPTION>
-              <% foreach my $agent ( qsearch('agent', { disabled=>'' } ) ) { %>
-                <OPTION VALUE="<%= $agent->agentnum %>"<%= $cgi->param('agentnum') == $agent->agentnum ? ' SELECTED' : '' %>><%= $agent->agent %>
-              <% } %>
-            </SELECT>
-        </TD>
-      </TR>
-      <TR>
-        <TD ALIGN="right">From: </TD>
-        <TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
-<SCRIPT TYPE="text/javascript">
-  Calendar.setup({
-    inputField: "beginning_text",
-    ifFormat:   "%m/%d/%Y",
-    button:     "beginning_button",
-    align:      "BR"
-  });
-</SCRIPT>
-      </TR>
-      <TR>
-        <TD ALIGN="right">To: </TD>
-        <TD><INPUT TYPE="text" NAME="ending" ID="ending_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="ending_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
-<SCRIPT TYPE="text/javascript">
-  Calendar.setup({
-    inputField: "ending_text",
-    ifFormat:   "%m/%d/%Y",
-    button:     "ending_button",
-    align:      "BR"
-  });
-</SCRIPT>
-      </TR>
+      <%= include( '/elements/tr-select-agent.html',
+                     $cgi->param('agentnum'),
+                     'label' => 'for agent: ',
+                 )
+      %>
+      <%= include( '/elements/tr-input-beginning_ending.html' ) %>
     </TABLE>
     <BR><INPUT TYPE="submit" VALUE="Get Report">
     </FORM>
diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index 5876657..4edd084 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>
   <% } %>
 
diff --git a/httemplate/search/report_tax.html b/httemplate/search/report_tax.html
index 85af212..38b665a 100755
--- a/httemplate/search/report_tax.html
+++ b/httemplate/search/report_tax.html
@@ -1,39 +1,13 @@
 <HTML>
   <HEAD>
     <TITLE>Tax Report Criteria</TITLE>
-    <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>  </HEAD>
+  </HEAD>
   <BODY BGCOLOR="#e8e8e8">
     <H1>Tax Report Criteria</H1>
     <FORM ACTION="report_tax.cgi" METHOD="GET">
-      Return <B>tax report</B> for period:
     <TABLE>
-      <TR>
-        <TD ALIGN="right">From: </TD>
-        <TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
-<SCRIPT TYPE="text/javascript">
-  Calendar.setup({
-    inputField: "beginning_text",
-    ifFormat:   "%m/%d/%Y",
-    button:     "beginning_button",
-    align:      "BR"
-  });
-</SCRIPT>
-      </TR>
-      <TR>
-        <TD ALIGN="right">To: </TD>
-        <TD><INPUT TYPE="text" NAME="ending" ID="ending_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="ending_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
-<SCRIPT TYPE="text/javascript">
-  Calendar.setup({
-    inputField: "ending_text",
-    ifFormat:   "%m/%d/%Y",
-    button:     "ending_button",
-    align:      "BR"
-  });
-</SCRIPT>
-      </TR>
+     <%= include( '/elements/tr-select-agent.html' ) %>
+     <%= include( '/elements/tr-input-beginning_ending.html' ) %>
     </TABLE>
 
       <BR><INPUT TYPE="submit" VALUE="Get Report">