[19.0][MIG] sale_operating_unit: Migration to 19.0

Author: yankinmax

sale_operating_unit/README.rst

@@ -94,6 +94,10 @@ Contributors
 
   - Bhavesh Heliconia
 
+- `Camptocamp <https://www.camptocamp.com>`__:
+
+  - Maksym Yankin <maksym.yankin@camptocamp.com>
+
 Maintainers
 -----------
 

sale_operating_unit/__manifest__.py

@@ -4,7 +4,7 @@
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
 {
     "name": "Operating Unit in Sales",
-    "version": "18.0.1.0.0",
+    "version": "19.0.1.0.0",
     "summary": "An operating unit (OU) is an organizational entity part of a company",
     "author": "ForgeFlow, "
     "Serpent Consulting Services Pvt. Ltd.,"

sale_operating_unit/models/crm_team.py

@@ -4,6 +4,7 @@
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
 from odoo import SUPERUSER_ID, api, models
 from odoo.exceptions import ValidationError
+from odoo.fields import Domain
 
 
 class CrmTeam(models.Model):
@@ -16,10 +17,12 @@ def _check_sales_order_operating_unit(self):
                 self.with_user(SUPERUSER_ID)
                 .env["sale.order"]
                 .search(
-                    [
-                        ("team_id", "=", rec.id),
-                        ("operating_unit_id", "!=", rec.operating_unit_id.id),
-                    ]
+                    Domain.AND(
+                        [
+                            Domain("team_id", "=", rec.id),
+                            Domain("operating_unit_id", "!=", rec.operating_unit_id.id),
+                        ]
+                    )
                 )
             )
             if orders:

sale_operating_unit/models/sale_order.py

@@ -4,6 +4,7 @@
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
 from odoo import api, fields, models
 from odoo.exceptions import ValidationError
+from odoo.fields import Domain
 
 
 class SaleOrder(models.Model):
@@ -48,15 +49,35 @@ def _compute_journal_id(self):
                 sale.journal_id = (
                     self.env["account.journal"]
                     .search(
-                        [
-                            "|",
-                            ("operating_unit_id", "=", sale.operating_unit_id.id),
-                            ("operating_unit_id", "=", False),
-                            "|",
-                            ("company_id", "=", sale.company_id.id),
-                            ("company_id", "=", False),
-                            ("type", "=", "sale"),
-                        ],
+                        Domain.AND(
+                            [
+                                Domain.AND(
+                                    [
+                                        Domain.OR(
+                                            [
+                                                Domain(
+                                                    "operating_unit_id",
+                                                    "=",
+                                                    sale.operating_unit_id.id,
+                                                ),
+                                                Domain("operating_unit_id", "=", False),
+                                            ]
+                                        ),
+                                        Domain.OR(
+                                            [
+                                                Domain(
+                                                    "company_id",
+                                                    "=",
+                                                    sale.company_id.id,
+                                                ),
+                                                Domain("company_id", "=", False),
+                                            ]
+                                        ),
+                                    ]
+                                ),
+                                Domain("type", "=", "sale"),
+                            ]
+                        ),
                         limit=1,
                     )
                     .id

sale_operating_unit/readme/CONTRIBUTORS.md

@@ -9,3 +9,5 @@
 - Alejandro Padrón \<<alejandro.padron@bt-group.com>\>
 - [Heliconia Solutions Pvt. Ltd.](https://www.heliconia.io)
   - Bhavesh Heliconia
+- [Camptocamp](https://www.camptocamp.com):
+  - Maksym Yankin \<maksym.yankin@camptocamp.com\>

sale_operating_unit/static/description/index.html

@@ -442,6 +442,10 @@ <h3><a class="toc-backref" href="#toc-entry-6">Contributors</a></h3>
 <li>Bhavesh Heliconia</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="maintainers">

sale_operating_unit/tests/test_sale_operating_unit.py

@@ -4,7 +4,7 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
 from odoo.exceptions import ValidationError
-from odoo.models import Command
+from odoo.fields import Command, Domain
 
 from odoo.addons.operating_unit.tests.common import OperatingUnitCommon
 
@@ -27,7 +27,7 @@ def setUpClass(cls):
         # Customer
         cls.customer = cls.env.ref("base.res_partner_2")
         # Price list
-        cls.pricelist = cls.env["product.pricelist"].search([], limit=1)
+        cls.pricelist = cls.env["product.pricelist"].search(Domain.TRUE, limit=1)
         # Products
         cls.product1 = cls.env.ref("product.product_product_2")
         cls.product1.write({"invoice_policy": "order"})
@@ -138,7 +138,12 @@ def test_security(self):
         # User 2 is only assigned to Operating Unit B2C, and cannot
         # Access Sales order from Main Operating Unit.
         sale = self.sale_model.with_user(self.user2.id).search(
-            [("id", "=", self.sale1.id), ("operating_unit_id", "=", self.ou1.id)]
+            Domain.AND(
+                [
+                    Domain("id", "=", self.sale1.id),
+                    Domain("operating_unit_id", "=", self.ou1.id),
+                ]
+            )
         )
         self.assertEqual(
             sale.ids, [], f"User 2 should not have access to OU {self.ou1.name}"
@@ -149,7 +154,12 @@ def test_security(self):
         b2c_invoice_id = self._confirm_sale(self.sale2)
         # Checks that invoice has OU b2c
         b2c = self.acc_move_model.with_user(self.user2.id).search(
-            [("id", "=", b2c_invoice_id), ("operating_unit_id", "=", self.b2c.id)]
+            Domain.AND(
+                [
+                    Domain("id", "=", b2c_invoice_id),
+                    Domain("operating_unit_id", "=", self.b2c.id),
+                ]
+            )
         )
         self.assertNotEqual(b2c.ids, [], "Invoice should have b2c OU")
 
@@ -158,14 +168,24 @@ def test_security_2(self):
         # User 2 is only assigned to Operating Unit B2C, and cannot
         # Access Sales order from Main Operating Unit.
         sale = self.sale_model.with_user(self.user2.id).search(
-            [("id", "=", self.sale1.id), ("operating_unit_id", "=", self.ou1.id)]
+            Domain.AND(
+                [
+                    Domain("id", "=", self.sale1.id),
+                    Domain("operating_unit_id", "=", self.ou1.id),
+                ]
+            )
         )
         self.assertEqual(
             sale.ids, [], f"User 2 should not have access to OU {self.ou1.name}"
         )
 
         sale = self.sale_model.with_user(self.user2.id).search(
-            [("id", "=", self.sale2.id), ("operating_unit_id", "=", self.b2c.id)]
+            Domain.AND(
+                [
+                    Domain("id", "=", self.sale2.id),
+                    Domain("operating_unit_id", "=", self.b2c.id),
+                ]
+            )
         )
 
         self.assertEqual(