projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
format_percent auf 2 stellen defaulten
[kivitendo-erp.git]
/
SL
/
ReportGenerator.pm
diff --git
a/SL/ReportGenerator.pm
b/SL/ReportGenerator.pm
index
402f89d
..
e23bf77
100644
(file)
--- a/
SL/ReportGenerator.pm
+++ b/
SL/ReportGenerator.pm
@@
-512,7
+512,7
@@
sub generate_pdf_content {
my $col_idx = 0;
foreach my $col_name (@visible_columns) {
my $col = $row->{$col_name};
my $col_idx = 0;
foreach my $col_name (@visible_columns) {
my $col = $row->{$col_name};
- push @{ $data_row }, $self->_decode_text(join("\n", @{ $col->{data} }));
+ push @{ $data_row }, $self->_decode_text(join("\n", @{ $col->{data}
|| []
}));
$column_props[$col_idx]->{justify} = 'right' if ($col->{align} eq 'right');
$column_props[$col_idx]->{justify} = 'right' if ($col->{align} eq 'right');
@@
-761,7
+761,7
@@
sub generate_csv_content {
next;
}
next;
}
- my $num_output = ($
col->{colspan} && ($col->{colspan} > 1)) ? $col
->{colspan} : 1;
+ my $num_output = ($
row->{$col}{colspan} && ($row->{$col}->{colspan} > 1)) ? $row->{$col}
->{colspan} : 1;
$skip_next = $num_output - 1;
push @data, join($eol, map { s/\r?\n/$eol/g; $_ } @{ $row->{$col}->{data} });
$skip_next = $num_output - 1;
push @data, join($eol, map { s/\r?\n/$eol/g; $_ } @{ $row->{$col}->{data} });