X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FMailer.pm;h=a408b03b946518f7dcb9df4260b3e0983c5ebb18;hb=2f5ea2de698efeaf8e7c31dcbc27b4e996f5e2ca;hp=b066499c464a2a48250bd2340d85fbb00a0a0fea;hpb=53e988b8907baa17f684ee66c6b7aa90fe7c27fb;p=kivitendo-erp.git

diff --git a/SL/Mailer.pm b/SL/Mailer.pm
index b066499c4..a408b03b9 100644
--- a/SL/Mailer.pm
+++ b/SL/Mailer.pm
@@ -57,6 +57,7 @@ my %type_to_table = (
   letter                  => 'letter',
   purchase_delivery_order => 'delivery_orders',
   sales_delivery_order    => 'delivery_orders',
+  dunning                 => 'dunning',
 );
 
 sub new {
@@ -207,8 +208,6 @@ sub _create_message {
 
   my @parts;
 
-  push @{ $self->{headers} }, (Type => "multipart/mixed");
-
   if ($self->{message}) {
     push @parts, Email::MIME->create(
       attributes => {
@@ -248,13 +247,13 @@ sub send {
   # Set defaults & headers
   $self->{charset}        =  'UTF-8';
   $self->{content_type} ||=  "text/plain";
-  $self->{headers}        =  [
+  $self->{headers}      ||=  [];
+  push @{ $self->{headers} }, (
     Subject               => $self->{subject},
     'Message-ID'          => '<' . $self->_create_message_id . '>',
     'X-Mailer'            => "kivitendo " . SL::Version->get_version,
-  ];
+  );
   $self->{mail_attachments} = [];
-  $self->{content_by_name}  = $::instance_conf->get_email_journal == 1 && $::instance_conf->get_doc_files;
 
   my $error;
   my $ok = eval {
@@ -423,6 +422,9 @@ Mail can be sent from kivitendo via the sendmail command or the smtp protocol.
 
   If $self->{journalentry} and either $self->{record_id} or $::form->{id} (checked in
   this order) exist a record link from record to email journal is created.
+  It is possible to provide an array reference with more than one id in
+  $self->{record_id} or $::form->{id}. In this case all records are linked to
+  the mail.
   Will fail silently if record_link creation wasn't successful (same behaviour as
   _store_in_journal).