From 008b51c43d064b8172168aee7fdff393c5d4b13a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20B=C3=BCren?= Date: Mon, 26 Jul 2021 10:34:42 +0200 Subject: [PATCH] =?utf8?q?Mandantenkonfig:=20Erzeugnis=20fertigen=20ber?= =?utf8?q?=C3=BCcksichtigt=20Dienstleistungen?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- SL/DB/MetaSetup/Default.pm | 1 + locale/de/all | 4 +++ ...ults_produce_assembly_transfer_service.sql | 5 +++ .../webpages/client_config/_warehouse.html | 33 ++++++++++++------- 4 files changed, 31 insertions(+), 12 deletions(-) create mode 100644 sql/Pg-upgrade2/defaults_produce_assembly_transfer_service.sql diff --git a/SL/DB/MetaSetup/Default.pm b/SL/DB/MetaSetup/Default.pm index d49ce4505..a956da55b 100644 --- a/SL/DB/MetaSetup/Default.pm +++ b/SL/DB/MetaSetup/Default.pm @@ -130,6 +130,7 @@ __PACKAGE__->meta->columns( ponumber => { type => 'text' }, precision => { type => 'numeric', default => '0.01', not_null => 1, precision => 15, scale => 5 }, produce_assembly_same_warehouse => { type => 'boolean', default => 'true' }, + produce_assembly_transfer_service => { type => 'boolean', default => 'false' }, profit_carried_forward_chart_id => { type => 'integer' }, profit_determination => { type => 'text' }, project_status_id => { type => 'integer' }, diff --git a/locale/de/all b/locale/de/all index cb95769f5..8577cc58c 100755 --- a/locale/de/all +++ b/locale/de/all @@ -351,6 +351,7 @@ $self->{texts} = { 'Assembly (typeabbreviation)' => 'E', 'Assembly Last Cost' => 'Erzeugnis-Einkaufspreis', 'Assembly Number missing!' => 'Erzeugnisnummer fehlt!', + 'Assembly creation transfers services' => 'Erzeugnis fertigen berücksichtigt Dienstleistungen', 'Assembly creation warehouse dependent' => 'Erzeugnis fertigen ist lagerabhängig', 'Assembly items' => 'Erzeugnisbestandteile', 'Asset' => 'Aktiva/Mittelverwendung', @@ -2594,6 +2595,8 @@ $self->{texts} = { 'Problem' => 'Problem', 'Produce' => 'Fertigen', 'Produce Assembly' => 'Erzeugnis fertigen', + 'Produce Assembly Configuration' => 'Konfiguration für Erzeugnis fertigen', + 'Produce assembly consumes services if assigned as a assembly item' => 'Erzeugnis fertigen verbraucht auch Dienstleistungen falls diese ein Erzeugnisbestandteil ist', 'Produce assembly only if all parts are in the same warehouse' => 'Erzeugnisse können nur gefertigt werden, wenn alle Einzelteile sich in demselben Lager befinden', 'Production' => 'Produktion', 'Production (typeabbreviation)' => 'P', @@ -3004,6 +3007,7 @@ $self->{texts} = { 'Service Number missing!' => 'Dienstleistungsnummer fehlt!', 'Service, assembly or part' => 'Dienstleistung, Erzeugnis oder Ware', 'Services' => 'Dienstleistungen', + 'Services in Delivery Orders' => 'Dienstleistungen in Lieferscheinen', 'Set (set to)' => 'Setze', 'Set all source and memo fields' => 'Alle Beleg-/Memo-Felder setzen', 'Set count for one or more of the items to select them' => 'Zum Selektieren bitte Menge für einen oder mehrere Artikel setzen', diff --git a/sql/Pg-upgrade2/defaults_produce_assembly_transfer_service.sql b/sql/Pg-upgrade2/defaults_produce_assembly_transfer_service.sql new file mode 100644 index 000000000..775013ca4 --- /dev/null +++ b/sql/Pg-upgrade2/defaults_produce_assembly_transfer_service.sql @@ -0,0 +1,5 @@ +-- @tag: defaults_produce_assembly_transfer_service +-- @description: Mandantenkonfiguration: Erzeugnis mit Dienstleistungen, Dienstleistung kann verbraucht werden +-- @depends: release_3_5_7 + +ALTER TABLE defaults ADD COLUMN produce_assembly_transfer_service BOOLEAN DEFAULT FALSE; diff --git a/templates/webpages/client_config/_warehouse.html b/templates/webpages/client_config/_warehouse.html index f30fc7808..4073c60d8 100644 --- a/templates/webpages/client_config/_warehouse.html +++ b/templates/webpages/client_config/_warehouse.html @@ -89,16 +89,6 @@ [% LxERP.t8('If one or more space separated serial numbers are assigned in a sales invoice, match the charge number of the inventory item. Assumes that Serial Number and Charge Number have 1:1 relation. Otherwise throw a error message for the default sales invoice transfer.') %] - - - [% LxERP.t8('Use default warehouse for assembly transfer') %] - - [% L.yes_no_tag('defaults.transfer_default_warehouse_for_assembly', SELF.defaults.transfer_default_warehouse_for_assembly) %] - - - [% LxERP.t8('Transfer of assemblies uses the assembly\'s default warehouse instead of the destination warehouse.') %]
- -
@@ -121,8 +111,7 @@ [% L.input_tag('defaults.undo_transfer_interval', LxERP.format_amount(SELF.defaults.undo_transfer_interval, 0), style=style) %] [% LxERP.t8('Defines the interval where undoing transfers from a delivery order are allowed.') %] -
- + [% LxERP.t8("Produce Assembly Configuration") %] [% LxERP.t8('Assembly creation warehouse dependent') %] @@ -132,6 +121,26 @@ [% LxERP.t8('Produce assembly only if all parts are in the same warehouse') %] + + [% LxERP.t8('Assembly creation transfers services') %] + + [% L.yes_no_tag('defaults.produce_assembly_transfer_service', SELF.defaults.produce_assembly_transfer_service) %] + + + [% LxERP.t8('Produce assembly consumes services if assigned as a assembly item') %] + + + + [% LxERP.t8('Use default warehouse for assembly transfer') %] + + [% L.yes_no_tag('defaults.transfer_default_warehouse_for_assembly', SELF.defaults.transfer_default_warehouse_for_assembly) %] + + + [% LxERP.t8('Transfer of assemblies uses the assembly\'s default warehouse instead of the destination warehouse.') %]
+ + + + [% LxERP.t8("Services in Delivery Orders") %] [% LxERP.t8('Sales Orders Services are deliverable') %] -- 2.20.1