CSV Import Defaults in die Worker ausgelagert

[mfinanz.git] / SL / DO.pm

diff --git a/SL/DO.pm b/SL/DO.pm
index 17876e514aede566c729be1c96fa36ac42cbafb3..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= ?)|;
   }
   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)) {
   }
 
   foreach my $item (qw(donumber ordnumber cusordnumber transaction_description)) {


@@ -298,7 +298,7 @@ SQL
 
     CVar->get_non_editable_ic_cvars(form               => $form,
                                     dbh                => $dbh,
 
     CVar->get_non_editable_ic_cvars(form               => $form,
                                     dbh                => $dbh,

-                                    row                => $i, 
+                                    row                => $i,

                                     sub_module         => 'delivery_order_items',
                                     may_converted_from => ['orderitems', 'delivery_order_items']);
 
                                     sub_module         => 'delivery_order_items',
                                     may_converted_from => ['orderitems', 'delivery_order_items']);
 


@@ -1008,7 +1008,7 @@ sub order_details {
 
     CVar->get_non_editable_ic_cvars(form               => $form,
                                     dbh                => $dbh,
 
     CVar->get_non_editable_ic_cvars(form               => $form,
                                     dbh                => $dbh,

-                                    row                => $i, 
+                                    row                => $i,

                                     sub_module         => 'delivery_order_items',
                                     may_converted_from => ['orderitems', 'delivery_order_items']);
 
                                     sub_module         => 'delivery_order_items',
                                     may_converted_from => ['orderitems', 'delivery_order_items']);
 


@@ -1190,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},
       '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},

     };
   }
 
     };
   }