X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCsvImport%2FARTransaction.pm;h=4018b78cb04f2c8afa4e6362a8da8d74560dc3f5;hb=370f135530d197929969bec28c8178e7ad28ef3c;hp=1d4179b75a694f5097f9f862b29612be568f5479;hpb=3f924c0fc876c2133e5ba22f25a45a484885ee0b;p=kivitendo-erp.git

diff --git a/SL/Controller/CsvImport/ARTransaction.pm b/SL/Controller/CsvImport/ARTransaction.pm
index 1d4179b75..4018b78cb 100644
--- a/SL/Controller/CsvImport/ARTransaction.pm
+++ b/SL/Controller/CsvImport/ARTransaction.pm
@@ -108,6 +108,7 @@ sub setup_displayable_columns {
                                  { name => 'taxincluded',             description => $::locale->text('Tax Included')                          },
                                  { name => 'customer',                description => $::locale->text('Customer (name)')                       },
                                  { name => 'customernumber',          description => $::locale->text('Customer Number')                       },
+                                 { name => 'customer_gln',            description => $::locale->text('Customer GLN')                          },
                                  { name => 'customer_id',             description => $::locale->text('Customer (database ID)')                },
                                  { name => 'language_id',             description => $::locale->text('Language (database ID)')                },
                                  { name => 'language',                description => $::locale->text('Language (name)')                       },
@@ -251,11 +252,11 @@ sub handle_invoice {
   $object->transactions( [] ); # initialise transactions for ar object so methods work on unsaved transactions
 
   my $vc_obj;
-  if (any { $entry->{raw_data}->{$_} } qw(customer customernumber customer_id)) {
+  if (any { $entry->{raw_data}->{$_} } qw(customer customernumber customer_gln customer_id)) {
     $self->check_vc($entry, 'customer_id');
     # check_vc only sets customer_id, but we need vc_obj later for customer defaults
     $vc_obj = SL::DB::Customer->new(id => $object->customer_id)->load if $object->customer_id;
-  } elsif (any { $entry->{raw_data}->{$_} } qw(vendor vendornumber vendor_id)) {
+  } elsif (any { $entry->{raw_data}->{$_} } qw(vendor vendornumber vendor_gln vendor_id)) {
     $self->check_vc($entry, 'vendor_id');
     $vc_obj = SL::DB::Vendor->new(id => $object->vendor_id)->load if $object->vendor_id;
   } else {
@@ -540,7 +541,7 @@ sub add_transactions_to_ar {
       $ar_entry = $entry; # remember as last ar_entry
 
     } elsif ( defined $ar_entry && $entry->{raw_data}->{datatype} eq $self->_transaction_column ) {
-      push @{ $entry->{errors} }, $::locale->text('no tax_id in acc_trans')   unless $entry->{object}->tax_id || $entry->{object}->tax_id == 0;
+      push @{ $entry->{errors} }, $::locale->text('no tax_id in acc_trans') if !defined $entry->{object}->tax_id;
       next if @{ $entry->{errors} };
 
       my $acc_trans_objects = $ar_entry->{object}->add_ar_amount_row(