From 764f12e89dc1f83fbe27212aed0faedeb5a19bca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?=
 <victor.martinez@tecnativa.com>
Date: Mon, 26 Feb 2024 11:18:03 +0100
Subject: [PATCH] [MIG] stock_request: Migration to 16.0

TT45771
---
 stock_request/i18n/de.po                      |  48 ------
 stock_request/i18n/es.po                      |   3 -
 stock_request/i18n/zh_CN.po                   |  48 ------
 stock_request/models/stock_request.py         |   5 +-
 .../security/stock_request_security.xml       |   6 +-
 stock_request/tests/test_stock_request.py     | 154 +++++++-----------
 .../views/stock_request_order_views.xml       |  18 +-
 stock_request/views/stock_request_views.xml   |   9 +-
 8 files changed, 69 insertions(+), 222 deletions(-)

diff --git a/stock_request/i18n/de.po b/stock_request/i18n/de.po
index 5279ea2b..f7be2295 100644
--- a/stock_request/i18n/de.po
+++ b/stock_request/i18n/de.po
@@ -1163,51 +1163,3 @@ msgid ""
 msgstr ""
 "Sie müssen eine Produktmengeneinheit aus der gleichen Kategorie, wie die "
 "Basismengeneinheit des Produkts, verwenden"
-
-#, fuzzy
-#~ msgid "SMS Delivery error"
-#~ msgstr "Meldungszustellfehler"
-
-#, fuzzy
-#~ msgid "Stock request"
-#~ msgstr "Bestandsanforderung"
-
-#, python-format
-#~ msgid "<li><b>%s</b>: Transferred quantity %s %s</li>"
-#~ msgstr "<li><b>%s</b>: Umgelagerte Menge %s %s</li>"
-
-#~ msgid "Followers (Channels)"
-#~ msgstr "Follower (Kanäle)"
-
-#, python-format
-#~ msgid "Receipt confirmation %s for your Request %s"
-#~ msgstr "Bestätigungsbeleg %s zu Ihrer Anforderung %s"
-
-#~ msgid "Requested by"
-#~ msgstr "Angefordert durch"
-
-#, python-format
-#~ msgid ""
-#~ "The following requested items from Stock Request %s have now been "
-#~ "received in %s using Picking %s:"
-#~ msgstr ""
-#~ "Die folgenden Posten aus Anforderung %s sind nun eingegangen in %s unter "
-#~ "Kommissionierung %s:"
-
-#~ msgid "Archived"
-#~ msgstr "Archiviert"
-
-#~ msgid "If checked new messages require your attention."
-#~ msgstr "Wenn angehakt, erfordern Meldungen Ihre Aufmerksamkeit."
-
-#~ msgid "Overdue"
-#~ msgstr "Überfällig"
-
-#~ msgid "Planned"
-#~ msgstr "Geplant"
-
-#~ msgid "Packing Operation"
-#~ msgstr "Packvorgang"
-
-#~ msgid "Procurement Rule"
-#~ msgstr "Beschaffungsregel"
diff --git a/stock_request/i18n/es.po b/stock_request/i18n/es.po
index ca33c7ef..277e1b68 100644
--- a/stock_request/i18n/es.po
+++ b/stock_request/i18n/es.po
@@ -1176,6 +1176,3 @@ msgid ""
 msgstr ""
 "Debe seleccionada una unidad de medida de producto de la misma categoría que "
 "la unidad de medida por defecto del producto"
-
-#~ msgid "SMS Delivery error"
-#~ msgstr "Error de entrega de SMS"
diff --git a/stock_request/i18n/zh_CN.po b/stock_request/i18n/zh_CN.po
index a1e67057..4a3102b8 100644
--- a/stock_request/i18n/zh_CN.po
+++ b/stock_request/i18n/zh_CN.po
@@ -1148,51 +1148,3 @@ msgid ""
 "You have to select a product unit of measure in the same category than the "
 "default unit of measure of the product"
 msgstr "您必须选择与产品默认计量单位相同类别的产品计量单位"
