X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FForm.pm;h=5424a7c923cbd2e6812b59471d953208c058ddeb;hb=3f89fa90275e5df9b806ca4f8abe447af83a3362;hp=bfc8827eb3abd672374f6f3de04d38bd737b80c7;hpb=a40f0c2f7523a7d6936ca483901c22dfe86358c9;p=kivitendo-erp.git

diff --git a/SL/Form.pm b/SL/Form.pm
index bfc8827eb..5424a7c92 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -1127,10 +1127,10 @@ sub parse_template {
 
 sub get_bcc_defaults {
   my ($self, $myconfig, $mybcc) = @_;
-#  if (SL::DB::Default->get->bcc_to_login) {
-#    $mybcc .= ", " if $mybcc;
-#    $mybcc .= $myconfig->{email};
-#  }
+  if (SL::DB::Default->get->bcc_to_login) {
+    $mybcc .= ", " if $mybcc;
+    $mybcc .= $myconfig->{email};
+  }
   my $otherbcc = SL::DB::Default->get->global_bcc;
   if ($otherbcc) {
     $mybcc .= ", " if $mybcc;
@@ -1212,9 +1212,9 @@ sub send_email {
       }
     }
     foreach my $attfile ( @attfiles ) {
-      push @{ $mail->{attachments} }, { path => SL::File->get_file_path(dbfile => $attfile),
+      push @{ $mail->{attachments} }, { path => $attfile->get_file,
                                         id   => $attfile->id,
-                                        type => $attfile->file_mime_type,
+                                        type => $attfile->mime_type,
                                         name => $attfile->file_name };
     }
   }
@@ -1223,6 +1223,10 @@ sub send_email {
   $self->{emailerr} = $mail->send();
   # $self->error($self->cleanup . "$err") if $self->{emailerr};
   $self->{email_journal_id} = $mail->{journalentry};
+  $self->{snumbers}  = "emailjournal" . "_" . $self->{email_journal_id};
+  $self->{what_done} = $::form->{type};
+  $self->{addition}  = "MAILED";
+  $self->save_history;
 
   #write back for message info and mail journal
   $self->{cc}  = $mail->{cc};
@@ -3177,7 +3181,10 @@ sub get_history {
     while(my $hash_ref = $sth->fetchrow_hashref()) {
       $hash_ref->{addition} = $main::locale->text($hash_ref->{addition});
       $hash_ref->{what_done} = $main::locale->text($hash_ref->{what_done});
-      $hash_ref->{snumbers} =~ s/^.+_(.*)$/$1/g;
+      my ( $what, $number ) = split /_/, $hash_ref->{snumbers};
+      $hash_ref->{snumbers} = $number;
+      $hash_ref->{haslink}  = 'controller.pl?action=EmailJournal/show&id='.$number if $what eq 'emailjournal';
+      $hash_ref->{snumbers} = $main::locale->text("E-Mail").' '.$number if $what eq 'emailjournal';
       $tempArray[$i++] = $hash_ref;
     }
     $main::lxdebug->leave_sub() and return \@tempArray