CsvImport Aufträge: Artikel auch nach EAN suchen

diff --git a/SL/Controller/CsvImport/Order.pm b/SL/Controller/CsvImport/Order.pm
index 0d5494413a38d542d8f5baccdceca0ce0bf9e3e1..4393fd424d72ce8fbcbaad38cdca5c12bc1ed2f7 100644 (file)
--- a/SL/Controller/CsvImport/Order.pm
+++ b/SL/Controller/CsvImport/Order.pm
@@ -162,6 +162,7 @@ sub setup_displayable_columns {
                                  { name => 'cusordnumber',    description => $::locale->text('Customer Order Number')      },
                                  { name => 'description',     description => $::locale->text('Description')                },
                                  { name => 'discount',        description => $::locale->text('Discount')                   },
                                  { name => 'cusordnumber',    description => $::locale->text('Customer Order Number')      },
                                  { name => 'description',     description => $::locale->text('Description')                },
                                  { name => 'discount',        description => $::locale->text('Discount')                   },

+                                 { name => 'ean',             description => $::locale->text('EAN')                        },

                                  { name => 'lastcost',        description => $::locale->text('Lastcost')                   },
                                  { name => 'longdescription', description => $::locale->text('Long Description')           },
                                  { name => 'marge_percent',   description => $::locale->text('Margepercent')               },
                                  { name => 'lastcost',        description => $::locale->text('Lastcost')                   },
                                  { name => 'longdescription', description => $::locale->text('Long Description')           },
                                  { name => 'marge_percent',   description => $::locale->text('Margepercent')               },


@@ -464,6 +465,17 @@ sub check_part {
     $object->parts_id($part->id);
   }
 
     $object->parts_id($part->id);
   }
 

+  # Map ean to ID if given.
+  if (!$object->parts_id && $entry->{raw_data}->{ean}) {
+    my $part = $self->parts_by->{ean}->{ $entry->{raw_data}->{ean} };
+    if (!$part) {
+      push @{ $entry->{errors} }, $::locale->text('Error: Invalid part');
+      return 0;
+    }
+
+    $object->parts_id($part->id);
+  }
+

   if ($object->parts_id) {
     $entry->{info_data}->{partnumber} = $self->parts_by->{id}->{ $object->parts_id }->partnumber;
   } else {
   if ($object->parts_id) {
     $entry->{info_data}->{partnumber} = $self->parts_by->{id}->{ $object->parts_id }->partnumber;
   } else {