X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCsvImport%2FInventory.pm;h=7dbe364d8238bce9cb180be4a9279d7f29c0cce9;hb=eabfa79517bccb2dd56220ffd7f381605944bc7f;hp=42bfac3d0ee3f32cab4f3487e57bc6f9d707c582;hpb=38b907c9866951e95c8741959b4ead1544e45011;p=kivitendo-erp.git

diff --git a/SL/Controller/CsvImport/Inventory.pm b/SL/Controller/CsvImport/Inventory.pm
index 42bfac3d0..7dbe364d8 100644
--- a/SL/Controller/CsvImport/Inventory.pm
+++ b/SL/Controller/CsvImport/Inventory.pm
@@ -79,7 +79,7 @@ sub check_objects {
 
   $self->controller->track_progress(phase => 'building data', progress => 0);
 
-  my $i;
+  my $i = 0;
   my $num_data = scalar @{ $self->controller->data };
   foreach my $entry (@{ $self->controller->data }) {
     $self->controller->track_progress(progress => $i/$num_data * 100) if $i % 100 == 0;
@@ -370,7 +370,7 @@ sub handle_employee {
 
   # 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;
   }
 
   if ($object->employee_id) {
@@ -395,7 +395,7 @@ sub save_objects {
   my $data = $params{data} || $self->controller->data;
 
   foreach my $entry (@{ $data }) {
-    my ($trans_id) = selectrow_query($::form, $::form->get_standard_dbh, qq|SELECT nextval('id')|);
+    my ($trans_id) = selectrow_query($::form,$entry->{object}->db->dbh, qq|SELECT nextval('id')|);
     $entry->{object}->trans_id($trans_id);
   }
 
@@ -424,7 +424,7 @@ SQL
                 $object->chargenumber);
   push @values, $object->bestbefore if $bestbefore_val_cnt;
 
-  my ($stocked_qty) = selectrow_query($::form, $::form->get_standard_dbh, $query, @values);
+  my ($stocked_qty) = selectrow_query($::form, $object->db->dbh, $query, @values);
 
   return $stocked_qty;
 }
@@ -434,7 +434,7 @@ sub _wh_id_and_description_ident {
 }
 
 sub _wh_id_and_description_maker {
-    return join '+', $_[0], $_[1]
+  return join '+', $_[0], $_[1]
 }
 
 sub _wh_id_and_id_ident {
@@ -442,7 +442,7 @@ sub _wh_id_and_id_ident {
 }
 
 sub _wh_id_and_id_maker {
-    return join '+', $_[0], $_[1]
+  return join '+', $_[0], $_[1]
 }
 
 1;