X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDN.pm;h=72154c24fa08745304161ab98887afc44f81fbab;hb=60c0c5790d1dfca6c14d7acd29fb816b1a58a80e;hp=5cf42b543870268df5b12b42c3e8514613286635;hpb=79783496069e3112eab9c74cf6060cd46a3ee6d3;p=kivitendo-erp.git diff --git a/SL/DN.pm b/SL/DN.pm index 5cf42b543..72154c24f 100644 --- a/SL/DN.pm +++ b/SL/DN.pm @@ -363,7 +363,7 @@ sub send_email { return; } - my $template = PlainTextTemplate->new(undef, $form, $myconfig); + my $template = SL::Template::create(type => 'PlainText', form => $form, myconfig => $myconfig); my $mail = Mailer->new(); $mail->{from} = $myconfig->{email}; $mail->{to} = $ref->{recipient}; @@ -663,29 +663,26 @@ sub melt_pdfs { my $in = IO::File->new("gs -dBATCH -dNOPAUSE -q -sDEVICE=pdfwrite -sOutputFile=- $inputfiles |"); $form->error($main::locale->text('Could not spawn ghostscript.')) unless $in; - my $out; - if ($form->{media} eq 'printer') { $form->get_printer_code($myconfig); + my $out; if ($form->{printer_command}) { $out = IO::File->new("| $form->{printer_command}"); } + $::locale->with_raw_io($out, sub { $out->print($_) while <$in> }); + $form->error($main::locale->text('Could not spawn the printer command.')) unless $out; } else { my $dunning_filename = $form->get_formname_translation('dunning'); - $out = IO::File->new('>-'); - $out->print(qq|Content-Type: Application/PDF\n| . - qq|Content-Disposition: attachment; filename="${dunning_filename}_${dunning_id}.pdf"\n\n|); - } + print qq|Content-Type: Application/PDF\n| . + qq|Content-Disposition: attachment; filename="${dunning_filename}_${dunning_id}.pdf"\n\n|; - while (my $line = <$in>) { - $out->print($line); + $::locale->with_raw_io(\*STDOUT, sub { print while <$in> }); } $in->close(); - $out->close(); map { unlink("${main::spool}/$_") } @{ $form->{DUNNING_PDFS} };