From 276028234bd1c9f8ad736d9be2062803040700f7 Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 10 Oct 2013 23:51:16 -0700
Subject: [PATCH] add customer class to advanced invoice report, RT#22851

---
 httemplate/search/report_cust_bill.html | 68 +++++++++++++++++++++++++--------
 1 file changed, 53 insertions(+), 15 deletions(-)

diff --git a/httemplate/search/report_cust_bill.html b/httemplate/search/report_cust_bill.html
index b339c80e0..4a005e97d 100644
--- a/httemplate/search/report_cust_bill.html
+++ b/httemplate/search/report_cust_bill.html
@@ -4,16 +4,54 @@
 <INPUT TYPE="hidden" NAME="magic" VALUE="_date">
 <INPUT TYPE="hidden" NAME="custnum" VALUE="<% $custnum %>">
 
-<TABLE BGCOLOR="#cccccc" CELLSPACING=0>
-
 % unless ( $custnum ) {
+
+  <TABLE BGCOLOR="#cccccc" CELLSPACING=0>
+
+    <TR>
+      <TH CLASS="background" COLSPAN=2 ALIGN="left">
+        <FONT SIZE="+1">Customer search options</FONT>
+      </TH>
+    </TR>
+
   <& /elements/tr-select-agent.html,
                  'curr_value'    => scalar( $cgi->param('agentnum') ),
-                 'label'         => emt('Invoices for agent: '),
+                 'label'         => emt('Agent'),
                  'disable_empty' => 0,
   &>
+
+  <& /elements/tr-select-cust_class.html,
+      label         => mt('Customer Class'),
+      field         => 'cust_classnum',
+      multiple      => 1,
+     'pre_options'  => [ '' => emt('(none)') ],
+     'all_selected' => 1,
+  &>
+
+%   if ( $cust_main ) {
+    <INPUT TYPE="hidden" NAME="payby" VALUE="<% $cust_main->payby %>">
+%   } else {
+    <& /elements/tr-select-payby.html,
+                  label   => emt('Payment method:'),
+                  payby_type   => 'cust',
+                  multiple     => 1,
+                  all_selected => 1,
+    &>
+% }
+
+  </TABLE>
+  <BR>
+
 % }
 
+  <TABLE BGCOLOR="#cccccc" CELLSPACING=0>
+
+    <TR>
+      <TH CLASS="background" COLSPAN=2 ALIGN="left">
+        <FONT SIZE="+1">Invoice search options</FONT>
+      </TH>
+    </TR>
+
   <& /elements/tr-input-beginning_ending.html &>
 
   <& /elements/tr-input-lessthan_greaterthan.html,
@@ -26,17 +64,6 @@
                 field   => 'owed',
   &>
 
-% if ( $cust_main ) {
-  <INPUT TYPE="hidden" NAME="payby" VALUE="<% $cust_main->payby %>">
-% } else {
-  <& /elements/tr-select-payby.html,
-                label   => emt('Payment method:'),
-                payby_type   => 'cust',
-                multiple     => 1,
-                all_selected => 1,
-  &>
-% }
-
 % if ( $conf->exists('cust_bill-enable_promised_date') ) {
   <TR>
     
@@ -53,6 +80,18 @@
   </TR>
 % }
 
+</TABLE>
+<BR>
+
+<TABLE BGCOLOR="#cccccc" CELLSPACING=0>
+
+  <TR>
+    <TH CLASS="background" COLSPAN=2 ALIGN="left">
+      <FONT SIZE="+1">Display options</FONT>
+    </TH>
+  </TR>
+
+
 <TR>
     <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="open" VALUE="1" CHECKED></TD>
     <TD><% mt('Show only open invoices') |h %></TD>
@@ -65,7 +104,6 @@
   </TR>
 % }
 
-
 </TABLE>
 
 <BR>
-- 
2.11.0