X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_cust_main.html;h=b6be023f637acece999aa388e262a861b610c881;hp=4309fbb7fcde52fc40ab8a384f2661c5715fed07;hb=ff27c3f36240aee48ed50153dd5d8fe3ac3f2443;hpb=701888cb344e68274df2f95494a5c48b0773d908

diff --git a/httemplate/search/report_cust_main.html b/httemplate/search/report_cust_main.html
index 4309fbb7f..b6be023f6 100755
--- a/httemplate/search/report_cust_main.html
+++ b/httemplate/search/report_cust_main.html
@@ -3,11 +3,8 @@
 <FORM ACTION="cust_main.html" METHOD="GET">
 <INPUT TYPE="hidden" NAME="magic" VALUE="bill">
 
-  <TABLE BGCOLOR="#cccccc" CELLSPACING=0>
-
-    <TR>
-      <TH CLASS="background" COLSPAN=2 ALIGN="left"><FONT SIZE="+1"><% mt('Search options') |h %></FONT></TH>
-    </TR>
+  <FONT CLASS="fsinnerbox-title"><% emt('Basic search options') %></FONT>
+  <TABLE CLASS="fsinnerbox">
 
     <& /elements/tr-select-agent.html,
                   'curr_value'    => scalar($cgi->param('agentnum')),
@@ -19,6 +16,7 @@
                   'pre_options'   => [ '' => 'all',
                                        0  => '(none)', ],
                   'disable_empty' => 1,
+                  'th' => 1,
     &>
 
     <& /elements/tr-select-cust_main-status.html,
@@ -40,17 +38,7 @@
     &>
 
     <TR>
-      <TD ALIGN="right" VALIGN="center"><% mt('Address') |h %></TD>
-      <TD><INPUT TYPE="text" NAME="address" SIZE=54></TD>
-    </TR>
-    
-    <TR>
-      <TD ALIGN="right" VALIGN="center"><% mt('Zip') |h %></TD>
-      <TD><INPUT TYPE="text" NAME="zip" SIZE=12></TD>
-    </TR>
-
-    <TR>
-        <TD ALIGN="right" VALIGN="center"><% mt('Signup date') |h %></TD>
+        <TH ALIGN="right" VALIGN="center"><% mt('Signup date') |h %></TH>
         <TD>
         <TABLE>
             <& /elements/tr-input-beginning_ending.html,
