X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FReportGenerator.pm;h=e23bf77865ccbb189ca537770ad36a3d3c8440cd;hb=b2945bf61775161f9ce9be9bdbd106ad44247a14;hp=402f89d434709e02623ff3101c4437de222ce583;hpb=863306157cee10bd58abb8f032083f04cea4e72b;p=kivitendo-erp.git

diff --git a/SL/ReportGenerator.pm b/SL/ReportGenerator.pm
index 402f89d43..e23bf7786 100644
--- 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};
-        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');
 
@@ -761,7 +761,7 @@ sub generate_csv_content {
           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} });