kivitendo 3.9.2-0.2

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

diff --git a/SL/Controller/Letter.pm b/SL/Controller/Letter.pm
index 4faf452cf60248f4d1232f4dc0769e0ace1cab45..f7397c46bdaa1253480f4f24000d11baeefb3ba8 100644 (file)
--- a/SL/Controller/Letter.pm
+++ b/SL/Controller/Letter.pm
@@ -160,16 +160,6 @@ sub action_delete {
   $self->redirect_to(action => 'list');
 }
 
-sub action_delete_letter_drafts {
-  my ($self, %params) = @_;
-
-  my @ids =  grep { /^checked_(.*)/ && $::form->{$_} } keys %$::form;
-
-  SL::DB::Manager::LetterDraft->delete_all(query => [ ids => \@ids ]) if @ids;
-
-  $self->redirect_to(action => 'add');
-}
-
 sub action_list {
   my ($self, %params) = @_;
 
@@ -249,15 +239,15 @@ sub action_print_letter {
 
     # set some form defaults for printing webdav copy variables
     if ( $::form->{media} eq 'email') {
-      my $mail             = Mailer->new;
-      my $signature        = $::myconfig{signature};
-      $mail->{$_}          = $params{email}->{$_} for qw(to cc subject message bcc);
-      $mail->{from}        = qq|"$::myconfig{name}" <$::myconfig{email}>|;
-      $mail->{attachments} = [{ path => $result{file_name},
-                                name => $params{email}->{attachment_filename} }];
-      $mail->{message}    .=  "\n-- \n$signature";
-      $mail->{message}     =~ s/\r//g;
-      $mail->{record_id}   =  $letter->id;
+      my $mail              = Mailer->new;
+      $mail->{$_}           = $params{email}->{$_} for qw(to cc subject message bcc);
+      $mail->{from}         = qq|"$::myconfig{name}" <$::myconfig{email}>|;
+      $mail->{attachments}  = [{ path => $result{file_name},
+                                 name => $params{email}->{attachment_filename} }];
+      $mail->{message}      =~ s/\r//g;
+      $mail->{message}     .=  $::form->create_email_signature();
+      $mail->{record_id}    =  $letter->id;
+      $mail->{content_type} = 'text/html';
       $mail->send;
       unlink $result{file_name};
 
@@ -310,6 +300,7 @@ sub action_delete_drafts {
   my @ids = @{ $::form->{ids} || [] };
   SL::DB::Manager::LetterDraft->delete_all(where => [ id => \@ids ]) if @ids;
 
+  flash('info', t8('Draft deleted'));
   $self->action_add(skip_drafts => 1);
 }
 
@@ -325,7 +316,7 @@ sub action_send_email {
 sub _display {
   my ($self, %params) = @_;
 
-  $::request->{layout}->use_javascript("${_}.js") for qw(ckeditor/ckeditor ckeditor/adapters/jquery kivi.Letter kivi.SalesPurchase kivi.File);
+  $::request->{layout}->use_javascript("${_}.js") for qw(kivi.Letter kivi.SalesPurchase kivi.File);
 
   my $letter = $self->letter;
 
@@ -370,8 +361,9 @@ sub _update {
 sub prepare_report {
   my ($self) = @_;
 
-  my $report      = SL::ReportGenerator->new(\%::myconfig, $::form);
-  $self->{report} = $report;
+  my $report       = SL::ReportGenerator->new(\%::myconfig, $::form);
+  $report->{title} = t8('Letters');
+  $self->{report}  = $report;
 
   my @columns  = qw(date subject letternumber customer_id vendor_id contact date);
   my @sortable = qw(date subject letternumber customer_id vendor_id contact date);
@@ -609,7 +601,7 @@ sub setup_load_letter_draft_action_bar {
       ],
       action => [
         t8('Delete'),
-        submit  => [ '#form', { action => 'delete_drafts' } ],
+        submit  => [ '#form', { action => 'Letter/delete_drafts' } ],
         checks  => [ [ 'kivi.check_if_entries_selected', '[name="ids[+]"]' ] ],
         confirm => t8('Do you really want to delete this draft?'),
       ],