projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #33 from kivitendo/f-send-emails-as-html
[kivitendo-erp.git]
/
SL
/
BackgroundJob
/
CreatePeriodicInvoices.pm
diff --git
a/SL/BackgroundJob/CreatePeriodicInvoices.pm
b/SL/BackgroundJob/CreatePeriodicInvoices.pm
index
f411353
..
4e32063
100644
(file)
--- a/
SL/BackgroundJob/CreatePeriodicInvoices.pm
+++ b/
SL/BackgroundJob/CreatePeriodicInvoices.pm
@@
-473,7
+473,7
@@
sub _email_invoice {
invoice => $data->{invoice},
vars => $data->{time_period_vars},
attribute => $_,
invoice => $data->{invoice},
vars => $data->{time_period_vars},
attribute => $_,
- attribute_format =>
'text'
+ attribute_format =>
($_ eq 'email_body' ? 'html' : 'text')
);
}
);
}
@@
-489,6
+489,8
@@
sub _email_invoice {
$mail->{bcc} = $global_bcc;
$mail->{subject} = $data->{config}->email_subject;
$mail->{message} = $data->{config}->email_body;
$mail->{bcc} = $global_bcc;
$mail->{subject} = $data->{config}->email_subject;
$mail->{message} = $data->{config}->email_body;
+ $mail->{message} .= SL::DB::Default->get->signature;
+ $mail->{content_type} = 'text/html';
$mail->{attachments} = [{
path => $pdf_file_name,
name => sprintf('%s %s.pdf', $label, $data->{invoice}->invnumber),
$mail->{attachments} = [{
path => $pdf_file_name,
name => sprintf('%s %s.pdf', $label, $data->{invoice}->invnumber),