X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fio.pl;h=ea8b20306eef709bd64e936d9402ebba498978f0;hb=4f82ce002979fbe9a59d5e69a53e3697b7df20c1;hp=87cb3ea7834ca210da567f51c66eba7ec5cc3ca7;hpb=16d8d3266859c841fe6a1a1e18630a230df36cc5;p=kivitendo-erp.git

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 87cb3ea78..ea8b20306 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -1366,7 +1366,8 @@ sub print_form {
     IS->invoice_details(\%myconfig, \%$form, $locale);
   }
 
-  $form->get_salesman(\%myconfig, $salesman_id_saved);
+  $form->get_employee_data('prefix' => 'employee', 'id' => $form->{employee_id});
+  $form->get_employee_data('prefix' => 'salesman', 'id' => $salesman_id_saved);
 
   if ($form->{shipto_id}) {
     $form->get_shipto(\%myconfig);
@@ -1464,22 +1465,24 @@ sub print_form {
     reformat_numbers($output_numberformat, $precision, @{ $field_list });
   }
 
-  $form->{IN} = "$form->{formname}$form->{language}${printer_code}.html";
+  my $extension = '';
   if ($form->{format} eq 'postscript') {
-    $form->{postscript} = 1;
-    $form->{IN} =~ s/html$/tex/;
+    $form->{postscript}   = 1;
+    $extension            = 'tex';
+
   } elsif ($form->{"format"} =~ /pdf/) {
-    $form->{pdf} = 1;
-    if ($form->{"format"} =~ /opendocument/) {
-      $form->{IN} =~ s/html$/odt/;
-    } else {
-      $form->{IN} =~ s/html$/tex/;
-    }
+    $form->{pdf}          = 1;
+    $extension            = $form->{'format'} =~ m/opendocument/i ? 'odt' : 'tex';
+
   } elsif ($form->{"format"} =~ /opendocument/) {
-    $form->{"opendocument"} = 1;
-    $form->{"IN"} =~ s/html$/odt/;
+    $form->{opendocument} = 1;
+    $extension            = 'odt';
   }
 
+  my $email_extension = '_email' if (($form->{media} eq 'email') && (-f "$myconfig{templates}/$form->{formname}_email$form->{language}${printer_code}.${extension}"));
+
+  $form->{IN}         = "$form->{formname}${email_extension}$form->{language}${printer_code}.${extension}";
+
   delete $form->{OUT};
 
   if ($form->{media} eq 'printer') {
@@ -1849,7 +1852,7 @@ sub set_duedate {
 
   $form->get_duedate(\%myconfig);
 
-  print $cgi->header() . $form->{duedate};
+  print $form->ajax_response_header() . $form->{duedate};
 
   $lxdebug->leave_sub();
 }