From 46bc75c8079099de22ccbc6281b04f42ade67f1a Mon Sep 17 00:00:00 2001 From: Thomas Heck Date: Wed, 15 Aug 2012 10:25:58 +0200 Subject: [PATCH] Date-Input-Felder durch 'L.date_tag's ersetzt --- .../acctranscorrections/analyze_filter.html | 14 +---- templates/webpages/amcvar/search_filter.html | 21 ++----- templates/webpages/ap/search.html | 9 +-- templates/webpages/ar/search.html | 8 +-- templates/webpages/ct/form_footer.html | 4 -- templates/webpages/ct/form_header.html | 15 +++-- templates/webpages/do/form_header.html | 9 +-- templates/webpages/do/search.html | 8 +-- templates/webpages/do/stock_in_form.html | 22 +------ templates/webpages/dunning/search.html | 22 ++----- templates/webpages/fu/add_edit.html | 5 +- templates/webpages/fu/search.html | 17 ++---- templates/webpages/ic/search.html | 16 ++--- templates/webpages/ir/_payments.html | 5 +- templates/webpages/is/_payments.html | 8 +-- templates/webpages/oe/form_footer.html | 3 - templates/webpages/oe/form_header.html | 6 +- templates/webpages/oe/search.html | 21 ++----- .../webpages/sepa/bank_transfer_create.html | 18 +----- .../webpages/sepa/bank_transfer_edit.html | 25 +------- .../webpages/sepa/bank_transfer_search.html | 61 ++++--------------- templates/webpages/vk/search_invoice.html | 9 +-- templates/webpages/wh/journal_filter.html | 37 ++--------- templates/webpages/wh/report_filter.html | 16 +---- .../webpages/wh/warehouse_selection.html | 17 +----- .../wh/warehouse_selection_assembly.html | 17 +----- .../wh/warehouse_selection_stock.html | 21 ++----- 27 files changed, 86 insertions(+), 348 deletions(-) diff --git a/templates/webpages/acctranscorrections/analyze_filter.html b/templates/webpages/acctranscorrections/analyze_filter.html index 1d81d0fe9..2aa769d3f 100644 --- a/templates/webpages/acctranscorrections/analyze_filter.html +++ b/templates/webpages/acctranscorrections/analyze_filter.html @@ -1,5 +1,6 @@ [%- USE T8 %] [% USE HTML %] +[%- USE L %]

[% title %]

@@ -25,11 +26,9 @@ [% 'Period:' | $T8 %] [% 'from (time)' | $T8 %] - - + [% L.date_tag('transdate_from') %] [% 'to (time)' | $T8 %] - - + [% L.date_tag('transdate_to') %] @@ -41,12 +40,5 @@ - - diff --git a/templates/webpages/amcvar/search_filter.html b/templates/webpages/amcvar/search_filter.html index 37f722b12..f97c4ec94 100644 --- a/templates/webpages/amcvar/search_filter.html +++ b/templates/webpages/amcvar/search_filter.html @@ -1,4 +1,5 @@ [%- USE T8 %] +[%- USE L %] [% USE HTML %] [%- FOREACH var = variables %] @@ -16,24 +17,10 @@ [%- ELSIF var.type == 'date' %] [% 'from (time)' | $T8 %] - - - [% 'to (time)' | $T8 %] - - + [% L.date_tag(filter_prefix _'cvar_'_ HTML.escape(var.name) _'_from') %] - + [% 'to (time)' | $T8 %] + [% L.date_tag(filter_prefix _'cvar_'_ HTML.escape(var.name) _'_to') %] [%- ELSIF var.type == 'number' %] - + [% L.date_tag('transdatefrom') %] [% 'Bis' | $T8 %] - - + [% L.date_tag('transdateto') %] @@ -176,8 +175,6 @@ @@ -47,7 +43,6 @@ [%- SET is_customer = '0' %] [%- END %] [%- IF delivered %] - [%- SET RO = ' readonly' %] [%- SET DISABLED = ' disabled' %] [%- END %] @@ -292,9 +287,7 @@ [% 'Delivery Order Date' | $T8 %] - - [% UNLESS delivered %][% END %] + [% L.date_tag('transdate', transdate, readonly => delivered) %] diff --git a/templates/webpages/do/search.html b/templates/webpages/do/search.html index b2ad1704f..7d750d06b 100644 --- a/templates/webpages/do/search.html +++ b/templates/webpages/do/search.html @@ -11,8 +11,6 @@ - [% END %] - [%- END %] - diff --git a/templates/webpages/dunning/search.html b/templates/webpages/dunning/search.html index c95829c58..2e6105af4 100644 --- a/templates/webpages/dunning/search.html +++ b/templates/webpages/dunning/search.html @@ -73,26 +73,22 @@ [% 'Invdate from' | $T8 %] - - + [% L.date_tag('transdatefrom') %] [% 'To (time)' | $T8 %] - - + [% L.date_tag('transdateto') %] [% 'Dunning Date from' | $T8 %] - - + [% L.date_tag('dunningfrom') %] [% 'To (time)' | $T8 %] - - + [% L.date_tag('dunningto') %] @@ -126,16 +122,6 @@ - - - diff --git a/templates/webpages/fu/add_edit.html b/templates/webpages/fu/add_edit.html index d32f3fcb0..4beb3d63d 100644 --- a/templates/webpages/fu/add_edit.html +++ b/templates/webpages/fu/add_edit.html @@ -1,10 +1,10 @@ [%- USE T8 %] +[%- USE L %] [% USE HTML %] -

