</html> entfernen

[kivitendo-erp.git] / SL / Controller / CsvImport / Part.pm

diff --git a/SL/Controller/CsvImport/Part.pm b/SL/Controller/CsvImport/Part.pm
index 5d203a9..3c781aa 100644 (file)
--- a/SL/Controller/CsvImport/Part.pm
+++ b/SL/Controller/CsvImport/Part.pm
@@ -132,29 +132,23 @@ sub check_objects {
   map { $self->add_raw_data_columns("make_${_}", "model_${_}", "lastcost_${_}") } sort { $a <=> $b } keys %{ $self->makemodel_columns };
 }
 
-sub check_duplicates {
-  my ($self, %params) = @_;
-
-  my $normalizer = sub { my $name = $_[0]; $name =~ s/[\s,\.\-]//g; return $name; };
-  my $name_maker = sub { return $normalizer->($_[0]->description) };
-
-  my %by_name;
-  if ('check_db' eq $self->controller->profile->get('duplicates')) {
-    %by_name = map { ( $name_maker->($_) => 'db' ) } @{ $self->existing_objects };
-  }
-
-  foreach my $entry (@{ $self->controller->data }) {
-    next if @{ $entry->{errors} };
-
-    my $name = $name_maker->($entry->{object});
-
-    if (!$by_name{ $name }) {
-      $by_name{ $name } = 'csv';
-
-    } else {
-      push @{ $entry->{errors} }, $by_name{ $name } eq 'db' ? $::locale->text('Duplicate in database') : $::locale->text('Duplicate in CSV file');
-    }
-  }
+sub get_duplicate_check_fields {
+  return {
+    partnumber => {
+      label     => $::locale->text('Part Number'),
+      default   => 0
+    },
+
+    description => {
+      label     => $::locale->text('Description'),
+      default   => 1,
+      maker     => sub {
+        my $desc = shift->description;
+        $desc =~ s/[\s,\.\-]//g;
+        return $desc;
+      }
+    },
+  };
 }
 
 sub check_buchungsgruppe {
@@ -367,6 +361,8 @@ sub handle_pricegroups {
 
 sub handle_makemodel {
   my ($self, $entry) = @_;
+  my $object = $entry->{object};
+  my $found_any;
 
   my @makemodels;
   foreach my $idx (map { substr $_, 5 } grep { m/^make_\d+$/ && $entry->{raw_data}->{$_} } keys %{ $entry->{raw_data} }) {
@@ -379,6 +375,7 @@ sub handle_makemodel {
       push @{ $entry->{errors} }, $::locale->text('Error: Invalid vendor in column make_#1', $idx);
 
     } else {
+      $found_any = 1;
       push @makemodels, SL::DB::MakeModel->new(make               => $vendor->id,
                                                model              => $entry->{raw_data}->{"model_${idx}"},
                                                lastcost_as_number => $entry->{raw_data}->{"lastcost_${idx}"});
@@ -388,8 +385,31 @@ sub handle_makemodel {
     }
   }
 
-  $entry->{object}->makemodels(\@makemodels);
-  $entry->{object}->makemodel(scalar(@makemodels) ? 1 : 0);
+  $object->makemodels(\@makemodels);
+  $object->makemodel(scalar(@makemodels) ? 1 : 0);
+
+  if ( !$entry->{part} || $self->settings->{article_number_policy} ne 'update_prices' ) {
+    return;
+  }
+
+  my %old_makemodels_by_make = map { $_->make => $_ } $entry->{part}->makemodels;
+
+  foreach my $makemodel ($object->makemodels()) {
+    my $makemodel_orig = $old_makemodels_by_make{$makemodel->make};
+    $found_any = 1;
+
+    if ($makemodel_orig) {
+      $makemodel_orig->model($makemodel->model);
+      $makemodel_orig->lastcost($makemodel->lastcost);
+
+    } else {
+      $entry->{part}->add_makemodels($makemodel);
+    }
+  }
+
+  $entry->{part}->makemodel($object->makemodel);
+
+  $self->save_with_cascade(1) if $found_any;
 }
 
 sub set_various_fields {
@@ -476,4 +496,4 @@ sub setup_displayable_columns {
   }
 }
 
-1;
+1;
\ No newline at end of file