Merge branch 'b-3.6.1' of ../kivitendo-erp_20220811

[mfinanz.git] / SL / Controller / CsvImport / Shipto.pm

diff --git a/SL/Controller/CsvImport/Shipto.pm b/SL/Controller/CsvImport/Shipto.pm
index e32da468b52483c40aa687bafe397c7db62095c7..1ca25ad8649b79e1e10fc2e7cb974b0c2d9ec070 100644 (file)
--- a/SL/Controller/CsvImport/Shipto.pm
+++ b/SL/Controller/CsvImport/Shipto.pm
@@ -24,7 +24,7 @@ sub check_objects {
 
   $self->controller->track_progress(phase => 'building data', progress => 0);
 
-  my $i;
+  my $i = 0;
   my $num_data = scalar @{ $self->controller->data };
   foreach my $entry (@{ $self->controller->data }) {
     $self->controller->track_progress(progress => $i/$num_data * 100) if $i % 100 == 0;
@@ -112,6 +112,7 @@ sub setup_displayable_columns {
                                  { name => 'shiptodepartment_2', description => $::locale->text('Department 2')                  },
                                  { name => 'shiptoemail',        description => $::locale->text('E-mail')                        },
                                  { name => 'shiptofax',          description => $::locale->text('Fax')                           },
+                                 { name => 'shiptogln',          description => $::locale->text('GLN')                           },
                                  { name => 'shiptoname',         description => $::locale->text('Name')                          },
                                  { name => 'shiptophone',        description => $::locale->text('Phone')                         },
                                  { name => 'shiptostreet',       description => $::locale->text('Street')                        },
@@ -119,8 +120,10 @@ sub setup_displayable_columns {
                                  { name => 'trans_id',           description => $::locale->text('Customer/Vendor (database ID)') },
                                  { name => 'customer',           description => $::locale->text('Customer (name)')               },
                                  { name => 'customernumber',     description => $::locale->text('Customer Number')               },
+                                 { name => 'customer_gln',       description => $::locale->text('Customer GLN')                  },
                                  { name => 'vendor',             description => $::locale->text('Vendor (name)')                 },
                                  { name => 'vendornumber',       description => $::locale->text('Vendor Number')                 },
+                                 { name => 'vendor_gln',         description => $::locale->text('Vendor GLN')                    },
                                 );
 }