X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/7579216c032f0793a11c7050fbc885b89b1d0ff9..7bc44f0f59f35d7d3b555e98ff9bb61c8ffbea0b:/SL/Controller/CsvImport.pm?ds=inline 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;