X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDN.pm;h=46749ab37cb676c656baadfbbe13c3169e88d048;hb=168836cf2b4967a5fb2332867b329785cccc932a;hp=6d00f438afe1b8d9732fa53e7d6f1857ba1c3c37;hpb=48963f462b5fff937438ca93bcc537d78e454f30;p=kivitendo-erp.git diff --git a/SL/DN.pm b/SL/DN.pm index 6d00f438a..46749ab37 100644 --- a/SL/DN.pm +++ b/SL/DN.pm @@ -368,6 +368,7 @@ sub send_email { my $template = SL::Template::create(type => 'PlainText', form => $form, myconfig => $myconfig); my $mail = Mailer->new(); + $mail->{charset} = $::lx_office_conf{system}->{dbcharset} || Common::DEFAULT_CHARSET; $mail->{from} = $myconfig->{email}; $mail->{to} = $ref->{recipient}; $mail->{subject} = $template->parse_block($ref->{email_subject}); @@ -483,6 +484,7 @@ sub get_invoices { "ordnumber" => "a.ordnumber", "invnumber" => "a.invnumber", "notes" => "a.notes", + "country" => "ct.country", ); foreach my $key (keys(%columns)) { next unless ($form->{$key});