PriceSource: Klassenauflösung fpr items von Gutschriften

[kivitendo-erp.git] / SL / Controller / CsvImport.pm

diff --git a/SL/Controller/CsvImport.pm b/SL/Controller/CsvImport.pm
index 50b5e4d..088e8c3 100644 (file)
--- 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;
 
@@ -363,6 +367,7 @@ sub load_all_profiles {
     where => [
       type  => $self->type,
       login => $::myconfig{login},
+      '!name'  => '',
     ],
   sort_by => 'name'));
 }
@@ -414,17 +419,17 @@ sub char_map {
 }
 
 sub save_report {
-  my ($self, $report_id) = @_;
+  my ($self, %params) = @_;
 
   if ($self->worker->is_multiplexed) {
-    return $self->save_report_multi($report_id);
+    return $self->save_report_multi(%params);
   } else {
-    return $self->save_report_single($report_id);
+    return $self->save_report_single(%params);
   }
 }
 
 sub save_report_single {
-  my ($self, $report_id) = @_;
+  my ($self, %params) = @_;
 
   $self->track_progress(phase => 'building report', progress => 0);
 
@@ -432,7 +437,7 @@ sub save_report_single {
   $clone_profile->save; # weird bug. if this isn't saved before adding it to the report, it will default back to the last profile.
 
   my $report = SL::DB::CsvImportReport->new(
-    session_id => $::auth->create_or_refresh_session,
+    session_id => $params{session_id},
     profile    => $clone_profile,
     type       => $self->type,
     file       => '',
@@ -494,7 +499,7 @@ sub save_report_single {
 }
 
 sub save_report_multi {
-  my ($self, $report_id) = @_;
+  my ($self, %params) = @_;
 
   $self->track_progress(phase => 'building report', progress => 0);
 
@@ -502,7 +507,7 @@ sub save_report_multi {
   $clone_profile->save; # weird bug. if this isn't saved before adding it to the report, it will default back to the last profile.
 
   my $report = SL::DB::CsvImportReport->new(
-    session_id => $::auth->create_or_refresh_session,
+    session_id => $params{session_id},
     profile    => $clone_profile,
     type       => $self->type,
     file       => '',