PriceSource: Priorität auf Preisquellenebene verstehen und umsetzen.

[mfinanz.git] / SL / DO.pm

diff --git a/SL/DO.pm b/SL/DO.pm
index d537c92f769b18241835977013ced271708f9e6e..80b1ae352f2bbb9306c54385dbc858954757e546 100644 (file)
--- a/SL/DO.pm
+++ b/SL/DO.pm
@@ -119,7 +119,7 @@ sub transactions {
   }
   if (!$main::auth->assert('sales_all_edit', 1)) {
     push @where, qq|dord.employee_id = (select id from employee where login= ?)|;
-    push @values, $form->{login};
+    push @values, $::myconfig{login};
   }
 
   foreach my $item (qw(donumber ordnumber cusordnumber transaction_description)) {
@@ -298,9 +298,9 @@ SQL
 
     CVar->get_non_editable_ic_cvars(form               => $form,
                                     dbh                => $dbh,
-                                    row                => $i, 
+                                    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
@@ -450,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}),
@@ -1007,9 +1008,9 @@ sub order_details {
 
     CVar->get_non_editable_ic_cvars(form               => $form,
                                     dbh                => $dbh,
-                                    row                => $i, 
+                                    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"}, $_), $_)
@@ -1189,6 +1190,7 @@ sub transfer_in_out {
       '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},
     };
   }