From 3250ebcff1de1f29b21fbced4a1beefd662585f3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bernd=20Ble=C3=9Fmann?= Date: Mon, 21 Oct 2013 15:08:13 +0200 Subject: [PATCH] =?utf8?q?Bezeichnung=20f=C3=BCr=20tax=20zone=20ge=C3=A4nd?= =?utf8?q?ert=20und=20vergessene=20Klammer=20hinzugef=C3=BCgt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- SL/Controller/CsvImport/Order.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SL/Controller/CsvImport/Order.pm b/SL/Controller/CsvImport/Order.pm index 35743e079..d3a221985 100644 --- a/SL/Controller/CsvImport/Order.pm +++ b/SL/Controller/CsvImport/Order.pm @@ -127,8 +127,8 @@ sub setup_displayable_columns { { name => 'language', description => $::locale->text('Language (name)') }, { name => 'payment_id', description => $::locale->text('Payment terms (database ID)') }, { name => 'payment', description => $::locale->text('Payment terms (name)') }, - { name => 'taxzone_id', description => $::locale->text('Steuersatz (database ID') }, - { name => 'taxzone', description => $::locale->text('Steuersatz (description)') }, + { name => 'taxzone_id', description => $::locale->text('Tax zone (database ID)') }, + { name => 'taxzone', description => $::locale->text('Tax zone (description)') }, { name => 'cp_id', description => $::locale->text('Contact Person (database ID)') }, { name => 'contact', description => $::locale->text('Contact Person (name)') }, { name => 'department_id', description => $::locale->text('Department (database ID)') }, @@ -579,7 +579,7 @@ sub check_taxzone { # Check wether or not taxzone ID is valid. if ($object->taxzone_id && !$self->taxzones_by->{id}->{ $object->taxzone_id }) { - push @{ $entry->{errors} }, $::locale->text('Error: Invalid taxzone'); + push @{ $entry->{errors} }, $::locale->text('Error: Invalid tax zone'); return 0; } @@ -587,7 +587,7 @@ sub check_taxzone { if (!$object->taxzone_id && $entry->{raw_data}->{taxzone}) { my $taxzone = $self->taxzones_by->{description}->{ $entry->{raw_data}->{taxzone} }; if (!$taxzone) { - push @{ $entry->{errors} }, $::locale->text('Error: Invalid taxzone'); + push @{ $entry->{errors} }, $::locale->text('Error: Invalid tax zone'); return 0; } -- 2.20.1