Order: und nochmal header nach oben

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

diff --git a/templates/webpages/order/tabs/_row.html b/templates/webpages/order/tabs/_row.html
index fd3f30a..63243c6 100644 (file)
--- a/templates/webpages/order/tabs/_row.html
+++ b/templates/webpages/order/tabs/_row.html
@@ -11,35 +11,41 @@
       [% L.hidden_tag("order.orderitems[+].id", ITEM.id, id='item_' _ ID) %]
       [% L.hidden_tag("order.orderitems[].parts_id", ITEM.parts_id) %]
     </td>
+    <td>
+      <div name="position" class="numeric">
+        [% HTML.escape(ITEM.position) %]
+      </div>
+    </td>
     <td align="center">
       <img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]" class="dragdrop">
     </td>
     <td align="center">
-      [%- L.button_tag("delete_order_item_row(this)",
+      [%- L.button_tag("kivi.Order.delete_order_item_row(this)",
                        LxERP.t8("X"),
                        confirm=LxERP.t8("Are you sure?")) %]
     </td>
     <td>
-      [% HTML.escape(ITEM.part.partnumber) %]
+      <div name="partnumber">[% HTML.escape(ITEM.part.partnumber) %]</div>
     </td>
     <td>
       [% L.input_tag("order.orderitems[].description",
                      ITEM.description,
                      style='width: 300px') %]
+      [%- L.button_tag("kivi.Order.show_longdescription_dialog(this)", LxERP.t8("L")) %]
     </td>
     <td>
       [%- L.input_tag("order.orderitems[].qty_as_number",
                       ITEM.qty_as_number,
                       size = 5,
-                      style='text-align:right',
-                      class="recalc reformat_number") %]
+                      class="recalc reformat_number numeric") %]
     </td>
     <td>
-      [%- L.input_tag("order.orderitems[].price_factor",
-                      ITEM.price_factor,
-                      size = 5,
-                      style='text-align:right',
-                      class="recalc") %]
+      [%- L.select_tag("order.orderitems[].price_factor_id",
+                       ALL_PRICE_FACTORS,
+                       default = ITEM.price_factor_id,
+                       title_key = 'description',
+                       with_empty = 1,
+                       class="recalc") %]
     </td>
     <td nowrap>
       [%- L.select_tag("order.orderitems[].unit",
@@ -50,23 +56,22 @@
                       class = 'unitselect') %]
     </td>
     <td>
-      [%- L.button_tag("price_chooser_item_row(this)",
+      [%- L.button_tag("kivi.Order.price_chooser_item_row(this)",
                        ITEM.active_price_source.source_description _ ' | ' _ ITEM.active_discount_source.source_description,
                        name = "price_chooser_button") %]
     </td>
     <td>
       [%- L.hidden_tag("order.orderitems[].active_price_source", ITEM.active_price_source.source) %]
       [%- SET EDIT_PRICE = (AUTH.assert('edit_prices', 1) && ITEM.active_price_source.source == '') %]
-      <div name="editable_price" [%- IF !EDIT_PRICE %]style="display:none"[%- END %]>
+      <div name="editable_price" [%- IF !EDIT_PRICE %]style="display:none"[%- END %] class="numeric">
         [%- L.input_tag("order.orderitems[].sellprice_as_number",
                         ITEM.sellprice_as_number,
                         size = 10,
-                        style='text-align:right',
                         disabled=(EDIT_PRICE? '' : 1),
-                        class="recalc reformat_number") %]
+                        class="recalc reformat_number numeric") %]
       </div>
       <div name="not_editable_price" [%- IF EDIT_PRICE %]style="display:none"[%- END %]>
-        [%- L.div_tag(ITEM.sellprice_as_number, name="sellprice_text", style='text-align:right') %]
+        [%- L.div_tag(ITEM.sellprice_as_number, name="sellprice_text", class="numeric") %]
         [%- L.hidden_tag("order.orderitems[].sellprice_as_number",
                          ITEM.sellprice_as_number,
                          disabled=(EDIT_PRICE? 1 : '')) %]
@@ -75,16 +80,15 @@
     <td>
       [%- L.hidden_tag("order.orderitems[].active_discount_source", ITEM.active_discount_source.source) %]
       [%- SET EDIT_DISCOUNT = (AUTH.assert('edit_prices', 1) && ITEM.active_discount_source.source == '') %]
-      <div name="editable_discount" [%- IF !EDIT_DISCOUNT %]style="display:none"[%- END %]>
+      <div name="editable_discount" [%- IF !EDIT_DISCOUNT %]style="display:none"[%- END %] class="numeric">
         [%- L.input_tag("order.orderitems[].discount_as_percent",
                         ITEM.discount_as_percent,
                         size = 5,
-                        style='text-align:right',
                         disabled=(EDIT_DISCOUNT? '' : 1),
-                        class="recalc reformat_number") %]
+                        class="recalc reformat_number numeric") %]
       </div>
       <div name="not_editable_discount" [%- IF EDIT_DISCOUNT %]style="display:none"[%- END %]>
-        [%- L.div_tag(ITEM.discount_as_percent, name="discount_text", style='text-align:right') %]
+        [%- L.div_tag(ITEM.discount_as_percent, name="discount_text", class="numeric") %]
         [%- L.hidden_tag("order.orderitems[].discount_as_percent",
                          ITEM.discount_as_percent,
                          disabled=(EDIT_DISCOUNT? 1 : '')) %]