X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FController%2FEmailJournal.pm;h=551214e2519b0299075ad4932367c7eadcb0bf45;hb=8a43a3175d876387cc6cb28be469d5427789ca2a;hp=7c40a0de7a6bb43b6d0b3f94ed497a054f85f392;hpb=72f19f83681b222d1606d75c90ceedc43bb545f9;p=kivitendo-erp.git

diff --git a/SL/Controller/EmailJournal.pm b/SL/Controller/EmailJournal.pm
index 7c40a0de7..551214e25 100644
--- a/SL/Controller/EmailJournal.pm
+++ b/SL/Controller/EmailJournal.pm
@@ -27,6 +27,9 @@ __PACKAGE__->run_before('add_stylesheet');
 sub action_list {
   my ($self) = @_;
 
+  if ( $::instance_conf->get_email_journal == 0 ) {
+    flash('info',  $::locale->text('Storing the emails in the journal is currently disabled in the client configuration.'));
+  }
   $self->render('email_journal/list',
                 title   => $::locale->text('Email journal'),
                 ENTRIES => $self->models->get,
@@ -40,7 +43,7 @@ sub action_show {
 
   $self->entry(SL::DB::EmailJournal->new(id => $::form->{id})->load);
 
-  if (!$self->can_view_all && ($self->entry->sender_id != SL::DB::Manager::Emplyee->current->id)) {
+  if (!$self->can_view_all && ($self->entry->sender_id != SL::DB::Manager::Employee->current->id)) {
     $::form->error(t8('You do not have permission to access this entry.'));
   }
 
@@ -54,7 +57,7 @@ sub action_download_attachment {
 
   my $attachment = SL::DB::EmailJournalAttachment->new(id => $::form->{id})->load;
 
-  if (!$self->can_view_all && ($attachment->email_journal->sender_id != SL::DB::Manager::Emplyee->current->id)) {
+  if (!$self->can_view_all && ($attachment->email_journal->sender_id != SL::DB::Manager::Employee->current->id)) {
     $::form->error(t8('You do not have permission to access this entry.'));
   }