X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDO.pm;h=5adccd535d600e576152a89645f68a3b9910e235;hb=b8125c17c8add08c9b84fb054f797547a853dd3a;hp=d537c92f769b18241835977013ced271708f9e6e;hpb=be42a45043cab936e86e91aa895c6fc25bab079f;p=kivitendo-erp.git

diff --git a/SL/DO.pm b/SL/DO.pm
index d537c92f7..5adccd535 100644
--- a/SL/DO.pm
+++ b/SL/DO.pm
@@ -300,7 +300,7 @@ SQL
                                     dbh                => $dbh,
                                     row                => $i, 
                                     sub_module         => 'delivery_order_items',
-                                    may_converted_from => ['orderitems']);
+                                    may_converted_from => ['orderitems', 'delivery_order_items']);
 
     my $position = $i;
 
@@ -395,8 +395,9 @@ SQL
                                 name_prefix  => 'ic_',
                                 name_postfix => "_$i",
                                 dbh          => $dbh);
+
     # link order items with doi, for future extension look at foreach IS.pm
-    if ($form->{"converted_from_orderitems_id_$i"}) {
+    if (!$form->{saveasnew} && $form->{"converted_from_orderitems_id_$i"}) {
       RecordLinks->create_links('dbh'        => $dbh,
                                 'mode'       => 'ids',
                                 'from_table' => 'orderitems',
@@ -404,8 +405,8 @@ SQL
                                 'to_table'   => 'delivery_order_items',
                                 'to_id'      =>  $form->{"delivery_order_items_id_$i"},
       );
-      delete $form->{"converted_from_orderitems_id_$i"};
     }
+    delete $form->{"converted_from_orderitems_id_$i"};
   }
 
   # 1. search for orphaned dois; processed_dois may be empty (no transfer) TODO: be supersafe and alter same statement for doi and oi
@@ -1009,7 +1010,7 @@ sub order_details {
                                     dbh                => $dbh,
                                     row                => $i, 
                                     sub_module         => 'delivery_order_items',
-                                    may_converted_from => ['orderitems']);
+                                    may_converted_from => ['orderitems', 'delivery_order_items']);
 
     push @{ $form->{TEMPLATE_ARRAYS}->{"ic_cvar_$_->{name}"} },
       CVar->format_to_template(CVar->parse($form->{"ic_cvar_$_->{name}_$i"}, $_), $_)