From: Sven Schöling <s.schoeling@linet-services.de>
Date: Tue, 22 Mar 2016 12:00:17 +0000 (+0100)
Subject: warnings: diverse nicht initialisierte hash keys in CsvImport
X-Git-Tag: release-3.4.1~298
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=0ec7590940218fbeaf500753efcffd1bba53124e;p=kivitendo-erp.git

warnings: diverse nicht initialisierte hash keys in CsvImport
---

diff --git a/SL/Controller/CsvImport/Base.pm b/SL/Controller/CsvImport/Base.pm
index c8456cafa..8544cf79d 100644
--- a/SL/Controller/CsvImport/Base.pm
+++ b/SL/Controller/CsvImport/Base.pm
@@ -200,8 +200,8 @@ sub check_vc {
   }
 
   if (!$entry->{object}->$id_column) {
-    my $vc = $self->vc_by->{number}->{customers}->{ $entry->{raw_data}->{customernumber} }
-          || $self->vc_by->{number}->{vendors}->{   $entry->{raw_data}->{vendornumber}   };
+    my $vc = ($entry->{raw_data}->{customernumber} && $self->vc_by->{number}->{customers}->{ $entry->{raw_data}->{customernumber} })
+          || ($entry->{raw_data}->{vendornumber}   && $self->vc_by->{number}->{vendors}->{   $entry->{raw_data}->{vendornumber}   });
     $entry->{object}->$id_column($vc->id) if $vc;
   }
 
@@ -522,7 +522,7 @@ sub clean_fields {
 sub _save_history {
   my ($self, $object) = @_;
 
-  if (any { $_ eq $self->controller->{type} } qw(parts customers_vendors orders ar_transactions)) {
+  if (any { $self->controller->{type} && $_ eq $self->controller->{type} } qw(parts customers_vendors orders ar_transactions)) {
     my $snumbers = $self->controller->{type} eq 'parts'             ? 'partnumber_' . $object->partnumber
                  : $self->controller->{type} eq 'customers_vendors' ?
                      ($self->table eq 'customer' ? 'customernumber_' . $object->customernumber : 'vendornumber_' . $object->vendornumber)