Merge branch 'master' of github.com:kivitendo/kivitendo-erp

[kivitendo-erp.git] / templates / webpages / ic / assembly_row.html

diff --git a/templates/webpages/ic/assembly_row.html b/templates/webpages/ic/assembly_row.html
index 02a7804bb00f7ce3cdf0456d480c151fb9a9749e..401b54a06b7d0ef8b62bb73a9c09df0b1fc7f5d1 100644 (file)
--- a/templates/webpages/ic/assembly_row.html
+++ b/templates/webpages/ic/assembly_row.html
@@ -1,6 +1,7 @@
 [%- USE T8 %]
 [%- USE LxERP %]
 [%- USE HTML %]
+[%- USE L %]
   <tr class=listheading>
    <th class=listheading>[% 'Individual Items' | $T8 %]</th>
   </tr>
@@ -17,7 +18,11 @@
      <tr>
  [%- FOREACH col = COLUMNS %]
   [%- SET rcol = row.$col %]
-      <td[% ' align=' _ rcol.align IF rcol.align %]>[%- rcol.data %]</td>
+  [%- IF rcol.escape %]
+      <td[% ' align=' _ rcol.align IF rcol.align %]>[%- HTML.escape(rcol.data) %]</td>
+  [%- ELSE %]
+      <td[% ' align=' _ rcol.align IF rcol.align %]>[%- IF rcol.link %][% L.link(rcol.link, rcol.data) %][% ELSE %][% rcol.data %][% END %]</td>
+  [%- END %]
  [%- END %]
  [%- FOREACH hidden = row.hiddens %]
       <input type=hidden name="[% HTML.escape(hidden.name) %]" value="[% HTML.escape(hidden.value) %]">