From: Moritz Bunkus Date: Fri, 20 Jun 2008 09:43:21 +0000 (+0000) Subject: ------------------------------------------------------------------------ X-Git-Tag: release-2.6.0beta1~126 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=74c7135dd76391b581476daffe240f2829493744;p=kivitendo-erp.git ------------------------------------------------------------------------ r7132 | mbunkus | 2008-06-20 10:12:27 +0200 (Fri, 20 Jun 2008) | 1 line Lieferscheine: Die Entscheidung, ob ein Lieferschein bearbeitet werden darf, wird vom Flag "delivered" abhängig gemacht, nicht von "closed". ------------------------------------------------------------------------ --- diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl index 26ebde50b..719d65b79 100644 --- a/bin/mozilla/do.pl +++ b/bin/mozilla/do.pl @@ -789,6 +789,7 @@ sub save_as_new { $form->{saveasnew} = 1; $form->{closed} = 0; + $form->{delivered} = 0; map { delete $form->{$_} } qw(printed emailed queued); # Let Lx-Office assign a new order number if the user hasn't changed the @@ -939,7 +940,7 @@ sub display_stock_in_form { $form->get_lists('warehouses' => { 'key' => 'WAREHOUSES', 'bins' => 'BINS' }); - redo_stock_info('stock_info' => $stock_info, 'add_empty_row' => !$form->{closed}); + redo_stock_info('stock_info' => $stock_info, 'add_empty_row' => !$form->{delivered}); get_basic_bin_wh_info($stock_info); @@ -986,7 +987,7 @@ sub stock_out_form { my $stock_info = DO->unpack_stock_information('packed' => $form->{stock}); - if (!$form->{closed}) { + if (!$form->{delivered}) { foreach my $row (@contents) { $row->{available_qty} = $form->format_amount_units('amount' => $row->{qty} * 1, 'part_unit' => $part_info->{unit}, @@ -1012,7 +1013,7 @@ sub stock_out_form { $form->header(); print $form->parse_html_template('do/stock_out_form', { 'UNITS' => $units_data, - 'WHCONTENTS' => $form->{closed} ? $stock_info : \@contents, + 'WHCONTENTS' => $form->{delivered} ? $stock_info : \@contents, 'PART_INFO' => $part_info, }); $lxdebug->leave_sub(); @@ -1056,7 +1057,7 @@ sub set_stock_out { $lxdebug->leave_sub(); } -sub transfer_in_and_close { +sub transfer_in { $lxdebug->enter_sub(); my @part_ids = map { $form->{"id_${_}"} } grep { $form->{"id_${_}"} && $form->{"stock_in_${_}"} } (1 .. $form->{rowcount}); @@ -1093,7 +1094,7 @@ sub transfer_in_and_close { } if (@{ $form->{ERRORS} }) { - push @{ $form->{ERRORS} }, $locale->text('The delivery order has not been closed. The warehouse contents have not changed.'); + push @{ $form->{ERRORS} }, $locale->text('The delivery order has not been marked as delivered. The warehouse contents have not changed.'); update(); $lxdebug->leave_sub(); @@ -1105,7 +1106,6 @@ sub transfer_in_and_close { DO->transfer_in_out('direction' => 'in', 'requests' => \@all_requests); - $form->{closed} = 1; $form->{delivered} = 1; save(); @@ -1113,7 +1113,7 @@ sub transfer_in_and_close { $lxdebug->leave_sub(); } -sub transfer_out_and_close { +sub transfer_out { $lxdebug->enter_sub(); my @part_ids = map { $form->{"id_${_}"} } grep { $form->{"id_${_}"} && $form->{"stock_out_${_}"} } (1 .. $form->{rowcount}); @@ -1186,7 +1186,7 @@ sub transfer_out_and_close { } if (@{ $form->{ERRORS} }) { - push @{ $form->{ERRORS} }, $locale->text('The delivery order has not been closed. The warehouse contents have not changed.'); + push @{ $form->{ERRORS} }, $locale->text('The delivery order has not been marked as delivered. The warehouse contents have not changed.'); update(); $lxdebug->leave_sub(); @@ -1198,7 +1198,6 @@ sub transfer_out_and_close { DO->transfer_in_out('direction' => 'out', 'requests' => \@all_requests); - $form->{closed} = 1; $form->{delivered} = 1; save(); diff --git a/js/stock_in_out.js b/js/stock_in_out.js index 2ad468740..542311032 100644 --- a/js/stock_in_out.js +++ b/js/stock_in_out.js @@ -1,23 +1,25 @@ function open_stock_in_out_window(in_out, row) { - var width = 980; - var height = 600; - var parm = centerParms(width, height) + ",width=" + width + ",height=" + height + ",status=yes,scrollbars=yes"; + var width = 980; + var height = 600; + var parm = centerParms(width, height) + ",width=" + width + ",height=" + height + ",status=yes,scrollbars=yes"; - var parts_id = document.getElementsByName("id_" + row)[0].value; - var stock = document.getElementsByName("stock_" + in_out + "_" + row)[0].value; - var do_qty = document.getElementsByName("qty_" + row)[0].value; - var do_unit = document.getElementsByName("unit_" + row)[0].value; - var closed = document.getElementsByName("closed")[0].value; + var parts_id = document.getElementsByName("id_" + row)[0].value; + var stock = document.getElementsByName("stock_" + in_out + "_" + row)[0].value; + var do_qty = document.getElementsByName("qty_" + row)[0].value; + var do_unit = document.getElementsByName("unit_" + row)[0].value; + var closed = document.getElementsByName("closed")[0].value; + var delivered = document.getElementsByName("delivered")[0].value; url = "do.pl?" + "action=stock_in_out_form&" + - "in_out=" + escape_more(in_out) + "&" + - "row=" + escape_more(row) + "&" + - "parts_id=" + escape_more(parts_id) + "&" + - "do_qty=" + escape_more(do_qty) + "&" + - "do_unit=" + escape_more(do_unit) + "&" + - "stock=" + escape_more(stock) + "&" + - "closed=" + escape_more(closed) + "&" + + "in_out=" + escape_more(in_out) + "&" + + "row=" + escape_more(row) + "&" + + "parts_id=" + escape_more(parts_id) + "&" + + "do_qty=" + escape_more(do_qty) + "&" + + "do_unit=" + escape_more(do_unit) + "&" + + "stock=" + escape_more(stock) + "&" + + "closed=" + escape_more(closed) + "&" + + "delivered=" + escape_more(delivered) + "&" + ""; //alert(url); window.open(url, "_new_generic", parm); diff --git a/locale/de/all b/locale/de/all index 11a206395..d1d0cb32a 100644 --- a/locale/de/all +++ b/locale/de/all @@ -1382,7 +1382,7 @@ aktualisieren wollen?', 'The dataset has to exist before a restoration can be started.' => 'Die Datenbank muss vor der Wiederherstellung bereits angelegt worden sein.', 'The dataset name is missing.' => 'Der Datenbankname fehlt.', 'The default value depends on the variable type:' => 'Die Bedeutung des Standardwertes hängt vom Variablentypen ab:', - 'The delivery order has not been closed. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht abgeschlossen. Die Lagerinhalte wurden nicht verändert.', + 'The delivery order has not been marked as delivered. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht als geliefert markiert. Der Lagerinhalt wurde nicht verändert.', 'The description is missing.' => 'Die Beschreibung fehlt.', 'The description is shown on the form. Chose something short and descriptive.' => 'Die Beschreibung wird in der jeweiligen Maske angezeigt. Sie sollte kurz und prägnant sein.', 'The directory "%s" could not be created:\n%s' => 'Das Verzeichnis "%s" konnte nicht erstellt werden:\n%s', @@ -1498,8 +1498,8 @@ aktualisieren wollen?', 'Transfer Quantity' => 'Umlagermenge', 'Transfer To Stock' => 'Lagereingang', 'Transfer from warehouse' => 'Quelllager', - 'Transfer in and close' => 'Einlagern und abschließen', - 'Transfer out and close' => 'Auslagern und abschließen', + 'Transfer in' => 'Einlagern', + 'Transfer out' => 'Auslagern', 'Transfer qty' => 'Umlagermenge', 'Translation (%s)' => 'Übersetzung (%s)', 'Trial Balance' => 'Summen- u. Saldenliste', @@ -1698,6 +1698,8 @@ aktualisieren wollen?', 'no' => 'nein', 'no chargenumber' => 'keine Chargennummer', 'none (pricegroup)' => 'keine', + 'not transferred in yet' => 'noch nicht eingelagert', + 'not transferred out yet' => 'noch nicht ausgelagert', 'number' => 'Nummer', 'order' => 'Reihenfolge', 'packing_list' => 'Versandliste', @@ -1748,6 +1750,8 @@ aktualisieren wollen?', 'to (date)' => 'bis', 'to (time)' => 'bis', 'transfer' => 'Umlagerung', + 'transferred in' => 'eingelagert', + 'transferred out' => 'ausgelagert', 'trial_balance' => 'susa', 'up' => 'hoch', 'use program settings' => 'benutze Programmeinstellungen', diff --git a/locale/de/do b/locale/de/do index 202d0c325..b8d6e6d0a 100644 --- a/locale/de/do +++ b/locale/de/do @@ -240,7 +240,7 @@ $self->{texts} = { 'The connection to the authentication database failed:' => 'Die Verbindung zur Authentifizierungsdatenbank schlug fehl:', 'The connection to the template database failed:' => 'Die Verbindung zur Vorlagendatenbank schlug fehl:', 'The creation of the authentication database failed:' => 'Das Anlegen der Authentifizierungsdatenbank schlug fehl:', - 'The delivery order has not been closed. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht abgeschlossen. Die Lagerinhalte wurden nicht verändert.', + 'The delivery order has not been marked as delivered. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht als geliefert markiert. Der Lagerinhalt wurde nicht verändert.', 'The list has been printed.' => 'Die Liste wurde ausgedruckt.', 'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, for the transfer of #5.' => 'Von \'#1\' ist in Lager \'#2\', Lagerplatz \'#3\', #4, nicht genügend eingelagert, um insgesamt #5 auszulagern.', 'To (email)' => 'An', @@ -381,8 +381,8 @@ $self->{subs} = { 'stock_in_form' => 'stock_in_form', 'stock_in_out_form' => 'stock_in_out_form', 'stock_out_form' => 'stock_out_form', - 'transfer_in_and_close' => 'transfer_in_and_close', - 'transfer_out_and_close' => 'transfer_out_and_close', + 'transfer_in' => 'transfer_in', + 'transfer_out' => 'transfer_out', 'update' => 'update', 'update_delivery_order' => 'update_delivery_order', 'update_stock_in' => 'update_stock_in', @@ -400,8 +400,8 @@ $self->{subs} = { 'speichern' => 'save', 'als_neu_speichern' => 'save_as_new', 'lieferadresse' => 'ship_to', - 'einlagern_und_abschließen' => 'transfer_in_and_close', - 'auslagern_und_abschließen' => 'transfer_out_and_close', + 'einlagern' => 'transfer_in', + 'auslagern' => 'transfer_out', 'erneuern' => 'update', 'ja' => 'yes', }; diff --git a/locale/de/login b/locale/de/login index 74c9f313b..a30bcba15 100644 --- a/locale/de/login +++ b/locale/de/login @@ -304,7 +304,7 @@ $self->{texts} = { 'The connection to the authentication database failed:' => 'Die Verbindung zur Authentifizierungsdatenbank schlug fehl:', 'The connection to the template database failed:' => 'Die Verbindung zur Vorlagendatenbank schlug fehl:', 'The creation of the authentication database failed:' => 'Das Anlegen der Authentifizierungsdatenbank schlug fehl:', - 'The delivery order has not been closed. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht abgeschlossen. Die Lagerinhalte wurden nicht verändert.', + 'The delivery order has not been marked as delivered. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht als geliefert markiert. Der Lagerinhalt wurde nicht verändert.', 'The follow-up date is missing.' => 'Das Wiedervorlagedatum fehlt.', 'The list has been printed.' => 'Die Liste wurde ausgedruckt.', 'The session is invalid or has expired.' => 'Die Session ist ungültig oder abgelaufen.', @@ -498,8 +498,8 @@ $self->{subs} = { 'stock_out_form' => 'stock_out_form', 'todo_list_follow_ups' => 'todo_list_follow_ups', 'todo_list_overdue_sales_quotations' => 'todo_list_overdue_sales_quotations', - 'transfer_in_and_close' => 'transfer_in_and_close', - 'transfer_out_and_close' => 'transfer_out_and_close', + 'transfer_in' => 'transfer_in', + 'transfer_out' => 'transfer_out', 'update' => 'update', 'update_delivery_order' => 'update_delivery_order', 'update_stock_in' => 'update_stock_in', @@ -527,8 +527,8 @@ $self->{subs} = { 'speichern_und_schließen' => 'save_and_close', 'als_neu_speichern' => 'save_as_new', 'lieferadresse' => 'ship_to', - 'einlagern_und_abschließen' => 'transfer_in_and_close', - 'auslagern_und_abschließen' => 'transfer_out_and_close', + 'einlagern' => 'transfer_in', + 'auslagern' => 'transfer_out', 'erneuern' => 'update', 'ja' => 'yes', }; diff --git a/locale/de/oe b/locale/de/oe index aaa23059b..73f82a0a4 100644 --- a/locale/de/oe +++ b/locale/de/oe @@ -279,7 +279,7 @@ $self->{texts} = { 'The connection to the authentication database failed:' => 'Die Verbindung zur Authentifizierungsdatenbank schlug fehl:', 'The connection to the template database failed:' => 'Die Verbindung zur Vorlagendatenbank schlug fehl:', 'The creation of the authentication database failed:' => 'Das Anlegen der Authentifizierungsdatenbank schlug fehl:', - 'The delivery order has not been closed. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht abgeschlossen. Die Lagerinhalte wurden nicht verändert.', + 'The delivery order has not been marked as delivered. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht als geliefert markiert. Der Lagerinhalt wurde nicht verändert.', 'The list has been printed.' => 'Die Liste wurde ausgedruckt.', 'There is not enough available of \'#1\' at warehouse \'#2\', bin \'#3\', #4, for the transfer of #5.' => 'Von \'#1\' ist in Lager \'#2\', Lagerplatz \'#3\', #4, nicht genügend eingelagert, um insgesamt #5 auszulagern.', 'To (email)' => 'An', @@ -449,8 +449,8 @@ $self->{subs} = { 'stock_in_form' => 'stock_in_form', 'stock_in_out_form' => 'stock_in_out_form', 'stock_out_form' => 'stock_out_form', - 'transfer_in_and_close' => 'transfer_in_and_close', - 'transfer_out_and_close' => 'transfer_out_and_close', + 'transfer_in' => 'transfer_in', + 'transfer_out' => 'transfer_out', 'update' => 'update', 'update_delivery_order' => 'update_delivery_order', 'update_stock_in' => 'update_stock_in', @@ -475,8 +475,8 @@ $self->{subs} = { 'speichern_und_schließen' => 'save_and_close', 'als_neu_speichern' => 'save_as_new', 'lieferadresse' => 'ship_to', - 'einlagern_und_abschließen' => 'transfer_in_and_close', - 'auslagern_und_abschließen' => 'transfer_out_and_close', + 'einlagern' => 'transfer_in', + 'auslagern' => 'transfer_out', 'erneuern' => 'update', 'ja' => 'yes', }; diff --git a/locale/de/todo b/locale/de/todo index 42dc1d414..e9ac42e2d 100644 --- a/locale/de/todo +++ b/locale/de/todo @@ -301,7 +301,7 @@ $self->{texts} = { 'The connection to the authentication database failed:' => 'Die Verbindung zur Authentifizierungsdatenbank schlug fehl:', 'The connection to the template database failed:' => 'Die Verbindung zur Vorlagendatenbank schlug fehl:', 'The creation of the authentication database failed:' => 'Das Anlegen der Authentifizierungsdatenbank schlug fehl:', - 'The delivery order has not been closed. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht abgeschlossen. Die Lagerinhalte wurden nicht verändert.', + 'The delivery order has not been marked as delivered. The warehouse contents have not changed.' => 'Der Lieferschein wurde nicht als geliefert markiert. Der Lagerinhalt wurde nicht verändert.', 'The follow-up date is missing.' => 'Das Wiedervorlagedatum fehlt.', 'The list has been printed.' => 'Die Liste wurde ausgedruckt.', 'The subject is missing.' => 'Der Betreff fehlt.', @@ -486,8 +486,8 @@ $self->{subs} = { 'stock_out_form' => 'stock_out_form', 'todo_list_follow_ups' => 'todo_list_follow_ups', 'todo_list_overdue_sales_quotations' => 'todo_list_overdue_sales_quotations', - 'transfer_in_and_close' => 'transfer_in_and_close', - 'transfer_out_and_close' => 'transfer_out_and_close', + 'transfer_in' => 'transfer_in', + 'transfer_out' => 'transfer_out', 'update' => 'update', 'update_delivery_order' => 'update_delivery_order', 'update_stock_in' => 'update_stock_in', @@ -514,8 +514,8 @@ $self->{subs} = { 'speichern_und_schließen' => 'save_and_close', 'als_neu_speichern' => 'save_as_new', 'lieferadresse' => 'ship_to', - 'einlagern_und_abschließen' => 'transfer_in_and_close', - 'auslagern_und_abschließen' => 'transfer_out_and_close', + 'einlagern' => 'transfer_in', + 'auslagern' => 'transfer_out', 'erneuern' => 'update', 'ja' => 'yes', }; diff --git a/templates/webpages/do/form_footer_de.html b/templates/webpages/do/form_footer_de.html index b96f99c25..850c8f6bd 100644 --- a/templates/webpages/do/form_footer_de.html +++ b/templates/webpages/do/form_footer_de.html @@ -3,7 +3,7 @@ - [%- IF closed %] + [%- IF delivered %] [%- SET RO = ' readonly' %] [%- END %] @@ -56,19 +56,19 @@

Lieferschein bearbeiten
- [%- UNLESS closed %] + [%- UNLESS delivered %] [%- IF vc == 'customer' %] [%- END %] [%- END %] - [%- UNLESS closed %] + [%- UNLESS delivered %] [%- IF vc == 'customer' %] - + [%- ELSE %] - + [%- END %] [%- END %] [%- IF id %] @@ -80,7 +80,7 @@

Workflow Lieferschein
- [% UNLESS closed %] + [% UNLESS delivered %] [% END %] diff --git a/templates/webpages/do/form_footer_master.html b/templates/webpages/do/form_footer_master.html index 554a369e7..cde704c5a 100644 --- a/templates/webpages/do/form_footer_master.html +++ b/templates/webpages/do/form_footer_master.html @@ -3,7 +3,7 @@ - [%- IF closed %] + [%- IF delivered %] [%- SET RO = ' readonly' %] [%- END %] @@ -56,19 +56,19 @@

Edit the Delivery Order
- [%- UNLESS closed %] + [%- UNLESS delivered %] [%- IF vc == 'customer' %] [%- END %] [%- END %] - [%- UNLESS closed %] + [%- UNLESS delivered %] [%- IF vc == 'customer' %] - + [%- ELSE %] - + [%- END %] [%- END %] [%- IF id %] @@ -80,7 +80,7 @@

Workflow Delivery Order
- [% UNLESS closed %] + [% UNLESS delivered %] [% END %] diff --git a/templates/webpages/do/form_header_de.html b/templates/webpages/do/form_header_de.html index d8f692f87..01983ab70 100644 --- a/templates/webpages/do/form_header_de.html +++ b/templates/webpages/do/form_header_de.html @@ -16,7 +16,7 @@ setupDateFormat('[% myconfig_dateformat %]', 'Falsches Datumsformat!'); setupPoints('[% myconfig_numberformat %]', 'Falsches Format'); - [%- UNLESS closed %] + [%- UNLESS delivered %] Calendar.setup({ inputField : "transdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "transdate_trigger" }); [%- END %] } @@ -42,7 +42,7 @@ [%- SET the_oldvc = oldvendor %] [%- SET is_customer = '0' %] [%- END %] - [%- IF closed %] + [%- IF delivered %] [%- SET RO = ' readonly' %] [%- SET DISABLED = ' disabled' %] [%- END %] @@ -101,7 +101,7 @@ [% IF is_customer %]Kunde[% ELSE %]Lieferant[% END %] - [%- UNLESS !closed && SHOW_VC_DROP_DOWN %] + [%- UNLESS !delivered && SHOW_VC_DROP_DOWN %] [%- ELSE %] [%- IF cp_id == row.cp_id %] [%- HTML.escape(row.cp_name) %][%- IF row.cp_abteilung %] ([% HTML.escape(row.cp_abteilung) %])[% END -%] @@ -141,7 +141,7 @@ Lieferadresse - [%- IF closed %] + [%- IF delivered %] [%- FOREACH row = ALL_SHIPTO %] [%- IF shipto_id == row.shipto_id %] @@ -191,7 +191,7 @@ Abteilung - [%- IF closed %] + [%- IF delivered %] [%- FOREACH row = ALL_DEPARTMENTS %] [% IF department == row.value %][% HTML.escape(row.description) %]--[% HTML.escape(row.id) %][% END %] @@ -229,24 +229,36 @@ - [%- IF vc == 'customer' %] - [%- ELSE %] + - [%- END %]
- - + [%- IF delivered %] + [%- IF is_customer %] + ausgelagert + [%- ELSE %] + eingelagert + [%- END %] + [%- ELSE %] + [%- IF is_customer %] + noch nicht ausgelagert + [%- ELSE %] + noch nicht eingelagert + [%- END %] + [%- END %] + ; [%- IF closed %] - + Geschlossen + [%- ELSE %] + Offen [%- END %]
Bearbeiter - [%- IF closed %] + [%- IF delivered %] [%- FOREACH row = ALL_EMPLOYEES %] [% IF row.id == employee_id %][%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %][% END %] @@ -272,7 +284,7 @@
Verkäufer/in - [%- IF closed %] + [%- IF delivered %] [%- FOREACH row = ALL_SALESMEN %] [% IF row.id == the_salesman_id %][%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %][% END %] @@ -310,14 +322,14 @@ - [% UNLESS closed %][% END %] + [% UNLESS delivered %][% END %]
Projektnummer - [%- IF closed %] + [%- IF delivered %] [%- FOREACH row = ALL_PROJECTS %] [% IF globalproject_id == row.id %][% HTML.escape(row.projectnumber) %][% END %] diff --git a/templates/webpages/do/form_header_master.html b/templates/webpages/do/form_header_master.html index a881a9ca0..7b0bfcbe3 100644 --- a/templates/webpages/do/form_header_master.html +++ b/templates/webpages/do/form_header_master.html @@ -16,7 +16,7 @@ setupDateFormat('[% myconfig_dateformat %]', 'Falsches Datumsformat!'); setupPoints('[% myconfig_numberformat %]', 'wrongformat'); - [%- UNLESS closed %] + [%- UNLESS delivered %] Calendar.setup({ inputField : "transdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "transdate_trigger" }); [%- END %] } @@ -42,7 +42,7 @@ [%- SET the_oldvc = oldvendor %] [%- SET is_customer = '0' %] [%- END %] - [%- IF closed %] + [%- IF delivered %] [%- SET RO = ' readonly' %] [%- SET DISABLED = ' disabled' %] [%- END %] @@ -101,7 +101,7 @@ [% IF is_customer %]Customer[% ELSE %]Vendor[% END %] - [%- UNLESS !closed && SHOW_VC_DROP_DOWN %] + [%- UNLESS !delivered && SHOW_VC_DROP_DOWN %] [%- ELSE %]
Contact Person - [%- IF closed %] + [%- IF delivered %] [%- IF cp_id == row.cp_id %] [%- HTML.escape(row.cp_name) %][%- IF row.cp_abteilung %] ([% HTML.escape(row.cp_abteilung) %])[% END -%] @@ -141,7 +141,7 @@
Shipping Address - [%- IF closed %] + [%- IF delivered %] [%- FOREACH row = ALL_SHIPTO %] [%- IF shipto_id == row.shipto_id %] @@ -191,7 +191,7 @@
Department - [%- IF closed %] + [%- IF delivered %] [%- FOREACH row = ALL_DEPARTMENTS %] [% IF department == row.value %][% HTML.escape(row.description) %]--[% HTML.escape(row.id) %][% END %] @@ -229,24 +229,36 @@ - [%- IF vc == 'customer' %] - [%- ELSE %] + - [%- END %]
- - + [%- IF delivered %] + [%- IF is_customer %] + transferred out + [%- ELSE %] + transferred in + [%- END %] + [%- ELSE %] + [%- IF is_customer %] + not transferred out yet + [%- ELSE %] + not transferred in yet + [%- END %] + [%- END %] + ; [%- IF closed %] - + Closed + [%- ELSE %] + Open [%- END %]
Employee - [%- IF closed %] + [%- IF delivered %] [%- FOREACH row = ALL_EMPLOYEES %] [% IF row.id == employee_id %][%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %][% END %] @@ -272,7 +284,7 @@
Salesman - [%- IF closed %] + [%- IF delivered %] [%- FOREACH row = ALL_SALESMEN %] [% IF row.id == the_salesman_id %][%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %][% END %] @@ -310,14 +322,14 @@ - [% UNLESS closed %][% END %] + [% UNLESS delivered %][% END %]
Project Number - [%- IF closed %] + [%- IF delivered %] [%- FOREACH row = ALL_PROJECTS %] [% IF globalproject_id == row.id %][% HTML.escape(row.projectnumber) %][% END %] diff --git a/templates/webpages/do/stock_in_form_de.html b/templates/webpages/do/stock_in_form_de.html index 8845b7b52..f7b6a689a 100644 --- a/templates/webpages/do/stock_in_form_de.html +++ b/templates/webpages/do/stock_in_form_de.html @@ -1,6 +1,6 @@ -[% USE HTML %][% USE LxERP %][% USE JavaScript %] +[% USE HTML %][% USE LxERP %][% USE JavaScript %] - [%- UNLESS closed %] + [%- UNLESS delivered %]