[MIG] stock_request_mrp: Migration to 17.0

AnaisLForgeFlow · AnaisLForgeFlow · commit 460566ba1a46 · 2024-05-24T10:10:04.000+02:00
diff --git a/stock_request_mrp/README.rst b/stock_request_mrp/README.rst
@@ -28,8 +28,8 @@ Stock Request MRP
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
 
-This module allows for users to be able to display manufacturing orders
-that have been created as a consequence of Stock Requests.
+This module allows users to be able to display Manufacturing Orders that
+have been created as a consequence of Stock Requests.
 
 **Table of contents**
 
@@ -43,6 +43,12 @@ In case that the confirmation of the Stock Request results in an
 immediate Manufacturing Order, the user will be able to display the MO's
 from the Stock Request form view.
 
+Navigate to Stock Requests and create a new stock request. Upon
+confirmation of the stock request, the system will automatically
+generate the corresponding manufacturing order. View and manage the
+generated manufacturing orders directly from the stock request record or
+through Manufacturing.
+
 Known issues / Roadmap
 ======================
 
diff --git a/stock_request_mrp/__manifest__.py b/stock_request_mrp/__manifest__.py
@@ -1,10 +1,10 @@
-# Copyright 2017-20 ForgeFlow S.L. (https://www.forgeflow.com)
+# Copyright 2017-24 ForgeFlow S.L. (https://www.forgeflow.com)
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
 
 {
     "name": "Stock Request MRP",
     "summary": "Manufacturing request for stock",
-    "version": "16.0.1.0.1",
+    "version": "17.0.1.0.0",
     "license": "LGPL-3",
     "website": "https://github.com/OCA/stock-logistics-request",
     "author": "ForgeFlow, Odoo Community Association (OCA)",
diff --git a/stock_request_mrp/hooks.py b/stock_request_mrp/hooks.py
@@ -1,4 +1,4 @@
-# Copyright 2020 ForgeFlow S.L. (https://www.forgeflow.com)
+# Copyright 2020-24 ForgeFlow S.L. (https://www.forgeflow.com)
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
 
 import logging
@@ -8,17 +8,17 @@
 logger = logging.getLogger(__name__)
 
 
-def post_init_hook(cr, registry):
+def post_init_hook(env):
     """
     The objective of this hook is to link existing MOs
     coming from a Stock Request.
     """
     logger.info("Linking existing MOs coming from a Stock Request")
-    link_existing_mos_to_stock_request(cr)
+    link_existing_mos_to_stock_request(env)
 
 
-def link_existing_mos_to_stock_request(cr):
-    env = api.Environment(cr, SUPERUSER_ID, dict())
+def link_existing_mos_to_stock_request(env):
+    env = api.Environment(env.cr, SUPERUSER_ID, dict())
     stock_request_obj = env["stock.request"]
     stock_request_order_obj = env["stock.request.order"]
     stock_request_allocation_obj = env["stock.request.allocation"]
@@ -29,7 +29,7 @@ def link_existing_mos_to_stock_request(cr):
         [("name", "in", [mo.origin for mo in mos_with_sr])]
     )
     for mo in mos_with_sr:
-        stock_request = stock_requests.filtered(lambda x: x.name == mo.origin)
+        stock_request = stock_requests.filtered(lambda x, mo=mo: x.name == mo.origin)
         if stock_request:
             # Link SR to MO
             mo.stock_request_ids = [(6, 0, stock_request.ids)]
@@ -59,13 +59,13 @@ def link_existing_mos_to_stock_request(cr):
             for ml in mo.finished_move_line_ids.filtered(
                 lambda m: m.exists() and m.move_id.allocation_ids
             ):
