From: Sven Schöling <s.schoeling@linet-services.de>
Date: Thu, 25 Feb 2016 17:25:44 +0000 (+0100)
Subject: PDF::Table: Prop Index korrekt indizieren
X-Git-Tag: release-3.4.1~394
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=53b594492c17d13c3e837531a30d3e9fac5219a2;p=kivitendo-erp.git

PDF::Table: Prop Index korrekt indizieren
---

diff --git a/modules/override/PDF/Table.pm b/modules/override/PDF/Table.pm
index 68fda657f..fd83d0438 100644
--- a/modules/override/PDF/Table.pm
+++ b/modules/override/PDF/Table.pm
@@ -654,8 +654,8 @@ sub table
             }
 
             # Choose colors for this row
-            $background_color = $row_index % 2 ? $background_color_even  : $background_color_odd;
-            $font_color       = $row_index % 2 ? $font_color_even        : $font_color_odd;
+            $background_color = ($row_index - $header_props->{num_header_rows}) % 2 ? $background_color_even  : $background_color_odd;
+            $font_color       = ($row_index - $header_props->{num_header_rows}) % 2 ? $font_color_even        : $font_color_odd;
 
             #Determine current row height
             my $current_row_height = $pad_top + $pre_calculated_row_height + $pad_bot;
@@ -716,9 +716,9 @@ sub table
                 $txt->fillcolor($cell_font_color);
 
                 my $this_width;
-                if (!$remaining_header_rows && $cell_props->[$row_index][$column_idx]->{colspan}) {
-                    $colspan = $cell_props->[$row_index][$column_idx]->{colspan};
-                } elsif ($remaining_header_rows && $header_row_cell_props[$header_props->{num_header_rows} - $remaining_header_rows][$column_idx]->{colspan}) {
+                if (!$remaining_header_rows && $cell_props->[$row_index + $header_props->{num_header_rows}][$column_idx]->{colspan}) {
+                    $colspan = $cell_props->[$row_index + $header_props->{num_header_rows}][$column_idx]->{colspan};
+                } elsif ($remaining_header_rows && ($header_row_cell_props[$header_props->{num_header_rows} - $remaining_header_rows][$column_idx]->{colspan})) {
                     $colspan = $header_row_cell_props[$header_props->{num_header_rows} - $remaining_header_rows][$column_idx]->{colspan};
                 }
 
@@ -799,7 +799,7 @@ sub table
                 }
                 
                 # Get the most specific value if none was already set from header_props
-                $cell_bg_color ||= $cell_props->[$row_index][$column_idx]->{'background_color'} 
+                $cell_bg_color ||= $cell_props->[$row_index + $header_props->{num_header_rows}][$column_idx]->{'background_color'}
                                ||  $col_props->[$column_idx]->{'background_color'}
                                ||  $background_color;