[MIG] stock_intercompany: Migration to 17.0

Author: BhaveshHeliconia

stock_intercompany/README.rst

@@ -79,6 +79,9 @@ Contributors
 - Alexandre Fayolle <alexandre.fayolle@camptocamp.com>
 - Yannick Vaucher <yannick.vaucher@camptocamp.com>
 - Italo Lopes <italo.lopes@camptocamp.com>
+- `Heliconia Solutions Pvt. Ltd. <https://www.heliconia.io>`__
+
+  - Bhavesh Heliconia
 
 Maintainers
 -----------

stock_intercompany/__manifest__.py

@@ -4,7 +4,7 @@
 {
     "name": "Stock Intercompany Delivery-Reception",
     "Summary": "Module that adds possibility for intercompany Delivery-Reception",
-    "version": "16.0.1.0.2",
+    "version": "17.0.1.0.0",
     "author": "Camptocamp, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/multi-company",
     "category": "Warehouse Management",

stock_intercompany/models/stock_picking.py

@@ -1,4 +1,4 @@
-from odoo import fields, models
+from odoo import Command, fields, models
 
 
 class StockPicking(models.Model):
@@ -12,71 +12,92 @@ def _create_counterpart_picking(self):
         picking = self.env["stock.picking"]
         if self.partner_id in partners:
             company = partners[self.partner_id]
+            # Switch to target company context before creating picking
+            picking = self.env["stock.picking"].sudo().with_company(company)
             vals = self._get_counterpart_picking_vals(company)
-            new_picking_vals = self.sudo().copy_data(default=vals)
-            picking = (
-                self.env["stock.picking"]
-                .sudo()
-                .with_company(company)
-                .create(new_picking_vals)
-            )
+            # Create picking in correct company context
+            picking = picking.create(vals)
+            # Confirm picking in the same company context
             picking.action_confirm()
         return picking
 
     def _get_counterpart_picking_vals(self, company):
-        if company.intercompany_in_type_id.warehouse_id:
-            warehouse = company.intercompany_in_type_id.warehouse_id
-        else:
-            warehouse = (
-                self.env["stock.warehouse"]
-                .sudo()
-                .search([("company_id", "=", company.id)], limit=1)
-            )
-        ptype = company.intercompany_in_type_id or warehouse.in_type_id
-        move_ids, move_line_ids = self._check_company_consistency(company)
+        # Get warehouse and picking type in correct company context
+        warehouse = False
+        with_company = self.env["stock.warehouse"].sudo().with_company(company)
+        ptype = False
+
+        if company.intercompany_in_type_id:
+            ptype = company.intercompany_in_type_id
+            if ptype.warehouse_id:
+                warehouse = ptype.warehouse_id
+
+        if not warehouse:
+            warehouse = with_company.search([("company_id", "=", company.id)], limit=1)
+
+        if not ptype:
+            ptype = warehouse.in_type_id
+
+        # Ensure locations belong to correct company
+        location_dest = ptype.default_location_dest_id or warehouse.lot_stock_id
+        supplier_location = self.env.ref("stock.stock_location_suppliers")
+
+        move_ids, move_line_ids = self._check_company_consistency(company, ptype)
+
         return {
             "partner_id": self.env.user.company_id.partner_id.id,
             "company_id": company.id,
             "origin": self.name,
             "picking_type_id": ptype.id,
             "state": "draft",
-            "location_id": self.env.ref("stock.stock_location_suppliers").id,
-            "location_dest_id": ptype.default_location_dest_id.id
-            or warehouse.lot_stock_id.id,
+            "location_id": supplier_location.id,
+            "location_dest_id": location_dest.id,
             "counterpart_of_picking_id": self.id,
             "move_ids": move_ids,
             "move_line_ids": move_line_ids,
+            "scheduled_date": self.scheduled_date,
+            "priority": self.priority,
         }
 
-    def _check_company_consistency(self, company):
-        # Replace company_id by the right one to create the counterpart picking
+    def _check_company_consistency(self, company, picking_type):
+        # Ensure supplier location has no company set
+        supplier_location = self.env.ref("stock.stock_location_suppliers")
+        if supplier_location.company_id:
+            supplier_location.sudo().company_id = False
+
         common_vals = {
             "company_id": company.id,
-            "location_id": self.env.ref("stock.stock_location_suppliers").id,
+            "location_id": supplier_location.id,
+            "picking_type_id": picking_type.id,
         }
-        move_ids = [
-            (
-                0,
-                0,
-                sm.with_company(company).copy_data(
-                    dict(common_vals, counterpart_of_move_id=sm.id)
-                )[0],
-            )
-            for sm in self.move_ids.sudo()
-        ]
-        move_line_ids = [
-            (
-                0,
-                0,
-                ln.with_company(company).copy_data(
-                    dict(common_vals, move_id=False, counterpart_of_line_id=ln.id)
-                )[0],
-            )
-            for ln in self.move_line_ids.sudo()
-        ]
+
+        # Create moves with correct company context
+        move_ids = []
+        for sm in self.move_ids.sudo():
+            move_vals = sm.with_company(company).copy_data(
+                dict(
+                    common_vals,
+                    counterpart_of_move_id=sm.id,
+                    picking_type_id=picking_type.id,
+                )
+            )[0]
+            move_ids.append(Command.create(move_vals))
+
+        # Create move lines with correct company context
+        move_line_ids = []
+        for ln in self.move_line_ids.sudo():
+            line_vals = ln.with_company(company).copy_data(
+                dict(
+                    common_vals,
+                    move_id=False,
+                    counterpart_of_line_id=ln.id,
+                    picking_type_id=picking_type.id,
+                )
+            )[0]
+            move_line_ids.append(Command.create(line_vals))
+
         return move_ids, move_line_ids
 
-    # override of method from stock module
     def _action_done(self):
         counterparts = []
         for picking in self:

stock_intercompany/readme/CONTRIBUTORS.md

@@ -2,3 +2,5 @@
 - Alexandre Fayolle \<<alexandre.fayolle@camptocamp.com>\>
 - Yannick Vaucher \<<yannick.vaucher@camptocamp.com>\>
 - Italo Lopes \<<italo.lopes@camptocamp.com>\>
+- [Heliconia Solutions Pvt. Ltd.](https://www.heliconia.io)
+  - Bhavesh Heliconia

stock_intercompany/static/description/index.html

@@ -425,6 +425,10 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 <li>Alexandre Fayolle &lt;<a class="reference external" href="mailto:alexandre.fayolle&#64;camptocamp.com">alexandre.fayolle&#64;camptocamp.com</a>&gt;</li>
 <li>Yannick Vaucher &lt;<a class="reference external" href="mailto:yannick.vaucher&#64;camptocamp.com">yannick.vaucher&#64;camptocamp.com</a>&gt;</li>
 <li>Italo Lopes &lt;<a class="reference external" href="mailto:italo.lopes&#64;camptocamp.com">italo.lopes&#64;camptocamp.com</a>&gt;</li>
+<li><a class="reference external" href="https://www.heliconia.io">Heliconia Solutions Pvt. Ltd.</a><ul>
+<li>Bhavesh Heliconia</li>
+</ul>
+</li>
 </ul>
 </div>
 <div class="section" id="maintainers">

stock_intercompany/tests/test_intercompany_picking.py

@@ -1,75 +1,88 @@
 # Copyright 2021 Camptocamp
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
-from odoo.tests.common import RecordCapturer, TransactionCase
+from odoo import Command
+from odoo.tests.common import RecordCapturer
 
+from odoo.addons.base.tests.common import BaseCommon
 
-class TestIntercompanyDelivery(TransactionCase):
-    def setUp(self):
-        super().setUp()
-        self.user_demo = self.env["res.users"].create(
+
+class TestIntercompanyDelivery(BaseCommon):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.user_demo = cls.env["res.users"].create(
             {
                 "login": "firstnametest",
                 "name": "User Demo",
                 "email": "firstnametest@example.org",
                 "groups_id": [
-                    (4, self.env.ref("base.group_user").id),
-                    (4, self.env.ref("stock.group_stock_user").id),
+                    Command.link(cls.env.ref("base.group_user").id),
+                    Command.link(cls.env.ref("stock.group_stock_user").id),
                 ],
             }
         )
-        company_obj = self.env["res.company"]
-        # Create 2 companies and configure intercompany picking type param on them
-        self.company1 = company_obj.create({"name": "Company A"})
-        self.company2 = company_obj.create({"name": "Company B"})
-        self.picking_type_1 = (
-            self.env["stock.picking.type"]
+        company_obj = cls.env["res.company"]
+        cls.company1 = company_obj.create({"name": "Company A"})
+        cls.company2 = company_obj.create({"name": "Company B"})
+        cls.picking_type_1 = (
+            cls.env["stock.picking.type"]
             .sudo()
             .search(
                 [
-                    ("company_id", "=", self.company1.id),
+                    ("company_id", "=", cls.company1.id),
                     ("name", "=", "Delivery Orders"),
                 ],
                 limit=1,
             )
         )
-        self.picking_type_2 = (
-            self.env["stock.picking.type"]
+        cls.picking_type_2 = (
+            cls.env["stock.picking.type"]
             .sudo()
             .search(
-                [("company_id", "=", self.company2.id), ("name", "=", "Receipts")],
+                [
+                    ("company_id", "=", cls.company2.id),
+                    ("name", "=", "Receipts"),
+                ],
                 limit=1,
             )
         )
 
-        self.company1.intercompany_in_type_id = self.picking_type_1.id
-        self.company2.intercompany_in_type_id = self.picking_type_2.id
-        # assign both companies to current user
-        self.user_demo.write(
+        cls.company1.intercompany_in_type_id = cls.picking_type_1.id
+        cls.company2.intercompany_in_type_id = cls.picking_type_2.id
+        cls.user_demo.write(
             {
-                "company_id": self.company1.id,
-                "company_ids": [(4, self.company1.id), (4, self.company2.id)],
+                "company_id": cls.company1.id,
+                "company_ids": [
+                    Command.link(cls.company1.id),
+                    Command.link(cls.company2.id),
+                ],
             }
         )
-        # create storable product
-        self.product1 = self.env["product.product"].create(
+        cls.user_demo.partner_id.with_context(
+            allowed_company_ids=[cls.company1.id, cls.company2.id]
+        ).write({})
+
+        cls.product1 = cls.env["product.product"].create(
             {
                 "name": "Product A",
                 "type": "product",
-                "categ_id": self.env.ref("product.product_category_all").id,
+                "categ_id": cls.env.ref("product.product_category_all").id,
                 "qty_available": 100,
             }
         )
-        self.stock_location = (
-            self.env["stock.location"]
+        cls.stock_location = (
+            cls.env["stock.location"]
             .sudo()
-            .search([("name", "=", "Stock"), ("company_id", "=", self.company1.id)])
+            .search(
+                [("name", "=", "Stock"), ("company_id", "=", cls.company1.id)], limit=1
+            )
         )
-        self.uom_unit = self.env.ref("uom.product_uom_unit")
+        cls.uom_unit = cls.env.ref("uom.product_uom_unit")
 
     def test_picking_creation(self):
         stock_location = self.env["stock.location"].search(
-            [("usage", "=", "internal"), ("company_id", "=", self.company1.id)]
+            [("usage", "=", "internal"), ("company_id", "=", self.company1.id)], limit=1
         )
         custs_location = self.env.ref("stock.stock_location_customers")
         custs_location.company_id = False
@@ -93,7 +106,7 @@ def test_picking_creation(self):
                 "location_dest_id": custs_location.id,
                 "product_id": self.product1.id,
                 "product_uom_id": self.uom_unit.id,
-                "qty_done": 1.0,
+                "quantity": 1.0,
                 "picking_id": picking.id,
             }
         )
@@ -105,12 +118,12 @@ def test_picking_creation(self):
         self.assertEqual(len(counterpart_picking), 1)
         self.assertEqual(counterpart_picking.counterpart_of_picking_id, picking)
         self.assertEqual(len(counterpart_picking.move_ids), len(picking.move_ids))
-        for cp_move, move in zip(counterpart_picking.move_ids, picking.move_ids):
+        for cp_move, move in zip(counterpart_picking.move_ids, picking.move_ids):  # noqa: B905
             self.assertEqual(cp_move.counterpart_of_move_id, move)
         self.assertEqual(
             len(counterpart_picking.move_line_ids), len(picking.move_line_ids)
         )
-        for cp_line, line in zip(
+        for cp_line, line in zip(  # noqa: B905
             counterpart_picking.move_line_ids, picking.move_line_ids
         ):
             self.assertEqual(cp_line.counterpart_of_line_id, line)

stock_intercompany/views/res_config_settings.xml

@@ -6,23 +6,18 @@
         <field name="model">res.config.settings</field>
         <field name="inherit_id" ref="stock.res_config_settings_view_form" />
         <field name="arch" type="xml">
-            <xpath expr="//div[@name='operations_setting_container']" position="inside">
-                <div
-                    class="col-12 col-lg-6 o_setting_box"
+            <xpath
+                expr="//block[@name='operations_setting_container']"
+                position="inside"
+            >
+                <setting
                     id="intercompany_delivery_sbox"
+                    company_dependent="1"
+                    title="Values set here are company-specific."
+                    groups="base.group_multi_company"
                 >
-                    <div class="o_setting_right_pane">
-                        <label for="intercompany_in_type_id" />
-                        <span
-                            class="fa fa-lg fa-building-o"
-                            title="Values set here are company-specific."
-                            groups="base.group_multi_company"
-                        />
-                        <div class="content-group">
-                            <field name="intercompany_in_type_id" />
-                        </div>
-                    </div>
-                </div>
+                    <field name="intercompany_in_type_id" />
+                </setting>
             </xpath>
         </field>
     </record>