From 6f58ae775b905cd462dd0faafee95973414a45d2 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Mon, 17 Jul 2017 19:18:12 -0700 Subject: [PATCH] 4.x style reports --- 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(-) diff --git a/httemplate/elements/tr-select-paybatch.html b/httemplate/elements/tr-select-paybatch.html index aedf893db..30b8f6690 100644 --- a/httemplate/elements/tr-select-paybatch.html +++ b/httemplate/elements/tr-select-paybatch.html @@ -1,5 +1,5 @@ - <% $opt{'paybatch'} || 'Payment entry batch: ' %> + <% $opt{'paybatch'} || 'Payment entry batch: ' %> <% include( '/elements/select-paybatch.html', 'curr_value' => $selected_paybatch, %opt ) %> diff --git a/httemplate/elements/tr-select-user.html b/httemplate/elements/tr-select-user.html index a9572af8f..ba550fbc1 100644 --- a/httemplate/elements/tr-select-user.html +++ b/httemplate/elements/tr-select-user.html @@ -1,5 +1,5 @@ - <% $opt{'label'} || 'Employee: ' %> + <% $opt{'label'} || 'Employee: ' %> <% include('select-user.html', %opt) %> diff --git a/httemplate/search/elements/report_cust_pay_or_refund.html b/httemplate/search/elements/report_cust_pay_or_refund.html index e05f1af73..728a12f23 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: - - - - - + <% emt('[_1] search options', ucfirst($name_singular)) %> +
- <% mt('[_1] search options', ucfirst($name_singular)) |h %> -
<& /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')) { - + % } - + - + @@ -74,7 +69,7 @@ Examples: % } - +
<% mt('Card Last 4 #:') |h %><% mt('Card Last 4 #:') |h %>
<% mt('Check #:') |h %> <% mt('Check #:') |h %>
<% mt('Transaction #:') |h %> <% mt('Transaction #:') |h %>
<% mt(ucfirst($name_singular). ' date') |h %><% mt(ucfirst($name_singular). ' date') |h %> <& /elements/tr-input-beginning_ending.html, @@ -87,7 +82,7 @@ Examples: % if ( $void ) { - +
<% mt('Voided') |h %><% mt('Voided') |h %> <& /elements/tr-input-beginning_ending.html, @@ -119,13 +114,8 @@ Examples:
-
- - - - +<% emt('Customer search options') %> +
- <% mt('Customer search options') |h %> -
<& /elements/tr-select-cust_tag.html, 'custnum' => $opt{'custnum'}, @@ -149,13 +139,9 @@ Examples: % if ( $table eq 'cust_pay' ) {
-
- - - + <% emt('Display options') %> +
- <% mt('Display options') |h %> -
<& /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 bd40b969b..d26ebdc90 100644 --- a/httemplate/search/report_cust_bill.html +++ b/httemplate/search/report_cust_bill.html @@ -6,13 +6,8 @@ % unless ( $custnum ) { -
- - - - + <% emt('Customer search options') %> +
- Customer search options -
<& /elements/tr-select-agent.html, 'curr_value' => scalar( $cgi->param('agentnum') ), @@ -37,13 +32,8 @@ % } -
- - - - + <% emt('Invoice search options') %> +
- Invoice search options -
<& /elements/tr-input-beginning_ending.html &> @@ -76,30 +66,24 @@

- +<% emt('Display options') %> +
- - - - - - + - + - + % unless ( $custnum ) { - - - - + + + + % }
- Display options -
<% mt('Show only open invoices') |h %>
<% emt('Exclude discounts from gross amount billed'), %>
<% mt('Show only the single most recent invoice per-customer') |h %>
<% mt('Show only the single most recent invoice per-customer') |h %>
diff --git a/httemplate/search/report_cust_pkg.html b/httemplate/search/report_cust_pkg.html index 556177c8a..5e8c429ec 100755 --- a/httemplate/search/report_cust_pkg.html +++ b/httemplate/search/report_cust_pkg.html @@ -6,9 +6,8 @@ % unless ( $custnum ) { - - - <& /elements/tr-title.html, value => mt('Customer search options') &> + <% emt('Customer search options') %> +
<& /elements/tr-select-agent.html, 'curr_value' => scalar( $cgi->param('agentnum') ), @@ -50,9 +49,8 @@ % } -
- - <& /elements/tr-title.html, value => mt('Package search options') &> +<% emt('Package search options') %> +
<& /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') &> +
+
+ +<% emt('Location search options') %> + % 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') &> +
+
+ +<% emt('Display options') %> + <& /elements/tr-select-cust-fields.html &> diff --git a/httemplate/search/report_prospect_main.html b/httemplate/search/report_prospect_main.html index f2e617f88..cfaf3aa5d 100644 --- a/httemplate/search/report_prospect_main.html +++ b/httemplate/search/report_prospect_main.html @@ -2,11 +2,8 @@ -
- - - - + <% emt('Search options') %> +
Search options
<& /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 8f4da6a1f..4bce9d9ae 100644 --- a/httemplate/search/report_quotation.html +++ b/httemplate/search/report_quotation.html @@ -5,7 +5,8 @@ -
+<% emt('Search options') %> +
% unless ( $custnum ) { <& /elements/tr-select-agent.html, -- 2.11.0