projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
L.pm um for_submit erweitert und in Kundenvorlage erweitert: #2386
[kivitendo-erp.git]
/
SL
/
Template
/
OpenDocument.pm
diff --git
a/SL/Template/OpenDocument.pm
b/SL/Template/OpenDocument.pm
index
4eed5ea
..
a90a9ae
100644
(file)
--- a/
SL/Template/OpenDocument.pm
+++ b/
SL/Template/OpenDocument.pm
@@
-22,7
+22,6
@@
sub new {
my $self = $type->SUPER::new(@_);
$self->{"rnd"} = int(rand(1000000));
my $self = $type->SUPER::new(@_);
$self->{"rnd"} = int(rand(1000000));
- $self->{"iconv"} = SL::Iconv->new($::lx_office_conf{system}->{dbcharset}, "UTF-8");
$self->set_tag_style('<%', '%>');
$self->{quot_re} = '"';
$self->set_tag_style('<%', '%>');
$self->{quot_re} = '"';
@@
-575,7
+574,6
@@
sub convert_to_pdf {
sub format_string {
my ($self, $variable) = @_;
my $form = $self->{"form"};
sub format_string {
my ($self, $variable) = @_;
my $form = $self->{"form"};
- my $iconv = $self->{"iconv"};
$variable = $main::locale->quote_special_chars('Template/OpenDocument', $variable);
$variable = $main::locale->quote_special_chars('Template/OpenDocument', $variable);
@@
-591,7
+589,7
@@
sub format_string {
$variable =~ s|\</${key}\>|</text:span>|gi;
}
$variable =~ s|\</${key}\>|</text:span>|gi;
}
- return $
iconv->convert($variable)
;
+ return $
variable
;
}
sub get_mime_type() {
}
sub get_mime_type() {