projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
marei: tl2019 compat
[kivitendo-erp.git]
/
SL
/
Controller
/
CsvImport
/
BaseMulti.pm
diff --git
a/SL/Controller/CsvImport/BaseMulti.pm
b/SL/Controller/CsvImport/BaseMulti.pm
index
5f5e337
..
5168ae2
100644
(file)
--- a/
SL/Controller/CsvImport/BaseMulti.pm
+++ b/
SL/Controller/CsvImport/BaseMulti.pm
@@
-2,7
+2,7
@@
package SL::Controller::CsvImport::BaseMulti;
use strict;
use strict;
-use List::MoreUtils qw(pairwise);
+use List::MoreUtils qw(pairwise
firstidx
);
use SL::Helper::Csv;
use SL::Helper::Csv;
@@
-22,7
+22,7
@@
sub run {
my $profile = $self->profile;
my $profile = $self->profile;
- $self->csv(SL::Helper::Csv->new(file
=>
$self->file->file_name,
+ $self->csv(SL::Helper::Csv->new(file
=> ('SCALAR' eq ref $self->file)? $self->file:
$self->file->file_name,
encoding => $self->controller->profile->get('charset'),
profile => $profile,
ignore_unknown_columns => 1,
encoding => $self->controller->profile->get('charset'),
profile => $profile,
ignore_unknown_columns => 1,
@@
-94,6
+94,17
@@
sub run {
$::myconfig{numberformat} = $old_numberformat;
}
$::myconfig{numberformat} = $old_numberformat;
}
+sub init_manager_class {
+ my ($self) = @_;
+
+ my @manager_classes;
+ foreach my $class (@{ $self->class }) {
+ $class =~ m/^SL::DB::(.+)/;
+ push @manager_classes, "SL::DB::Manager::" . $1;
+ }
+ $self->manager_class(\@manager_classes);
+}
+
sub add_columns {
my ($self, $row_ident, @columns) = @_;
sub add_columns {
my ($self, $row_ident, @columns) = @_;
@@
-158,6
+169,8
@@
sub init_cvar_columns_by {
sub handle_cvars {
my ($self, $entry, %params) = @_;
sub handle_cvars {
my ($self, $entry, %params) = @_;
+ return if @{ $entry->{errors} };
+
my %type_to_column = ( text => 'text_value',
textfield => 'text_value',
select => 'text_value',
my %type_to_column = ( text => 'text_value',
textfield => 'text_value',
select => 'text_value',
@@
-167,13
+180,21
@@
sub handle_cvars {
bool => 'bool_value' );
$params{sub_module} ||= '';
bool => 'bool_value' );
$params{sub_module} ||= '';
+
+ # autovivify all cvars (cvars_by_config will do that for us)
my @cvars;
my @cvars;
+ @cvars = @{ $entry->{object}->cvars_by_config } if $entry->{object}->can('cvars_by_config');
+
foreach my $config (@{ $self->cvar_configs_by->{row_ident}->{$entry->{raw_data}->{datatype}} }) {
next unless exists $entry->{raw_data}->{ "cvar_" . $config->name };
my $value = $entry->{raw_data}->{ "cvar_" . $config->name };
my $column = $type_to_column{ $config->type } || die "Program logic error: unknown custom variable storage type";
foreach my $config (@{ $self->cvar_configs_by->{row_ident}->{$entry->{raw_data}->{datatype}} }) {
next unless exists $entry->{raw_data}->{ "cvar_" . $config->name };
my $value = $entry->{raw_data}->{ "cvar_" . $config->name };
my $column = $type_to_column{ $config->type } || die "Program logic error: unknown custom variable storage type";
- push @cvars, SL::DB::CustomVariable->new(config_id => $config->id, $column => $value, sub_module => $params{sub_module});
+ my $cvar = SL::DB::CustomVariable->new(config_id => $config->id, $column => $value, sub_module => $params{sub_module});
+
+ # replace autovivified cvar by new one
+ my $idx = firstidx { $_->config_id == $config->id } @cvars;
+ $cvars[$idx] = $cvar if -1 != $idx;
}
$entry->{object}->custom_variables(\@cvars) if @cvars;
}
$entry->{object}->custom_variables(\@cvars) if @cvars;
@@
-188,7
+209,7
@@
sub init_profile {
my %unwanted = map { ( $_ => 1 ) } (qw(itime mtime), map { $_->name } @{ $class->meta->primary_key_columns });
my %unwanted = map { ( $_ => 1 ) } (qw(itime mtime), map { $_->name } @{ $class->meta->primary_key_columns });
- # TODO: ex
e
ceptions for AccTransaction and Invoice wh
+ # TODO: exceptions for AccTransaction and Invoice wh
if ( $class =~ m/^SL::DB::AccTransaction/ ) {
my %unwanted_acc_trans = map { ( $_ => 1 ) } (qw(acc_trans_id trans_id cleared fx_transaction ob_transaction cb_transaction itime mtime chart_link tax_id description gldate memo source transdate), map { $_->name } @{ $class->meta->primary_key_columns });
@unwanted{keys %unwanted_acc_trans} = values %unwanted_acc_trans;
if ( $class =~ m/^SL::DB::AccTransaction/ ) {
my %unwanted_acc_trans = map { ( $_ => 1 ) } (qw(acc_trans_id trans_id cleared fx_transaction ob_transaction cb_transaction itime mtime chart_link tax_id description gldate memo source transdate), map { $_->name } @{ $class->meta->primary_key_columns });
@unwanted{keys %unwanted_acc_trans} = values %unwanted_acc_trans;
@@
-291,4
+312,3
@@
sub fix_field_lengths {
sub is_multiplexed { 1 }
1;
sub is_multiplexed { 1 }
1;
-