X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/92f6fae1e8c4861460ae364ac7dc243b429a9cb6..008b51c43d064b8172168aee7fdff393c5d4b13a:/SL/DB/Order.pm

diff --git a/SL/DB/Order.pm b/SL/DB/Order.pm
index dc4bbebd8..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;
@@ -393,6 +393,7 @@ sub new_from {
                                                         marge_percent marge_price_factor marge_total
                                                         ordnumber parts_id price_factor price_factor_id pricegroup_id
                                                         project_id qty reqdate sellprice serialnumber ship subtotal transdate unit
+                                                        optional
                                                      )),
                                                  custom_variables => \@custom_variables,
     );