[MIG] stock_request: Migration to 19.0

Author: kirca

stock_request/README.rst

@@ -21,13 +21,13 @@ Stock Request
     :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html
     :alt: License: LGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fstock--logistics--request-lightgray.png?logo=github
-    :target: https://github.com/OCA/stock-logistics-request/tree/18.0/stock_request
+    :target: https://github.com/OCA/stock-logistics-request/tree/19.0/stock_request
     :alt: OCA/stock-logistics-request
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/stock-logistics-request-18-0/stock-logistics-request-18-0-stock_request
+    :target: https://translation.odoo-community.org/projects/stock-logistics-request-19-0/stock-logistics-request-19-0-stock_request
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
-    :target: https://runboat.odoo-community.org/builds?repo=OCA/stock-logistics-request&target_branch=18.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/stock-logistics-request&target_branch=19.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
@@ -96,7 +96,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/stock-logistics-request/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/stock-logistics-request/issues/new?body=module:%20stock_request%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/stock-logistics-request/issues/new?body=module:%20stock_request%0Aversion:%2019.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -151,6 +151,6 @@ Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-LoisRForgeFlow| |maintainer-etobella| 
 
-This module is part of the `OCA/stock-logistics-request <https://github.com/OCA/stock-logistics-request/tree/18.0/stock_request>`_ project on GitHub.
+This module is part of the `OCA/stock-logistics-request <https://github.com/OCA/stock-logistics-request/tree/19.0/stock_request>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

stock_request/__manifest__.py

@@ -4,7 +4,7 @@
 {
     "name": "Stock Request",
     "summary": "Internal request for stock",
-    "version": "18.0.1.1.3",
+    "version": "19.0.1.0.0",
     "license": "LGPL-3",
     "website": "https://github.com/OCA/stock-logistics-request",
     "author": "ForgeFlow, Odoo Community Association (OCA)",

stock_request/models/__init__.py

@@ -1,4 +1,3 @@
-from . import procurement_group
 from . import stock_request_abstract
 from . import stock_request
 from . import stock_request_allocation

stock_request/models/procurement_group.py

@@ -103,13 +103,13 @@ def _get_expected_date():
     product_id = fields.Many2one()
     product_uom_id = fields.Many2one()
     product_uom_qty = fields.Float()
-    procurement_group_id = fields.Many2one()
+    reference_ids = fields.Many2many()
     company_id = fields.Many2one()
     route_id = fields.Many2one()
 
-    _sql_constraints = [
-        ("name_uniq", "unique(name, company_id)", "Stock Request name must be unique")
-    ]
+    _name_uniq = models.Constraint(
+        "unique(name, company_id)", "Stock Request name must be unique"
+    )
 
     @api.constrains("state", "product_qty")
     def _check_qty(self):
@@ -221,15 +221,14 @@ def check_order_location(self):
             ):
                 raise ValidationError(_("Location must be equal to the order"))
 
-    @api.constrains("order_id", "procurement_group_id")
-    def check_order_procurement_group(self):
+    @api.constrains("order_id", "reference_ids")
+    def check_order_reference_ids(self):
         for stock_request in self:
             if (
                 stock_request.order_id
-                and stock_request.order_id.procurement_group_id
-                != stock_request.procurement_group_id
+                and stock_request.order_id.reference_ids != stock_request.reference_ids
             ):
-                raise ValidationError(_("Procurement group must be equal to the order"))
+                raise ValidationError(_("References must be equal to the order"))
 
     @api.constrains("order_id", "company_id")
     def check_order_company(self):
@@ -318,7 +317,7 @@ def _check_cancel_allocation(self):
             and float_compare(self.qty_cancelled, 0, precision_digits=precision) > 0
         )
 
-    def _prepare_procurement_values(self, group_id=False):
+    def _prepare_procurement_values(self, reference_ids=False):
         """Prepare specific key for moves or other components that
         will be created from a procurement rule
         coming from a stock request. This method could be override
@@ -329,7 +328,9 @@ def _prepare_procurement_values(self, group_id=False):
             "date_planned": self.expected_date,
             "warehouse_id": self.warehouse_id,
             "stock_request_allocation_ids": self.id,
-            "group_id": group_id or self.procurement_group_id.id or False,
+            "reference_ids": reference_ids
+            or self.reference_ids
+            or self.env["stock.reference"],
             "route_ids": self.route_id,
             "stock_request_id": self.id,
         }
@@ -339,7 +340,6 @@ def _skip_procurement(self):
 
     def _prepare_stock_move(self, qty):
         return {
-            "name": self.product_id.display_name,
             "company_id": self.company_id.id,
             "product_id": self.product_id.id,
             "product_uom_qty": qty,
@@ -380,9 +380,9 @@ def _action_use_stock_available(self):
 
     def _action_launch_procurement_rule(self):
         """
-        Launch procurement group (if not enough stock is available) run method
+        Launch stock rule (if not enough stock is available) run method
         with required/custom fields genrated by a
-        stock request. procurement group will launch '_run_move',
+        stock request. stock rule will launch '_run_move',
         '_run_buy' or '_run_manufacture'
         depending on the stock request product rule.
         """
@@ -416,12 +416,12 @@ def _action_launch_procurement_rule(self):
                     continue
 
             values = request._prepare_procurement_values(
-                group_id=request.procurement_group_id
+                reference_ids=request.reference_ids
             )
             try:
                 procurements = []
                 procurements.append(
-                    self.env["procurement.group"].Procurement(
+                    self.env["stock.rule"].Procurement(
                         request.product_id,
                         request.product_uom_qty,
                         request.product_uom_id,
@@ -432,7 +432,7 @@ def _action_launch_procurement_rule(self):
                         values,
                     )
                 )
-                self.env["procurement.group"].run(procurements)
+                self.env["stock.rule"].run(procurements)
             except UserError as error:
                 errors.append(str(error))
         if errors:

stock_request/models/stock_request.py

@@ -63,13 +63,15 @@ def _compute_product_qty(self):
     allow_virtual_location = fields.Boolean(
         related="company_id.stock_request_allow_virtual_loc", readonly=True
     )
-    allowed_uom_categ_id = fields.Many2one(related="product_id.uom_id.category_id")
+    allowed_uom_ids = fields.Many2many(
+        comodel_name="uom.uom", compute="_compute_allowed_uom_ids"
+    )
     product_uom_id = fields.Many2one(
         comodel_name="uom.uom",
         string="Product Unit of Measure",
-        domain="[('category_id', '=?', allowed_uom_categ_id)]",
+        domain="[('id', 'in', allowed_uom_ids)]",
         required=True,
-        default=lambda self: self._context.get("product_uom_id", False),
+        default=lambda self: self.env.context.get("product_uom_id", False),
     )
     product_uom_qty = fields.Float(
         "Quantity",
@@ -85,11 +87,11 @@ def _compute_product_qty(self):
         digits="Product Unit of Measure",
         help="Quantity in the default UoM of the product",
     )
-    procurement_group_id = fields.Many2one(
-        "procurement.group",
-        "Procurement Group",
-        help="Moves created through this stock request will be put in this "
-        "procurement group. If none is given, the moves generated by "
+    reference_ids = fields.Many2many(
+        "stock.reference",
+        "References",
+        help="Moves created through this stock request will be grouped using "
+        "these references. If none are given, the moves generated by "
         "procurement rules will be grouped into one big picking.",
     )
     company_id = fields.Many2one(
@@ -109,9 +111,14 @@ def _compute_product_qty(self):
         readonly=True,
     )
 
-    _sql_constraints = [
-        ("name_uniq", "unique(name, company_id)", "Name must be unique")
-    ]
+    _name_uniq = models.Constraint("unique(name, company_id)", "Name must be unique")
+
+    @api.depends("product_id", "product_id.uom_id", "product_id.uom_ids")
+    def _compute_allowed_uom_ids(self):
+        for record in self:
+            record.allowed_uom_ids = (
+                record.product_id.uom_id | record.product_id.uom_ids
+            )
 
     @api.depends("product_id", "warehouse_id", "location_id")
     def _compute_route_ids(self):
@@ -190,7 +197,12 @@ def _check_product_uom(self):
         """Check if the UoM has the same category as the
         product standard UoM"""
         if any(
-            request.product_id.uom_id.category_id != request.product_uom_id.category_id
+            request.product_id.uom_id
+            not in (
+                request.product_uom_id
+                | request.product_uom_id.relative_uom_id
+                | request.product_uom_id.relative_uom_id.related_uom_ids
+            )
             for request in self
         ):
             raise ValidationError(

stock_request/models/stock_request_abstract.py

@@ -1,7 +1,7 @@
 # Copyright 2018 Creu Blanca
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
 
-from odoo import _, api, fields, models
+from odoo import Command, _, api, fields, models
 from odoo.exceptions import UserError, ValidationError
 
 
@@ -76,11 +76,14 @@ def _get_default_requested_by(self):
     allow_virtual_location = fields.Boolean(
         related="company_id.stock_request_allow_virtual_loc", readonly=True
     )
-    procurement_group_id = fields.Many2one(
-        "procurement.group",
-        "Procurement Group",
-        help="Moves created through this stock request will be put in this "
-        "procurement group. If none is given, the moves generated by "
+    reference_ids = fields.Many2many(
+        comodel_name="stock.reference",
+        relation="stock_request_order_stock_reference_rel",
+        column1="stock_request_order_id",
+        column2="stock_reference_id",
+        string="References",
+        help="Moves created through this stock request will be grouped using "
+        "these references. If none are given, the moves generated by "
         "procurement rules will be grouped into one big picking.",
     )
     company_id = fields.Many2one(
@@ -143,9 +146,9 @@ def _get_default_requested_by(self):
         help="The route related to a stock request order",
     )
 
-    _sql_constraints = [
-        ("name_uniq", "unique(name, company_id)", "Stock Request name must be unique")
-    ]
+    _name_uniq = models.Constraint(
+        "unique(name, company_id)", "Stock Request name must be unique"
+    )
 
     @api.depends("warehouse_id", "location_id", "stock_request_ids")
     def _compute_route_ids(self):
@@ -271,8 +274,8 @@ def onchange_warehouse_id(self):
                 self.with_context(no_change_childs=True).onchange_company_id()
         self.change_childs()
 
-    @api.onchange("procurement_group_id")
-    def onchange_procurement_group_id(self):
+    @api.onchange("reference_ids")
+    def onchange_reference_ids(self):
         self.change_childs()
 
     @api.onchange("company_id")
@@ -287,15 +290,15 @@ def onchange_company_id(self):
         self.change_childs()
 
     def change_childs(self):
-        if not self._context.get("no_change_childs", False):
+        if not self.env.context.get("no_change_childs", False):
             for line in self.stock_request_ids:
                 line.warehouse_id = self.warehouse_id
                 line.location_id = self.location_id
                 line.company_id = self.company_id
                 line.picking_policy = self.picking_policy
                 line.expected_date = self.expected_date
                 line.requested_by = self.requested_by
-                line.procurement_group_id = self.procurement_group_id
+                line.reference_ids = [Command.set(self.reference_ids.ids)]
 
     def action_confirm(self):
         if not self.stock_request_ids:

stock_request/models/stock_request_order.py

@@ -1,7 +1,7 @@
 # Copyright 2017-2020 ForgeFlow, S.L.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
 
-from odoo import models
+from odoo import api, models
 
 
 class StockRule(models.Model):
@@ -40,3 +40,24 @@ def _get_stock_move_values(
                 )
             ]
         return result
+
+    @api.model
+    def run(self, procurements, raise_user_error=True):
+        indexes_to_pop = []
+        new_procs = []
+        for i, procurement in enumerate(procurements):
+            if "stock_request_id" in procurement.values and procurement.values.get(
+                "stock_request_id"
+            ):
+                req = self.env["stock.request"].browse(
+                    procurement.values.get("stock_request_id")
+                )
+                if req.order_id:
+                    new_procs.append(procurement._replace(origin=req.order_id.name))
+                    indexes_to_pop.append(i)
+        if new_procs:
+            indexes_to_pop.reverse()
+            for index in indexes_to_pop:
+                procurements.pop(index)
+            procurements.extend(new_procs)
+        return super().run(procurements, raise_user_error=raise_user_error)

stock_request/models/stock_rule.py

@@ -1,30 +1,33 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <record model="ir.module.category" id="module_category_stock_request">
+    <record model="res.groups.privilege" id="res_groups_privilege_stock_request">
         <field name="name">Stock Request</field>
-        <field name="parent_id" ref="base.module_category_inventory" />
-        <field name="sequence">10</field>
+        <field name="category_id" ref="base.module_category_supply_chain" />
+    </record>
+    <record model="res.groups.privilege" id="res_groups_privilege_stock_request_order">
+        <field name="name">Stock Request Orders</field>
+        <field name="category_id" ref="base.module_category_hidden" />
     </record>
     <record id="group_stock_request_user" model="res.groups">
         <field name="name">Stock Request User</field>
         <field name="implied_ids" eval="[(4, ref('base.group_user'))]" />
-        <field name="category_id" ref="module_category_stock_request" />
+        <field name="privilege_id" ref="res_groups_privilege_stock_request" />
     </record>
     <record id="group_stock_request_manager" model="res.groups">
         <field name="name">Stock Request Manager</field>
         <field
-            name="users"
+            name="user_ids"
             eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"
         />
         <field
             name="implied_ids"
             eval="[(4, ref('stock_request.group_stock_request_user')),(4, ref('stock.group_stock_user'))]"
         />
-        <field name="category_id" ref="module_category_stock_request" />
+        <field name="privilege_id" ref="res_groups_privilege_stock_request" />
     </record>
     <record id="group_stock_request_order" model="res.groups">
         <field name="name">Stock Request Order</field>
-        <field name="category_id" ref="base.module_category_hidden" />
+        <field name="privilege_id" ref="res_groups_privilege_stock_request_order" />
     </record>
     <data noupdate="1">
         <record model="ir.rule" id="stock_picking_rule">