Merge branch 'b-3.6.1' of ../kivitendo-erp_20220811

[kivitendo-erp.git] / SL / Controller / CsvImport / Helper / Consistency.pm

diff --git a/SL/Controller/CsvImport/Helper/Consistency.pm b/SL/Controller/CsvImport/Helper/Consistency.pm
index da9f455bca0edff18899fe5a67ec71a9214cefb5..5538a738c864cb7e76c87cf7807a6025aa855121 100644 (file)
--- a/SL/Controller/CsvImport/Helper/Consistency.pm
+++ b/SL/Controller/CsvImport/Helper/Consistency.pm
@@ -208,7 +208,7 @@ sub handle_salesman {
     if ($vc_obj && $vc_obj->salesman_id) {
       $object->salesman(SL::DB::Manager::Employee->find_by(id => $vc_obj->salesman_id));
     } else {
-      $object->salesman(SL::DB::Manager::Employee->find_by(login => $::myconfig{login}));
+      $object->salesman(SL::DB::Manager::Employee->current);
     }
   }
 }
@@ -219,9 +219,13 @@ sub handle_employee {
 
   my $object = $entry->{object};
 
+  # employee from front end if not given
+  if (!$object->employee_id) {
+    $object->employee_id($self->controller->{employee_id});
+  }
   # employee from login if not given
   if (!$object->employee_id) {
-    $object->employee_id(SL::DB::Manager::Employee->find_by(login => $::myconfig{login})->id);
+    $object->employee_id(SL::DB::Manager::Employee->current->id) if SL::DB::Manager::Employee->current;
   }
 }