X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/1d28ae882fe910c18a835ee0b47fc7d41facdfdd..41ec1a254c67a6bbd3ce97b91fb9521876a2e91b:/SL/Controller/CsvImport/Order.pm diff --git a/SL/Controller/CsvImport/Order.pm b/SL/Controller/CsvImport/Order.pm index 656567f09..c3c5c5c87 100644 --- a/SL/Controller/CsvImport/Order.pm +++ b/SL/Controller/CsvImport/Order.pm @@ -255,6 +255,8 @@ sub check_objects { foreach my $entry (@{ $self->controller->data }) { $self->controller->track_progress(progress => $i/$num_data * 100) if $i % 100 == 0; + $entry->{info_data}->{datatype} = $entry->{raw_data}->{datatype}; + if ($entry->{raw_data}->{datatype} eq $self->_order_column) { $self->handle_order($entry); } elsif ($entry->{raw_data}->{datatype} eq $self->_item_column && $entry->{object}->can('part')) { @@ -266,6 +268,11 @@ sub check_objects { $i++; } + $self->add_info_columns($self->_order_column, + { header => $::locale->text('Data type'), method => 'datatype' }); + $self->add_info_columns($self->_item_column, + { header => $::locale->text('Data type'), method => 'datatype' }); + $self->add_info_columns($self->_order_column, { header => $::locale->text('Customer/Vendor'), method => 'vc_name' }); # Todo: access via ->[0] ok? Better: search first order column and use this @@ -656,16 +663,16 @@ sub handle_prices_and_taxes() { sub save_objects { my ($self, %params) = @_; - # set order number and collect to save - my $objects_to_save = []; + # Collect orders without errors to save. + my $entries_to_save = []; foreach my $entry (@{ $self->controller->data }) { next if $entry->{raw_data}->{datatype} ne $self->_order_column; next if @{ $entry->{errors} }; - push @{ $objects_to_save }, $entry; + push @{ $entries_to_save }, $entry; } - $self->SUPER::save_objects(data => $objects_to_save); + $self->SUPER::save_objects(data => $entries_to_save); } sub _order_column {