From b8f55e8877f21109656935d04f772099baa6f26f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20B=C3=BCren?= Date: Mon, 9 Mar 2015 11:15:25 +0100 Subject: [PATCH] =?utf8?q?Standardlagerverfahren=20Kommentar=20setzen=20/?= =?utf8?q?=20=C3=BCbernehmen?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Beim Standardauslagern wurde bisher nicht der Kommentar übernommen, der seit Anfang dieser Funktion in do.pl gesetzt wurde. Ferner die Beschreibung in der Mandantenkonfiguration etwas besser gesetzt, bzw. beschrieben. --- SL/DO.pm | 5 +++-- bin/mozilla/do.pl | 3 +-- templates/webpages/client_config/_warehouse.html | 9 +++------ 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/SL/DO.pm b/SL/DO.pm index 17876e514..3b6981931 100644 --- a/SL/DO.pm +++ b/SL/DO.pm @@ -298,7 +298,7 @@ SQL CVar->get_non_editable_ic_cvars(form => $form, dbh => $dbh, - row => $i, + row => $i, sub_module => 'delivery_order_items', may_converted_from => ['orderitems', 'delivery_order_items']); @@ -1008,7 +1008,7 @@ sub order_details { CVar->get_non_editable_ic_cvars(form => $form, dbh => $dbh, - row => $i, + row => $i, sub_module => 'delivery_order_items', may_converted_from => ['orderitems', 'delivery_order_items']); @@ -1190,6 +1190,7 @@ sub transfer_in_out { 'transfer_type' => $params{direction} eq 'in' ? 'stock' : 'shipped', 'project_id' => $request->{project_id}, 'delivery_order_items_stock_id' => $request->{delivery_order_items_stock_id}, + 'comment' => $request->{comment}, }; } diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl index e3c192a69..aae537f2c 100644 --- a/bin/mozilla/do.pl +++ b/bin/mozilla/do.pl @@ -1599,8 +1599,7 @@ sub transfer_in_out_default { 'bin_id' => $part_info_map{$form->{"id_$i"}}{bin_id}, 'qty' => $qty, 'parts_id' => $form->{"id_$i"}, - 'comment' => 'Default transfer DO', - 'ok' => 1, + 'comment' => $locale->text("Default transfer delivery order"), 'unit' => $part_info_map{$form->{"id_$i"}}{unit}, 'warehouse_id' => $part_info_map{$form->{"id_$i"}}{warehouse_id}, 'oe_id' => $form->{id}, diff --git a/templates/webpages/client_config/_warehouse.html b/templates/webpages/client_config/_warehouse.html index 18df06d37..b8854d161 100644 --- a/templates/webpages/client_config/_warehouse.html +++ b/templates/webpages/client_config/_warehouse.html @@ -56,21 +56,20 @@ - [% LxERP.t8('Default Warehouse with ignoring on hand') %] + [% LxERP.t8('Default Warehouse with ignoring onhand') %] [% L.select_tag('defaults.warehouse_id_ignore_onhand', SELF.all_warehouses, id='warehouse_id_ignore_onhand', with_empty=1, default=SELF.defaults.warehouse_id_ignore_onhand, title_key='description', onchange="warehouse_selected(this.selectedIndex == 0 ? -1 : warehouses[this.selectedIndex - 1].id, -1, 'bin_id_ignore_onhand')") %] - [% LxERP.t8('This is the default bin for ignoring onhand') %]
- [% LxERP.t8('If the default transfer out always succeed use this bin for negative stock quantity.') %]
+ [% LxERP.t8('This is the default warehouse for ignoring onhand') %]
[% LxERP.t8('Default Bin with ignoring onhand') %] [% L.select_tag('defaults.bin_id_ignore_onhand', [], id='bin_id_ignore_onhand', with_empty=1) %] + [% LxERP.t8('If the default transfer out always succeed use this bin for negative stock quantity.') %] -
[% LxERP.t8('Transfer out on posting sales invoices?') %] @@ -81,7 +80,6 @@ [% LxERP.t8('Transfer out all items of a sales invoice when posting it. Items are transfered out acording to the settings above.') %] -
@@ -118,6 +116,5 @@ [% LxERP.t8('The default delivery plan only checks if all delivery orders have been created not if the goods are transferred. This feature will check if all the goods are transferred. Caveat: Only the state of the delivery orders are checked not partial transferred delivery orders (in technical terms: the table inventory is not checked') %] - -- 2.20.1