diff --git a/templates/webpages/ir/_payments.html b/templates/webpages/ir/_payments.html index 51a1fdd18..1677219d4 100644 --- a/templates/webpages/ir/_payments.html +++ b/templates/webpages/ir/_payments.html @@ -1,5 +1,6 @@ [%- USE T8 %] [%- USE LxERP %] +[%- USE L %] @@ -42,8 +43,7 @@ [% IF $changeable %] diff --git a/templates/webpages/is/_payments.html b/templates/webpages/is/_payments.html index 01413ab2e..a87221502 100644 --- a/templates/webpages/is/_payments.html +++ b/templates/webpages/is/_payments.html @@ -1,4 +1,6 @@ -[%- USE LxERP %][% USE T8 %] +[%- USE LxERP %] +[%- USE T8 %] +[%- USE L %]
[% IF $changeable %] - - + [% L.date_tag('datepaid_'_ i, $datepaid) %] [% ELSE %] [% $datepaid %] [% END %] @@ -101,7 +101,6 @@
@@ -43,8 +45,7 @@ [%- END %] @@ -128,16 +125,5 @@ - - diff --git a/templates/webpages/sepa/bank_transfer_edit.html b/templates/webpages/sepa/bank_transfer_edit.html index a534d1ada..3af74c980 100644 --- a/templates/webpages/sepa/bank_transfer_edit.html +++ b/templates/webpages/sepa/bank_transfer_edit.html @@ -1,6 +1,7 @@ [%- USE T8 %] [% USE HTML %] [% USE LxERP %] +[%- USE L %] [% IF vc == 'vendor' %] [% SET is_vendor = 1 %] [% SET arap = 'ap' %] @@ -46,8 +47,7 @@ [%- IF show_post_payments_button %] [%- ELSE %] @@ -82,9 +82,7 @@ [%- ELSIF item.export_closed %] [% 'not executed' | $T8 %] [%- ELSE %] - - + [% L.date_tag('items[].execution_date', item.requested_execution_date || current_date) %] [%- END %] @@ -116,23 +114,6 @@ $(this).attr('checked', checked); }); }); - - [%- IF show_post_payments_button %] - Calendar.setup({ inputField : "set_all_execution_date", - ifFormat : "[% myconfig_jsc_dateformat %]", - align : "BL", - button : "set_all_execution_date_trigger", - onUpdate : set_all_execution_date_fields }); - - [%- FOREACH item = export.items %] - [%- IF !item.executed %] - Calendar.setup({ inputField : "execution_date_[% loop.count %]", - ifFormat : "[% myconfig_jsc_dateformat %]", - align : "BL", - button : "execution_date_[% loop.count %]_trigger" }); - [%- END %] - [%- END %] - [%- END %] }); --> diff --git a/templates/webpages/sepa/bank_transfer_search.html b/templates/webpages/sepa/bank_transfer_search.html index bc60d8850..74060f5ba 100644 --- a/templates/webpages/sepa/bank_transfer_search.html +++ b/templates/webpages/sepa/bank_transfer_search.html @@ -1,5 +1,7 @@ [%- USE T8 %] -[% USE HTML %][% USE LxERP %] +[%- USE HTML %] +[%- USE LxERP %] +[%- USE L %]
[% title %]
@@ -20,33 +22,27 @@ @@ -90,38 +86,5 @@
- - - diff --git a/templates/webpages/vk/search_invoice.html b/templates/webpages/vk/search_invoice.html index 25ec860ce..84eb11e7e 100644 --- a/templates/webpages/vk/search_invoice.html +++ b/templates/webpages/vk/search_invoice.html @@ -1,4 +1,5 @@ [%- USE T8 %] +[%- USE L %] @@ -195,13 +196,11 @@ @@ -296,8 +295,6 @@ - diff --git a/templates/webpages/wh/report_filter.html b/templates/webpages/wh/report_filter.html index 53d0842e9..9215374e9 100644 --- a/templates/webpages/wh/report_filter.html +++ b/templates/webpages/wh/report_filter.html @@ -110,8 +110,7 @@ [% END %] @@ -195,18 +194,5 @@
- [% IF conf_show_best_before %] - - [% END %] - diff --git a/templates/webpages/wh/warehouse_selection.html b/templates/webpages/wh/warehouse_selection.html index 0f499b28f..254e8549c 100644 --- a/templates/webpages/wh/warehouse_selection.html +++ b/templates/webpages/wh/warehouse_selection.html @@ -1,5 +1,6 @@ [%- USE T8 %] [%- USE HTML %] +[%- USE L %] [% USE JavaScript %] @@ -122,8 +123,7 @@ [% END %] @@ -140,18 +140,5 @@
- [% IF conf_show_best_before %] - - [% END %] - diff --git a/templates/webpages/wh/warehouse_selection_assembly.html b/templates/webpages/wh/warehouse_selection_assembly.html index 74da21aa3..3999e8cc6 100644 --- a/templates/webpages/wh/warehouse_selection_assembly.html +++ b/templates/webpages/wh/warehouse_selection_assembly.html @@ -1,4 +1,5 @@ [%- USE T8 %] +[%- USE L %] [% USE HTML %][% USE JavaScript %][% USE LxERP %] @@ -110,8 +111,7 @@ [% END %] @@ -142,18 +142,5 @@
- [% IF conf_show_best_before %] - - [% END %] - diff --git a/templates/webpages/wh/warehouse_selection_stock.html b/templates/webpages/wh/warehouse_selection_stock.html index 4bb3c04e9..fef9940a4 100644 --- a/templates/webpages/wh/warehouse_selection_stock.html +++ b/templates/webpages/wh/warehouse_selection_stock.html @@ -1,4 +1,5 @@ [%- USE T8 %] +[%- USE L %] [% USE HTML %][% USE JavaScript %][% USE LxERP %] @@ -110,8 +111,7 @@ [% END %] @@ -145,20 +145,7 @@ [%- END %]
- - - [% IF conf_show_best_before %] - - [% END %] - + + -- 2.20.1
[% IF $changeable %] - - + [% L.date_tag('datepaid_'_ i, $datepaid) %] [% ELSE %] [% $datepaid %] [% END %] @@ -105,7 +106,6 @@
diff --git a/templates/webpages/oe/form_footer.html b/templates/webpages/oe/form_footer.html index cb449faa1..19f90cd77 100644 --- a/templates/webpages/oe/form_footer.html +++ b/templates/webpages/oe/form_footer.html @@ -188,9 +188,6 @@ -
diff --git a/templates/webpages/sepa/bank_transfer_create.html b/templates/webpages/sepa/bank_transfer_create.html index 0a5059a20..a2dc8c0f3 100644 --- a/templates/webpages/sepa/bank_transfer_create.html +++ b/templates/webpages/sepa/bank_transfer_create.html @@ -1,4 +1,5 @@ [%- USE T8 %] +[%- USE L %] [% USE HTML %][% USE LxERP %] [% IF vc == 'vendor' %] [% SET is_vendor = 1 %] @@ -104,11 +105,7 @@ - - + [% L.date_tag('requested_execution_date_'_ loop.count, bank_transfer.requested_execution_date) %]

