X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Forder%2Ftabs%2F_second_row.html;h=8b4d83ad6fcb292b0ef616ad2ef5831391244ad2;hb=927ec7273b39dffbd1cb91062fed46c60d9be47f;hp=d8d8a8644232ff9a55d4b98fa92b4885740a5008;hpb=78e36cfd9021212db652db06c18054644861c687;p=kivitendo-erp.git

diff --git a/templates/webpages/order/tabs/_second_row.html b/templates/webpages/order/tabs/_second_row.html
index d8d8a8644..8b4d83ad6 100644
--- a/templates/webpages/order/tabs/_second_row.html
+++ b/templates/webpages/order/tabs/_second_row.html
@@ -6,15 +6,19 @@
 
 <table>
   <tr><td colspan="100%">
-    <b>[%- 'Serial No.' | $T8 %]</b>&nbsp;
-    [%- L.input_tag("order.orderitems[].serialnumber", ITEM.serialnumber, size = 15) %]&nbsp;
+    [%- 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 %]
     <b>[%- 'Project' | $T8 %]</b>&nbsp;
     [% P.project.picker("order.orderitems[].project_id", ITEM.project_id, size = 15) %]&nbsp;
-    <b>[%- 'Reqdate' | $T8 %]</b>&nbsp;
-    [% L.date_tag("order.orderitems[].reqdate", ITEM.reqdate) %]&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" %]
+    [%- IF (TYPE == "sales_order" || TYPE == "sales_quotation") %]
       <b>[%- 'Ertrag' | $T8 %]</b>&nbsp;
         <span name="linemargin">
           <span[%- IF ITEM.marge_total < 0 -%] class="plus0"[%- END -%]>
@@ -31,9 +35,12 @@
                         class="recalc reformat_number numeric") %]&nbsp;
     [%- END %]
     <b>[%- 'On Hand' | $T8 %]</b>&nbsp;
-      <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[%- 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>