Revert "Weiche Mandantenkonfiguration: Untererzeugnisse direkt mitfertigen"

This reverts commit 033138109231a9737da9b2f0ee7cb5d20413ddbf.

diff --git a/SL/DB/MetaSetup/Default.pm b/SL/DB/MetaSetup/Default.pm
index ec5c85f..1486d21 100644 (file)
--- a/SL/DB/MetaSetup/Default.pm
+++ b/SL/DB/MetaSetup/Default.pm
@@ -129,7 +129,6 @@ __PACKAGE__->meta->columns(
   pdonumber                                 => { type => 'text' },
   ponumber                                  => { type => 'text' },
   precision                                 => { type => 'numeric', default => '0.01', not_null => 1, precision => 15, scale => 5 },
-  produce_assembly_multiple_levels          => { type => 'boolean', default => 'false' },
   produce_assembly_same_warehouse           => { type => 'boolean', default => 'true' },
   profit_carried_forward_chart_id           => { type => 'integer' },
   profit_determination                      => { type => 'text' },

diff --git a/locale/de/all b/locale/de/all
index ed8f516..eb78f3e 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -758,7 +758,6 @@ $self->{texts} = {
   'Create a new user'           => 'Einen neuen Benutzer anlegen',
   'Create a new user group'     => 'Eine neue Benutzergruppe erfassen',
   'Create a new version'        => 'Eine neue Version anlegen',
-  'Create all sub-assemblies'   => 'Fertige alle Untererzeugnisse',
   'Create and edit RFQs'        => 'Lieferantenanfragen erfassen und bearbeiten',
   'Create and edit dunnings'    => 'Mahnungen erfassen und bearbeiten',
   'Create and edit invoices and credit notes' => 'Rechnungen und Gutschriften erfassen und bearbeiten',
@@ -2578,7 +2577,6 @@ $self->{texts} = {
   'Problem'                     => 'Problem',
   'Produce'                     => 'Fertigen',
   'Produce Assembly'            => 'Erzeugnis fertigen',
-  'Produce assembly and ALL sublevels of assemblies in one step.' => 'Erzeugnis fertigen, versucht auch direkt alle Untererzeugnisse die hierachisch verknüpft sind zu fertigen',
   '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',

diff --git a/sql/Pg-upgrade2/defaults_assembly_level.sql b/sql/Pg-upgrade2/defaults_assembly_level.sql
deleted file mode 100644 (file)
index c1d53d1..0000000
--- a/sql/Pg-upgrade2/defaults_assembly_level.sql
+++ /dev/null
@@ -1,5 +0,0 @@
--- @tag: defaults_assembly_level
--- @description: Mandantenkonfiguration: Erzeugnis fertigen und alle Untererzeugnisse mitfertigen (standardmäßig deaktiviert)
--- @depends: release_3_5_6_1
-
-ALTER TABLE defaults ADD COLUMN produce_assembly_multiple_levels BOOLEAN DEFAULT FALSE;

diff --git a/templates/webpages/client_config/_warehouse.html b/templates/webpages/client_config/_warehouse.html
index b169219..081f5a1 100644 (file)
--- a/templates/webpages/client_config/_warehouse.html
+++ b/templates/webpages/client_config/_warehouse.html
@@ -132,15 +132,6 @@
     [% LxERP.t8('Produce assembly only if all parts are in the same warehouse') %]
    </td>
   </tr>
-  <tr>
-   <td align="right">[% LxERP.t8('Create all sub-assemblies') %]</td>
-   <td>
-    [% L.yes_no_tag('defaults.produce_assembly_multiple_levels', SELF.defaults.produce_assembly_multiple_levels) %]
-   </td>
-   <td>
-    [% LxERP.t8('Produce assembly and ALL sublevels of assemblies in one step.') %]
-   </td>
-  </tr>
   <tr>
    <td align="right">[% LxERP.t8('Sales Orders Services are deliverable') %]</td>
    <td>