From: Jan Büren Date: Mon, 25 Sep 2017 14:58:30 +0000 (+0200) Subject: Mailer.pm wurde umgebaut, vergessene Caller geändert X-Git-Tag: release-3.5.4~803 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=3fdf284406a544178c13603e0da5c8848bac6301;p=kivitendo-erp.git Mailer.pm wurde umgebaut, vergessene Caller geändert Behebt #303, ggf. noch weitere Stellen betroffen. --- diff --git a/SL/Controller/Letter.pm b/SL/Controller/Letter.pm index 9efca360c..780d7f99a 100644 --- a/SL/Controller/Letter.pm +++ b/SL/Controller/Letter.pm @@ -241,8 +241,8 @@ 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; diff --git a/SL/DN.pm b/SL/DN.pm index adb58b711..cf800dac5 100644 --- a/SL/DN.pm +++ b/SL/DN.pm @@ -904,7 +904,7 @@ sub print_dunning { delete $form->{tmpfile}; push @{ $form->{DUNNING_PDFS} }, $filename; - push @{ $form->{DUNNING_PDFS_EMAIL} }, { 'filename' => "${spool}/$filename", + push @{ $form->{DUNNING_PDFS_EMAIL} }, { 'path' => "${spool}/$filename", 'name' => $form->get_formname_translation('dunning') . "_${dunning_id}.pdf" }; $form->get_employee_data('prefix' => 'employee', 'id' => $form->{employee_id});