L-Plugin und Presenter: Erzeugung "ID"-Attribute mittels "no_id => 1" unterdrückbar

[kivitendo-erp.git] / SL / Template / HTML.pm

diff --git a/SL/Template/HTML.pm b/SL/Template/HTML.pm
index abca75c07e8b51455cbb6a7ddaddb358d17c6c83..09f24fcebc5bf799ac99e6f60d27d93f6bd7222d 100644 (file)
--- a/SL/Template/HTML.pm
+++ b/SL/Template/HTML.pm
@@ -70,10 +70,9 @@ sub convert_to_postscript {
     $psfile .= ".ps";
   }
 
-  system("html2ps -f html2ps-config < $form->{tmpfile} > $psfile");
+  system($::lx_office_conf{applications}->{html2ps} . " -f html2ps-config < $form->{tmpfile} > $psfile");
   if ($?) {
-    $self->{"error"} = $form->cleanup();
-    $self->cleanup();
+    $self->{"error"} = $form->cleanup($::lx_office_conf{applications}->{html2ps});
     return 0;
   }
 
@@ -103,10 +102,9 @@ sub convert_to_pdf {
     $pdffile .= ".pdf";
   }
 
-  system("html2ps -f html2ps-config < $form->{tmpfile} | ps2pdf - $pdffile");
+  system($::lx_office_conf{applications}->{html2ps} . " -f html2ps-config < $form->{tmpfile} | ps2pdf - $pdffile");
   if ($?) {
-    $self->{"error"} = $form->cleanup();
-    $self->cleanup();
+    $self->{"error"} = $form->cleanup($::lx_office_conf{applications}->{html2ps});
     return 0;
   }