Merge branch 'master' of github.com:kivitendo/kivitendo-erp

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

diff --git a/SL/IS.pm b/SL/IS.pm
index e09c08c..e2358ea 100644 (file)
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -578,13 +578,6 @@ sub post_invoice {
   $form->{defaultcurrency} = $form->get_default_currency($myconfig);
   my $defaultcurrency = $form->{defaultcurrency};
 
-  # Seit neuestem wird die department_id schon übergeben UND $form->department nicht mehr
-  # korrekt zusammengebaut. Sehr wahrscheinlich beim Umstieg auf T8 kaputt gegangen
-  # Ich lass den Code von 2005 erstmal noch stehen ;-) jb 03-2011
-  if (!$form->{department_id}){
-    ($null, $form->{department_id}) = split(/--/, $form->{department});
-  }
-
   my $all_units = AM->retrieve_units($myconfig, $form);
 
   if (!$payments_only) {
@@ -803,6 +796,28 @@ SQL
                                   name_postfix => "_$i",
                                   dbh          => $dbh);
     }
+    # link oe items with invoice
+    if ($form->{"converted_from_orderitems_id_$i"}) {
+      RecordLinks->create_links('dbh'        => $dbh,
+                                'mode'       => 'ids',
+                                'from_table' => 'orderitems',
+                                'from_ids'   => $form->{"converted_from_orderitems_id_$i"},
+                                'to_table'   => 'invoice',
+                                'to_id'      => $form->{"invoice_id_$i"},
+      );
+      delete $form->{"converted_from_orderitems_id_$i"};
+    }
+    # link doi items with invoice
+    if ($form->{"converted_from_delivery_order_items_id_$i"}) {
+      RecordLinks->create_links('dbh'        => $dbh,
+                                'mode'       => 'ids',
+                                'from_table' => 'delivery_order_items',
+                                'from_ids'   => $form->{"converted_from_delivery_order_items_id_$i"},
+                                'to_table'   => 'invoice',
+                                'to_id'      => $form->{"invoice_id_$i"},
+      );
+      delete $form->{"converted_from_delivery_order_items_id_$i"};
+    }
   }
 
   # total payments, don't move we need it here