X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDO.pm;h=3b6981931d6b7cea08ad76100d09691d90ba2210;hb=fea73b796d2289979be90dfc808346ec10a008f6;hp=8fad24ce00faa7bb406bd52b7e41378c6a6d561a;hpb=2247150caea321232883531cccdc003ca7516ed4;p=kivitendo-erp.git

diff --git a/SL/DO.pm b/SL/DO.pm
index 8fad24ce0..3b6981931 100644
--- a/SL/DO.pm
+++ b/SL/DO.pm
@@ -296,9 +296,14 @@ SQL
   for my $i (1 .. $form->{rowcount}) {
     next if (!$form->{"id_$i"});
 
+    CVar->get_non_editable_ic_cvars(form               => $form,
+                                    dbh                => $dbh,
+                                    row                => $i,
+                                    sub_module         => 'delivery_order_items',
+                                    may_converted_from => ['orderitems', 'delivery_order_items']);
+
     my $position = $i;
 
-    my $cvars;
     if (!$form->{"delivery_order_items_id_$i"}) {
       # there is no persistent id, therefore create one with all necessary constraints
       my $q_item_id = qq|SELECT nextval('delivery_order_items_id')|;
@@ -309,22 +314,7 @@ SQL
       do_query($form, $dbh, $query, conv_i($form->{"delivery_order_items_id_$i"}),
                 conv_i($form->{"id"}), conv_i($position), conv_i($form->{"id_$i"}));
       $h_item_id->finish();
-
-      # get values for CVars from master data for new items
-      $cvars = CVar->get_custom_variables(dbh      => $dbh,
-                                          module   => 'IC',
-                                          trans_id => $form->{"id_$i"},
-                                         );
-    } else {
-      # get values for CVars from custom_variables for existing items
-      $cvars = CVar->get_custom_variables(dbh        => $dbh,
-                                          module     => 'IC',
-                                          sub_module => 'delivery_order_items',
-                                          trans_id   => $form->{"delivery_order_items_id_$i"},
-                                         );
     }
-    # map only non-editable CVars to form (editable ones are already there)
-    map { $form->{"ic_cvar_$_->{name}_$i"} = $_->{value} unless $_->{flag_editable} } @{ $cvars };
 
     $form->{"qty_$i"} = $form->parse_amount($myconfig, $form->{"qty_$i"});
 
@@ -387,6 +377,8 @@ SQL
                   conv_i($form->{"delivery_order_items_id_$i"}), $sinfo->{qty}, $sinfo->{unit}, conv_i($sinfo->{warehouse_id}),
                   conv_i($sinfo->{bin_id}));
        $h_item_stock_id->finish();
+      # write back the id to the form (important if only transfer was clicked (id fk for invoice)
+      $form->{"stock_${in_out}_$i"} = YAML::Dump($stock_info);
       }
       @values = ($form->{"delivery_order_items_id_$i"}, $sinfo->{qty}, $sinfo->{unit}, conv_i($sinfo->{warehouse_id}),
                  conv_i($sinfo->{bin_id}), $sinfo->{chargenumber}, conv_date($sinfo->{bestbefore}),
@@ -403,6 +395,18 @@ SQL
                                 name_prefix  => 'ic_',
                                 name_postfix => "_$i",
                                 dbh          => $dbh);
+
+    # link order items with doi, for future extension look at foreach IS.pm
+    if (!$form->{saveasnew} && $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'   => 'delivery_order_items',
+                                'to_id'      =>  $form->{"delivery_order_items_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
@@ -447,7 +451,7 @@ SQL
              $form->{cusordnumber}, conv_date($form->{transdate}),
              conv_i($form->{vendor_id}), conv_i($form->{customer_id}),
              conv_date($form->{reqdate}), $form->{shippingpoint}, $form->{shipvia},
-             $form->{notes}, $form->{intnotes},
+             $restricter->process($form->{notes}), $form->{intnotes},
              $form->{closed} ? 't' : 'f', $form->{delivered} ? "t" : "f",
              conv_i($form->{department_id}), conv_i($form->{language_id}), conv_i($form->{shipto_id}),
              conv_i($form->{globalproject_id}), conv_i($form->{employee_id}),
@@ -1002,23 +1006,11 @@ sub order_details {
       }
     }
 
-    my $cvars;
-    if (! $form->{"delivery_order_items_id_$i"}) {
-      # get values for CVars from master data for new items
-      $cvars = CVar->get_custom_variables(dbh      => $dbh,
-                                          module   => 'IC',
-                                          trans_id => $form->{"id_$i"},
-                                         );
-    } else {
-      # get values for CVars from custom_variables for existing items
-      $cvars = CVar->get_custom_variables(dbh        => $dbh,
-                                          module     => 'IC',
-                                          sub_module => 'delivery_order_items',
-                                          trans_id   => $form->{"delivery_order_items_id_$i"},
-                                         );
-    }
-    # map only non-editable CVars to form (editable ones are already there)
-    map { $form->{"ic_cvar_$_->{name}_$i"} = $_->{value} unless $_->{flag_editable} } @{ $cvars };
+    CVar->get_non_editable_ic_cvars(form               => $form,
+                                    dbh                => $dbh,
+                                    row                => $i,
+                                    sub_module         => 'delivery_order_items',
+                                    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"}, $_), $_)
@@ -1186,17 +1178,19 @@ sub transfer_in_out {
 
   foreach my $request (@{ $params{requests} }) {
     push @transfers, {
-      'parts_id'               => $request->{parts_id},
-      "${prefix}_warehouse_id" => $request->{warehouse_id},
-      "${prefix}_bin_id"       => $request->{bin_id},
-      'chargenumber'           => $request->{chargenumber},
-      'bestbefore'             => $request->{bestbefore},
-      'qty'                    => $request->{qty},
-      'unit'                   => $request->{unit},
-      'oe_id'                  => $form->{id},
-      'shippingdate'           => 'current_date',
-      'transfer_type'          => $params{direction} eq 'in' ? 'stock' : 'shipped',
-      'project_id'             => $request->{project_id},
+      'parts_id'                      => $request->{parts_id},
+      "${prefix}_warehouse_id"        => $request->{warehouse_id},
+      "${prefix}_bin_id"              => $request->{bin_id},
+      'chargenumber'                  => $request->{chargenumber},
+      'bestbefore'                    => $request->{bestbefore},
+      'qty'                           => $request->{qty},
+      'unit'                          => $request->{unit},
+      'oe_id'                         => $form->{id},
+      'shippingdate'                  => 'current_date',
+      'transfer_type'                 => $params{direction} eq 'in' ? 'stock' : 'shipped',
+      'project_id'                    => $request->{project_id},
+      'delivery_order_items_stock_id' => $request->{delivery_order_items_stock_id},
+      'comment'                       => $request->{comment},
     };
   }
 
@@ -1275,5 +1269,4 @@ sub is_marked_as_delivered {
   return $delivered ? 1 : 0;
 }
 
-
 1;