X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Freport_generator%2Fhtml_report_master.html;h=59101774ac83fe02b678301ca79991f3c83b2312;hb=1cd85a06d6541f15f8f080c215ae46d39d19a2db;hp=b1bd96d3110800ae83b4f6e975549e4278281d69;hpb=8c7e44938a661e035f62840e1e177353240ace5d;p=kivitendo-erp.git

diff --git a/templates/webpages/report_generator/html_report_master.html b/templates/webpages/report_generator/html_report_master.html
index b1bd96d31..59101774a 100644
--- a/templates/webpages/report_generator/html_report_master.html
+++ b/templates/webpages/report_generator/html_report_master.html
@@ -38,11 +38,21 @@
  [% IF DATA_PRESENT %]
  <p>
   <table width="100%">
+   [%- FOREACH row = HEADER_ROWS %]
    <tr>
-    [% FOREACH col = COLUMN_HEADERS %]
-     <th class="listheading">[% IF col.link %]<a href="[% col.link %]">[% END %][% col.text %][% IF col.link %][% IF col.show_sort_indicator %]<img border="0" src="image/[% IF col.sort_indicator_direction %]down[% ELSE %]up[% END %].png">[% END %]</a>[% ELSE %][% IF col.show_sort_indicator %]<img src="image/[% IF col.sort_indicator_direction %]down[% ELSE %]up[% END %].png">[% END %][% END %]</th>
+    [% FOREACH col = row %]
+     <th class="listheading"
+     [%- IF col.align %] align="[% HTML.escape(col.align) %]" style="text-align: [% HTML.escape(col.align) %]"[% END -%]
+     [%- IF col.colspan && col.colspan > 1 %] colspan="[% HTML.escape(col.colspan) %]"[% END -%]
+     >
+      [%- IF col.link -%]<a href="[% col.link %]">[%- END -%]
+      [%- col.text -%]
+      [%- IF col.show_sort_indicator -%]<img border="0" src="image/[% IF col.sort_indicator_direction %]down[% ELSE %]up[% END %].png">[%- END -%]
+      [%- IF col.link -%]</a>[%- END -%]
+     </th>
     [% END %]
    </tr>
+   [%- END %]
 
    [% FOREACH row = ROWS %]
     [% IF row.IS_CONTROL %]
@@ -52,6 +62,7 @@
       [%- FOREACH col = row.COLUMNS %]
       <td[% IF col.align %] align="[% col.align %]"[% END %]
          [%- IF col.valign %] valign="[% col.valign %]"[%- END %]
+         [%- IF col.colspan && col.colspan > 1 %] colspan="[% HTML.escape(col.colspan) %]"[% END -%]
          [%- SET tdclass = '' %]
          [%- IF row.BORDER_TOP %][%- SET tdclass = "$tdclass top_border" %][%- END %]
          [%- IF row.BORDER_BOTTOM %][%- SET tdclass = "$tdclass bottom_border" %][%- END %]
@@ -59,7 +70,7 @@
          [%- IF tdclass %] class="[% tdclass %]"[%- END %]>
        [%- IF col.raw_data %][%- col.raw_data %][%- END %]
        [%- USE iterator(col.CELL_ROWS) %][%- FOREACH cell_row = iterator %]
-        [%- IF cell_row.data %]
+        [%- IF cell_row.data != '' %]
          [%- IF cell_row.link %]<a href="[% cell_row.link %]">[%- END %]
          [%- cell_row.data %]
          [%- IF cell_row.link %]</a>[%- END %]