[MIG] mrp_lot_number_propagation: migrate to V17

mrp_lot_number_propagation/README.rst

@@ -63,6 +63,9 @@ Contributors
 
 -  Akim Juillerat <[email protected]>
 -  Sébastien Alix <[email protected]>
+-  `360ERP <https://www.360erp.com>`__:
+
+   -  Andrea Stirpe
 
 Maintainers
 -----------

mrp_lot_number_propagation/__manifest__.py

@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
 {
     "name": "MRP Serial Number Propagation",
-    "version": "16.0.1.0.0",
+    "version": "17.0.1.0.0",
     "development_status": "Beta",
     "license": "AGPL-3",
     "author": "Camptocamp, Odoo Community Association (OCA)",

mrp_lot_number_propagation/models/mrp_production.py

@@ -1,17 +1,9 @@
 # Copyright 2022 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
 
-from lxml import etree
 
 from odoo import _, api, fields, models, tools
 from odoo.exceptions import UserError
-from odoo.osv import expression
-from odoo.tools.safe_eval import safe_eval
-
-from odoo.addons.base.models.ir_ui_view import (
-    transfer_modifiers_to_node,
-    transfer_node_to_modifiers,
-)
 
 
 class MrpProduction(models.Model):
@@ -36,19 +28,19 @@ class MrpProduction(models.Model):
 
     @api.depends(
         "move_raw_ids.propagate_lot_number",
-        "move_raw_ids.move_line_ids.qty_done",
+        "move_raw_ids.move_line_ids.quantity",
         "move_raw_ids.move_line_ids.lot_id",
     )
     def _compute_propagated_lot_producing(self):
         for order in self:
             order.propagated_lot_producing = False
             move_with_lot = order._get_propagating_component_move()
             line_with_sn = move_with_lot.move_line_ids.filtered(
-                lambda l: (
-                    l.lot_id
-                    and l.product_id.tracking == "serial"
+                lambda ln: (
+                    ln.lot_id
+                    and ln.product_id.tracking == "serial"
                     and tools.float_compare(
-                        l.qty_done, 1, precision_rounding=l.product_uom_id.rounding
+                        ln.quantity, 1, precision_rounding=ln.product_uom_id.rounding
                     )
                     == 0
                 )
@@ -107,11 +99,11 @@ def _create_and_assign_propagated_lot_number(self):
             if not order.is_lot_number_propagated or order.lot_producing_id:
                 continue
             finish_moves = order.move_finished_ids.filtered(
-                lambda m: m.product_id == order.product_id
-                and m.state not in ("done", "cancel")
+                lambda mv, mo=order: mv.product_id == mo.product_id
+                and mv.state not in ("done", "cancel")
             )
             if finish_moves and not finish_moves.quantity_done:
-                lot_model = self.env["stock.production.lot"]
+                lot_model = self.env["stock.lot"]
                 lot = lot_model.search(
                     [
                         ("product_id", "=", order.product_id.id),
@@ -128,7 +120,7 @@ def _create_and_assign_propagated_lot_number(self):
                         )
                     )
                 if not lot:
-                    lot = self.env["stock.production.lot"].create(
+                    lot = self.env["stock.lot"].create(
                         {
                             "product_id": order.product_id.id,
                             "company_id": order.company_id.id,
@@ -141,7 +133,7 @@ def write(self, vals):
         for order in self:
             if (
                 order.is_lot_number_propagated
-                and "lot_producing_id" in vals
+                and vals.get("lot_producing_id")
                 and not self.env.context.get("lot_propagation")
             ):
                 raise UserError(
@@ -152,42 +144,31 @@ def write(self, vals):
                 )
         return super().write(vals)
 
-    def fields_view_get(
-        self, view_id=None, view_type="form", toolbar=False, submenu=False
-    ):
+    @api.model
+    def _get_view(self, view_id=None, view_type="form", **options):
         # Override to hide the "lot_producing_id" field + "action_generate_serial"
         # button if the MO is configured to propagate a serial number
-        result = super().fields_view_get(
-            view_id=view_id, view_type=view_type, toolbar=toolbar, submenu=submenu
-        )
-        if result.get("name") in self._views_to_adapt():
-            result["arch"] = self._fields_view_get_adapt_lot_tags_attrs(result)
-        return result
+        arch, view = super()._get_view(view_id, view_type, **options)
+        if view.name in self._views_to_adapt():
+            arch = self._fields_view_get_adapt_lot_tags_attrs(arch)
+        return arch, view
 
     def _views_to_adapt(self):
         """Return the form view names bound to 'mrp.production' to adapt."""
         return ["mrp.production.form"]
 
-    def _fields_view_get_adapt_lot_tags_attrs(self, view):
+    def _fields_view_get_adapt_lot_tags_attrs(self, arch):
         """Hide elements related to lot if it is automatically propagated."""
-        doc = etree.XML(view["arch"])
-        tags = (
-            "//label[@for='lot_producing_id']",
-            "//field[@name='lot_producing_id']/..",  # parent <div>
-        )
-        for xpath_expr in tags:
-            attrs_key = "invisible"
-            nodes = doc.xpath(xpath_expr)
-            for field in nodes:
-                attrs = safe_eval(field.attrib.get("attrs", "{}"))
-                if not attrs[attrs_key]:
-                    continue
-                invisible_domain = expression.OR(
-                    [attrs[attrs_key], [("is_lot_number_propagated", "=", True)]]
+
+        for node in arch.xpath(
+            "//label[@for='lot_producing_id']"
+            "|//field[@name='lot_producing_id']/.."  # parent <div>
+        ):
+            attr_invisible = node.attrib.get("invisible", "")
+            if not attr_invisible:
+                node.attrib["invisible"] = "is_lot_number_propagated"
+            else:
+                node.attrib["invisible"] = (
+                    node.attrib["invisible"] + " or is_lot_number_propagated"
                 )
-                attrs[attrs_key] = invisible_domain
-                field.set("attrs", str(attrs))
-                modifiers = {}
-                transfer_node_to_modifiers(field, modifiers, self.env.context)
-                transfer_modifiers_to_node(modifiers, field)
-        return etree.tostring(doc, encoding="unicode")
+        return arch

mrp_lot_number_propagation/readme/CONTRIBUTORS.md

@@ -1,2 +1,4 @@
 - Akim Juillerat \<<[email protected]>\>
 - Sébastien Alix \<<[email protected]>\>
+- [360ERP](https://www.360erp.com):
+  - Andrea Stirpe

mrp_lot_number_propagation/static/description/index.html

@@ -410,6 +410,10 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 <ul class="simple">
 <li>Akim Juillerat &lt;<a class="reference external" href="mailto:akim.juillerat&#64;camptocamp.com">akim.juillerat&#64;camptocamp.com</a>&gt;</li>
 <li>Sébastien Alix &lt;<a class="reference external" href="mailto:sebastien.alix&#64;camptocamp.com">sebastien.alix&#64;camptocamp.com</a>&gt;</li>
+<li><a class="reference external" href="https://www.360erp.com">360ERP</a>:<ul>
+<li>Andrea Stirpe</li>
+</ul>
+</li>
 </ul>
 </div>
 <div class="section" id="maintainers">

mrp_lot_number_propagation/tests/common.py

@@ -80,7 +80,7 @@ def _update_stock_component_qty(cls, order=None, bom=None, location=None):
                     "company_id": line.company_id.id,
                     "name": lot_name,
                 }
-                lot = cls.env["stock.production.lot"].create(vals)
+                lot = cls.env["stock.lot"].create(vals)
             cls._update_qty_in_location(
                 location,
                 line.product_id,

mrp_lot_number_propagation/tests/test_mrp_production.py

@@ -34,7 +34,7 @@ def _create_order(cls, product, bom):
 
     def _set_qty_done(self, order):
         for line in order.move_raw_ids.move_line_ids:
-            line.qty_done = line.product_uom_qty
+            line.quantity = line.product_uom_qty
         order.qty_producing = order.product_qty
 
     def test_order_propagated_lot_producing(self):
@@ -64,7 +64,7 @@ def test_order_post_inventory_lot_already_exists_but_not_used(self):
         self.assertEqual(self.order.propagated_lot_producing, self.LOT_NAME)
         # Create a lot with the same number for the finished product
         # without any stock/quants (so not used at all) before validating the MO
-        existing_lot = self.env["stock.production.lot"].create(
+        existing_lot = self.env["stock.lot"].create(
             {
                 "product_id": self.order.product_id.id,
                 "company_id": self.order.company_id.id,
@@ -82,7 +82,7 @@ def test_order_post_inventory_lot_already_exists_and_used(self):
         # Create a lot with the same number for the finished product
         # with some stock/quants (so it is considered as used) before
         # validating the MO
-        existing_lot = self.env["stock.production.lot"].create(
+        existing_lot = self.env["stock.lot"].create(
             {
                 "product_id": self.order.product_id.id,
                 "company_id": self.order.company_id.id,

mrp_lot_number_propagation/views/mrp_bom.xml

@@ -12,14 +12,14 @@
         <field name="display_lot_number_propagation" invisible="1" />
         <field
                     name="lot_number_propagation"
-                    attrs="{'invisible': [('display_lot_number_propagation', '=', False)]}"
+                    invisible="not display_lot_number_propagation"
                 />
       </field>
       <xpath expr="//field[@name='bom_line_ids']/tree" position="inside">
         <field name="display_propagate_lot_number" invisible="1" />
         <field
                     name="propagate_lot_number"
-                    attrs="{'column_invisible': ['|', ('parent.display_lot_number_propagation', '=', False), ('parent.lot_number_propagation', '=', False)]}"
+                    column_invisible="not parent.display_lot_number_propagation or not parent.lot_number_propagation"
                 />
       </xpath>
     </field>

mrp_lot_number_propagation/views/mrp_production.xml

@@ -16,7 +16,7 @@
         <field
                     name="propagated_lot_producing"
                     string="Lot/Serial Number"
-                    attrs="{'invisible': [('is_lot_number_propagated', '=', False)]}"
+                    invisible="not is_lot_number_propagated"
                 />
       </label>
     </field>