X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCsvImport.pm;h=088e8c3e6832e452034fb6ca421abf7994fc763c;hb=223e6d0cf51b9847fd164b76c5a7fb77219f1855;hp=0e598a5b378ca1108a261c3cbac5a2a55188764b;hpb=7579216c032f0793a11c7050fbc885b89b1d0ff9;p=kivitendo-erp.git

diff --git a/SL/Controller/CsvImport.pm b/SL/Controller/CsvImport.pm
index 0e598a5b3..088e8c3e6 100644
--- a/SL/Controller/CsvImport.pm
+++ b/SL/Controller/CsvImport.pm
@@ -27,7 +27,7 @@ use parent qw(SL::Controller::Base);
 use Rose::Object::MakeMethods::Generic
 (
  scalar                  => [ qw(type profile file all_profiles all_charsets sep_char all_sep_chars quote_char all_quote_chars escape_char all_escape_chars all_buchungsgruppen all_units
-                                 import_status errors headers raw_data_headers info_headers data num_imported num_importable displayable_columns file) ],
+                                 import_status errors headers raw_data_headers info_headers data num_imported num_importable displayable_columns file all_taxzones) ],
  'scalar --get_set_init' => [ qw(worker task_server) ],
  'array'                 => [
    progress_tracker     => { },
@@ -267,6 +267,10 @@ sub render_inputs {
             : $self->type eq 'orders'            ? $::locale->text('CSV import: orders')
             : die;
 
+  if ($self->{type} eq 'customers_vendors' or $self->{type} eq 'orders'  ) {
+    $self->all_taxzones(SL::DB::Manager::TaxZone->get_all_sorted(query => [ obsolete => 0 ]));
+  };
+
   if ($self->{type} eq 'parts') {
     $self->all_buchungsgruppen(SL::DB::Manager::Buchungsgruppe->get_all_sorted);
     $self->all_units(SL::DB::Manager::Unit->get_all_sorted);
@@ -308,7 +312,7 @@ sub test_and_import_deferred {
     $self->task_server->start;
   }
 
-  flash('info', $::locale->text('Your import is beig processed.'));
+  flash('info', $::locale->text('Your import is being processed.'));
 
   $self->{deferred} = 1;