- - + [% L.date_tag('set_all_execution_date') %]

[% 'Export date from' | $T8 %] - - - [% 'to (time)' | $T8 %] - - + [% L.date_tag('f_export_date_from') %] + [% 'to (time)' | $T8 %] + [% L.date_tag('f_export_date_to') %]

[% 'Requested execution date from' | $T8 %] - - - [% 'to (time)' | $T8 %] - - + [% L.date_tag('f_requested_execution_date_from') %] + [% 'to (time)' | $T8 %] + [% L.date_tag('f_requested_execution_date_to') %]

[% 'Execution date from' | $T8 %] - - - [% 'to (time)' | $T8 %] - - + [% L.date_tag('f_execution_date_from') %] + [% 'to (time)' | $T8 %] + [% L.date_tag('f_execution_date_to') %]

[% 'Invoice Date' | $T8 %] [% 'From' | $T8 %] - - + [% L.date_tag('transdatefrom') %] [% 'Bis' | $T8 %] - - + [% L.date_tag('transdateto') %]

[% 'Best Before' | $T8 %]: - - + [% L.date_tag('bestbefore') %]

[% 'Best Before' | $T8 %] - - + [% L.date_tag('bestbefore') %]

[% 'Best Before' | $T8 %] - - + [% L.date_tag('bestbefore', bestbefore) %]

[% 'Best Before' | $T8 %] - - + [% L.date_tag('bestbefore', bestbefore) %]