projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Login: Callback setzen und berücksichtigen, wenn abgemeldet
[kivitendo-erp.git]
/
SL
/
Controller
/
CsvImport
/
Part.pm
diff --git
a/SL/Controller/CsvImport/Part.pm
b/SL/Controller/CsvImport/Part.pm
index
d337550
..
f04e7d6
100644
(file)
--- 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;
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;
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;
# 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;
}
$self->save_with_cascade(1) if $found_any;
}