X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/ac1a9e8e357375b2426041eefee1f555fc5139b5..639066d179464ead41625a9a901b165ce9a5eb06:/SL/Controller/Letter.pm?ds=sidebyside

diff --git a/SL/Controller/Letter.pm b/SL/Controller/Letter.pm
index d299eea1e..b16a91365 100644
--- a/SL/Controller/Letter.pm
+++ b/SL/Controller/Letter.pm
@@ -20,6 +20,7 @@ use SL::Helper::PrintOptions;
 use SL::Locale::String qw(t8);
 use SL::Mailer;
 use SL::IS;
+use SL::Presenter::Tag qw(select_tag);
 use SL::ReportGenerator;
 use SL::Webdav;
 use SL::Webdav::File;
@@ -124,7 +125,7 @@ sub action_update_contacts {
   $self->js
     ->replaceWith(
       '#letter_cp_id',
-      SL::Presenter->get->select_tag('letter.cp_id', $contacts, default => $default, value_key => 'cp_id', title_key => 'full_name')
+      select_tag('letter.cp_id', $contacts, default => $default, value_key => 'cp_id', title_key => 'full_name')
     )
     ->render;
 }
@@ -176,7 +177,7 @@ sub action_list {
   $self->prepare_report;
 
   my $letters = $self->models->get;
-  $self->report_generator_list_objects(report => $self->{report}, objects => $letters, action_bar => 1);
+  $self->report_generator_list_objects(report => $self->{report}, objects => $letters);
 
 }
 
@@ -241,11 +242,11 @@ sub action_print_letter {
       my $signature        = $::myconfig{signature};
       $mail->{$_}          = $params{email}->{$_} for qw(to cc subject message bcc);
       $mail->{from}        = qq|"$::myconfig{name}" <$::myconfig{email}>|;
-      $mail->{attachments} = [{ filename => $result{file_name},
-                                name     => $params{email}->{attachment_filename} }];
+      $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;
       $mail->send;
       unlink $result{file_name};
 
@@ -578,7 +579,6 @@ sub init_webdav_objects {
     number   => $self->letter->letternumber,
   );
 
-  my $webdav_path = $webdav->webdav_path;
   my @all_objects = $webdav->get_all_objects;
 
   return [ map {
@@ -655,7 +655,7 @@ sub setup_display_action_bar {
         action => [ t8('Export') ],
         action => [
           t8('Print'),
-          submit   => [ '#form', { action => 'Letter/print_letter' } ],
+          call     => [ 'kivi.SalesPurchase.show_print_dialog', 'Letter/print_letter' ],
           disabled => !$self->letter->id ? t8('The object has not been saved yet.') : undef,
         ],
         action => [