CsvImport Aufträge: Variable besser benannt und Kommentar berichtigt.

[kivitendo-erp.git] / SL / Controller / CsvImport / BaseMulti.pm

diff --git a/SL/Controller/CsvImport/BaseMulti.pm b/SL/Controller/CsvImport/BaseMulti.pm
index d5010a2..ad84039 100644 (file)
--- a/SL/Controller/CsvImport/BaseMulti.pm
+++ b/SL/Controller/CsvImport/BaseMulti.pm
@@ -16,7 +16,7 @@ use Rose::Object::MakeMethods::Generic
 sub run {
   my ($self, %params) = @_;
 
-  $self->test_run($params{test_run});
+  $self->test_run($params{test});
 
   $self->controller->track_progress(phase => 'parsing csv', progress => 0);
 
@@ -70,7 +70,7 @@ sub run {
   $self->controller->raw_data_headers($raw_data_headers);
   $self->controller->info_headers($info_headers);
 
-  my @objects  = $self->csv->get_objects;
+  my $objects  = $self->csv->get_objects;
 
   $self->controller->track_progress(progress => 70);
 
@@ -78,7 +78,7 @@ sub run {
 
   $self->controller->track_progress(progress => 80);
 
-  $self->controller->data([ pairwise { { object => $a, raw_data => $b, errors => [], information => [], info_data => {} } } @objects, @raw_data ]);
+  $self->controller->data([ pairwise { { object => $a, raw_data => $b, errors => [], information => [], info_data => {} } } @$objects, @raw_data ]);
 
   $self->controller->track_progress(progress => 90);
 
@@ -151,7 +151,7 @@ sub init_cvar_columns_by {
     my $ri = $p->{row_ident};
     $ccb->{row_ident}->{$ri} = [ map { "cvar_" . $_->name } (@{ $self->cvar_configs_by->{row_ident}->{$ri} }) ];
   }
-    
+
   return $ccb;
 }
 
@@ -187,6 +187,18 @@ sub init_profile {
     eval "require " . $class;
 
     my %unwanted = map { ( $_ => 1 ) } (qw(itime mtime), map { $_->name } @{ $class->meta->primary_key_columns });
+
+    # 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::Invoice/ ) {
+      # remove fields that aren't needed / shouldn't be set for ar transaction
+      my %unwanted_ar = map { ( $_ => 1 ) } (qw(closed currency currency_id datepaid dunning_config_id gldate invnumber_for_credit_note invoice marge_percent marge_total amount netamount paid shippingpoint shipto_id shipvia storno storno_id type cp_id), map { $_->name } @{ $class->meta->primary_key_columns });
+      @unwanted{keys %unwanted_ar} = values %unwanted_ar;
+    };
+
     my %prof;
     $prof{datatype} = '';
     for my $col ($class->meta->columns) {
@@ -250,6 +262,32 @@ sub add_cvar_columns_to_displayable_columns {
                                      @{ $self->cvar_configs_by->{row_ident}->{$row_ident} });
 }
 
+sub field_lengths {
+  my ($self) = @_;
+
+  my %field_lengths_by_ri = ();
+
+  foreach my $p (@{ $self->profile }) {
+    my %field_lengths = map { $_->name => $_->length } grep { $_->type eq 'varchar' } @{ $p->{class}->meta->columns };
+    $field_lengths_by_ri{ $p->{row_ident} } = \%field_lengths;
+  }
+
+  return %field_lengths_by_ri;
+}
+
+sub fix_field_lengths {
+  my ($self) = @_;
+
+  my %field_lengths_by_ri = $self->field_lengths;
+  foreach my $entry (@{ $self->controller->data }) {
+    next unless defined $entry->{errors} && @{ $entry->{errors} };
+    my %field_lengths = %{ $field_lengths_by_ri{ $entry->{raw_data}->{datatype} } };
+    map { $entry->{object}->$_(substr($entry->{object}->$_, 0, $field_lengths{$_})) if $entry->{object}->$_ } keys %field_lengths;
+  }
+
+  return;
+}
+
 sub is_multiplexed { 1 }
 
 1;