DeliveryOrder::TypeData Locales eindeutig setzen

[kivitendo-erp.git] / templates / webpages / requirement_spec_order / list.html

diff --git a/templates/webpages/requirement_spec_order/list.html b/templates/webpages/requirement_spec_order/list.html
index 775ce18..d1c2278 100644 (file)
--- a/templates/webpages/requirement_spec_order/list.html
+++ b/templates/webpages/requirement_spec_order/list.html
@@ -15,6 +15,8 @@
     <th>[% LxERP.t8("Title") %]</th>
     <th>[% LxERP.t8("Description") %]</th>
     <th>[% LxERP.t8("Article") %]</th>
+    <th>[% LxERP.t8("Unit") %]</th>
+    <th>[% LxERP.t8("Position type in quotation/order") %]</th>
    </tr>
   </thead>
 
@@ -23,7 +25,7 @@
     <tr class="listrow">
      <td>[% HTML.escape(section.fb_number) %]</td>
      <td>[% HTML.escape(section.title) %]</td>
-     <td>[% HTML.escape(P.truncate(section.description)) %]</td>
+     <td>[% HTML.escape(P.truncate(section.description_as_stripped_html)) %]</td>
      <td>
       [% IF section.order_part %]
        [% HTML.escape(section.order_part.partnumber) %] [% HTML.escape(section.order_part.description) %]
@@ -31,6 +33,14 @@
        [% LxERP.t8("no article assigned yet") %]
       [% END %]
      </td>
+     <td>[% HTML.escape(section.order_part.unit) %]</td>
+     <td>
+      [% IF section.order_part_id && section.order_part.unit_obj.is_time_based %]
+       [% LxERP.t8("time and effort based position") %]
+      [% ELSIF section.order_part_id %]
+       [% LxERP.t8("flat-rate position") %]
+      [% END %]
+     </td>
     </tr>
    [% END %]
   </tbody>
@@ -69,7 +79,11 @@
       [% END %]
      </td>
      <td>
-      <a href="oe.pl?action=edit&id=[% HTML.url(rs_order.order_id) %]&type=[% HTML.url(rs_order.order.type) %]">
+      [%- IF INSTANCE_CONF.get_feature_experimental_order -%]
+        <a href="controller.pl?action=Order/edit&id=[% HTML.url(rs_order.order_id) %]&type=[% HTML.url(rs_order.order.type) %]">
+      [%- ELSE -%]
+        <a href="oe.pl?action=edit&id=[% HTML.url(rs_order.order_id) %]&type=[% HTML.url(rs_order.order.type) %]">
+      [%- END -%]
        [% HTML.escape(rs_order.order.quotation ? rs_order.order.quonumber : rs_order.order.ordnumber) %]
       </a>
      </td>