-                qty_done = ml.product_uom_id._compute_quantity(
-                    ml.qty_done, ml.product_id.uom_id
+                quantity = ml.product_uom_id._compute_quantity(
+                    ml.quantity, ml.product_id.uom_id
                 )
-                to_allocate_qty = ml.qty_done
+                to_allocate_qty = ml.quantity
                 for allocation in ml.move_id.allocation_ids:
                     if allocation.open_product_qty:
-                        allocated_qty = min(allocation.open_product_qty, qty_done)
+                        allocated_qty = min(allocation.open_product_qty, quantity)
                         allocation.allocated_product_qty += allocated_qty
                         to_allocate_qty -= allocated_qty
             stock_request.check_done()
diff --git a/stock_request_mrp/models/mrp_production.py b/stock_request_mrp/models/mrp_production.py
@@ -1,4 +1,4 @@
-# Copyright 2020 ForgeFlow S.L. (https://www.forgeflow.com)
+# Copyright 2020-24 ForgeFlow S.L. (https://www.forgeflow.com)
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
 
 from odoo import api, fields, models
diff --git a/stock_request_mrp/models/stock_request.py b/stock_request_mrp/models/stock_request.py
@@ -1,4 +1,4 @@
-# Copyright 2020 ForgeFlow S.L. (https://www.forgeflow.com)
+# Copyright 2020-24 ForgeFlow S.L. (https://www.forgeflow.com)
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
 
 from odoo import _, api, fields, models
diff --git a/stock_request_mrp/models/stock_request_order.py b/stock_request_mrp/models/stock_request_order.py
@@ -1,4 +1,4 @@
-# Copyright 2020 ForgeFlow S.L. (https://www.forgeflow.com)
+# Copyright 2020-24 ForgeFlow S.L. (https://www.forgeflow.com)
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
 
 from odoo import api, fields, models
diff --git a/stock_request_mrp/models/stock_rule.py b/stock_request_mrp/models/stock_rule.py
@@ -1,4 +1,4 @@
-# Copyright 2020 ForgeFlow S.L. (https://www.forgeflow.com)
+# Copyright 2020-24 ForgeFlow S.L. (https://www.forgeflow.com)
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
 from odoo import models
 
diff --git a/stock_request_mrp/readme/DESCRIPTION.md b/stock_request_mrp/readme/DESCRIPTION.md
@@ -1,2 +1,2 @@
-This module allows for users to be able to display manufacturing orders
+This module allows users to be able to display Manufacturing Orders
 that have been created as a consequence of Stock Requests.
diff --git a/stock_request_mrp/readme/USAGE.md b/stock_request_mrp/readme/USAGE.md
@@ -1,3 +1,7 @@
 In case that the confirmation of the Stock Request results in an
 immediate Manufacturing Order, the user will be able to display the MO's
 from the Stock Request form view.
+
+Navigate to Stock Requests and create a new stock request.
+Upon confirmation of the stock request, the system will automatically generate the corresponding manufacturing order.
+View and manage the generated manufacturing orders directly from the stock request record or through Manufacturing.
diff --git a/stock_request_mrp/static/description/index.html b/stock_request_mrp/static/description/index.html
@@ -369,8 +369,8 @@ <h1 class="title">Stock Request MRP</h1>
 !! source digest: sha256:f6a1ec65a0741589dfbce1eedd9b245fcc1df92be32de0e1a87d92fe14e044d2
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/stock-logistics-request/tree/17.0/stock_request_mrp"><img alt="OCA/stock-logistics-request" src="https://img.shields.io/badge/github-OCA%2Fstock--logistics--request-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/stock-logistics-request-17-0/stock-logistics-request-17-0-stock_request_mrp"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/stock-logistics-request&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
-<p>This module allows for users to be able to display manufacturing orders
-that have been created as a consequence of Stock Requests.</p>
+<p>This module allows users to be able to display Manufacturing Orders that
+have been created as a consequence of Stock Requests.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
@@ -390,6 +390,11 @@ <h1><a class="toc-backref" href="#toc-entry-1">Usage</a></h1>
 <p>In case that the confirmation of the Stock Request results in an
 immediate Manufacturing Order, the user will be able to display the MO’s
 from the Stock Request form view.</p>
+<p>Navigate to Stock Requests and create a new stock request. Upon
+confirmation of the stock request, the system will automatically
+generate the corresponding manufacturing order. View and manage the
+generated manufacturing orders directly from the stock request record or
+through Manufacturing.</p>
 </div>
 <div class="section" id="known-issues-roadmap">
 <h1><a class="toc-backref" href="#toc-entry-2">Known issues / Roadmap</a></h1>
diff --git a/stock_request_mrp/tests/test_stock_request_mrp.py b/stock_request_mrp/tests/test_stock_request_mrp.py
@@ -1,6 +1,6 @@
-# Copyright 2016-20 ForgeFlow S.L. (https://www.forgeflow.com)
-# Copyright 2022 Tecnativa - Pedro M. Baeza
-# Copyright 2022 Tecnativa - Víctor Martínez
+# Copyright 2016-24 ForgeFlow S.L. (https://www.forgeflow.com)
+# Copyright 2022-24 Tecnativa - Pedro M. Baeza
+# Copyright 2022-24 Tecnativa - Víctor Martínez
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0).
 
 from odoo import fields
