projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
surplus: Erfassungsdatum bei Stammdatensuche Waren/Dienstleistungen/Erzeugnisse ...
[kivitendo-erp.git]
/
SL
/
Controller
/
CsvImport
/
Part.pm
diff --git
a/SL/Controller/CsvImport/Part.pm
b/SL/Controller/CsvImport/Part.pm
index
a78ab8c
..
33301d1
100644
(file)
--- a/
SL/Controller/CsvImport/Part.pm
+++ b/
SL/Controller/CsvImport/Part.pm
@@
-427,10
+427,11
@@
sub handle_makemodel {
return;
}
return;
}
- my %old_makemodels_by_make = map { $_->make => $_ } $entry->{part}->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()) {
- my $makemodel_orig = $old_makemodels_by_m
ake{$makemodel->make
};
+ my $makemodel_orig = $old_makemodels_by_m
m{$makemodel->make,$makemodel->model
};
$found_any = 1;
if ($makemodel_orig) {
$found_any = 1;
if ($makemodel_orig) {
@@
-438,10
+439,12
@@
sub handle_makemodel {
$makemodel_orig->lastcost($makemodel->lastcost);
} else {
$makemodel_orig->lastcost($makemodel->lastcost);
} else {
-
$entry->{part}->add_makemodels($makemodel)
;
+
push @new_makemodels, $makemodel
;
}
}
}
}
+ $entry->{part}->makemodels([ $entry->{part}->makemodels, @new_makemodels ]) if @new_makemodels;
+
# reindex makemodels
my $i = 0;
$_->sortorder(++$i) for @{ $entry->{part}->makemodels };
# reindex makemodels
my $i = 0;
$_->sortorder(++$i) for @{ $entry->{part}->makemodels };