From: Bernd Bleßmann <bernd@kivitendo-premium.de>
Date: Wed, 1 Dec 2021 12:42:49 +0000 (+0100)
Subject: Auftrags-Controller: Email/DMS falls kein Dokument vorhanden, eines erstellen, …
X-Git-Tag: kivitendo-mebil_0.1-0~10^2~2^2~261
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=67a645ce8de654ab8f0b4b0dfd7b91040a85716f;p=kivitendo-erp.git

Auftrags-Controller: Email/DMS falls kein Dokument vorhanden, eines erstellen, …

… wenn die Policy sagt, dass der letzte Ausdruck mitgeschickt werden soll
---

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index 759de322b..5c14971cb 100644
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -474,9 +474,19 @@ sub action_send_email {
   $::form->{$_}     = $::form->{print_options}->{$_} for keys %{ $::form->{print_options} };
   $::form->{media}  = 'email';
 
-  if (($::form->{attachment_policy} // '') !~ m{^(?:old_file|no_file)$}) {
+  $::form->{attachment_policy} //= '';
+
+  # Is an old file version available?
+  my $attfile;
+  if ($::form->{attachment_policy} eq 'old_file') {
+    $attfile = SL::File->get_all(object_id   => $self->order->id,
+                                 object_type => $::form->{formname},
+                                 file_type   => 'document');
+  }
+
+  if ($::form->{attachment_policy} ne 'no_file' && !($::form->{attachment_policy} eq 'old_file' && $attfile)) {
     my $doc;
-    my @errors = $self->generate_doc(\$doc, {media      => $::form->{media},
+    my @errors = $self->generate_pdf(\$doc, {media      => $::form->{media},
                                             format     => $::form->{print_options}->{format},
                                             formname   => $::form->{print_options}->{formname},
                                             language   => $self->order->language,