Entwürfe: beim Buchen dazugehörigen Entwurf löschen

[mfinanz.git] / SL / Controller / CsvImport / Order.pm

diff --git a/SL/Controller/CsvImport/Order.pm b/SL/Controller/CsvImport/Order.pm
index 8c3665e8b760a95fd56ec9a6c77067a6c9c8326f..21273347b95064e3279b7c99e94fa69a2bdc34b4 100644 (file)
--- a/SL/Controller/CsvImport/Order.pm
+++ b/SL/Controller/CsvImport/Order.pm
@@ -285,21 +285,6 @@ sub check_objects {
 
   $self->add_items_to_order();
   $self->handle_prices_and_taxes();
 
   $self->add_items_to_order();
   $self->handle_prices_and_taxes();

-
-
-  # If order has errors set error for orderitems as well
-  my $order_entry;
-  foreach my $entry (@{ $self->controller->data }) {
-    # Search first order
-    if ($entry->{raw_data}->{datatype} eq $self->_order_column) {
-      $order_entry = $entry;
-    } elsif ( defined $order_entry
-              && $entry->{raw_data}->{datatype} eq $self->_item_column
-              && scalar @{ $order_entry->{errors} } > 0 ) {
-      push @{ $entry->{errors} }, $::locale->text('Error: Invalid order for this order item');
-    }
-  }
-

 }
 
 sub handle_order {
 }
 
 sub handle_order {


@@ -671,16 +656,16 @@ sub handle_prices_and_taxes() {
 sub save_objects {
   my ($self, %params) = @_;
 
 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} };
 
   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 {
 }
 
 sub _order_column {