projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
[kivitendo-erp.git]
/
SL
/
Controller
/
CsvImport
/
Part.pm
diff --git
a/SL/Controller/CsvImport/Part.pm
b/SL/Controller/CsvImport/Part.pm
index
387bdb5
..
3be6f2a
100644
(file)
--- a/
SL/Controller/CsvImport/Part.pm
+++ b/
SL/Controller/CsvImport/Part.pm
@@
-194,11
+194,14
@@
sub check_existing {
my $object = $entry->{object};
my $object = $entry->{object};
- $entry->{part} = $self->parts_by->{partnumber}->{ $object->type }->{ $object->partnumber };
+ $entry->{part} = SL::DB::Manager::Part->find_by(
+ SL::DB::Manager::Part->type_filter($object->type),
+ ( partnumber => $object->partnumber ) x!! $object->partnumber,
+ );
if ($self->settings->{article_number_policy} eq 'update_prices') {
if ($entry->{part}) {
if ($self->settings->{article_number_policy} eq 'update_prices') {
if ($entry->{part}) {
- map { $entry->{part}->$_( $object->$_ )
} qw(sellprice listprice lastcost);
+ map { $entry->{part}->$_( $object->$_ )
if defined $object->$_ } qw(sellprice listprice lastcost);
# merge prices
my %prices_by_pricegroup_id = map { $_->pricegroup->id => $_ } $entry->{part}->prices, $object->prices;
# merge prices
my %prices_by_pricegroup_id = map { $_->pricegroup->id => $_ } $entry->{part}->prices, $object->prices;