X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Frequirement_spec_order%2Flist.html;h=d1c227891117b7ab8e29916159c4968d440e0711;hb=3fa7a7a8e245681454e2bf11be50b4c305900511;hp=fb86baf5cb5ebb24ff2ad2b7e77b487b8d904481;hpb=fb692c5f36d073818aec001f281a70a77dfb6977;p=kivitendo-erp.git

diff --git a/templates/webpages/requirement_spec_order/list.html b/templates/webpages/requirement_spec_order/list.html
index fb86baf5c..d1c227891 100644
--- a/templates/webpages/requirement_spec_order/list.html
+++ b/templates/webpages/requirement_spec_order/list.html
@@ -1,6 +1,7 @@
 [%- USE HTML -%][%- USE LxERP -%][%- USE L -%][%- USE P -%]
 <div id="quotations_and_orders" class="quotations-and-orders-context-menu">
  <h2>[% LxERP.t8("Assignment of articles to sections") %]</h2>
+
  [% SET sections = SELF.requirement_spec.sections_sorted %]
  [% IF !sections.size %]
  <div>
@@ -14,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>
 
@@ -22,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) %]
@@ -30,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>
@@ -49,8 +60,9 @@
      <th>[% LxERP.t8("Type") %]</th>
      <th>[% LxERP.t8("Requirement Spec Version") %]</th>
      <th>[% LxERP.t8("Record number") %]</th>
-     <th>[% LxERP.t8("Transaction Description") %]</th>
-     <th>[% LxERP.t8("Date") %]</th>
+     <th>[% LxERP.t8("Transaction description") %]</th>
+     <th>[% LxERP.t8("Quotation/Order Date") %]</th>
+     <th>[% LxERP.t8("Creation Date") %]</th>
     </tr>
    </thead>
 
@@ -58,7 +70,7 @@
     [% FOREACH rs_order = orders %]
     <tr class="listrow quotations-and-orders-order-context-menu">
      [% L.hidden_tag('order_id', rs_order.id, no_id=1) %]
-     <td>[% rs_order.order.type == 'sales_quotation' ? LxERP.t8('Sales quotation') : LxERP.t8('Sales order') %]</td>
+     <td>[% rs_order.order.type == 'sales_quotation' ? LxERP.t8('Sales quotation') : LxERP.t8('Sales Order') %]</td>
      <td>
       [% IF rs_order.version %]
        [% HTML.escape(rs_order.version.version_number) %]
@@ -66,8 +78,17 @@
        [% LxERP.t8("working copy") %]
       [% END %]
      </td>
-     <td>[% HTML.escape(rs_order.order.quotation ? rs_order.order.quonumber : rs_order.order.ordnumber) %]</td>
+     <td>
+      [%- 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>
      <td>[% HTML.escape(rs_order.order.transaction_description) %]</td>
+     <td>[% rs_order.order.transdate.to_kivitendo(precision='day') %]</td>
      <td>[% rs_order.itime.to_kivitendo(precision='day') %]</td>
     </tr>
     [%- END %]