X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=d5209cf0808b6f48510311192c2d80f4e0b25e27;hb=1118dab96d2c42e872c9782b4374709d52b20653;hp=7f8f65a54a2fa52138672630e1fbd88f443e7adb;hpb=a4f92ff17d2572ec3a0465fe4444c741d80ecc77;p=kivitendo-erp.git

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 7f8f65a54..d5209cf08 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -1374,19 +1374,21 @@ sub print_options {
       opthash("screen", $form->{OP}{screen}, $locale->text('Screen')),
     (scalar @{ $form->{printers} } && $latex_templates) ?
       opthash("printer", $form->{OP}{printer}, $locale->text('Printer')) : undef,
-    ($latex_templates && !$options{no_queue}) ?
+    ($latex_templates && !$options->{no_queue}) ?
       opthash("queue", $form->{OP}{queue}, $locale->text('Queue')) : undef
         if ($form->{media} ne 'email');
 
   push @FORMAT, grep $_,
-    ($opendocument_templates && $openofficeorg_writer_bin && $xvfb_bin && (-x $openofficeorg_writer_bin) && (-x $xvfb_bin)) ?
+    ($opendocument_templates && $openofficeorg_writer_bin && $xvfb_bin && (-x $openofficeorg_writer_bin) && (-x $xvfb_bin)
+     && !$options->{no_opendocument_pdf}) ?
       opthash("opendocument_pdf", $form->{DF}{"opendocument_pdf"}, $locale->text("PDF (OpenDocument/OASIS)")) : undef,
-    ($latex_templates) ? (
-      opthash("pdf", $form->{DF}{pdf}, $locale->text('PDF')),
-      opthash("postscript", $form->{DF}{postscript}, $locale->text('Postscript'))
-    ) : undef,
-      opthash("html", $form->{DF}{html}, "HTML"),
-    ($opendocument_templates) ?
+    ($latex_templates) ?
+      opthash("pdf", $form->{DF}{pdf}, $locale->text('PDF')) : undef,
+    ($latex_templates && !$options->{no_postscript}) ?
+      opthash("postscript", $form->{DF}{postscript}, $locale->text('Postscript')) : undef,
+    (!$options->{no_html}) ?
+      opthash("html", $form->{DF}{html}, "HTML") : undef,
+    ($opendocument_templates && !$options->{no_opendocument}) ?
       opthash("opendocument", $form->{DF}{opendocument}, $locale->text("OpenDocument/OASIS")) : undef;
 
   push @LANGUAGE_ID, 
@@ -1413,7 +1415,7 @@ sub print_options {
 
   my $print_options = $form->parse_html_template("generic/print_options", { SELECTS  => \@SELECTS, %template_vars } );
 
-  if ($options{inline}) {
+  if ($options->{inline}) {
     $lxdebug->leave_sub() and return $print_options;
   } else {
     print $print_options; $lxdebug->leave_sub();
@@ -1423,6 +1425,12 @@ sub print_options {
 sub print {
   $lxdebug->enter_sub();
 
+  if ($form->{print_nextsub}) {
+    call_sub($form->{print_nextsub});
+    $lxdebug->leave_sub();
+    return;
+  }
+
   # if this goes to the printer pass through
   if ($form->{media} eq 'printer' || $form->{media} eq 'queue') {
     $form->error($locale->text('Select postscript or PDF!'))