X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/6f45549b6f3d1f4f178b8799c9997fdc6e1447d0..0dfb1453080f4bcd515bff166f35d5577a08b75b:/SL/Controller/CsvImport/BaseMulti.pm diff --git a/SL/Controller/CsvImport/BaseMulti.pm b/SL/Controller/CsvImport/BaseMulti.pm index 2f31be6d7..32dc4c45e 100644 --- a/SL/Controller/CsvImport/BaseMulti.pm +++ b/SL/Controller/CsvImport/BaseMulti.pm @@ -5,11 +5,6 @@ use strict; use List::MoreUtils qw(pairwise); use SL::Helper::Csv; -use SL::DB::Customer; -use SL::DB::Language; -use SL::DB::PaymentTerm; -use SL::DB::Vendor; -use SL::DB::Contact; use parent qw(SL::Controller::CsvImport::Base); @@ -40,11 +35,6 @@ sub run { $self->controller->track_progress(progress => 50); - # bb: make sanity-check of it? - #if ($self->csv->is_multiplexed != $self->is_multiplexed) { - # die "multiplex controller on simplex data or vice versa"; - #} - $self->controller->errors([ $self->csv->errors ]) if $self->csv->errors; return if ( !$self->csv->header || $self->csv->errors ); @@ -74,9 +64,9 @@ sub run { } $self->controller->raw_data_headers($raw_data_headers); $self->controller->info_headers($info_headers); - my @objects = $self->csv->get_objects; + $self->controller->track_progress(progress => 70); my @raw_data = @{ $self->csv->get_data }; @@ -101,7 +91,7 @@ sub run { sub add_columns { my ($self, $row_ident, @columns) = @_; - + my $h = $self->controller->headers->{$row_ident}; foreach my $column (grep { !$h->{used}->{$_} } @columns) { @@ -134,12 +124,6 @@ sub add_raw_data_columns { } } -sub add_cvar_raw_data_columns { - my ($self) = @_; - - map { $self->add_raw_data_columns($_) if exists $self->controller->data->[0]->{raw_data}->{$_} } @{ $self->cvar_columns }; -} - sub init_profile { my ($self) = @_; @@ -164,7 +148,7 @@ sub init_profile { $prof{ 'cvar_' . $_->name } = '' for @{ $self->all_cvar_configs }; $class =~ m/^SL::DB::(.+)/; - push @profile, {'profile' => \%prof, 'class' => $class, 'row_ident' => $1}; + push @profile, {'profile' => \%prof, 'class' => $class, 'row_ident' => $::locale->text($1)}; } \@profile; @@ -202,31 +186,7 @@ sub setup_displayable_columns { } } -sub add_cvar_columns_to_displayable_columns { - my ($self) = @_; - - $self->add_displayable_columns(map { { name => 'cvar_' . $_->name, - description => $::locale->text('#1 (custom variable)', $_->description) } } - @{ $self->all_cvar_configs }); -} - -sub init_existing_objects { - my ($self) = @_; - - eval "require " . $self->class; - $self->existing_objects($self->manager_class->get_all); -} - -sub init_class { - die "class not set"; -} - -sub init_manager_class { - my ($self) = @_; - - $self->class =~ m/^SL::DB::(.+)/; - $self->manager_class("SL::DB::Manager::" . $1); -} +sub is_multiplexed { 1 } 1;