From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 10 Nov 2009 16:27:21 +0000 (+0100)
Subject: ReportGenerator: Beim der HTML-Ausgabe nur entweder raw_data oder data ausgeben;... 
X-Git-Tag: release-2.6.1beta1~100
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=a40ea2781b794da7c0284a484f581cd5390c8a72;p=kivitendo-erp.git

ReportGenerator: Beim der HTML-Ausgabe nur entweder raw_data oder data ausgeben; raw_data hat PrioritÀt.
---

diff --git a/templates/webpages/report_generator/html_report_de.html b/templates/webpages/report_generator/html_report_de.html
index 00ae13b03..8547b2812 100644
--- a/templates/webpages/report_generator/html_report_de.html
+++ b/templates/webpages/report_generator/html_report_de.html
@@ -68,14 +68,17 @@
          [%- IF row.BORDER_BOTTOM %][%- SET tdclass = "$tdclass bottom_border" %][%- END %]
          [%- IF col.class %][%- SET tdclass = "$tdclass $col.class" %][%- END %]
          [%- 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.link %]<a href="[% cell_row.link %]">[%- END %]
-         [%- cell_row.data %]
-         [%- IF cell_row.link %]</a>[%- END %]
+       [%- IF col.raw_data %]
+        [%- col.raw_data %]
+       [%- ELSE %]
+        [%- USE iterator(col.CELL_ROWS) %][%- FOREACH cell_row = iterator %]
+         [%- IF cell_row.data != '' %]
+          [%- IF cell_row.link %]<a href="[% cell_row.link %]">[%- END %]
+          [%- cell_row.data %]
+          [%- IF cell_row.link %]</a>[%- END %]
+         [%- END %]
+        [%- UNLESS iterator.last %]<br>[%- END %]
         [%- END %]
-       [%- UNLESS iterator.last %]<br>[%- END %]
        [%- END %]
       </td>
       [%- END %]
diff --git a/templates/webpages/report_generator/html_report_master.html b/templates/webpages/report_generator/html_report_master.html
index 279975db7..707657c56 100644
--- a/templates/webpages/report_generator/html_report_master.html
+++ b/templates/webpages/report_generator/html_report_master.html
@@ -68,14 +68,17 @@
          [%- IF row.BORDER_BOTTOM %][%- SET tdclass = "$tdclass bottom_border" %][%- END %]
          [%- IF col.class %][%- SET tdclass = "$tdclass $col.class" %][%- END %]
          [%- 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.link %]<a href="[% cell_row.link %]">[%- END %]
-         [%- cell_row.data %]
-         [%- IF cell_row.link %]</a>[%- END %]
+       [%- IF col.raw_data %]
+        [%- col.raw_data %]
+       [%- ELSE %]
+        [%- USE iterator(col.CELL_ROWS) %][%- FOREACH cell_row = iterator %]
+         [%- IF cell_row.data != '' %]
+          [%- IF cell_row.link %]<a href="[% cell_row.link %]">[%- END %]
+          [%- cell_row.data %]
+          [%- IF cell_row.link %]</a>[%- END %]
+         [%- END %]
+        [%- UNLESS iterator.last %]<br>[%- END %]
         [%- END %]
-       [%- UNLESS iterator.last %]<br>[%- END %]
        [%- END %]
       </td>
       [%- END %]