invoice_sections_with_taxes per-agent, RT#79636

[freeside.git] / httemplate / search / report_cust_bill.html

diff --git a/httemplate/search/report_cust_bill.html b/httemplate/search/report_cust_bill.html
index 8734467..d26ebdc 100644 (file)
--- a/httemplate/search/report_cust_bill.html
+++ b/httemplate/search/report_cust_bill.html
@@ -6,13 +6,8 @@
 
 % unless ( $custnum ) {
 
-  <TABLE BGCOLOR="#cccccc" CELLSPACING=0>
-
-    <TR>
-      <TH CLASS="background" COLSPAN=2 ALIGN="left">
-        <FONT SIZE="+1">Customer search options</FONT>
-      </TH>
-    </TR>
+  <FONT CLASS="fsinnerbox-title"><% emt('Customer search options') %></FONT>
+  <TABLE CLASS="fsinnerbox">
 
   <& /elements/tr-select-agent.html,
                  'curr_value'    => scalar( $cgi->param('agentnum') ),
@@ -29,33 +24,16 @@
       label         => mt('Customer Class'),
       field         => 'cust_classnum',
       multiple      => 1,
-     'pre_options'  => [ '' => emt('(none)') ],
-     'all_selected' => 1,
+     'pre_options'  => [ 0 => emt('(none)') ],
   &>
 
-%   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>
+  <FONT CLASS="fsinnerbox-title"><% emt('Invoice search options') %></FONT>
+  <TABLE CLASS="fsinnerbox">
 
   <& /elements/tr-input-beginning_ending.html &>
 
@@ -88,25 +66,24 @@
 </TABLE>
 <BR>
 
-<TABLE BGCOLOR="#cccccc" CELLSPACING=0>
+<FONT CLASS="fsinnerbox-title"><% emt('Display options') %></FONT>
+<TABLE CLASS="fsinnerbox">
 
   <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>
   </TR>
 
-% unless ( $custnum ) {
   <TR>
-    <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="newest_percust" VALUE="1"></TD>
-    <TD><% mt('Show only the single most recent invoice per-customer') |h %></TD>
+    <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="invoiced" VALUE="1"></TD>
+    <TD><% emt('Exclude discounts from gross amount billed'), %></TD>
   </TR>
+
+% unless ( $custnum ) {
+    <TR>
+      <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="newest_percust" VALUE="1"></TD>
+      <TD><% mt('Show only the single most recent invoice per-customer') |h %></TD>
+    </TR>
 % }
 
 </TABLE>