ZUGFeRD: Feature über Mandantenkonfiguration abschaltbar

[mfinanz.git] / SL / Controller / CsvImport.pm

diff --git a/SL/Controller/CsvImport.pm b/SL/Controller/CsvImport.pm
index af70dac3d85dfedee7ea397552d74f1892f5513a..6ca25d0698104cdf3c6e8a5ade661fb4f52d3361 100644 (file)
--- a/SL/Controller/CsvImport.pm
+++ b/SL/Controller/CsvImport.pm
@@ -488,7 +488,7 @@ sub profile_from_form {
     $::form->{settings}->{sellprice_adjustment} = $::form->parse_amount(\%::myconfig, $::form->{settings}->{sellprice_adjustment});
   }
 
     $::form->{settings}->{sellprice_adjustment} = $::form->parse_amount(\%::myconfig, $::form->{settings}->{sellprice_adjustment});
   }
 

-  if ($self->type eq 'orders') {
+  if ($self->type eq 'orders' or $self->{type} eq 'ar_transactions') {

     $::form->{settings}->{max_amount_diff} = $::form->parse_amount(\%::myconfig, $::form->{settings}->{max_amount_diff});
   }
 
     $::form->{settings}->{max_amount_diff} = $::form->parse_amount(\%::myconfig, $::form->{settings}->{max_amount_diff});
   }
 


@@ -733,9 +733,13 @@ sub cleanup_reports {
 }
 
 sub check_task_server {
 }
 
 sub check_task_server {

+  if (!$::auth->client->{task_server_user_id}) {
+    flash('error', t8('The task server is required for this module but not enabled for the current client. Please enable it for the client "#1" in the administration section.', $::auth->client->{name}));
+  }
+

   return 1 if $_[0]->task_server->is_running;
 
   return 1 if $_[0]->task_server->is_running;
 

-  flash('info', t8('The task server is not running at the moment but needed for this module'));
+  flash('warning', t8('The task server is not running at the moment but needed for this module'));

 
   1;
 }
 
   1;
 }