Merge branch 'master' of vc.linet-services.de:public/lx-office-erp

diff --combined SL/Controller/CsvImport/Part.pm
index d707aaafd3603898198fcf2475015ae691c1d82f,6c056d0f96e8fb68ed80dbb258a8b399017d74a4..3be6f2a4421b8e3b6eaf9285e62a0851ec4162eb
--- 1/SL/Controller/CsvImport/Part.pm
--- 2/SL/Controller/CsvImport/Part.pm
+++ b/SL/Controller/CsvImport/Part.pm
@@@ -194,11 -194,14 +194,14 @@@ sub check_existing 
  
    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}) {
 -      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;