Fertigen ohne Prüfung nach Bestand(2)

[kivitendo-erp.git] / SL / WH.pm

diff --git a/SL/WH.pm b/SL/WH.pm
index 29643dc16f61cfb09042ec623cf32b1b7f2b3e0a..f363ae50e53a3a5e666433c48b88d2f0e81ea71f 100644 (file)
--- a/SL/WH.pm
+++ b/SL/WH.pm
@@ -211,11 +211,15 @@ sub transfer_assembly {
     my $partsQTY          = $hash_ref->{qty} * $params{qty}; # benötigte teile * anzahl erzeugnisse
     my $currentPart_ID    = $hash_ref->{parts_id};
 
+    my $currentPart_WH_ID = $use_default_warehouse && $hash_ref->{warehouse_id} ? $hash_ref->{warehouse_id} : $params{dst_warehouse_id};
+    my $no_check = 0;
+
     # Prüfen ob Erzeugnis-Teile Standardlager haben.
     if ($use_default_warehouse && ! $hash_ref->{warehouse_id}) {
       # Prüfen ob in Mandantenkonfiguration ein Standardlager aktiviert isti.
       if ($::instance_conf->get_transfer_default_ignore_onhand) {
-        $hash_ref->{warehouse_id} = $::instance_conf->get_warehouse_id_ignore_onhand;
+        $currentPart_WH_ID = $::instance_conf->get_warehouse_id_ignore_onhand;
+        $no_check = 1;
       } else {
         $kannNichtFertigen .= "Kein Standardlager: " .
                             " Die Ware " . $self->get_part_description(parts_id => $currentPart_ID) .
@@ -224,12 +228,11 @@ sub transfer_assembly {
         next;
       }
     }
-    my $currentPart_WH_ID = $use_default_warehouse ? $hash_ref->{warehouse_id} : $params{dst_warehouse_id};
     my $warehouse_info    = $self->get_basic_warehouse_info('id'=> $currentPart_WH_ID);
     my $warehouse_desc    = $warehouse_info->{"warehouse_description"};
 
     # Fertigen ohne Prüfung nach Bestand
-    if ($currentPart_WH_ID == $::instance_conf->get_warehouse_id_ignore_onhand) {
+    if ($no_check) {
       my $temppart_bin_id       = $::instance_conf->get_bin_id_ignore_onhand;
       my $temppart_chargenumber = "";
       my $temppart_bestbefore   = localtime();