X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/9bf9acdff05a8047d0561c68cdd93b0a03deb568..67f06c1e8f18a54acb36e452f00da9cee8223a43:/SL/DN.pm diff --git a/SL/DN.pm b/SL/DN.pm index 38174f912..c9289e46f 100644 --- a/SL/DN.pm +++ b/SL/DN.pm @@ -244,7 +244,7 @@ sub create_invoice_for_fees { $dunning_id, # duedate $curr, # default currency sprintf($main::locale->text('Automatically created invoice for fee and interest for dunning %s'), $dunning_id), # notes - $form->{login}); # employee_id + $::myconfig{login}); # employee_id do_query($form, $dbh, $query, @values); $query = @@ -379,9 +379,7 @@ sub send_email { $mail->{subject} = $template->parse_block($ref->{email_subject}); $mail->{message} = $template->parse_block($ref->{email_body}); - if ($myconfig->{signature}) { - $mail->{message} .= "\n-- \n$myconfig->{signature}"; - } + $mail->{message} .= $form->create_email_signature(); $mail->{message} =~ s/\r\n/\n/g; @@ -875,7 +873,7 @@ sub print_dunning { push @{ $form->{DUNNING_PDFS} }, $filename; push @{ $form->{DUNNING_PDFS_EMAIL} }, { 'filename' => "${spool}/$filename", - 'name' => "dunning_${dunning_id}.pdf" }; + 'name' => $form->get_formname_translation('dunning') . "_${dunning_id}.pdf" }; $form->parse_template($myconfig); @@ -928,7 +926,7 @@ sub print_invoice_for_fees { map { $form->{$_} = $ref->{$_} } keys %{ $ref }; $query = qq|SELECT * FROM employee WHERE login = ?|; - $ref = selectfirst_hashref_query($form, $dbh, $query, $form->{login}); + $ref = selectfirst_hashref_query($form, $dbh, $query, $::myconfig{login}); map { $form->{"employee_${_}"} = $ref->{$_} } keys %{ $ref }; $query = qq|SELECT * FROM acc_trans WHERE trans_id = ? ORDER BY acc_trans_id ASC|;