[MIG] res_partner_operating_unit: Migration to 19.0

Author: yankinmax

res_partner_operating_unit/README.rst

@@ -81,6 +81,10 @@ Contributors
 
   - Cai Hoang Huynh
 
+- `Camptocamp <https://www.camptocamp.com>`__:
+
+  - Maksym Yankin <maksym.yankin@camptocamp.com>
+
 Other credits
 -------------
 

res_partner_operating_unit/__manifest__.py

@@ -3,7 +3,7 @@
 {
     "name": "Partner with Operating Unit",
     "summary": "Introduces Operating Unit fields in Partner",
-    "version": "18.0.1.1.1",
+    "version": "19.0.1.0.0",
     "author": "Edi Santoso, Niaga Solution, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/operating-unit",
     "category": "Generic",

res_partner_operating_unit/models/res_partner.py

@@ -2,6 +2,7 @@
 # Copyright (C) 2019 Serpent Consulting Services
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
 from odoo import api, fields, models
+from odoo.fields import Domain
 
 
 class ResPartner(models.Model):
@@ -10,7 +11,7 @@ class ResPartner(models.Model):
     @api.model
     def operating_unit_default_get(self, uid2=False):
         if not uid2:
-            uid2 = self._uid
+            uid2 = self.env.uid
         user = self.env["res.users"].browse(uid2)
         return user.default_operating_unit_id
 
@@ -23,34 +24,35 @@ def _default_operating_units(self):
         return self._default_operating_unit()
 
     operating_unit_ids = fields.Many2many(
-        "operating.unit",
-        "operating_unit_partner_rel",
-        "partner_id",
-        "operating_unit_id",
-        "Operating Units",
+        comodel_name="operating.unit",
+        relation="operating_unit_partner_rel",
+        column1="partner_id",
+        column2="operating_unit_id",
+        string="Operating Units",
         default=lambda self: self._default_operating_units(),
     )
 
+    @api.model
+    def _user_ous_domain(self):
+        ou_ids = self.env.user.operating_unit_ids.ids
+        domain = Domain.OR(
+            [
+                Domain("operating_unit_ids", "in", ou_ids),
+                Domain("operating_unit_ids", "=", False),
+            ]
+        )
+        return domain
+
     # Extending methods to replace a record rule.
     # Ref: https://github.com/OCA/operating-unit/issues/258
     @api.model
     def search(self, args, offset=0, limit=None, order=None):
         # Get the OUs of the user
-        ou_ids = self.env.user.operating_unit_ids.ids
-        domain = [
-            "|",
-            ("operating_unit_ids", "in", ou_ids),
-            ("operating_unit_ids", "=", False),
-        ]
+        domain = self._user_ous_domain()
         return super().search(domain + args, offset=offset, limit=limit, order=order)
 
     @api.model
     def search_count(self, args, limit=None):
         # Get the OUs of the user
-        ou_ids = self.env.user.operating_unit_ids.ids
-        domain = [
-            "|",
-            ("operating_unit_ids", "in", ou_ids),
-            ("operating_unit_ids", "=", False),
-        ]
+        domain = self._user_ous_domain()
         return super().search_count(domain + args, limit=limit)

res_partner_operating_unit/models/res_users.py

@@ -4,6 +4,7 @@
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
 from odoo import api, models
 from odoo.exceptions import UserError
+from odoo.fields import Command
 
 
 class ResUsers(models.Model):
@@ -15,7 +16,7 @@ def create(self, vals_list):
         for rec in res:
             if rec.default_operating_unit_id:
                 rec.partner_id.operating_unit_ids = [
-                    (4, rec.default_operating_unit_id.id)
+                    Command.link(rec.default_operating_unit_id.id)
                 ]
                 rec.check_partner_operating_unit()
         return res
@@ -26,7 +27,7 @@ def write(self, vals):
             if vals.get("default_operating_unit_id"):
                 # Add the new OU
                 user.partner_id.operating_unit_ids = [
-                    (4, user.default_operating_unit_id.id)
+                    Command.link(user.default_operating_unit_id.id)
                 ]
                 user.check_partner_operating_unit()
             return res

res_partner_operating_unit/readme/CONTRIBUTORS.md

@@ -3,3 +3,5 @@
 - Hiren Dangar \<hiren.dangar.serpentcs@gmail.com\>
 - [Komit](https://komit-consulting.com):
   - Cai Hoang Huynh
+- [Camptocamp](https://www.camptocamp.com):
+  - Maksym Yankin \<maksym.yankin@camptocamp.com\>

res_partner_operating_unit/static/description/index.html

@@ -432,6 +432,10 @@ <h3><a class="toc-backref" href="#toc-entry-5">Contributors</a></h3>
 <li>Cai Hoang Huynh</li>
 </ul>
 </li>
+<li><a class="reference external" href="https://www.camptocamp.com">Camptocamp</a>:<ul>
+<li>Maksym Yankin &lt;<a class="reference external" href="mailto:maksym.yankin&#64;camptocamp.com">maksym.yankin&#64;camptocamp.com</a>&gt;</li>
+</ul>
+</li>
 </ul>
 </div>
 <div class="section" id="other-credits">

res_partner_operating_unit/tests/test_res_partner_operating_unit.py

@@ -1,84 +1,68 @@
 # © 2017 Niaga Solution - Edi Santoso <repodevs@gmail.com>
 # Copyright (C) 2019 Serpent Consulting Services
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
-from odoo.tests import common
+from odoo.fields import Command, Domain
 
+from odoo.addons.operating_unit.tests.common import OperatingUnitCommon
 
-class TestResPartnerOperatingUnit(common.TransactionCase):
-    def setUp(self):
-        super().setUp()
-        self.res_partner_model = self.env["res.partner"]
-        self.res_users_model = self.env["res.users"]
-        # Company
-        self.company = self.env.ref("base.main_company")
-        # Main Operating Unit
-        self.ou1 = self.env.ref("operating_unit.main_operating_unit")
-        # B2C Operating Unit
-        self.b2c = self.env.ref("operating_unit.b2c_operating_unit")
-
-        # Create User 1 with Main OU
-        self.user1 = self._create_user("user_1", self.company, [self.ou1])
-        # Create User 2 with B2C OU
-        self.user2 = self._create_user("user_2", self.company, [self.b2c])
 
+class TestResPartnerOperatingUnit(OperatingUnitCommon):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.res_partner_model = cls.env["res.partner"]
+        cls.res_users_model = cls.env["res.users"]
+        cls.grp_user = cls.env.ref("base.group_user")
+        # Define User groups
+        cls.user1.group_ids = [Command.set([cls.grp_user.id])]
+        cls.user2.group_ids = [Command.set([cls.grp_user.id])]
         # Create Partner 1 with Main OU
-        self.partner1 = self._create_partner("Test Partner 1", self.ou1)
-
+        cls.partner1 = cls._create_partner("Test Partner 1", cls.ou1)
         # Create Partner 2 with B2C OU
-        self.partner2 = self._create_partner("Test Partner 2", self.b2c)
+        cls.partner2 = cls._create_partner("Test Partner 2", cls.b2c)
 
-    def _create_partner(self, name, operating_unit, context=None):
+    @classmethod
+    def _create_partner(cls, name, operating_unit, context=None):
         """Create a partner."""
-        partner = self.res_partner_model.create(
+        partner = cls.res_partner_model.create(
             {
                 "name": name,
-                "operating_unit_ids": [(4, operating_unit.id)],
+                "operating_unit_ids": [Command.link(operating_unit.id)],
             }
         )
         return partner
 
-    def _create_user(self, login, company, operating_units, context=None):
-        """Create a user."""
-        user = self.res_users_model.create(
-            {
-                "name": "Test User",
-                "login": login,
-                "password": "demo",
-                "email": "test@yourcompany.com",
-                "company_id": company.id,
-                "company_ids": [(4, company.id)],
-                "operating_unit_ids": [(4, ou.id) for ou in operating_units],
-            }
-        )
-        return user
-
     def test_create_user_adds_ou_to_partner(self):
-        new_user = self._create_user("new_user_ou", self.company, [self.ou1])
+        new_user = self._create_user(
+            "new_user_ou", self.grp_ou_mngr, self.company, [self.ou1]
+        )
         self.assertIn(self.ou1, new_user.partner_id.operating_unit_ids)
 
     def test_write_user_adds_new_ou_to_partner(self):
-        new_user = self._create_user("edit_user_ou", self.company, [self.ou1])
+        new_user = self._create_user(
+            "edit_user_ou", self.grp_ou_mngr, self.company, [self.ou1]
+        )
         self.assertIn(self.ou1, new_user.partner_id.operating_unit_ids)
 
         new_user.write(
             {
                 "default_operating_unit_id": self.b2c.id,
-                "operating_unit_ids": [(4, self.b2c.id)],
+                "operating_unit_ids": [Command.link(self.b2c.id)],
             }
         )
 
         self.assertIn(self.b2c, new_user.partner_id.operating_unit_ids)
 
     def test_search_partner_with_operating_unit(self):
         partners = self.res_partner_model.with_user(self.user1).search(
-            [("name", "!=", "")]
+            Domain("name", "!=", "")
         )
         self.assertIn(self.partner1, partners)
         self.assertNotIn(self.partner2, partners)
 
     def test_search_count_partner_with_operating_unit(self):
         count = self.res_partner_model.with_user(self.user2).search_count(
-            [("name", "!=", "")]
+            Domain("name", "!=", "")
         )
         self.assertGreaterEqual(count, 1)
 
@@ -90,22 +74,27 @@ def test_create_user_with_default_operating_unit(self):
                 "password": "demo",
                 "email": "user@default.com",
                 "company_id": self.company.id,
-                "company_ids": [(4, self.company.id)],
-                "operating_unit_ids": [(4, self.ou1.id)],
+                "company_ids": [Command.link(self.company.id)],
+                "operating_unit_ids": [Command.link(self.ou1.id)],
                 "default_operating_unit_id": self.ou1.id,
             }
         )
 
         self.assertIn(self.ou1, new_user.partner_id.operating_unit_ids)
 
     def test_write_user_sets_default_operating_unit(self):
-        user = self._create_user("write_user_default_ou", self.company, [self.ou1])
+        user = self._create_user(
+            "write_user_default_ou", self.grp_ou_mngr, self.company, [self.ou1]
+        )
         self.assertIn(self.ou1, user.partner_id.operating_unit_ids)
 
         user.write(
             {
                 "default_operating_unit_id": self.b2c.id,
-                "operating_unit_ids": [(4, self.ou1.id), (4, self.b2c.id)],
+                "operating_unit_ids": [
+                    Command.link(self.ou1.id),
+                    Command.link(self.b2c.id),
+                ],
             }
         )