projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Dialogbuchen: Bug in updateTaxes behoben und Code vereinfacht
[kivitendo-erp.git]
/
SL
/
BackgroundJob
/
CsvImport.pm
diff --git
a/SL/BackgroundJob/CsvImport.pm
b/SL/BackgroundJob/CsvImport.pm
index
66d830f
..
7df8b9b
100644
(file)
--- a/
SL/BackgroundJob/CsvImport.pm
+++ b/
SL/BackgroundJob/CsvImport.pm
@@
-5,7
+5,6
@@
use strict;
use parent qw(SL::BackgroundJob::Base);
use YAML ();
use parent qw(SL::BackgroundJob::Base);
use YAML ();
-use SL::Controller::CsvImport;
use SL::DB::CsvImportProfile;
use SL::SessionFile::Random;
use SL::DB::CsvImportProfile;
use SL::SessionFile::Random;
@@
-51,27
+50,32
@@
sub run {
$self->{db_obj} = shift;
$self->do_import;
$self->{db_obj} = shift;
$self->do_import;
-
- $self->cleanup;
}
sub do_import {
my ($self) = @_;
}
sub do_import {
my ($self) = @_;
+ require SL::Controller::CsvImport;
my $c = SL::Controller::CsvImport->new;
my $job = $self->{db_obj};
$c->profile($self->profile);
$c->type($job->data_as_hash->{type});
my $c = SL::Controller::CsvImport->new;
my $job = $self->{db_obj};
$c->profile($self->profile);
$c->type($job->data_as_hash->{type});
+ $c->{employee_id} = $job->data_as_hash->{employee_id};
my $test = $job->data_as_hash->{test};
my $test = $job->data_as_hash->{test};
+
+ # $::locale->text('parsing csv')
+ # $::locale->text('building data')
+ # $::locale->text('saving data')
+ # $::locale->text('building report')
$self->track_progress(
progress => 0,
plan => {
'parsing csv' => 1,
'building data' => 2,
$self->track_progress(
progress => 0,
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),
'building report' => ($test ? 3 : 4),
},
num_phases => ($test ? 3 : 4),
@@
-79,12
+83,11
@@
sub do_import {
$c->add_progress_tracker($self);
$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(
errors => $c->errors,
if ($c->errors) {
$job->set_data(
errors => $c->errors,
- progress => -1,
)->save;
} else {
)->save;
} else {
@@
-106,10
+109,6
@@
sub track_progress {
$self->{db_obj}->save;
}
$self->{db_obj}->save;
}
-sub cleanup {
-
-}
-
1;
__END__
1;
__END__