From: Bernd Bleßmann Date: Mon, 19 Aug 2013 10:00:43 +0000 (+0200) Subject: Unveränderte Methoden nicht auch in abgeleiteter Klasse definieren. X-Git-Tag: release-3.1.0beta1~22^2~132 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=1feb4280006369334d558e208d15461cfd575165;p=kivitendo-erp.git Unveränderte Methoden nicht auch in abgeleiteter Klasse definieren. --- diff --git a/SL/Controller/CsvImport/BaseMulti.pm b/SL/Controller/CsvImport/BaseMulti.pm index fb2437a05..089d8d735 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); @@ -76,6 +71,7 @@ sub run { $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 }; @@ -133,12 +129,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) = @_; @@ -201,32 +191,6 @@ 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;