Merge branch 'currency'

[kivitendo-erp.git] / SL / BackgroundJob / CsvImport.pm

diff --git a/SL/BackgroundJob/CsvImport.pm b/SL/BackgroundJob/CsvImport.pm
index 98aed9c..18cf7cf 100644 (file)
--- a/SL/BackgroundJob/CsvImport.pm
+++ b/SL/BackgroundJob/CsvImport.pm
@@ -51,8 +51,6 @@ sub run {
   $self->{db_obj} = shift;
 
   $self->do_import;
-
-  $self->cleanup;
 }
 
 sub do_import {
@@ -76,7 +74,7 @@ sub do_import {
     plan => {
       'parsing csv'     => 1,
       'building data'   => 2,
-    ( 'saving data'     => 3, )x!!$test,
+    ( 'saving data'     => 3, )x!$test,
       'building report' => ($test ? 3 : 4),
     },
     num_phases => ($test ? 3 : 4),
@@ -84,7 +82,7 @@ sub do_import {
   $c->add_progress_tracker($self);
 
 
-  $c->test_and_import(test => 1, session_id => $job->data_as_hash->{session_id});
+  $c->test_and_import(test => $test, session_id => $job->data_as_hash->{session_id});
 
   if ($c->errors) {
     $job->set_data(
@@ -110,10 +108,6 @@ sub track_progress {
   $self->{db_obj}->save;
 }
 
-sub cleanup {
-
-}
-
 1;
 
 __END__