X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fdelivery_order%2Ftabs%2F_row.html;h=82422ef162cc783d89b766455a1062ca18821cf3;hb=577042c61c5e1fffb8747079b4f9826e51532ee8;hp=60d6cf18a3d23b48503cbd0c206aed39d85d7278;hpb=d6cc1832b06d875ea85b14dd523da9ff7e32df8d;p=kivitendo-erp.git

diff --git a/templates/webpages/delivery_order/tabs/_row.html b/templates/webpages/delivery_order/tabs/_row.html
index 60d6cf18a..82422ef16 100644
--- a/templates/webpages/delivery_order/tabs/_row.html
+++ b/templates/webpages/delivery_order/tabs/_row.html
@@ -17,6 +17,7 @@
       [% L.hidden_tag("orderitem_ids[+]", ID) %]
       [% L.hidden_tag("converted_from_orderitems_ids[+]", ITEM.converted_from_orderitems_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) %]
     </td>
     <td>
@@ -28,7 +29,7 @@
       <img src="image/updown.png" alt="[%- LxERP.t8('reorder item') %]" class="dragdrop">
     </td>
     <td align="center">
-      [%- L.button_tag("kivi.Order.delete_order_item_row(this)",
+      [%- L.button_tag("kivi.DeliveryOrder.delete_order_item_row(this)",
                        LxERP.t8("X"),
                        confirm=LxERP.t8("Are you sure?")) %]
     </td>
@@ -37,7 +38,7 @@
       [%- L.img_tag(src="image/rotate_cw.svg",
                     alt=LxERP.t8('Update from master data'),
                     title= LxERP.t8('Update from master data'),
-                    onclick="if (!confirm('" _ LxERP.t8("Are you sure to update this position from master data?") _ "')) return false; kivi.Order.update_row_from_master_data(this);",
+                    onclick="if (!confirm('" _ LxERP.t8("Are you sure to update this position from master data?") _ "')) return false; kivi.DeliveryOrder.update_row_from_master_data(this);",
                     id='update_from_master') %]
     </td>
     [%- END -%]
@@ -60,7 +61,7 @@
                      size='40',
                      style='width: 300px') %]
       [%- L.hidden_tag("order.orderitems[].longdescription", ITEM.longdescription) %]
-      [%- L.button_tag("kivi.Order.show_longdescription_dialog(this)", LxERP.t8("L")) %]
+      [%- L.button_tag("kivi.DeliveryOrder.show_longdescription_dialog(this)", LxERP.t8("L")) %]
     </td>
     [%- IF (SELF.type == "sales_order" || SELF.type == "purchase_order") -%]
     <td nowrap>
@@ -73,17 +74,10 @@
                       size = 5,
                       class="reformat_number numeric") %]
       [%- IF ITEM.part.formel -%]
-        [%- L.button_tag("kivi.Order.show_calculate_qty_dialog(this)", LxERP.t8("*/")) %]
+        [%- L.button_tag("kivi.DeliveryOrder.show_calculate_qty_dialog(this)", LxERP.t8("*/")) %]
         [%- 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,63 +86,18 @@
                       value_key = 'name',
                       class = 'unitselect') %]
     </td>
+
     <td>
-      [%- 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>
-    [% 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>
-      [%- L.hidden_tag("order.orderitems[].active_price_source", ITEM.active_price_source.source) %]
-      [%- SET EDIT_PRICE = (RIGHT_TO_EDIT_PRICES && ITEM.active_price_source.source == '') %]
-      <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>
-      [%- L.hidden_tag("order.orderitems[].active_discount_source", ITEM.active_discount_source.source) %]
-      [%- SET EDIT_DISCOUNT = (RIGHT_TO_EDIT_PRICES && ITEM.active_discount_source.source == '') %]
-      <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>
-    </td>
-    <td align="right">
-      [%- L.div_tag(LxERP.format_amount(ITEM.linetotal, 2, 0), name="linetotal") %]
+      <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>
-
   </tr>
 
   <tr [%- IF !MYCONFIG.show_form_details -%]style="display:none"[%- END -%]>
     <td colspan="100%">
       [%- IF MYCONFIG.show_form_details || ITEM.render_second_row %]
         <div name="second_row" data-loaded="1">
-          [%- PROCESS order/tabs/_second_row.html ITEM=ITEM TYPE=SELF.type %]
+          [%- PROCESS delivery_order/tabs/_second_row.html ITEM=ITEM TYPE=SELF.type %]
         </div>
       [%- ELSE %]
         <div name="second_row" id="second_row_[% ID %]">