Merge branch 'b-3.6.1' of ../kivitendo-erp_20220811

[kivitendo-erp.git] / templates / webpages / order / tabs / _second_row.html

diff --git a/templates/webpages/order/tabs/_second_row.html b/templates/webpages/order/tabs/_second_row.html
index cc2646e..8b4d83a 100644 (file)
--- a/templates/webpages/order/tabs/_second_row.html
+++ b/templates/webpages/order/tabs/_second_row.html
@@ -2,26 +2,47 @@
 [%- USE HTML %]
 [%- USE LxERP %]
 [%- USE L %]
+[%- USE P %]
 
 <table>
-  <tr>
-    <th>[%- 'Serial No.' | $T8 %]</th>
-    <td>[%- L.input_tag("order.orderitems[].serialnumber", ITEM.serialnumber, size = 15) %]</td>
-    <th>[%- 'Reqdate' | $T8 %]</th>
-    <td>[% L.date_tag("order.orderitems[].reqdate", ITEM.reqdate) %]</td>
-    <th>[%- 'Subtotal' | $T8 %]</th>
-    <td>[% L.yes_no_tag("order.orderitems[].subtotal", ITEM.subtotal) %]</td>
-    [%- IF ITEM.order.is_sales %]
-      <th>[%- 'LP' | $T8 %]</th>
-      <td>[%- LxERP.format_amount(ITEM.part.listprice, 2, 0) %]</td>
+  <tr><td colspan="100%">
+    [%- IF (TYPE == "sales_order" || TYPE == "purchase_order") %]
+      <b>[%- 'Serial No.' | $T8 %]</b>&nbsp;
+      [%- L.input_tag("order.orderitems[].serialnumber", ITEM.serialnumber, size = 15) %]&nbsp;
     [%- END %]
-    <th>[%- 'On Hand' | $T8 %]</th>
-    <td>
-      <span[%- IF ITEM.part.onhand < ITEM.part.rop -%] class="plus0"[%- END -%]>
-        [%- LxERP.format_amount(ITEM.part.onhand_as_number, 2, 0) -%]&nbsp;[%- ITEM.part.unit -%]
-      </span>
-    </td>
-  </tr>
+    <b>[%- 'Project' | $T8 %]</b>&nbsp;
+    [% P.project.picker("order.orderitems[].project_id", ITEM.project_id, size = 15) %]&nbsp;
+    [%- IF (TYPE == "sales_order" || TYPE == "purchase_order") %]
+      <b>[%- 'Reqdate' | $T8 %]</b>&nbsp;
+      [% L.date_tag("order.orderitems[].reqdate_as_date", ITEM.reqdate_as_date) %]&nbsp;
+    [%- END %]
+    <b>[%- 'Subtotal' | $T8 %]</b>&nbsp;
+    [% L.yes_no_tag("order.orderitems[].subtotal", ITEM.subtotal) %]&nbsp;
+    [%- IF (TYPE == "sales_order" || TYPE == "sales_quotation") %]
+      <b>[%- 'Ertrag' | $T8 %]</b>&nbsp;
+        <span name="linemargin">
+          <span[%- IF ITEM.marge_total < 0 -%] class="plus0"[%- END -%]>
+            [%- LxERP.format_amount(ITEM.marge_total, 2, 0) %]&nbsp;&nbsp;
+            [%- LxERP.format_amount(ITEM.marge_percent, 2, 0) %]%
+          </span>
+       </span>&nbsp;
+      <b>[%- 'LP' | $T8 %]</b>&nbsp;
+      [%- LxERP.format_amount(ITEM.part.listprice, 2, 0) %]&nbsp;
+      <b>[%- 'EK' | $T8 %]</b>&nbsp;
+        [%- L.input_tag("order.orderitems[].lastcost_as_number",
+                        ITEM.lastcost_as_number,
+                        size = 5,
+                        class="recalc reformat_number numeric") %]&nbsp;
+    [%- END %]
+    <b>[%- 'On Hand' | $T8 %]</b>&nbsp;
+      <span[%- IF ITEM.part.onhand < ITEM.part.rop -%] class="numeric plus0"[%- END -%]>
+        [%- ITEM.part.onhand_as_number -%]&nbsp;[%- ITEM.part.unit -%]
+      </span>&nbsp;
+    <b>[%- 'Optional' | $T8 %]</b>&nbsp;
+      [%- L.yes_no_tag("order.orderitems[].optional", ITEM.optional
+                        class="recalc") %]&nbsp;
+  </td></tr>
+
   <tr>
     [%- SET n = 0 %]
     [%- FOREACH var = ITEM.cvars_by_config %]