[freeside-commits] branch FREESIDE_4_BRANCH updated. 5ee3f6265c43f3a6a51db2f8e676d315a7ae1771
Ivan
ivan at 420.am
Mon Jul 17 19:18:15 PDT 2017
The branch, FREESIDE_4_BRANCH has been updated
via 5ee3f6265c43f3a6a51db2f8e676d315a7ae1771 (commit)
from 4fb5738f5391547e6c87c73c4325ea8c2b506d73 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5ee3f6265c43f3a6a51db2f8e676d315a7ae1771
Author: Ivan Kohler <ivan at freeside.biz>
Date: Mon Jul 17 19:18:14 2017 -0700
4.x style reports
diff --git a/httemplate/elements/tr-select-paybatch.html b/httemplate/elements/tr-select-paybatch.html
index aedf893..30b8f66 100644
--- a/httemplate/elements/tr-select-paybatch.html
+++ b/httemplate/elements/tr-select-paybatch.html
@@ -1,5 +1,5 @@
<TR>
- <TD ALIGN="right"><% $opt{'paybatch'} || 'Payment entry batch: ' %></TD>
+ <TH ALIGN="right"><% $opt{'paybatch'} || 'Payment entry batch: ' %></TH>
<TD>
<% include( '/elements/select-paybatch.html', 'curr_value' => $selected_paybatch, %opt ) %>
</TD>
diff --git a/httemplate/elements/tr-select-user.html b/httemplate/elements/tr-select-user.html
index a9572af..ba550fb 100644
--- a/httemplate/elements/tr-select-user.html
+++ b/httemplate/elements/tr-select-user.html
@@ -1,5 +1,5 @@
<TR>
- <TD ALIGN="right"><% $opt{'label'} || 'Employee: ' %></TD>
+ <TH ALIGN="right"><% $opt{'label'} || 'Employee: ' %></TH>
<TD><% include('select-user.html', %opt) %></TD>
</TR>
diff --git a/httemplate/search/elements/report_cust_pay_or_refund.html b/httemplate/search/elements/report_cust_pay_or_refund.html
index e05f1af..728a12f 100644
--- a/httemplate/search/elements/report_cust_pay_or_refund.html
+++ b/httemplate/search/elements/report_cust_pay_or_refund.html
@@ -19,13 +19,8 @@ Examples:
<INPUT TYPE="hidden" NAME="magic" VALUE="_date">
<INPUT TYPE="hidden" NAME="unapplied" VALUE="<% $unapplied %>">
-<TABLE BGCOLOR="#cccccc" CELLSPACING=0>
-
- <TR>
- <TH CLASS="background" COLSPAN=2 ALIGN="left">
- <FONT SIZE="+1"><% mt('[_1] search options', ucfirst($name_singular)) |h %></FONT>
- </TH>
- </TR>
+ <FONT CLASS="fsinnerbox-title"><% emt('[_1] search options', ucfirst($name_singular)) %></FONT>
+ <TABLE CLASS="fsinnerbox">
<& /elements/tr-select.html,
label => ucfirst(PL($name_singular)) . ' of type:',
@@ -38,20 +33,20 @@ Examples:
% if (substr($conf->config('card_masking_method'), -5) eq 'last4' || !$conf->config('card_masking_method')) {
<TR>
- <TD ALIGN="right"><% mt('Card Last 4 #:') |h %></TD>
+ <TH ALIGN="right"><% mt('Card Last 4 #:') |h %></TH>
<TD>
<INPUT TYPE="text" ID="paymask" NAME="paymask">
</TD>
</TR>
% }
<TR>
- <TD ALIGN="right"><% mt('Check #:') |h %> </TD>
+ <TH ALIGN="right"><% mt('Check #:') |h %> </TH>
<TD>
<INPUT TYPE="text" ID="payinfo" NAME="payinfo">
</TD>
</TR>
<TR>
- <TD ALIGN="right"><% mt('Transaction #:') |h %> </TD>
+ <TH ALIGN="right"><% mt('Transaction #:') |h %> </TH>
<TD>
<INPUT TYPE="text" ID="ccpay" NAME="ccpay">
</TD>
@@ -74,7 +69,7 @@ Examples:
% }
<TR>
- <TD ALIGN="right" VALIGN="center"><% mt(ucfirst($name_singular). ' date') |h %></TD>
+ <TH ALIGN="right" VALIGN="center"><% mt(ucfirst($name_singular). ' date') |h %></TH>
<TD>
<TABLE>
<& /elements/tr-input-beginning_ending.html,
@@ -87,7 +82,7 @@ Examples:
% if ( $void ) {
<TR>
- <TD ALIGN="right" VALIGN="center"><% mt('Voided') |h %></TD>
+ <TH ALIGN="right" VALIGN="center"><% mt('Voided') |h %></TH>
<TD>
<TABLE>
<& /elements/tr-input-beginning_ending.html,
@@ -119,13 +114,8 @@ Examples:
<BR>
-<TABLE BGCOLOR="#cccccc" CELLSPACING=0>
-
- <TR>
- <TH CLASS="background" COLSPAN=2 ALIGN="left">
- <FONT SIZE="+1"><% mt('Customer search options') |h %></FONT>
- </TH>
- </TR>
+<FONT CLASS="fsinnerbox-title"><% emt('Customer search options') %></FONT>
+<TABLE CLASS="fsinnerbox">
<& /elements/tr-select-cust_tag.html,
'custnum' => $opt{'custnum'},
@@ -149,13 +139,9 @@ Examples:
% if ( $table eq 'cust_pay' ) {
<BR>
- <TABLE BGCOLOR="#cccccc" CELLSPACING=0>
- <TR>
- <TH CLASS="background" COLSPAN=2 ALIGN="left">
- <FONT SIZE="+1"><% mt('Display options') |h %></FONT>
- </TH>
- </TR>
+ <FONT CLASS="fsinnerbox-title"><% emt('Display options') %></FONT>
+ <TABLE CLASS="fsinnerbox">
<& /elements/tr-checkbox.html,
'label' => emt('Include tax names'),
diff --git a/httemplate/search/report_cust_bill.html b/httemplate/search/report_cust_bill.html
index bd40b96..d26ebdc 100644
--- 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') ),
@@ -37,13 +32,8 @@
% }
- <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 &>
@@ -76,30 +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>
+ </TR>
-<TR>
+ <TR>
<TD ALIGN="right"><INPUT TYPE="checkbox" NAME="invoiced" VALUE="1"></TD>
<TD><% emt('Exclude discounts from gross amount billed'), %></TD>
-</TR>
+ </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>
+ <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>
diff --git a/httemplate/search/report_cust_pkg.html b/httemplate/search/report_cust_pkg.html
index 556177c..5e8c429 100755
--- a/httemplate/search/report_cust_pkg.html
+++ b/httemplate/search/report_cust_pkg.html
@@ -6,9 +6,8 @@
% unless ( $custnum ) {
- <TABLE BGCOLOR="#cccccc" CELLSPACING=0>
-
- <& /elements/tr-title.html, value => mt('Customer search options') &>
+ <FONT CLASS="fsinnerbox-title"><% emt('Customer search options') %></FONT>
+ <TABLE CLASS="fsinnerbox">
<& /elements/tr-select-agent.html,
'curr_value' => scalar( $cgi->param('agentnum') ),
@@ -50,9 +49,8 @@
% }
- <TABLE BGCOLOR="#cccccc" CELLSPACING=0>
-
- <& /elements/tr-title.html, value => mt('Package search options') &>
+<FONT CLASS="fsinnerbox-title"><% emt('Package search options') %></FONT>
+<TABLE CLASS="fsinnerbox">
<& /elements/tr-select-sales.html,
'label' => 'Package sales person',
@@ -233,7 +231,11 @@
<& /elements/tr-selectmultiple-part_pkg.html &>
- <& /elements/tr-title.html, value => mt('Location search options') &>
+</TABLE>
+<BR>
+
+<FONT CLASS="fsinnerbox-title"><% emt('Location search options') %></FONT>
+<TABLE CLASS="fsinnerbox">
% my @location_options = qw(cust nocust census nocensus);
% if ( $conf->config('tax_data_vendor') eq 'cch' ) {
@@ -253,7 +255,11 @@
'value' => { map { $_ => 0 } @location_options },
&>
- <& /elements/tr-title.html, value => mt('Display options') &>
+</TABLE>
+<BR>
+
+<FONT CLASS="fsinnerbox-title"><% emt('Display options') %></FONT>
+<TABLE CLASS="fsinnerbox">
<& /elements/tr-select-cust-fields.html &>
diff --git a/httemplate/search/report_prospect_main.html b/httemplate/search/report_prospect_main.html
index f2e617f..cfaf3aa 100644
--- a/httemplate/search/report_prospect_main.html
+++ b/httemplate/search/report_prospect_main.html
@@ -2,11 +2,8 @@
<FORM ACTION="prospect_main.html" METHOD="GET">
- <TABLE BGCOLOR="#cccccc" CELLSPACING=0>
-
- <TR>
- <TH CLASS="background" COLSPAN=2 ALIGN="left"><FONT SIZE="+1">Search options</FONT></TH>
- </TR>
+ <FONT CLASS="fsinnerbox-title"><% emt('Search options') %></FONT>
+ <TABLE CLASS="fsinnerbox">
<& /elements/tr-select-agent.html,
'curr_value' => scalar($cgi->param('agentnum')),
diff --git a/httemplate/search/report_quotation.html b/httemplate/search/report_quotation.html
index 8f4da6a..4bce9d9 100644
--- a/httemplate/search/report_quotation.html
+++ b/httemplate/search/report_quotation.html
@@ -5,7 +5,8 @@
<INPUT TYPE="hidden" NAME="prospectnum" VALUE="<% $prospectnum %>">
<INPUT TYPE="hidden" NAME="custnum" VALUE="<% $custnum %>">
-<TABLE BGCOLOR="#cccccc" CELLSPACING=0>
+<FONT CLASS="fsinnerbox-title"><% emt('Search options') %></FONT>
+<TABLE CLASS="fsinnerbox">
% unless ( $custnum ) {
<& /elements/tr-select-agent.html,
-----------------------------------------------------------------------
Summary of changes:
httemplate/elements/tr-select-paybatch.html | 2 +-
httemplate/elements/tr-select-user.html | 2 +-
.../search/elements/report_cust_pay_or_refund.html | 36 +++++------------
httemplate/search/report_cust_bill.html | 42 ++++++--------------
httemplate/search/report_cust_pkg.html | 22 ++++++----
httemplate/search/report_prospect_main.html | 7 +---
httemplate/search/report_quotation.html | 3 +-
7 files changed, 44 insertions(+), 70 deletions(-)
More information about the freeside-commits
mailing list