From 4f97d578f0ea0104fcd5cc63ed96622d89f6fceb Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Fri, 3 May 2013 13:47:17 +0200 Subject: [PATCH] Artikelsuchmaske auf L.checkbox_tag/L.radio_button_tag umgestellt --- locale/de/all | 4 +- templates/webpages/ic/search.html | 175 ++++++++---------------------- 2 files changed, 46 insertions(+), 133 deletions(-) diff --git a/locale/de/all b/locale/de/all index 4729648e3..406b2ad62 100755 --- a/locale/de/all +++ b/locale/de/all @@ -935,8 +935,8 @@ $self->{texts} = { 'From' => 'Von', 'From Date' => 'Von', 'From this version on a new feature is available.' => 'Ab dieser Version ist ein neues Feature verfügbar.', - 'From this version on the partnumber of services, articles and assemblies have to be unique.' => 'Ab dieser Version müssen Artikelnummern eindeutig vergeben werden.', 'From this version on it is necessary to name a default value.' => 'Ab dieser Version benötigt kivitendo eine Standardwährung.', + 'From this version on the partnumber of services, articles and assemblies have to be unique.' => 'Ab dieser Version müssen Artikelnummern eindeutig vergeben werden.', 'From this version on the taxkey 0 must have a tax rate of 0 (for DATEV compatibility).' => 'Ab dieser Version muss der Steuerschlüssel 0 einen Steuersatz von 0% haben (auf Grund der DATEV-Kompatibilität).', 'Full Access' => 'Vollzugriff', 'Full Preview' => 'Alles', @@ -2171,7 +2171,7 @@ $self->{texts} = { 'Top (Javascript)' => 'Oben (mit Javascript)', 'Top 100' => 'Top 100', 'Top 100 hinzufuegen' => 'Top 100 hinzufügen', - 'Top Level' => 'Hauptartikelbezeichnung', + 'Top Level Designation only' => 'Nur Hauptartikelbezeichnung', 'Total' => 'Summe', 'Total Fees' => 'Kumulierte Gebühren', 'Total stock value' => 'Gesamter Bestandswert', diff --git a/templates/webpages/ic/search.html b/templates/webpages/ic/search.html index 8379e15a6..b8276e6a5 100644 --- a/templates/webpages/ic/search.html +++ b/templates/webpages/ic/search.html @@ -73,8 +73,8 @@ -   -   + [% L.radio_button_tag('bom', id='bom_0', value=0, checked=1, label=LxERP.t8('Top Level Designation only')) %] + [% L.radio_button_tag('bom', id='bom_1', value=1, label=LxERP.t8('Individual Items')) %] [%- END %] @@ -82,20 +82,14 @@ - - - + [%- L.radio_button_tag('itemstatus', value='active', id='itemstatus_active', label=LxERP.t8('Active'), checked=1) %] [%- UNLESS is_service %] - - - - + [%- L.radio_button_tag('itemstatus', value='onhand', id='itemstatus_onhand', label=LxERP.t8('On Hand')) %] + [%- L.radio_button_tag('itemstatus', value='short', id='itemstatus_short', label=LxERP.t8('Short')) %] + [%- L.radio_button_tag('itemstatus', value='obsolete', id='itemstatus_obsolete', label=LxERP.t8('Obsolete')) %] [%- END %] - - - - - + [%- L.radio_button_tag('itemstatus', value='orphaned', id='itemstatus_orphaned', label=LxERP.t8('Orphaned')) %] + [%- L.radio_button_tag('itemstatus', value='', id='itemstatus_all', label=LxERP.t8('All')) %] @@ -108,37 +102,31 @@ [%- UNLESS is_assembly %] - - + [%- END %] - - + - + [%- UNLESS is_assembly %] - - + [%- END %] - - + - + [%- UNLESS is_assembly %] - - + [%- END %] - - +
[%- L.checkbox_tag('bought', label=LxERP.t8('Bought')) %][%- L.checkbox_tag('sold', label=LxERP.t8('Sold')) %]
[%- L.checkbox_tag('onorder', label=LxERP.t8('On Order')) %][%- L.checkbox_tag('ordered', label=LxERP.t8('Ordered')) %]
[%- L.checkbox_tag('rfq', label=LxERP.t8('RFQ')) %][%- L.checkbox_tag('quoted', label=LxERP.t8('Quoted')) %]
@@ -149,9 +137,9 @@ - + - +
[% 'From' | $T8 %][% L.date_tag('transdatefrom') %][% L.date_tag('transdatefrom') %] [% 'To (time)' | $T8 %][% L.date_tag('transdateto') %][% L.date_tag('transdateto') %]
@@ -171,133 +159,58 @@ [% 'Include in Report' | $T8 %] - - + + [%- UNLESS is_service %] - + [%- END %] - + - - - - + + + + - - - - - - + + [%- UNLESS is_service %] - - + + [%- END %] - - - - + + + - - - - + + + + [%- UNLESS is_service %] - + [%- END %] - - - + + + - + [% CUSTOM_VARIABLES_INCLUSION_CODE %] -- 2.20.1
- - - - - - [%- L.checkbox_tag('l_partnumber', label=LxERP.t8('Part Number'), checked=1, value='Y') %][%- L.checkbox_tag('l_description', label=LxERP.t8('Part Description'), checked=1, value='Y') %] - - - [%- L.checkbox_tag('l_serialnumber', label=LxERP.t8('Serial Number'), value='Y') %] - - - [%- L.checkbox_tag('l_unit', label=LxERP.t8('Unit of measure'), value='Y', checked=1) %]
- - - - - - - - - - - - [%- L.checkbox_tag('l_listprice', label=LxERP.t8('List Price'), value='Y') %][%- L.checkbox_tag('l_sellprice', label=LxERP.t8('Sell Price'), value='Y', checked=1) %][%- L.checkbox_tag('l_lastcost', label=LxERP.t8('Last Cost'), value='Y', checked=1) %][%- L.checkbox_tag('l_linetotal', label=LxERP.t8('Line Total'), value='Y', checked=1) %]
- - - + [%- L.checkbox_tag('l_priceupdate', label=LxERP.t8('Updated'), value='Y') %] [%- L.checkbox_tag('l_deliverydate', label=LxERP.t8('Delivery Date'), value='Y') %] - - - - - - [%- L.checkbox_tag('l_rop', label=LxERP.t8('ROP'), value='Y') %][%- L.checkbox_tag('l_weight', label=LxERP.t8('Weight'), value='Y') %]
- - - - - - - - - - - + [%- L.checkbox_tag('l_image', label=LxERP.t8('Image'), value='Y', checked=(conf_parts_listing_images ? 1 : 0)) %][%- L.checkbox_tag('l_drawing', label=LxERP.t8('Drawing'), value='Y') %][%- L.checkbox_tag('l_microfiche', label=LxERP.t8('Microfiche'), value='Y') %][%- L.checkbox_tag('l_partsgroup', label=LxERP.t8('Group'), value='Y') %]
- - - - - - - - - - - - [%- L.checkbox_tag('l_transdate', label=LxERP.t8('Transdate'), value='Y') %][%- L.checkbox_tag('l_subtotal', label=LxERP.t8('Subtotal'), value='Y') %][%- L.checkbox_tag('l_soldtotal', label=LxERP.t8('Qty in Selected Records'), value='Y') %][%- L.checkbox_tag('l_ean', label=LxERP.t8('EAN'), value='Y') %]
- - - [%- L.checkbox_tag('l_onhand', label=LxERP.t8('Stocked Qty'), value='Y') %] - - - - - - - - - [%- L.checkbox_tag('l_projectnumber', label=LxERP.t8('Project Number'), value='Y') %][%- L.checkbox_tag('l_projectdescription', label=LxERP.t8('Project Description'), value='Y') %][%- L.checkbox_tag('l_pricegroups', label=LxERP.t8('Pricegroups'), value='Y', checked=1) %]
- - - [%- L.checkbox_tag('l_notes', label=LxERP.t8('Notes'), value='Y') %]