X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/cbb8eb078305a3eeca9c6c192a66176676da54f8..8f413df46f21248aa3593b21b72febe65b9751e7:/SL/DB/Order.pm

diff --git a/SL/DB/Order.pm b/SL/DB/Order.pm
index b3741df98..fe0b32153 100644
--- a/SL/DB/Order.pm
+++ b/SL/DB/Order.pm
@@ -275,7 +275,7 @@ sub convert_to_delivery_order {
       }
     }
 
-    $self->update_attributes(delivered => 1);
+    $self->update_attributes(delivered => 1) unless $::instance_conf->get_shipped_qty_require_stock_out;
     1;
   })) {
     return undef;