From: G. Richardson <information@lx-office-hosting.de>
Date: Wed, 1 Aug 2012 10:03:07 +0000 (+0200)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-3.0.0beta1~307
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/93d494952f69bfad31e5d887b57609cbf8e41d43?ds=sidebyside;hp=-c

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

93d494952f69bfad31e5d887b57609cbf8e41d43
diff --combined SL/Controller/CsvImport/Part.pm
index d707aaafd,6c056d0f9..3be6f2a44
--- a/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;