projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master', remote branch 'origin'
[kivitendo-erp.git]
/
SL
/
Template
/
HTML.pm
diff --git
a/SL/Template/HTML.pm
b/SL/Template/HTML.pm
index
0ff939f
..
09f24fc
100644
(file)
--- a/
SL/Template/HTML.pm
+++ b/
SL/Template/HTML.pm
@@
-72,8
+72,7
@@
sub convert_to_postscript {
system($::lx_office_conf{applications}->{html2ps} . " -f html2ps-config < $form->{tmpfile} > $psfile");
if ($?) {
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;
}
return 0;
}
@@
-105,8
+104,7
@@
sub convert_to_pdf {
system($::lx_office_conf{applications}->{html2ps} . " -f html2ps-config < $form->{tmpfile} | ps2pdf - $pdffile");
if ($?) {
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;
}
return 0;
}