Brieffunktion: beim Drucken im WebDAV speichern

diff --git a/SL/Controller/Letter.pm b/SL/Controller/Letter.pm
index 2af59b07d84ebdbf36f86366e98f55d7751d9355..9ca6bc76c91508c7df104aa10471a18547901602 100644 (file)
--- a/SL/Controller/Letter.pm
+++ b/SL/Controller/Letter.pm
@@ -4,6 +4,7 @@ use strict;
 use parent qw(SL::Controller::Base);
 
 use Carp;
 use parent qw(SL::Controller::Base);
 
 use Carp;

+use File::Basename;

 use POSIX qw(strftime);
 use SL::Controller::Helper::GetModels;
 use SL::Controller::Helper::ReportGenerator;
 use POSIX qw(strftime);
 use SL::Controller::Helper::GetModels;
 use SL::Controller::Helper::ReportGenerator;


@@ -247,6 +248,14 @@ sub action_print_letter {
       return !$err;
     }
 
       return !$err;
     }
 

+    my $webdav_copy_args   = Form->new('');
+    %{ $webdav_copy_args } = (
+      %{ $::form },
+      tmpdir  => dirname($pdf_file_name),
+      tmpfile => basename($pdf_file_name),
+      cwd     => POSIX::getcwd(),
+    );
+

     if (!$::form->{printer_id} || $::form->{media} eq 'screen') {
 
       my $file = IO::File->new($pdf_file_name, 'r') || croak("Cannot open file '$pdf_file_name'");
     if (!$::form->{printer_id} || $::form->{media} eq 'screen') {
 
       my $file = IO::File->new($pdf_file_name, 'r') || croak("Cannot open file '$pdf_file_name'");


@@ -263,7 +272,7 @@ sub action_print_letter {
       $::locale->with_raw_io(\*STDOUT, sub { print while <$file> });
       $file->close;
 
       $::locale->with_raw_io(\*STDOUT, sub { print while <$file> });
       $file->close;
 

-      Common::copy_file_to_webdav_folder($::form) if $::instance_conf->get_webdav_documents;
+      Common::copy_file_to_webdav_folder($webdav_copy_args) if $::instance_conf->get_webdav_documents;

       unlink $pdf_file_name;
       return 1;
     }
       unlink $pdf_file_name;
       return 1;
     }


@@ -275,7 +284,7 @@ sub action_print_letter {
     binmode $out;
     print $out scalar(read_file($pdf_file_name));
     close $out;
     binmode $out;
     print $out scalar(read_file($pdf_file_name));
     close $out;

-    Common::copy_file_to_webdav_folder($::form) if $::instance_conf->get_webdav_documents;
+    Common::copy_file_to_webdav_folder($webdav_copy_args) if $::instance_conf->get_webdav_documents;

 
     flash_later('info', t8('The documents have been sent to the printer \'#1\'.', $printer->printer_description));
     $self->redirect_to(action => 'edit', id => $letter->{id}, 'printer_id' => $::form->{printer_id});
 
     flash_later('info', t8('The documents have been sent to the printer \'#1\'.', $printer->printer_description));
     $self->redirect_to(action => 'edit', id => $letter->{id}, 'printer_id' => $::form->{printer_id});

diff --git a/doc/changelog b/doc/changelog
index 38edef00e154bec70d337ae0ab86ffe70d1572e2..fc5b242404b832947eb4daa75f24163c2a65cc58 100644 (file)
--- a/doc/changelog
+++ b/doc/changelog
@@ -7,8 +7,9 @@
 einere neue Features und Detailverbesserungen:
 
   - Auftrag um Druckvariante Gelangensbestätigung erweitert.
 einere neue Features und Detailverbesserungen:
 
   - Auftrag um Druckvariante Gelangensbestätigung erweitert.

-
-
+  - Beim Speichern und Drucken von Briefen werden diese im
+    WebDAV-Verzeichnis gespeichert, sofern das Feature in der
+    Mandantenkonfiguration aktiv ist.

 
 
 2016-03-12 - Release 3.4.0
 
 
 2016-03-12 - Release 3.4.0