From: Sven Schöling Date: Fri, 23 Nov 2007 17:25:00 +0000 (+0000) Subject: Waren/Dienstleistungen/Erzeugnisse Suche auf Template umgestellt X-Git-Tag: release-2.6.0beta1~400 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=2a4980a82c334d9836da4c990a6ce3f5fb61ebb9;p=kivitendo-erp.git Waren/Dienstleistungen/Erzeugnisse Suche auf Template umgestellt --- diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl index 1d0c51950..714baea45 100644 --- a/bin/mozilla/ic.pl +++ b/bin/mozilla/ic.pl @@ -75,11 +75,6 @@ sub add { sub search { $lxdebug->enter_sub(); - my ($button1, $button2, $onhand, $makemodel, $serialnumber, $l_serialnumber, $toplevel, $bought); - - $form->{title} = (ucfirst $form->{searchitems}) . "s"; - $form->{title} = $locale->text($form->{title}); - # switch for backward sorting $form->{revers} = 0; @@ -92,310 +87,19 @@ sub search { # $locale->text('Parts') # $locale->text('Services') - # use JavaScript Calendar or not - $form->{jsscript} = 1; - my $jsscript = ""; - if ($form->{jsscript}) { - - # with JavaScript Calendar - $button1 = qq| - - text('button') . qq|> - |; - $button2 = qq| - - text('button') . qq|> - |; - - #write Trigger - $jsscript = Form->write_trigger(\%myconfig, "2", "transdatefrom", "BL", "trigger1", "transdateto", "BL", "trigger2"); - } else { - - # without JavaScript Calendar - $button1 = qq| |; - $button2 = qq| |; - } - - unless ($form->{searchitems} eq 'service') { - - $onhand = qq| | . $locale->text('On Hand') . qq| - | . $locale->text('Short') . qq| -|; - - $makemodel = qq| - - | . $locale->text('Make') . qq| - | . $locale->text('Model') . qq| - -|; - - $serialnumber = qq| - | . $locale->text('Serial Number') . qq| -|; + my $is_service = $form->{searchitems} eq 'service'; + my $is_assembly = $form->{searchitems} eq 'assembly'; - $l_serialnumber = qq| - | . $locale->text('Serial Number') . qq| -|; - - } - - if ($form->{searchitems} eq 'assembly') { - - $form->{title} = $locale->text('Assemblies'); - - $toplevel = qq| - - - - | - . $locale->text('Top Level') . qq| - | - . $locale->text('Individual Items') . qq| - - -|; - - $bought = qq| - - - - - - - - - $button1 - - $button2 - -

- - - - - - - - - - - - - - - - - - - -

	\| . $locale->text('Sold') . qq\|

	\| . $locale->text('Ordered') . qq\|

	\| . $locale->text('Quoted') . qq\|

| . $locale->text('From') . qq|

| . $locale->text('To (time)') . qq|

- - -|; - - } else { + $form->{title} = (ucfirst $form->{searchitems}) . "s"; + $form->{title} = $locale->text($form->{title}); + $form->{title} = $locale->text('Assemblies') if $is_assembly; - $bought = qq| - - - - - - - - - -

- - - - - - - - - - - - - - - - - - - - - - - - - -

	\| . $locale->text('Bought') . qq\|		\| . $locale->text('Sold') . qq\|

	\| . $locale->text('On Order') . qq\|		\| . $locale->text('Ordered') . qq\|

	\| . $locale->text('RFQ') . qq\|		\| . $locale->text('Quoted') . qq\|

- - - - $button1 - - $button2 - -

\| . $locale->text('From') . qq\|	\| . $locale->text('To (time)') . qq\|

- - -|; - } + $form->{jsscript} = 1; $form->header; - print qq| - - -

{script}> - -{searchitems}> - + print $form->parse_html_template('ic/search', { is_assembly => $is_assembly, is_service => $is_service, dateformat => $myconfig{dateformat} }); - - - - - - - - - - -

$form->{title}

- - - - - - - - - - - - - - - $serialnumber - - $makemodel - - - - - - - $toplevel - - - - - $bought - - - - - - - - -

| . $locale->text('Part Number') . qq|

| . $locale->text('EAN') . qq|

| - . $locale->text('Part Description') . qq|

| . $locale->text('Group') . qq|

| . $locale->text('Drawing') . qq|

| . $locale->text('Microfiche') . qq|

- | - . $locale->text('Active') . qq| - $onhand - | - . $locale->text('Obsolete') . qq| - | - . $locale->text('Orphaned') . qq| -

| - . $locale->text('Include in Report') . qq|

- - - - - $l_serialnumber - - - - - - - - - - - - - - - - - - - - - - - - - -

\| - . $locale->text('Part Number') . qq\|	\| - . $locale->text('Part Description') . qq\|	\| - . $locale->text('Unit of measure') . qq\|
\| - . $locale->text('List Price') . qq\|	\| - . $locale->text('Sell Price') . qq\|	\| - . $locale->text('Last Cost') . qq\|	\| - . $locale->text('Line Total') . qq\|
\| - . $locale->text('Updated') . qq\|	\| - . $locale->text('Bin') . qq\|	\| - . $locale->text('ROP') . qq\|	\| - . $locale->text('Weight') . qq\|
\| - . $locale->text('Image') . qq\|	\| - . $locale->text('Drawing') . qq\|	\| - . $locale->text('Microfiche') . qq\|	\| - . $locale->text('Group') . qq\|
\| - . $locale->text('Subtotal') . qq\|	\| - . $locale->text('soldtotal') . qq\|	\| - . $locale->text('deliverydate') . qq\|

- -$jsscript - - - -{login}> -{password}> - - - - - - - -
- - -

- - - -|; $lxdebug->leave_sub(); } #end search() diff --git a/templates/webpages/ic/search_de.html b/templates/webpages/ic/search_de.html new file mode 100644 index 000000000..32987e3bd --- /dev/null +++ b/templates/webpages/ic/search_de.html @@ -0,0 +1,194 @@ +[%- USE HTML %] +[%- USE LxERP %] + + +