-
-#, fuzzy
-#~ msgid "SMS Delivery error"
-#~ msgstr "消息递送错误"
-
-#~ msgid "Stock request"
-#~ msgstr "库存请求"
-
-#, python-format
-#~ msgid "<li><b>%s</b>: Transferred quantity %s %s</li>"
-#~ msgstr "<li><b>%s</b>: 调拨数量%s %s</li>"
-
-#~ msgid "Followers (Channels)"
-#~ msgstr "关注者(频道)"
-
-#, python-format
-#~ msgid "Receipt confirmation %s for your Request %s"
-#~ msgstr "您的请求%s的收据确认%s"
-
-#~ msgid "Requested by"
-#~ msgstr "请求者"
-
-#, python-format
-#~ msgid ""
-#~ "The following requested items from Stock Request %s have now been "
-#~ "received in %s using Picking %s:"
-#~ msgstr "从库存请求%s中请求的下列项目现在已在使用领料%s的%s中收到："
-
-#, python-format
-#~ msgid ""
-#~ "Unfortunately it seems you do not have the necessary rights for creating "
-#~ "stock requests. Please contact your administrator."
-#~ msgstr "不幸的是，您似乎没有创建库存请求的必要权限。请与管理员联系。"
-
-#~ msgid "Archived"
-#~ msgstr "已归档"
-
-#~ msgid "If checked new messages require your attention."
-#~ msgstr ".如果勾选此项，将会收到新消息提醒。"
-
-#~ msgid "Overdue"
-#~ msgstr "逾期"
-
-#~ msgid "Planned"
-#~ msgstr "计划"
-
-#~ msgid "Today"
-#~ msgstr "今天"
diff --git a/stock_request/models/stock_request.py b/stock_request/models/stock_request.py
index e7cfd366..eeadff9b 100644
--- a/stock_request/models/stock_request.py
+++ b/stock_request/models/stock_request.py
@@ -283,7 +283,6 @@ def _check_cancel_allocation(self):
         )
 
     def _prepare_procurement_values(self, group_id=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
@@ -423,8 +422,8 @@ def create(self, vals_list):
             if upd_vals.get("name", "/") == "/":
                 upd_vals["name"] = self.env["ir.sequence"].next_by_code("stock.request")
             if "order_id" in upd_vals:
-                order_id = self.env["stock.request.order"].browse(upd_vals["order_id"])
-                upd_vals["expected_date"] = order_id.expected_date
+                order = self.env["stock.request.order"].browse(upd_vals["order_id"])
+                upd_vals["expected_date"] = order.expected_date
             else:
                 upd_vals["expected_date"] = self._get_expected_date()
             vals_list_upd.append(upd_vals)
diff --git a/stock_request/security/stock_request_security.xml b/stock_request/security/stock_request_security.xml
index 74de3d9b..d49eb957 100644
--- a/stock_request/security/stock_request_security.xml
+++ b/stock_request/security/stock_request_security.xml
@@ -29,11 +29,7 @@
     <data noupdate="1">
         <record model="ir.rule" id="stock_picking_rule">
             <field name="name">stock_request multi-company</field>
-            <field
-                name="model_id"
-                search="[('model','=','stock.request')]"
-                model="ir.model"
-            />
+            <field name="model_id" ref="model_stock_request" />
             <field name="global" eval="True" />
             <field
                 name="domain_force"
diff --git a/stock_request/tests/test_stock_request.py b/stock_request/tests/test_stock_request.py
index 4601346a..743fc8fd 100644
--- a/stock_request/tests/test_stock_request.py
+++ b/stock_request/tests/test_stock_request.py
@@ -1,14 +1,15 @@
 # Copyright 2017 ForgeFlow S.L.
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0).
-
 from collections import Counter
 from datetime import datetime
 
 from odoo import exceptions, fields
-from odoo.tests import common
+from odoo.tests import new_test_user
+
+from odoo.addons.base.tests.common import BaseCommon
 
 
-class TestStockRequest(common.TransactionCase):
+class TestStockRequest(BaseCommon):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
@@ -21,9 +22,6 @@ def setUpClass(cls):
         cls.stock_request_user_group = cls.env.ref(
             "stock_request.group_stock_request_user"
         )
