projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reportgenerator: optionale table class und hr aus table genommen
[kivitendo-erp.git]
/
SL
/
Template
/
LaTeX.pm
diff --git
a/SL/Template/LaTeX.pm
b/SL/Template/LaTeX.pm
index
291eb9f
..
2f99f7e
100644
(file)
--- a/
SL/Template/LaTeX.pm
+++ b/
SL/Template/LaTeX.pm
@@
-12,6
+12,8
@@
use File::Temp;
use List::MoreUtils qw(any);
use Unicode::Normalize qw();
use List::MoreUtils qw(any);
use Unicode::Normalize qw();
+use SL::DB::Default;
+
sub new {
my $type = shift;
sub new {
my $type = shift;
@@
-336,7
+338,7
@@
sub parse {
$self->{"error"} = "$form->{templates}/$form->{IN}: $!";
return 0;
}
$self->{"error"} = "$form->{templates}/$form->{IN}: $!";
return 0;
}
- binmode IN, ":utf8"
if $::locale->is_utf8
;
+ binmode IN, ":utf8";
my @lines = <IN>;
close(IN);
my @lines = <IN>;
close(IN);
@@
-372,13
+374,8
@@
sub parse {
return 0;
}
return 0;
}
- if ($::locale->is_utf8) {
- binmode OUT, ":utf8";
- print OUT Unicode::Normalize::normalize('C', $new_contents);
-
- } else {
- print OUT $new_contents;
- }
+ binmode OUT, ":utf8";
+ print OUT Unicode::Normalize::normalize('C', $new_contents);
if ($form->{"format"} =~ /postscript/i) {
return $self->convert_to_postscript();
if ($form->{"format"} =~ /postscript/i) {
return $self->convert_to_postscript();
@@
-516,7
+513,7
@@
sub parse_and_create_pdf {
$local_form->{IN} = $template_file_name;
$local_form->{tmpdir} = $::lx_office_conf{paths}->{userspath};
$local_form->{tmpfile} = $tex_file_name;
$local_form->{IN} = $template_file_name;
$local_form->{tmpdir} = $::lx_office_conf{paths}->{userspath};
$local_form->{tmpfile} = $tex_file_name;
- $local_form->{templates} =
$::myconfig{templates}
;
+ $local_form->{templates} =
SL::DB::Default->get->templates
;
foreach (keys %params) {
croak "The parameter '$_' must not be used." if exists $local_form->{$_};
foreach (keys %params) {
croak "The parameter '$_' must not be used." if exists $local_form->{$_};