projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Spool-Dateien: Handling vom wiederholten Spoolen desselben Beleges gefixt
[kivitendo-erp.git]
/
SL
/
Template
/
HTML.pm
diff --git
a/SL/Template/HTML.pm
b/SL/Template/HTML.pm
index
1fa7252
..
09f24fc
100644
(file)
--- a/
SL/Template/HTML.pm
+++ b/
SL/Template/HTML.pm
@@
-1,9
+1,6
@@
package SL::Template::HTML;
package SL::Template::HTML;
-use SL::Template::LaTeX;
-
-use vars qw(@ISA);
-@ISA = qw(SL::Template::LaTeX);
+use parent qw(SL::Template::LaTeX);
use strict;
use strict;
@@
-73,10
+70,9
@@
sub convert_to_postscript {
$psfile .= ".ps";
}
$psfile .= ".ps";
}
- system(
"html2ps
-f html2ps-config < $form->{tmpfile} > $psfile");
+ system(
$::lx_office_conf{applications}->{html2ps} . "
-f html2ps-config < $form->{tmpfile} > $psfile");
if ($?) {
if ($?) {
- $self->{"error"} = $form->cleanup();
- $self->cleanup();
+ $self->{"error"} = $form->cleanup($::lx_office_conf{applications}->{html2ps});
return 0;
}
return 0;
}
@@
-106,10
+102,9
@@
sub convert_to_pdf {
$pdffile .= ".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 ($?) {
if ($?) {
- $self->{"error"} = $form->cleanup();
- $self->cleanup();
+ $self->{"error"} = $form->cleanup($::lx_office_conf{applications}->{html2ps});
return 0;
}
return 0;
}