From: Sven Schöling <s.schoeling@linet-services.de>
Date: Thu, 20 Nov 2014 11:52:04 +0000 (+0100)
Subject: CsvImport: Makemodels feiner granulieren.
X-Git-Tag: release-3.2.0beta~238
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/commitdiff_plain/90e9b1aba1bf4397b795ae824fc95930c4531ff4?ds=sidebyside

CsvImport: Makemodels feiner granulieren.
---

diff --git a/SL/Controller/CsvImport/Part.pm b/SL/Controller/CsvImport/Part.pm
index a78ab8c1e..9f4ed7284 100644
--- a/SL/Controller/CsvImport/Part.pm
+++ b/SL/Controller/CsvImport/Part.pm
@@ -427,10 +427,10 @@ sub handle_makemodel {
     return;
   }
 
-  my %old_makemodels_by_make = map { $_->make => $_ } $entry->{part}->makemodels;
+  my %old_makemodels_by_mm = map { $_->make . $; . $_->model => $_ } $entry->{part}->makemodels;
 
   foreach my $makemodel ($object->makemodels()) {
-    my $makemodel_orig = $old_makemodels_by_make{$makemodel->make};
+    my $makemodel_orig = $old_makemodels_by_mm{$makemodel->make,$makemodel->model};
     $found_any = 1;
 
     if ($makemodel_orig) {