Mandantenkonfig: Erzeugnis fertigen berücksichtigt Dienstleistungen

diff --git a/SL/DB/MetaSetup/Default.pm b/SL/DB/MetaSetup/Default.pm
index d49ce45..a956da5 100644 (file)
--- 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 cb95769..8577cc5 100755 (executable)
--- 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 (file)
index 0000000..775013c
--- /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 f30fc78..4073c60 100644 (file)
--- 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.') %]
    </td>
   </tr>
-
-  <tr>
-   <td align="right">[% LxERP.t8('Use default warehouse for assembly transfer') %]</td>
-   <td>
-    [% L.yes_no_tag('defaults.transfer_default_warehouse_for_assembly', SELF.defaults.transfer_default_warehouse_for_assembly) %]
-   </td>
-   <td>
-    [% LxERP.t8('Transfer of assemblies uses the assembly\'s default warehouse instead of the destination warehouse.') %]<br>
-   </td>
-  </tr>
   <tr><td colspan="3"><hr /></td></tr>
   <tr>
   <tr>
@@ -121,8 +111,7 @@
    <td>[% L.input_tag('defaults.undo_transfer_interval', LxERP.format_amount(SELF.defaults.undo_transfer_interval, 0), style=style) %]</td>
    <td>[% LxERP.t8('Defines the interval where undoing transfers from a delivery order are allowed.') %]</td>
   </tr>
-  <tr><td colspan="3"><hr /></td></tr>
-  <tr>
+  <tr><td class="listheading" colspan="4">[% LxERP.t8("Produce Assembly Configuration") %]</td></tr>
   <tr>
    <td align="right">[% LxERP.t8('Assembly creation warehouse dependent') %]</td>
    <td>
@@ -132,6 +121,26 @@
     [% LxERP.t8('Produce assembly only if all parts are in the same warehouse') %]
    </td>
   </tr>
+  <tr>
+   <td align="right">[% LxERP.t8('Assembly creation transfers services') %]</td>
+   <td>
+    [% L.yes_no_tag('defaults.produce_assembly_transfer_service', SELF.defaults.produce_assembly_transfer_service) %]
+   </td>
+   <td>
+    [% LxERP.t8('Produce assembly consumes services if assigned as a assembly item') %]
+   </td>
+  </tr>
+  <tr>
+   <td align="right">[% LxERP.t8('Use default warehouse for assembly transfer') %]</td>
+   <td>
+    [% L.yes_no_tag('defaults.transfer_default_warehouse_for_assembly', SELF.defaults.transfer_default_warehouse_for_assembly) %]
+   </td>
+   <td>
+    [% LxERP.t8('Transfer of assemblies uses the assembly\'s default warehouse instead of the destination warehouse.') %]<br>
+   </td>
+  </tr>
+
+  <tr><td class="listheading" colspan="4">[% LxERP.t8("Services in Delivery Orders") %]</td></tr>
   <tr>
    <td align="right">[% LxERP.t8('Sales Orders Services are deliverable') %]</td>
    <td>