From: Bernd Bleßmann <bernd@kivitendo-premium.de>
Date: Mon, 21 Oct 2013 13:08:13 +0000 (+0200)
Subject: Bezeichnung für tax zone geändert und vergessene Klammer hinzugefügt.
X-Git-Tag: release-3.1.0beta1~22^2~122
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=3250ebcff1de1f29b21fbced4a1beefd662585f3;p=kivitendo-erp.git

Bezeichnung für tax zone geändert und vergessene Klammer hinzugefügt.
---

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;
     }