+ + + + + + + + + + + + + + +

[% title %]

+ + + + + + + + + + + + + + +[%- UNLESS is_service %] + +[%- END %] + +[%- UNLESS is_service %] + + + + +[%- END %] + + + + + + +[%- IF is_assembly %] + + + + +[%- END %] + + + + + + + + + + + + + + + +

Artikelnummer

EAN

Artikelbeschreibung

Warengruppe

Seriennummer

Hersteller

Modell

Zeichnung

Mikrofilm

+ Hauptartikelbezeichnung + Einzelteile +

+ Aktiv +[%- UNLESS is_service %] + Auf Lager + Knapp +[%- END %] + Ungültig + Nie benutzt +

+ + + + + + +

+ + +[%- UNLESS is_assembly %] + +[%- END %] + + + + + + +[%- UNLESS is_assembly %] + +[%- END %] + + + + + + +[%- UNLESS is_assembly %] + +[%- END %] + + +

	Gekauft		Verkauft

	Ist bestellt		Vom Kunde bestellt

	Anfrage		Angeboten

+ + + + + + + + + +

Von			Bis

In Bericht aufnehmen

+ + + + +[%- UNLESS is_service %] + +[%- END %] + + + + + + + + + + + + + + + + + + + + + + + + + +

Artikelnummer	Artikelbeschreibung	Seriennummer	Maßeinheit
Listenpreis	Verkaufspreis	Einkaufspreis	Zeilensumme
Erneuert am	Lagerplatz	Mindestlagerbestand	Gewicht
Grafik	Zeichnung	Mikrofilm	Warengruppe
Zwischensumme	Verkaufte Anzahl	Lieferdatum

+ + + + + + + + + + + + + + + + +
+ + +

+ + + diff --git a/templates/webpages/ic/search_master.html b/templates/webpages/ic/search_master.html new file mode 100644 index 000000000..9bb476b40 --- /dev/null +++ b/templates/webpages/ic/search_master.html @@ -0,0 +1,194 @@ +[%- USE HTML %] +[%- USE LxERP %] + + +

+ + + + + + + + + + + + + + +

[% title %]

Part Number

EAN

Part Description

Group

Serial Number

Make

Model

Drawing

Microfiche

+ Top Level + Individual Items +

+ Active +[%- UNLESS is_service %] + On Hand + Short +[%- END %] + Obsolete + Orphaned +

+ + + + + + +

+ + +[%- UNLESS is_assembly %] + +[%- END %] + + + + + + +[%- UNLESS is_assembly %] + +[%- END %] + + + + + + +[%- UNLESS is_assembly %] + +[%- END %] + + +

	Bought		Sold

	On Order		Ordered

	RFQ		Quoted

+ + + + + + + + + +

From			To (time)

Include in Report

+ + + + +[%- UNLESS is_service %] + +[%- END %] + + + + + + + + + + + + + + + + + + + + + + + + + +

Part Number	Part Description	Serial Number	Unit of measure
List Price	Sell Price	Last Cost	Line Total
Updated	Bin	ROP	Weight
Image	Drawing	Microfiche	Group
Subtotal	soldtotal	deliverydate

+ + + + + + + + + + + + + + + + +
+ + +

+ + +