X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/28a7a5397bb2363fe72f9f43759d429535e29391..69e526ee5:/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 7f9a17bf2..9e1370858 100644
--- a/templates/webpages/order/tabs/_second_row.html
+++ b/templates/webpages/order/tabs/_second_row.html
@@ -4,7 +4,38 @@
 [%- USE L %]
 
 <table>
-  <tr class="listrow1">
+  <tr><td colspan="100%">
+    <b>[%- 'Serial No.' | $T8 %]</b>&nbsp;
+    [%- L.input_tag("order.orderitems[].serialnumber", ITEM.serialnumber, size = 15) %]&nbsp;
+    <b>[%- 'Project' | $T8 %]</b>&nbsp;
+    [% L.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;
+    <b>[%- 'Subtotal' | $T8 %]</b>&nbsp;
+    [% L.yes_no_tag("order.orderitems[].subtotal", ITEM.subtotal) %]&nbsp;
+    [%- IF ITEM.order.is_sales %]
+      <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="plus0"[%- END -%]>
+        [%- LxERP.format_amount(ITEM.part.onhand_as_number, 2, 0) -%]&nbsp;[%- ITEM.part.unit -%]
+      </span>&nbsp;
+  </td></tr>
+
+  <tr>
     [%- SET n = 0 %]
     [%- FOREACH var = ITEM.cvars_by_config %]
     [%- NEXT UNLESS (var.config.processed_flags.editable && ITEM.part.cvar_by_name(var.config.name).is_valid) %]
@@ -19,7 +50,8 @@
       [% INCLUDE 'common/render_cvar_input.html' var_name='order.orderitems[].custom_variables[].unparsed_value' %]
     </td>
     [%- IF (n % (MYCONFIG.form_cvars_nr_cols || 3)) == 0 %]
-  </tr><tr class="listrow1">
+
+  </tr><tr>
     [%- END %]
     [%- END %]
   </tr>