Beim Versenden per Email eine anständige Überschrift anzeigen und nicht "email oe".

diff --git a/SL/Form.pm b/SL/Form.pm
index 978a01596a90e835eebe9b0f9a76ad5796e3e3da..d1dbfb631a2cabbf973293d1f409f8b001d37cf4 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -982,8 +982,10 @@ Content-Length: $numbytes
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }
 

-sub generate_attachment_filename {
-  my ($self) = @_;
+sub get_formname_translation {
+  my ($self, $formname) = @_;
+
+  $formname ||= $self->{formname};

 
   my %formname_translations = (
      bin_list            => $main::locale->text('Bin List'),
 
   my %formname_translations = (
      bin_list            => $main::locale->text('Bin List'),


@@ -1000,7 +1002,13 @@ sub generate_attachment_filename {
      storno_packing_list => $main::locale->text('Storno Packing List'),
   );
 
      storno_packing_list => $main::locale->text('Storno Packing List'),
   );
 

-  my $attachment_filename = $formname_translations{$self->{"formname"}};
+  return $formname_translations{$formname}
+}
+
+sub generate_attachment_filename {
+  my ($self) = @_;
+
+  my $attachment_filename = $self->get_formname_translation();

   my $prefix = 
       (grep { $self->{"type"} eq $_ } qw(invoice credit_note)) ? "inv"
     : ($self->{"type"} =~ /_quotation$/)                       ? "quo"
   my $prefix = 
       (grep { $self->{"type"} eq $_ } qw(invoice credit_note)) ? "inv"
     : ($self->{"type"} =~ /_quotation$/)                       ? "quo"

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index b27d2286796819630bf4ac5faf6cea2ad52f801a..f783c19c00252e19cfe80296f3e4c1869ba294f2 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -1321,8 +1321,7 @@ sub edit_e_mail {
     $form->{"email"} = $form->{"cp_email"};
   }
 
     $form->{"email"} = $form->{"cp_email"};
   }
 

-  $form->{ $form->{vc} } =~ /--/;
-  $title = $locale->text('E-mail') . " $`";
+  $title = $locale->text('E-mail') . " " . $form->get_formname_translation();

 
   $form->{oldmedia} = $form->{media};
   $form->{media}    = "email";
 
   $form->{oldmedia} = $form->{media};
   $form->{media}    = "email";