X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCsvImport%2FPart.pm;h=f04e7d63282979ff5943361a23ac5c94903de95a;hb=95e7381ef5bb87305c6653fa11023071bbb1d5c4;hp=d337550b0734d6fb314cfe8e268b0bcdc5a56769;hpb=1181d2b6f3805a2a48a34a72b14440e30cb7c6c2;p=kivitendo-erp.git diff --git a/SL/Controller/CsvImport/Part.pm b/SL/Controller/CsvImport/Part.pm index d337550b0..f04e7d632 100644 --- a/SL/Controller/CsvImport/Part.pm +++ b/SL/Controller/CsvImport/Part.pm @@ -667,7 +667,7 @@ sub handle_makemodel { my %old_makemodels_by_mm = map { $_->make . $; . $_->model => $_ } $entry->{part}->makemodels; my @new_makemodels; - foreach my $makemodel ($object->makemodels()) { + foreach my $makemodel (@{ $object->makemodels_sorted }) { my $makemodel_orig = $old_makemodels_by_mm{$makemodel->make,$makemodel->model}; $found_any = 1; @@ -680,11 +680,11 @@ sub handle_makemodel { } } - $entry->{part}->makemodels([ $entry->{part}->makemodels, @new_makemodels ]) if @new_makemodels; + $entry->{part}->makemodels([ $entry->{part}->makemodels_sorted, @new_makemodels ]) if @new_makemodels; # reindex makemodels my $i = 0; - $_->sortorder(++$i) for @{ $entry->{part}->makemodels }; + $_->sortorder(++$i) for @{ $entry->{part}->makemodels_sorted }; $self->save_with_cascade(1) if $found_any; }