@@ -14,31 +14,35 @@ class TestStockRequestMrp(TestStockRequest):
     def setUpClass(cls):
         super().setUpClass()
         cls.mrp_user_group = cls.env.ref("mrp.group_mrp_user")
-        # common data
-        cls.stock_request_user.write({"groups_id": [(4, cls.mrp_user_group.id)]})
-        cls.stock_request_manager.write({"groups_id": [(4, cls.mrp_user_group.id)]})
-        cls.route_manufacture = cls.warehouse.manufacture_pull_id.route_id
-        cls.product.write({"route_ids": [(6, 0, cls.route_manufacture.ids)]})
-        cls.raw_1 = cls._create_product("SL", "Sole", False)
-        cls._update_qty_in_location(cls, cls.warehouse.lot_stock_id, cls.raw_1, 10)
-        cls.raw_2 = cls._create_product("LC", "Lace", False)
-        cls._update_qty_in_location(cls, cls.warehouse.lot_stock_id, cls.raw_2, 10)
-
-        cls.bom = cls._create_mrp_bom(cls, cls.product, [cls.raw_1, cls.raw_2])
-
-        cls.uom_pair = cls.env["uom.uom"].create(
+
+    def setUp(self):
+        super().setUp()
+        self.stock_request_user.write({"groups_id": [(4, self.mrp_user_group.id)]})
+        self.stock_request_manager.write({"groups_id": [(4, self.mrp_user_group.id)]})
+        self.route_manufacture = self.warehouse.manufacture_pull_id.route_id
+        self.product.write({"route_ids": [(6, 0, self.route_manufacture.ids)]})
+        self.raw_1 = self._create_product("SL", "Sole", False)
+        self._update_qty_in_location(self.warehouse.lot_stock_id, self.raw_1, 10)
+        self.raw_2 = self._create_product("LC", "Lace", False)
+        self._update_qty_in_location(self.warehouse.lot_stock_id, self.raw_2, 10)
+
+        self.bom = self._create_mrp_bom(self.product, [self.raw_1, self.raw_2])
+
+        self.uom_pair = self.env["uom.uom"].create(
             {
                 "name": "Test-Pair",
-                "category_id": cls.categ_unit.id,
+                "category_id": self.categ_unit.id,
                 "factor_inv": 2,
                 "uom_type": "bigger",
                 "rounding": 0.001,
             }
         )
 
+    @classmethod
     def _update_qty_in_location(self, location, product, quantity):
         self.env["stock.quant"]._update_available_quantity(product, location, quantity)
 
+    @classmethod
     def _create_mrp_bom(self, product_id, raw_materials):
         bom = self.env["mrp.bom"].create(
             {
@@ -95,10 +99,11 @@ def test_create_request_01(self):
             manufacturing_order.company_id, order.stock_request_ids[0].company_id
         )
         res = manufacturing_order.button_mark_done()
-        wizard_model = (
-            self.env[res["res_model"]].with_context(**res["context"]).create({})
-        )
-        wizard_model.process()
+        if isinstance(res, dict):
+            wizard_model = (
+                self.env[res["res_model"]].with_context(**res["context"]).create({})
+            )
+            wizard_model.process()
         self.assertEqual(order.stock_request_ids.qty_in_progress, 0.0)
         self.assertEqual(order.stock_request_ids.qty_done, 5.0)
         order2 = order.copy()
diff --git a/stock_request_mrp/views/mrp_production_views.xml b/stock_request_mrp/views/mrp_production_views.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" ?>
-<!-- Copyright 2020 ForgeFlow S.L. (https://www.forgeflow.com)
+<!-- Copyright 2020-24 ForgeFlow S.L. (https://www.forgeflow.com)
      License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) -->
 <odoo>
     <record id="mrp_production_form_view" model="ir.ui.view">
-        <field name="name">mrp.production.form.inherit.stock.request.mrp</field>
+        <field
+            name="name"
+        >mrp.production.form.inherit.stock.request.mrp - stock_request_mrp</field>
         <field name="model">mrp.production</field>
         <field name="inherit_id" ref="mrp.mrp_production_form_view" />
         <field name="arch" type="xml">
@@ -13,7 +15,7 @@
                     name="action_view_stock_request"
                     class="oe_stat_button"
                     icon="fa-chain"
-                    attrs="{'invisible':[('stock_request_count', '=', 0)]}"
+                    invisible="stock_request_count == 0"
                     groups="stock_request.group_stock_request_user"
                 >
                     <field
diff --git a/stock_request_mrp/views/stock_request_order_views.xml b/stock_request_mrp/views/stock_request_order_views.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2020 ForgeFlow S.L. (https://www.forgeflow.com)
+<!-- Copyright 2020-24 ForgeFlow S.L. (https://www.forgeflow.com)
      License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) -->
 <odoo>
     <record id="stock_request_order_form" model="ir.ui.view">
-        <field name="name">stock.request.order.form</field>
+        <field name="name">stock.request.order.form - stock_request_mrp</field>
         <field name="model">stock.request.order</field>
         <field name="inherit_id" ref="stock_request.stock_request_order_form" />
         <field name="arch" type="xml">
@@ -18,7 +18,7 @@
                     name="action_view_mrp_production"
                     class="oe_stat_button"
                     icon="fa-wrench"
-                    attrs="{'invisible': [('production_count', '=', 0)]}"
+                    invisible="production_count == 0"
                     groups="mrp.group_mrp_user"
                 >
                     <field name="production_count" widget="statinfo" string="MOs" />
diff --git a/stock_request_mrp/views/stock_request_views.xml b/stock_request_mrp/views/stock_request_views.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2020 ForgeFlow S.L. (https://www.forgeflow.com)
+<!-- Copyright 2020-24 ForgeFlow S.L. (https://www.forgeflow.com)
      License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) -->
 <odoo>
     <record id="view_stock_request_form" model="ir.ui.view">
-        <field name="name">stock.request.form</field>
+        <field name="name">stock.request.form - stock_request_mrp</field>
         <field name="model">stock.request</field>
         <field name="inherit_id" ref="stock_request.view_stock_request_form" />
         <field name="arch" type="xml">
@@ -18,7 +18,7 @@
                     name="action_view_mrp_production"
                     class="oe_stat_button"
                     icon="fa-wrench"
-                    attrs="{'invisible': [('production_count', '=', 0)]}"
+                    invisible="production_count == 0"
                     groups="mrp.group_mrp_user"
                 >
                     <field name="production_count" widget="statinfo" string="MOs" />

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Copyright 2020 ForgeFlow S.L. (https://www.forgeflow.com)`
	`1`	`+# Copyright 2020-24 ForgeFlow S.L. (https://www.forgeflow.com)`
`2`	`2`	`# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).`
`3`	`3`
`4`	`4`	`from odoo import api, fields, models`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-This module allows for users to be able to display manufacturing orders`
	`1`	`+This module allows users to be able to display Manufacturing Orders`
`2`	`2`	`that have been created as a consequence of Stock Requests.`