-        cls.stock_request_manager_group = cls.env.ref(
-            "stock_request.group_stock_request_manager"
-        )
         cls.main_company = cls.env.ref("base.main_company")
         cls.warehouse = cls.env.ref("stock.warehouse0")
         cls.categ_unit = cls.env.ref("uom.product_uom_categ_unit")
@@ -38,59 +36,40 @@ def setUpClass(cls):
             .with_context(company_id=cls.company_2.id)
             .create({"name": "Peñiscola"})
         )
+        cls.wh = cls.env["stock.warehouse"].search(
+            [("company_id", "=", cls.main_company.id)], limit=1
+        )
         cls.wh2 = cls.env["stock.warehouse"].search(
             [("company_id", "=", cls.company_2.id)], limit=1
         )
-        cls.stock_request_user = cls._create_user(
-            "stock_request_user",
-            [cls.stock_request_user_group.id],
-            [cls.main_company.id, cls.company_2.id],
+        cls.stock_request_user = new_test_user(
+            cls.env,
+            login="stock_request_user",
+            groups="stock_request.group_stock_request_user",
+            company_ids=[(4, cls.main_company.id), (4, cls.company_2.id)],
         )
-        cls.stock_request_manager = cls._create_user(
-            "stock_request_manager",
-            [cls.stock_request_manager_group.id],
-            [cls.main_company.id, cls.company_2.id],
+        cls.stock_request_manager = new_test_user(
+            cls.env,
+            login="stock_request_manager",
+            groups="stock_request.group_stock_request_manager",
+            company_ids=[(4, cls.main_company.id), (4, cls.company_2.id)],
         )
         cls.product = cls._create_product("SH", "Shoes", False)
         cls.product_company_2 = cls._create_product("SH_2", "Shoes", cls.company_2.id)
 
-        cls.ressuply_loc = cls.env["stock.location"].create(
-            {
-                "name": "Ressuply",
-                "location_id": cls.warehouse.view_location_id.id,
-                "usage": "internal",
-                "company_id": cls.main_company.id,
-            }
+        cls.ressuply_loc = cls._create_location(
+            name="Ressuply",
+            location_id=cls.warehouse.view_location_id.id,
+            company_id=cls.main_company.id,
         )
-
-        cls.ressuply_loc_2 = cls.env["stock.location"].create(
-            {
-                "name": "Ressuply",
-                "location_id": cls.wh2.view_location_id.id,
-                "usage": "internal",
-                "company_id": cls.company_2.id,
-            }
-        )
-
-        cls.route = cls.env["stock.route"].create(
-            {
-                "name": "Transfer",
-                "product_categ_selectable": False,
-                "product_selectable": True,
-                "company_id": cls.main_company.id,
-                "sequence": 10,
-            }
+        cls.ressuply_loc_2 = cls._create_location(
+            name="Ressuply",
+            location_id=cls.wh2.view_location_id.id,
+            company_id=cls.company_2.id,
         )
 
-        cls.route_2 = cls.env["stock.route"].create(
-            {
-                "name": "Transfer",
-                "product_categ_selectable": False,
-                "product_selectable": True,
-                "company_id": cls.company_2.id,
-                "sequence": 10,
-            }
-        )
+        cls.route = cls._create_route(name="Transfer", company_id=cls.main_company.id)
+        cls.route_2 = cls._create_route(name="Transfer", company_id=cls.company_2.id)
 
         cls.uom_dozen = cls.env["uom.uom"].create(
             {
@@ -134,23 +113,6 @@ def setUpClass(cls):
             "stock.no_auto_scheduler", "True"
         )
 
-    @classmethod
-    def _create_user(cls, name, group_ids, company_ids):
-        return (
-            cls.env["res.users"]
-            .with_context(no_reset_password=True)
-            .create(
-                {
-                    "name": name,
-                    "password": "demo",
-                    "login": name,
-                    "email": "@".join([name, "test.com"]),
-                    "groups_id": [(6, 0, group_ids)],
-                    "company_ids": [(6, 0, company_ids)],
-                }
-            )
-        )
-
     @classmethod
     def _create_product(cls, default_code, name, company_id, **vals):
         return cls.env["product.product"].create(
@@ -186,12 +148,23 @@ def _create_product_attribute_value(cls, name, attribute):
     def _create_product_attribute(cls, name):
         return cls.env["product.attribute"].create({"name": name})
 
+    @classmethod
+    def _create_location(cls, **vals):
+        return cls.env["stock.location"].create(dict(usage="internal", **vals))
 
-class TestStockRequestBase(TestStockRequest):
     @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
+    def _create_route(cls, **vals):
+        return cls.env["stock.route"].create(
+            dict(
+                product_categ_selectable=False,
+                product_selectable=True,
+                sequence=10,
+                **vals
+            )
+        )
+
 
+class TestStockRequestBase(TestStockRequest):
     def _create_stock_quant(self, product, location, qty):
         self.env["stock.quant"].create(
             {"product_id": product.id, "location_id": location.id, "quantity": qty}
@@ -203,30 +176,17 @@ def test_defaults(self):
             "product_uom_id": self.product.uom_id.id,
             "product_uom_qty": 5.0,
         }
-        stock_request = (
-            self.stock_request.with_user(self.stock_request_user)
-            .with_context(company_id=self.main_company.id)
-            .create(vals)
-        )
-
+        request_model = self.stock_request.with_user(self.stock_request_user)
+        stock_request = request_model.with_company(self.main_company).create(vals)
         self.assertEqual(stock_request.requested_by, self.stock_request_user)
-
         self.assertEqual(stock_request.warehouse_id, self.warehouse)
-
         self.assertEqual(stock_request.location_id, self.warehouse.lot_stock_id)
 
     def test_defaults_order(self):
-        vals = {}
-        order = (
-            self.request_order.with_user(self.stock_request_user)
-            .with_context(company_id=self.main_company.id)
-            .create(vals)
-        )
-
+        request_model = self.request_order.with_user(self.stock_request_user)
+        order = request_model.with_company(self.main_company).create({})
         self.assertEqual(order.requested_by, self.stock_request_user)
-
         self.assertEqual(order.warehouse_id, self.warehouse)
-
         self.assertEqual(order.location_id, self.warehouse.lot_stock_id)
 
     def test_onchanges_order(self):
@@ -252,10 +212,9 @@ def test_onchanges_order(self):
                 )
             ],
         }
-        order = self.request_order.with_user(self.stock_request_user).create(vals)
+        order = self.request_order.with_user(self.stock_request_user).new(vals)
         self.stock_request_user.company_id = self.company_2
         order.company_id = self.company_2
-
         order.onchange_company_id()
 
         stock_request = order.stock_request_ids
@@ -294,13 +253,9 @@ def test_onchanges(self):
             "product_id": self.product.id,
             "product_uom_id": self.product.uom_id.id,
             "product_uom_qty": 5.0,
-            "company_id": self.wh2.company_id.id,
-            "warehouse_id": self.wh2.id,
-            "location_id": self.wh2.lot_stock_id.id,
+            "company_id": self.main_company.id,
         }
-        stock_request = self.stock_request.with_user(self.stock_request_user).create(
-            vals
-        )
+        stock_request = self.stock_request.with_user(self.stock_request_user).new(vals)
         stock_request.product_id = self.product
         vals = stock_request.default_get(["warehouse_id", "company_id"])
         stock_request.update(vals)
@@ -335,7 +290,7 @@ def test_onchanges(self):
         # Test onchange_warehouse_id
         wh2_2 = (
             self.env["stock.warehouse"]
-            .with_context(company_id=self.company_2.id)
+            .with_company(self.company_2)
             .create(
                 {
                     "name": "C2_2",
@@ -808,14 +763,15 @@ def test_create_request_03(self):
             "warehouse_id": self.warehouse.id,
             "location_id": self.warehouse.lot_stock_id.id,
         }
-
         stock_request_1 = (
-            self.env["stock.request"].with_user(self.stock_request_user).create(vals)
+            self.env["stock.request"]
+            .with_user(self.stock_request_user)
+            .create(vals.copy())
         )
         stock_request_2 = (
             self.env["stock.request"]
             .with_user(self.stock_request_manager.id)
-            .create(vals)
+            .create(vals.copy())
         )
         stock_request_2.product_uom_qty = 6.0
         self.product.route_ids = [(6, 0, self.route.ids)]
@@ -947,10 +903,10 @@ def test_view_actions(self):
             ],
         }
 
-        order = self.request_order.create(vals)
+        order = self.request_order.with_user(self.stock_request_manager).create(vals)
         self.product.route_ids = [(6, 0, self.route.ids)]
 
-        order.with_user(self.stock_request_manager).action_confirm()
+        order.action_confirm()
         stock_request = order.stock_request_ids
         self.assertTrue(stock_request.picking_ids)
         self.assertTrue(order.picking_ids)
diff --git a/stock_request/views/stock_request_order_views.xml b/stock_request/views/stock_request_order_views.xml
index 5cfe2346..0e2131d1 100644
--- a/stock_request/views/stock_request_order_views.xml
+++ b/stock_request/views/stock_request_order_views.xml
@@ -17,7 +17,7 @@
         <field name="name">stock.request.order.form</field>
         <field name="model">stock.request.order</field>
         <field name="arch" type="xml">
-            <form string="Stock request">
+            <form>
                 <field name="allow_virtual_location" invisible="1" />
                 <field name="company_id" invisible="1" />
                 <field name="warehouse_id" invisible="1" />
@@ -46,7 +46,11 @@
                 </header>
                 <sheet>
                     <div class="oe_button_box" name="button_box">
-                        <field name="picking_ids" invisible="1" />
+                        <field
+                            name="picking_ids"
+                            invisible="1"
+                            groups="stock.group_stock_user"
+                        />
                         <button
                             type="object"
                             name="action_view_transfer"
@@ -57,6 +61,7 @@
                         >
                             <field
                                 name="picking_count"
+                                groups="stock.group_stock_user"
                                 widget="statinfo"
                                 string="Transfers"
                             />
@@ -77,7 +82,7 @@
                         </button>
                     </div>
                     <div class="oe_title">
-                        <label for="name" string="Stock Request" />
+                        <label for="name" string="Stock request Order" />
                         <h1>
                             <field name="name" readonly="1" />
                         </h1>
@@ -132,12 +137,7 @@
                                         options="{'no_open': True, 'no_create': True}"
                                         groups="uom.group_uom"
                                     />
-                                    <field
-                                        name="product_uom_id"
-                                        readonly="True"
-                                        groups="!uom.group_uom"
-                                        force_save="1"
-                                    />
+                                    <field name="product_uom_id" invisible="1" />
                                     <field
                                         name="route_id"
                                         options="{'no_create': True}"
diff --git a/stock_request/views/stock_request_views.xml b/stock_request/views/stock_request_views.xml
index fcdcd220..e2339c24 100644
--- a/stock_request/views/stock_request_views.xml
+++ b/stock_request/views/stock_request_views.xml
@@ -140,7 +140,6 @@
                 </header>
                 <sheet>
                     <div class="oe_button_box" name="button_box">
-                        <field name="picking_ids" invisible="1" />
                         <button
                             type="object"
                             name="action_view_transfer"
@@ -151,6 +150,7 @@
                         >
                             <field
                                 name="picking_count"
+                                groups="stock.group_stock_user"
                                 widget="statinfo"
                                 string="Transfers"
                             />
@@ -212,12 +212,7 @@
                                     options="{'no_open': True, 'no_create': True}"
                                     groups="uom.group_uom"
                                 />
-                                <field
-                                    name="product_uom_id"
-                                    readonly="True"
-                                    groups="!uom.group_uom"
-                                    force_save="1"
-                                />
+                                <field name="product_uom_id" invisible="1" />
                             </div>
                             <field
                                 name="qty_in_progress"