From 5e34b4afb0b02edb4e24253bf4bfc8336bff8cce Mon Sep 17 00:00:00 2001 From: "Martin Helmling mh@waldpark.octosoft.eu" Date: Mon, 12 May 2014 14:15:00 +0200 Subject: [PATCH] =?utf8?q?Beim=20Einlagern=20Grund=20f=C3=BCr=20Einlagerun?= =?utf8?q?g=20mit=20aufnehmen?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- SL/Controller/Inventory.pm | 4 +++- locale/de/all | 1 + templates/webpages/inventory/warehouse_selection_stock.html | 5 +++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/SL/Controller/Inventory.pm b/SL/Controller/Inventory.pm index ceebf6826..6392ecc0c 100644 --- a/SL/Controller/Inventory.pm +++ b/SL/Controller/Inventory.pm @@ -39,7 +39,9 @@ sub action_stock_in { $::form->{title} = t8('Stock'); $::request->layout->focus('#part_id_name'); - $_[0]->render('inventory/warehouse_selection_stock', title => $::form->{title}); + my $transfer_types = WH->retrieve_transfer_types('in'); + map { $_->{description} = $main::locale->text($_->{description}) } @{ $transfer_types }; + $self->render('inventory/warehouse_selection_stock', title => $::form->{title}, TRANSFER_TYPES => $transfer_types ); } sub action_stock { diff --git a/locale/de/all b/locale/de/all index 532596b83..4b05b81a7 100755 --- a/locale/de/all +++ b/locale/de/all @@ -2483,6 +2483,7 @@ $self->{texts} = { 'Select template to paste' => 'Einzufügende Vorlage auswählen', 'Select type of removal' => 'Grund der Entnahme auswählen', 'Select type of transfer' => 'Grund der Umlagerung auswählen', + 'Select type of transfer in' => 'Grund der Einlagerung auswählen:', 'Selected' => 'Ausgewählt', 'Selection' => 'Auswahlbox', 'Selection fields: The option field must contain the available options for the selection. Options are separated by \'##\', for example \'Early##Normal##Late\'.' => 'Auswahlboxen: Das Optionenfeld muss die für die Auswahl verfügbaren Einträge enthalten. Die Einträge werden mit \'##\' voneinander getrennt. Beispiel: \'Früh##Normal##Spät\'.', diff --git a/templates/webpages/inventory/warehouse_selection_stock.html b/templates/webpages/inventory/warehouse_selection_stock.html index d53dc0569..c9ca33906 100644 --- a/templates/webpages/inventory/warehouse_selection_stock.html +++ b/templates/webpages/inventory/warehouse_selection_stock.html @@ -56,6 +56,11 @@ + + [% 'Select type of transfer in' | $T8 %]: + [% L.select_tag('transfer_type_id', TRANSFER_TYPES, title_key='description') %] + + [% 'Optional comment' | $T8 %] [% L.input_tag('comment', FORM.comment, size=60) %] -- 2.20.1