Mandantenkonfiguration: transfer_default_warehouse_for_assembly entfernt

S.a. UPGRADE

diff --git a/SL/DB/MetaSetup/Default.pm b/SL/DB/MetaSetup/Default.pm
index a956da55b0f9061fd25428d64371a7b44c3f2794..b4091917ae70cd318011b06f554293da0873c5ae 100644 (file)
--- a/SL/DB/MetaSetup/Default.pm
+++ b/SL/DB/MetaSetup/Default.pm
@@ -179,7 +179,6 @@ __PACKAGE__->meta->columns(
   transfer_default_ignore_onhand            => { type => 'boolean', default => 'false' },
   transfer_default_services                 => { type => 'boolean', default => 'true' },
   transfer_default_use_master_default_bin   => { type => 'boolean', default => 'false' },
-  transfer_default_warehouse_for_assembly   => { type => 'boolean', default => 'false' },
   transport_cost_reminder_article_number_id => { type => 'integer' },
   undo_transfer_interval                    => { type => 'integer', default => 7 },
   vc_greetings_use_textfield                => { type => 'boolean' },

diff --git a/SL/WH.pm b/SL/WH.pm
index f1b9500756a12e87490553c0150a928bf3f26797..69874ceeb33d6a8e292de5cfd54c433a77aa92f0 100644 (file)
--- a/SL/WH.pm
+++ b/SL/WH.pm
@@ -1185,26 +1185,6 @@ as the specific reason.
 The method is transaction safe, in case of errors not a single entry will be made
 in inventory.
 
-Two prerequisites can be changed with these global parameters
-
-=over 2
-
-=item  $::instance_conf->get_transfer_default_warehouse_for_assembly
-
-  If trueish we try to get all the items form the default bins defined in parts
-  and do not try to find them in the destination warehouse. Returns an
-  error if not all items have set a default bin in parts.
-
-=item  $::instance_conf->get_bin_id_ignore_onhand
-
-  If trueish we can create assemblies even if we do not have enough items in stock.
-  The needed qty will be booked in a special bin, which has to be configured in
-  the client config.
-
-=back
-
-
-
 
 =head1 BUGS
 

diff --git a/doc/UPGRADE b/doc/UPGRADE
index a1cf9b437e6dc88434d0f603284b91ae5c0f49e0..e72c699edfc75c65469bad2a4704a08481687789 100644 (file)
--- a/doc/UPGRADE
+++ b/doc/UPGRADE
@@ -3,6 +3,18 @@ Wichtige Hinweise zum Upgrade von älteren Versionen
 
 ** BITTE FERTIGEN SIE VOR DEM UPGRADE EIN BACKUP IHRER DATENBANK(EN) AN! **
 
+Upgrade auf v3.5.8
+
+Die API für 'Erzeugnis fertigen' wurde geändert:
+Die Einstellung der Mandantenkonfiguration für 'Zum Fertigen wird das Standardlager
+des Bestandteils verwendet, nicht das Ziellager' hat keine Auswirkung mehr.
+Falls dieser Wert auf 'Nein' steht funktioniert das Verfahren wie vorher auch.
+Falls dieser Wert auf 'Ja' steht, muss geprüft werden, ob das Verfahren noch so
+benötigt wird.
+Alternativ kann 'Erzeugnis fertigen' ab dieser Version auch Erzeugnisbestandteile aus
+fremden Lagern (nicht das Ziellager) nehmen. Dies sollte i.d.R. den Prozeß abbilden können.
+
+
 
 Upgrade auf v3.5.7
   * Neue Perl Abhängigkeiten:

diff --git a/sql/Pg-upgrade2/delete_warehouse_for_assembly.sql b/sql/Pg-upgrade2/delete_warehouse_for_assembly.sql
new file mode 100644 (file)
index 0000000..f0be3a9
--- /dev/null
+++ b/sql/Pg-upgrade2/delete_warehouse_for_assembly.sql
@@ -0,0 +1,4 @@
+-- @tag: delete_warehouse_for_assembly
+-- @description: Entfernen von: Konfigurations-Option für das Fertigen von Erzeugnissen aus dem Standardlager
+-- @depends: release_3_5_7
+ALTER TABLE defaults DROP column transfer_default_warehouse_for_assembly;

diff --git a/templates/webpages/client_config/_warehouse.html b/templates/webpages/client_config/_warehouse.html
index 4073c60d897a969ef8cb4148a6e4cbb05ca11fd8..60199fc7e4e384404b0d1a2aaafff55fcc6aa4a3 100644 (file)
--- a/templates/webpages/client_config/_warehouse.html
+++ b/templates/webpages/client_config/_warehouse.html
@@ -130,16 +130,6 @@
     [% 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>