Mailer: Zeichensatzattribut bei Anhängen nur bei Text-Anhängen setzen

[kivitendo-erp.git] / SL / Form.pm

diff --git a/SL/Form.pm b/SL/Form.pm
index 600e9b81c145c41adef654cdc060188b671a8a49..6f183e90a2500061c90a878a34da4fb51f9e5f55 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -660,6 +660,16 @@ sub show_generic_error {
 
   $self->{title} = $params{title} if $params{title};
 
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        t8('Back'),
+        call      => [ 'kivi.history_back' ],
+        accesskey => 'enter',
+      ],
+    );
+  }
+
   $self->header();
   print $self->parse_html_template("generic/error", $add_params);
 
@@ -1191,7 +1201,7 @@ sub send_email {
                                         id      => $attfile->id,
                                         type    => $attfile->mime_type,
                                         name    => $attfile->file_name,
-                                        content => $attfile->get_content };
+                                        content => $attfile->get_content ? ${ $attfile->get_content } : undef };
     }
   }
   $mail->{message}  =~ s/\r//g;
@@ -1283,6 +1293,7 @@ sub get_formname_translation {
     dunning                 => $main::locale->text('Dunning'),
     letter                  => $main::locale->text('Letter'),
     ic_supply               => $main::locale->text('Intra-Community supply'),
+    statement               => $main::locale->text('Statement'),
   );
 
   $main::lxdebug->leave_sub();