@@ -63,7 +51,7 @@
 
 %    if ( $conf->exists('cust_main-enable_birthdate') ) {
       <TR>
-          <TD ALIGN="right" VALIGN="center"><% mt('Date of Birth') |h %></TD>
+          <TH ALIGN="right" VALIGN="center"><% mt('Date of Birth') |h %></TH>
           <TD>
           <TABLE>
               <& /elements/tr-input-beginning_ending.html,
@@ -77,7 +65,7 @@
 
 %    if ( $conf->exists('cust_main-enable_spouse_birthdate') ) {
       <TR>
-          <TD ALIGN="right" VALIGN="center"><% mt('Spouse Date of Birth') |h %></TD>
+          <TH ALIGN="right" VALIGN="center"><% mt('Spouse Date of Birth') |h %></TH>
           <TD>
           <TABLE>
               <& /elements/tr-input-beginning_ending.html,
@@ -91,7 +79,7 @@
 
 %    if ( $conf->exists('cust_main-enable_anniversary_date') ) {
       <TR>
-          <TD ALIGN="right" VALIGN="center"><% mt('Anniversary Date') |h %></TD>
+          <TH ALIGN="right" VALIGN="center"><% mt('Anniversary Date') |h %></TH>
           <TD>
           <TABLE>
               <& /elements/tr-input-beginning_ending.html,
@@ -104,7 +92,7 @@
 %   }
 
       <TR>
-        <TD ALIGN="right">Tags</TD>
+        <TH ALIGN="right">Tags</TH>
         <TD>
             <& /elements/select-cust_tag.html,
                           'cgi'	        => $cgi,
@@ -119,8 +107,23 @@
         </TD>
       </TR>
 
+  </TABLE>
+  <BR>
+
+  <FONT CLASS="fsinnerbox-title"><% emt('Package search options') %></FONT>
+  <TABLE CLASS="fsinnerbox">
+
       <TR>
-        <TD ALIGN="right">With package of class</TD>
+
+        <TH ALIGN="right">With</TH>
+        <TD><SELECT NAME="any_pkg_status">
+              <OPTION VALUE="0">active packages
+              <OPTION VALUE="1">any status packages
+            </SELECT>
+        </TD>
+     </TR>
+
+        <TH ALIGN="right">of class</TH>
         <TD>
             <& /elements/select-pkg_class.html,
                           'field'       => 'pkg_classnum',
@@ -136,49 +139,107 @@
         </TD>
       </TR>
 
-    <& /elements/tr-select-payby.html,
-                  'payby_type'   => 'cust',
-                  'multiple'     => 1,
-                  'all_selected' => 1,
-    &>
+  </TABLE>
+  <BR>
+
+  <FONT CLASS="fsinnerbox-title"><% emt('Location search options') %></FONT>
+  <TABLE CLASS="fsinnerbox">
+
+    <TR>
+      <TH ALIGN="right" VALIGN="center"><% mt('Address') |h %></TH>
+      <TD><INPUT TYPE="text" NAME="address" SIZE=54></TD>
+    </TR>
 
     <TR>
-      <TD ALIGN="right"><% mt('Payment expiration before') |h %></TD>
+      <TH ALIGN="right" VALIGN="center"><% mt('City') |h %></TH>
       <TD>
-        <SELECT NAME="paydate_month" DISABLED>
-%         foreach my $month ( 1 .. 12 ) {
-            <OPTION VALUE="<% $month %>"><% $month %></OPTION>
-%         }
-        </SELECT>
-        /
-        <SELECT NAME="paydate_year" onChange="paydate_year_changed(this);">
-          <OPTION VALUE=""></OPTION>
-%         my $lastyear = (localtime(time))[5] + 1899;
-%         foreach my $year ( $lastyear .. $lastyear+12 ) {
-            <OPTION VALUE="<% $year %>"><% $year %></OPTION>
-%         }
-        </SELECT>
+        <& /elements/city.html,
+             disable_empty => 0,
+             empty_label   => '(all)',
+             disable_text  => 1,
+        &>
       </TD>
     </TR>
 
+    <TR>
+      <TH ALIGN="right" VALIGN="center"><% mt('County') |h %></TH>
+      <TD>
+        <& /elements/select-county.html,
+             disable_empty => 0,
+             empty_label   => '(all)',
+        &>
+      </TD>
+    </TR>
+    
+    <TR>
+      <TH ALIGN="right" VALIGN="center"><% mt('State') |h %></TH>
+      <TD>
+        <& /elements/select-state.html,
+             disable_empty => 0,
+             empty_label   => '(all)',
+        &>
+      </TD>
+    </TR>
+    
+    <TR>
+      <TH ALIGN="right" VALIGN="center"><% mt('Zip') |h %></TH>
+      <TD><INPUT TYPE="text" NAME="zip" SIZE=12></TD>
+    </TR>
+
+    <TR>
+      <TH ALIGN="right" VALIGN="center"><% mt('Country') |h %></TH>
+      <TD>
+        <& /elements/select-country.html,
+             disable_empty       => 0,
+             state_disable_empty => 0,
+             state_empty_label   => '(all)',
+        &>
+      </TD>
+    </TR>
+
+  </TABLE>
+  <BR>
+
+  <FONT CLASS="fsinnerbox-title"><% emt('Billing search options') %></FONT>
+  <TABLE CLASS="fsinnerbox">
+
+% my @exempt_groups = grep /\S/, $conf->config('tax-cust_exempt-groups');
+% unless ( @exempt_groups ) { 
+
+%   #falze laziness with With/Without postal mail invoices
+     <TR>
+      <TH ALIGN="right" VALIGN="center"><% mt('Tax exempt') |h %></TH>
+        <TD><INPUT TYPE="checkbox" NAME="tax" ID="tax" onClick="tax_changed();"></TD>
+    </TR>
+
+    <TR>
+      <TH ALIGN="right" VALIGN="center"><% mt('Not tax exempt') |h %></TH>
+        <TD><INPUT TYPE="checkbox" NAME="no_tax" ID="no_tax" onClick="no_tax_changed();"></TD>
+    </TR>
+
     <SCRIPT TYPE="text/javascript">
-      function paydate_year_changed(what) {
-        var value = what.options[what.selectedIndex].value;
-        var month_select = what.form.paydate_month;
-        if ( value == '' ) {
-          month_select.disabled = true;
-        } else {
-          month_select.disabled = false;
+      function  tax_changed() {
+        if ( document.getElementById('tax').checked == true ) {
+          document.getElementById('no_tax').checked = false;
+        }
+      }
+      function no_tax_changed() {
+        if ( document.getElementById('no_tax').checked == true ) {
+          document.getElementById('tax').checked = false;
         }
       }
     </SCRIPT>
- 
+% }
+
     <TR>
-      <TD ALIGN="right"><% mt('Invoice terms') |h %></TD>
+      <TH ALIGN="right"><% mt('Invoice terms') |h %></TH>
       <TD>
+%       my @agentnums = $FS::CurrentUser::CurrentUser->agentnums;
+%       my $agentnum = scalar(@agentnums) == 1 ? $agentnums[0] : '';
         <& /elements/select-terms.html,
-                      'pre_options' => [ '' => emt('all') ],
-                      'empty_value' => 'NULL',
+             'pre_options' => [ '' => emt('all') ],
+             'empty_value' => 'NULL',
+             'agentnum'    => $agentnum,
         &>
       </TD>
     </TR>
@@ -189,17 +250,17 @@
     &>
 
     <TR>
-      <TD ALIGN="right" VALIGN="center"><% mt('With email address(es)') |h %></TD>
+      <TH ALIGN="right" VALIGN="center"><% mt('With invoicing email address(es)') |h %></TH>
         <TD><INPUT TYPE="checkbox" NAME="with_email"></TD>
     </TR>
 
     <TR>
-      <TD ALIGN="right" VALIGN="center"><% mt('With postal mail invoices') |h %></TD>
+      <TH ALIGN="right" VALIGN="center"><% mt('With postal mail invoices') |h %></TH>
         <TD><INPUT TYPE="checkbox" NAME="POST" ID="POST" onClick="POST_changed();"></TD>
     </TR>
 
     <TR>
-      <TD ALIGN="right" VALIGN="center"><% mt('Without postal mail invoices') |h %></TD>
+      <TH ALIGN="right" VALIGN="center"><% mt('Without postal mail invoices') |h %></TH>
         <TD><INPUT TYPE="checkbox" NAME="no_POST" ID="no_POST" onClick="no_POST_changed();"></TD>
     </TR>
 
@@ -216,22 +277,21 @@
       }
     </SCRIPT>
 
-    <TR>
-      <TH CLASS="background" COLSPAN=2>&nbsp;</TH>
-    </TR>
+  </TABLE>
+  <BR>
+
+  <FONT CLASS="fsinnerbox-title"><% emt('Display options') %></FONT>
+  <TABLE CLASS="fsinnerbox">
 
-    <TR>
-      <TH CLASS="background" COLSPAN=2 ALIGN="left"><FONT SIZE="+1"><% mt('Display options') |h %></FONT></TH>
-    </TR>
     <& /elements/tr-select-cust-fields.html &>
 
     <TR>
-      <TD ALIGN="right" VALIGN="center"><% mt('Add package columns') |h %></TD>
+      <TH ALIGN="right" VALIGN="center"><% mt('Add package columns') |h %></TH>
         <TD><INPUT TYPE="checkbox" NAME="flattened_pkgs"></TD>
     </TR>
 
     <TR>
-      <TD ALIGN="right" VALIGN="center"><% mt('Include cancelled packages') |h %></TD>
+      <TH ALIGN="right" VALIGN="center"><% mt('Include cancelled packages') |h %></TH>
         <TD><INPUT TYPE="checkbox" NAME="cancelled_pkgs"></TD>
     </TR>