X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/5be160844da9f03e9b95fec066418a99832d8cca..HEAD:/templates/webpages/delivery_order/tabs/_row.html

diff --git a/templates/webpages/delivery_order/tabs/_row.html b/templates/webpages/delivery_order/tabs/_row.html
index c93d18c6c..50bb01e04 100644
--- a/templates/webpages/delivery_order/tabs/_row.html
+++ b/templates/webpages/delivery_order/tabs/_row.html
@@ -15,9 +15,24 @@
                      alt=LxERP.t8('Show details'), title=LxERP.t8('Show details'), class="expand") %]
       [%- END %]
       [% L.hidden_tag("orderitem_ids[+]", ID) %]
-      [% L.hidden_tag("converted_from_orderitems_ids[+]", ITEM.converted_from_orderitems_id) %]
+      [% L.hidden_tag("converted_from_record_item_type_ref[+]", ITEM.converted_from_record_item_type_ref) %]
+      [% L.hidden_tag("converted_from_record_item_id[+]",       ITEM.converted_from_record_item_id) %]
       [% L.hidden_tag("order.orderitems[+].id", ITEM.id, id='item_' _ ID) %]
+      [% L.hidden_tag("order.orderitems[].stock_info", ITEM.stock_info, class="data-stock-info") %]
       [% L.hidden_tag("order.orderitems[].parts_id", ITEM.parts_id) %]
+      [% L.hidden_tag("order.orderitems[].sellprice", ITEM.sellprice) %]
+      [% L.hidden_tag("order.orderitems[].discount", ITEM.discount) %]
+      [% L.hidden_tag("order.orderitems[].ordnumber", ITEM.ordnumber) %]
+      [% L.hidden_tag("order.orderitems[].transdate", ITEM.transdate) %]
+      [% L.hidden_tag("order.orderitems[].cusordnumber", ITEM.cusordnumber) %]
+      [% L.hidden_tag("order.orderitems[].base_qty", ITEM.base_qty) %]
+      [% L.hidden_tag("order.orderitems[].lastcost", ITEM.lastcost) %]
+      [% L.hidden_tag("order.orderitems[].price_factor_id", ITEM.price_factor_id) %]
+      [% L.hidden_tag("order.orderitems[].price_factor", ITEM.price_factor) %]
+      [% L.hidden_tag("order.orderitems[].marge_price_factor", ITEM.marge_price_factor) %]
+      [% L.hidden_tag("order.orderitems[].pricegroup_id", ITEM.pricegroup_id) %]
+      [% L.hidden_tag("order.orderitems[].active_price_source", ITEM.active_price_source.source) %]
+      [% L.hidden_tag("order.orderitems[].active_discount_source", ITEM.active_discount_source.source) %]
     </td>
     <td>
       <div name="position" class="numeric">
@@ -77,13 +92,6 @@
         [%- L.hidden_tag("formula[+]", ITEM.part.formel) -%]
       [%- END -%]
     </td>
-    <td>
-      [%- L.select_tag("order.orderitems[].price_factor_id",
-                       SELF.all_price_factors,
-                       default = ITEM.price_factor_id,
-                       title_key = 'description',
-                       with_empty = 1) %]
-    </td>
     <td nowrap>
       [%- L.select_tag("order.orderitems[].unit",
                       ITEM.part.available_units,
@@ -92,49 +100,11 @@
                       value_key = 'name',
                       class = 'unitselect') %]
     </td>
-    [% SET RIGHT_TO_EDIT_PRICES = 0 %]
-    [% IF (SELF.type == "sales_order" || SELF.type == "sales_quotation") %]
-      [% SET RIGHT_TO_EDIT_PRICES = AUTH.assert('sales_edit_prices', 1) %]
-    [% END %]
-    [% IF (SELF.type == "purchase_order" || SELF.type == "request_quotation") %]
-      [% SET RIGHT_TO_EDIT_PRICES = AUTH.assert('purchase_edit_prices', 1) %]
-    [% END %]
-    <td>
-      [%- SET EDIT_PRICE = (RIGHT_TO_EDIT_PRICES) %]
-      <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,
-                        disabled=(EDIT_PRICE? '' : 1),
-                        class="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", class="numeric") %]
-        [%- L.hidden_tag("order.orderitems[].sellprice_as_number",
-                         ITEM.sellprice_as_number,
-                         disabled=(EDIT_PRICE? 1 : '')) %]
-      </div>
-    </td>
+
     <td>
-      [%- SET EDIT_DISCOUNT = (RIGHT_TO_EDIT_PRICES) %]
-      <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,
-                        disabled=(EDIT_DISCOUNT? '' : 1),
-                        class="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", class="numeric") %]
-        [%- L.hidden_tag("order.orderitems[].discount_as_percent",
-                         ITEM.discount_as_percent,
-                         disabled=(EDIT_DISCOUNT? 1 : '')) %]
-      </div>
+      <span id="stock_[% ID %]" class="data-stock-qty">[% SELF.calculate_stock_in_out(ITEM) %] [% ITEM.unit %]</span>
+      [% P.button_tag("kivi.DeliveryOrder.open_stock_in_out_dialog(this, '" _ in_out _"')", "?") %]
     </td>
-    <td align="right">
-      [%- L.div_tag(LxERP.format_amount(ITEM.linetotal, 2, 0), name="linetotal") %]
-    </td>
-
   </tr>
 
   <tr [%- IF !MYCONFIG.show_form_details -%]style="display:none"[%- END -%]>