Weiche Mandantenkonfiguration: Untererzeugnisse direkt mitfertigen

diff --git a/SL/DB/MetaSetup/Default.pm b/SL/DB/MetaSetup/Default.pm
index 1486d213e3265ba33eb511ce1b53394dd76b51b5..ec5c85f4e1964c90ca0f31b3f08f416120ad7005 100644 (file)
--- a/SL/DB/MetaSetup/Default.pm
+++ b/SL/DB/MetaSetup/Default.pm
@@ -129,6 +129,7 @@ __PACKAGE__->meta->columns(
   pdonumber                                 => { type => 'text' },
   ponumber                                  => { type => 'text' },
   precision                                 => { type => 'numeric', default => '0.01', not_null => 1, precision => 15, scale => 5 },
   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' },
   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 eb78f3eba49ba9c8d42b1e12cfa5907fa855894e..ed8f516746dab51925dab92da9151e90ef3ab9ec 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -758,6 +758,7 @@ $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 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',
   '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',


@@ -2577,6 +2578,7 @@ $self->{texts} = {
   'Problem'                     => 'Problem',
   'Produce'                     => 'Fertigen',
   'Produce Assembly'            => 'Erzeugnis fertigen',
   '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',
   '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
new file mode 100644 (file)
index 0000000..c1d53d1
--- /dev/null
+++ b/sql/Pg-upgrade2/defaults_assembly_level.sql
@@ -0,0 +1,5 @@
+-- @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 081f5a1a21fbfb90c4421d23476a61192bb4693b..b169219a18de4bbb740024d94077daefe283cd3d 100644 (file)
--- a/templates/webpages/client_config/_warehouse.html
+++ b/templates/webpages/client_config/_warehouse.html
@@ -132,6 +132,15 @@
     [% LxERP.t8('Produce assembly only if all parts are in the same warehouse') %]
    </td>
   </tr>
     [% 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>
   <tr>
    <td align="right">[% LxERP.t8('Sales Orders Services are deliverable') %]</td>
    <td>