odoo-addon-base-tier-validation 17.0.2.3.4.1__py3-none-any.whl → 17.0.2.4.0__py3-none-any.whl

odoo/addons/base_tier_validation/README.rst

@@ -7,7 +7,7 @@ Base Tier Validation
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:383888146dbed9d6782bb997d2c3c5737d1603d2345785aef167a0ac028790f3
+   !! source digest: sha256:e4f55b4e91a75826046e629fd7419db7f83cd415ce90fc9e031a00be6f69c4bf
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Mature-brightgreen.png

odoo/addons/base_tier_validation/__manifest__.py

@@ -3,7 +3,7 @@
 {
     "name": "Base Tier Validation",
     "summary": "Implement a validation process based on tiers.",
-    "version": "17.0.2.3.4",
+    "version": "17.0.2.4.0",
     "development_status": "Mature",
     "maintainers": ["LoisRForgeFlow"],
     "category": "Tools",

odoo/addons/base_tier_validation/models/tier_validation.py

@@ -21,6 +21,7 @@ class TierValidation(models.AbstractModel):
     _tier_validation_buttons_xpath = "/form/header/button[last()]"
     _tier_validation_manual_config = True
     _tier_validation_state_field_is_computed = False
+    _tier_validation_company_field = "company_id"
 
     _state_field = "state"
     _state_from = ["draft"]
@@ -250,7 +251,7 @@ class TierValidation(models.AbstractModel):
                 .search(
                     [
                         ("model", "=", self._name),
-                        ("company_id", "in", [False] + self.env.company.ids),
+                        ("company_id", "in", [False] + rec._get_company().ids),
                     ]
                 )
             )
@@ -275,7 +276,7 @@ class TierValidation(models.AbstractModel):
             .search(
                 [
                     ("model_name", "=", self._name),
-                    ("company_id", "in", [False] + self.env.company.ids),
+                    ("company_id", "in", [False] + self._get_company().ids),
                     "|",
                     ("group_ids", "in", self.env.user.groups_id.ids),
                     ("group_ids", "=", False),
@@ -708,6 +709,17 @@ class TierValidation(models.AbstractModel):
             "sequence": sequence,
         }
 
+    @api.model
+    def _get_company(self):
+        company_id = self.env.company
+        if (
+            self
+            and self._tier_validation_company_field in self.env[self._name]
+            and self[self._tier_validation_company_field]
+        ):
+            company_id = self[self._tier_validation_company_field]
+        return company_id
+
     def request_validation(self):
         td_obj = self.env["tier.definition"]
         tr_obj = self.env["tier.review"]
@@ -717,7 +729,7 @@ class TierValidation(models.AbstractModel):
                 tier_definitions = td_obj.search(
                     [
                         ("model", "=", self._name),
-                        ("company_id", "in", [False] + self.env.company.ids),
+                        ("company_id", "in", [False] + rec._get_company().ids),
                     ],
                     order="sequence desc",
                 )

odoo/addons/base_tier_validation/static/description/index.html

@@ -367,7 +367,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:383888146dbed9d6782bb997d2c3c5737d1603d2345785aef167a0ac028790f3
+!! source digest: sha256:e4f55b4e91a75826046e629fd7419db7f83cd415ce90fc9e031a00be6f69c4bf
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Mature" src="https://img.shields.io/badge/maturity-Mature-brightgreen.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-ux/tree/17.0/base_tier_validation"><img alt="OCA/server-ux" src="https://img.shields.io/badge/github-OCA%2Fserver--ux-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-ux-17-0/server-ux-17-0-base_tier_validation"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/server-ux&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Validating some operations is a common need across different areas in a

odoo/addons/base_tier_validation/tests/common.py

@@ -44,6 +44,9 @@ class CommonTierValidation(common.TransactionCase):
         cls.tester_model_computed = cls.env["ir.model"].search(
             [("model", "=", "tier.validation.tester.computed")]
         )
+        # Create a multi-company
+        cls.main_company = cls.env.ref("base.main_company")
+        cls.other_company = cls.env["res.company"].create({"name": "My Company"})
 
         models = (
             cls.tester_model,
@@ -93,6 +96,14 @@ class CommonTierValidation(common.TransactionCase):
         cls.test_user_2 = cls.env["res.users"].create(
             {"name": "Mike", "login": "test2", "email": "mike@yourcompany.example.com"}
         )
+        cls.test_user_3_multi_company = cls.env["res.users"].create(
+            {
+                "name": "Jane",
+                "login": "test3",
+                "email": "jane@mycompany.example.com",
+                "company_ids": [(6, 0, [cls.main_company.id, cls.other_company.id])],
+            }
+        )
 
         # Create tier definitions:
         cls.tier_def_obj = cls.env["tier.definition"]
@@ -161,6 +172,49 @@ class CommonTierValidation(common.TransactionCase):
             }
         )
 
+        # Create definition for test 30, 31
+        # Main company tier definition
+        cls.tier_def_obj.create(
+            {
+                "model_id": cls.tester_model_2.id,
+                "review_type": "individual",
+                "reviewer_id": cls.test_user_1.id,
+                "definition_domain": "[('test_field', '>=', 1.0)]",
+                "approve_sequence": True,
+                "notify_on_pending": False,
+                "sequence": 30,
+                "name": "Definition for test 30 - sequence - user 1 - main company",
+                "company_id": cls.main_company.id,
+            }
+        )
+        cls.tier_def_obj.create(
+            {
+                "model_id": cls.tester_model_2.id,
+                "review_type": "individual",
+                "reviewer_id": cls.test_user_3_multi_company.id,
+                "definition_domain": "[('test_field', '>=', 1.0)]",
+                "approve_sequence": True,
+                "notify_on_pending": False,
+                "sequence": 20,
+                "name": "Definition for test 30 - sequence - user 3 - main company",
+                "company_id": cls.main_company.id,
+            }
+        )
+        # Other company tier definition
+        cls.tier_def_obj.create(
+            {
+                "model_id": cls.tester_model_2.id,
+                "review_type": "individual",
+                "reviewer_id": cls.test_user_3_multi_company.id,
+                "definition_domain": "[('test_field', '>=', 1.0)]",
+                "approve_sequence": True,
+                "notify_on_pending": False,
+                "sequence": 30,
+                "name": "Definition for test 30 - sequence - user 3 - other company",
+                "company_id": cls.other_company.id,
+            }
+        )
+
     @classmethod
     def tearDownClass(cls):
         cls.loader.restore_registry()

odoo/addons/base_tier_validation/tests/test_tier_validation.py

@@ -934,7 +934,7 @@ class TierTierValidation(CommonTierValidation):
         )
         self.assertEqual(notifications_no_2, notifications_no_1)
 
-    def test_25_change_field_exception_validation(self):
+    def test_27_change_field_exception_validation(self):
         """Test under and after validations"""
         # Cannot create `tier.validation.exception` records because
         # `tier.validation.tester` are fake model and its fields are
@@ -985,7 +985,7 @@ class TierTierValidation(CommonTierValidation):
             )
         self.assertEqual(self.test_record.test_validation_field, 4)
 
-    def test_26_computed_state_field(self):
+    def test_28_computed_state_field(self):
         """Test the regular flow on a model where state is a computed field"""
         # The record cannot be confirmed without validation
         with self.assertRaisesRegex(
@@ -1014,7 +1014,7 @@ class TierTierValidation(CommonTierValidation):
         self.assertFalse(self.test_record_computed.review_ids)
         self.test_record_computed.invalidate_recordset()
 
-    def test_27_allow_write_for_reviewers(self):
+    def test_29_allow_write_for_reviewers(self):
         reviews = self.test_record.with_user(self.test_user_2.id).request_validation()
         record = self.test_record.with_user(self.test_user_1.id)
         record.invalidate_recordset()
@@ -1025,6 +1025,62 @@ class TierTierValidation(CommonTierValidation):
         )
         record.with_user(self.test_user_1.id).write({"test_field": 0.3})
 
+    def test_30_request_validation_diff_company(self):
+        """
+        Test validation request behavior with multi-company setup.
+
+        Setup:
+        - Main company has 2 tier definitions:
+          - One for User1 (sequence 30)
+          - One for User3 (sequence 20)
+        - Other company has 1 tier definition:
+          - One for User3 (sequence 30)
+
+        When record's company is set to 'other company':
+        - Only User3's tier definition from other company should be applied
+        - Should create only 1 review
+        """
+        self.assertFalse(self.test_record_2.review_ids)
+        self.assertFalse(self.test_record_2.company_id)
+        self.assertEqual(self.test_user_3_multi_company.env.company, self.main_company)
+
+        self.test_record_2.company_id = self.other_company
+
+        reviews = self.test_record_2.with_user(
+            self.test_user_3_multi_company.id
+        ).request_validation()
+        self.test_record_2.invalidate_recordset()
+
+        self.assertEqual(len(reviews), 1)
+
+    def test_31_request_validation_same_company(self):
+        """
+        Test validation request behavior with multi-company setup.
+
+        Setup:
+        - Main company has 2 tier definitions:
+          - One for User1 (sequence 30)
+          - One for User3 (sequence 20)
+        - Other company has 1 tier definition:
+          - One for User3 (sequence 30)
+
+        When record's company is set to 'main company':
+        - Both User1 and User3's tier definitions from main company should be applied
+        - Should create 2 reviews
+        """
+        self.assertFalse(self.test_record_2.review_ids)
+        self.assertFalse(self.test_record_2.company_id)
+        self.assertEqual(self.test_user_3_multi_company.env.company, self.main_company)
+
+        self.test_record_2.company_id = self.main_company
+
+        reviews = self.test_record_2.with_user(
+            self.test_user_3_multi_company.id
+        ).request_validation()
+        self.test_record_2.invalidate_recordset()
+
+        self.assertEqual(len(reviews), 2)
+
 
 @tagged("at_install")
 class TierTierValidationView(CommonTierValidation):

odoo/addons/base_tier_validation/tests/tier_validation_tester.py

@@ -43,6 +43,7 @@ class TierValidationTester2(models.Model):
     test_field = fields.Float()
     test_validation_field = fields.Float()
     user_id = fields.Many2one(string="Assigned to:", comodel_name="res.users")
+    company_id = fields.Many2one(comodel_name="res.company")
 
     def action_confirm(self):
         self.write({"state": "confirmed"})

{odoo_addon_base_tier_validation-17.0.2.3.4.1.dist-info → odoo_addon_base_tier_validation-17.0.2.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-base_tier_validation
-Version: 17.0.2.3.4.1
+Version: 17.0.2.4.0
 Requires-Python: >=3.10
 Requires-Dist: odoo>=17.0a,<17.1dev
 Summary: Implement a validation process based on tiers.
@@ -23,7 +23,7 @@ Base Tier Validation
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:383888146dbed9d6782bb997d2c3c5737d1603d2345785aef167a0ac028790f3
+   !! source digest: sha256:e4f55b4e91a75826046e629fd7419db7f83cd415ce90fc9e031a00be6f69c4bf
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Mature-brightgreen.png

{odoo_addon_base_tier_validation-17.0.2.3.4.1.dist-info → odoo_addon_base_tier_validation-17.0.2.4.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
-odoo/addons/base_tier_validation/README.rst,sha256=r8O0BITf4GFm1o3cEF00oo5IZHoW2Mw6Q2bjQsJfbUc,8904
+odoo/addons/base_tier_validation/README.rst,sha256=tCWlrLCRNwSv0EiHveb3Wr1rraNpzxvcHK0pJ2aYFsg,8904
 odoo/addons/base_tier_validation/__init__.py,sha256=rKfzYX9RhkkCxgh2f0PJLYN45Kw8T8-fwxw1pbjLuug,108
-odoo/addons/base_tier_validation/__manifest__.py,sha256=f90jg2MHWYBHDt5SHX60iu-G1J39xknh-RUlhvMUis8,1674
+odoo/addons/base_tier_validation/__manifest__.py,sha256=4TyhPt7-LISnFLiMdzdpzgW3nkPcEaAjm-6_mXfgJsA,1674
 odoo/addons/base_tier_validation/data/cron_data.xml,sha256=HMA_SgAk3_vLu_QQLHd0UyzPASuDRj5cvpiK_17esQc,707
 odoo/addons/base_tier_validation/data/mail_data.xml,sha256=hXhGTSyG2NAsDfZShmpyBKTXJi46L5PP1mFJAlKmlVE,1984
 odoo/addons/base_tier_validation/i18n/base_tier_validation.pot,sha256=ShkkRe-CS7a4eBPc86lxy4u2sfn4Forn2ck85in9JeE,33179
@@ -17,7 +17,7 @@ odoo/addons/base_tier_validation/models/res_config_settings.py,sha256=xMdQiCfU5p
 odoo/addons/base_tier_validation/models/res_users.py,sha256=0xJZVWDUfdJwA3_ysHKO99cQph2m8iz0Zr5JU90td68,2163
 odoo/addons/base_tier_validation/models/tier_definition.py,sha256=_aMzT4DAzV2C0dWm85UwomMlXRyjNN-Bo9xLaSfl58U,5775
 odoo/addons/base_tier_validation/models/tier_review.py,sha256=F6oEiE6CkIIAYAbQN9mUfyrUyqqhxdVfU9kvduNqnRg,8398
-odoo/addons/base_tier_validation/models/tier_validation.py,sha256=yeb-KWE_PWpDGScMAGDvBZ45b-QjyGqcV8GxdQ4iM7w,35425
+odoo/addons/base_tier_validation/models/tier_validation.py,sha256=kSTfIQ6K3nts4jEtAmeHQ1VcMRUpXMhCv4iBq75bc9w,35832
 odoo/addons/base_tier_validation/models/tier_validation_exception.py,sha256=9H_FbTF04IyB2u6a82UAdIPmv_MUcFKmLNVl7UOM1lg,2882
 odoo/addons/base_tier_validation/readme/CONFIGURE.md,sha256=MuyVCH75T0_3Rtrkl7RUg7XzxjoU7zUkbPWv84_a-XU,1709
 odoo/addons/base_tier_validation/readme/CONTRIBUTORS.md,sha256=QM71L1RKrzDEgNvfgXjNAoWy3dMxH5k26HhcrrpdYRs,664
@@ -28,7 +28,7 @@ odoo/addons/base_tier_validation/security/ir.model.access.csv,sha256=_NMShHIoKCQ
 odoo/addons/base_tier_validation/security/tier_validation_security.xml,sha256=eWFwz-osHgYFmVoEVzOSboO9oqUMtQ8oygyaz0os50Y,806
 odoo/addons/base_tier_validation/static/description/icon.png,sha256=ocMS0YO1xbJs6kkXqCuw71UnsCa_4d1U5cMvzcKSH2U,4993
 odoo/addons/base_tier_validation/static/description/icon.svg,sha256=SBeR3DJDE_jBR3Z92Yn3r7WPOkpsRlOd61t1Tuk7M_A,2684
-odoo/addons/base_tier_validation/static/description/index.html,sha256=i1XEiVm-vA1liAs3U01FhJ3RfoNkWwif7mqDBgFq1Mk,23747
+odoo/addons/base_tier_validation/static/description/index.html,sha256=6GuA0SIofMcrXLOBZxmJhybMPCPut6up9ZP81ZQckt0,23747
 odoo/addons/base_tier_validation/static/src/components/tier_review_menu/tier_review_menu.esm.js,sha256=MNfjKSg-9h3JfeXiYlf15SAdVHjj3aUvedj0BqVvJrk,2254
 odoo/addons/base_tier_validation/static/src/components/tier_review_menu/tier_review_menu.xml,sha256=_wIy5Gv2VUJEXD5_FGphx1J19-Y8uzFlWryuPqlIh8c,2798
 odoo/addons/base_tier_validation/static/src/components/tier_review_widget/tier_review_widget.esm.js,sha256=MDWUp2ozeRdBoLeCfTcOnD-bKnk3yF6pHwtTAnsLZmg,1090
@@ -37,10 +37,10 @@ odoo/addons/base_tier_validation/static/src/components/tier_review_widget/tier_r
 odoo/addons/base_tier_validation/static/src/js/services/tier_review_service.esm.js,sha256=E4xNh1WmnofpFt88EYYCGcDWyP53S2Mt450QawcrsCM,972
 odoo/addons/base_tier_validation/templates/tier_validation_templates.xml,sha256=VI6kY0V6nVSz6KQ9GRxY_9TZkRrJgzBzsl9xFKtA__Y,3620
 odoo/addons/base_tier_validation/tests/__init__.py,sha256=7tj1DSbPnyA__lAKxvjX53Ll_ZTE8y8Z1bewtZJoURI,166
-odoo/addons/base_tier_validation/tests/common.py,sha256=0UDM1P5r7c2YftiBIs42ykFQdznWXzYur8SNscRK8cI,5966
-odoo/addons/base_tier_validation/tests/test_tier_validation.py,sha256=WVZNMIGu2Rh0EjwuVUVuoLXBUgjy2yzqEK2OhR4J8zM,43283
+odoo/addons/base_tier_validation/tests/common.py,sha256=eO028boA6aiAmX_VnOkPlUQDIthAF8IqthiaAH3cwro,8229
+odoo/addons/base_tier_validation/tests/test_tier_validation.py,sha256=7VtIypBLgCXFEZon-KU24ZrPLycHptx70zBdp8woEUg,45343
 odoo/addons/base_tier_validation/tests/test_tier_validation_reminder.py,sha256=jsLU-7pJtbUvKPi7ddXU4jAwiJp32pKTrluarrtLKvU,1963
-odoo/addons/base_tier_validation/tests/tier_validation_tester.py,sha256=m25QbB9-9Goxx1Fiz0qwsVO3WPL6jrtMlGDW6VQbLik,3345
+odoo/addons/base_tier_validation/tests/tier_validation_tester.py,sha256=O0QFANIH-jH_1GZtcv-EqPMGp2LgWF2HJMaaibFROWs,3406
 odoo/addons/base_tier_validation/views/res_config_settings_views.xml,sha256=5HbrsAVaXRoQNX7utIQ_EzZrqzKnwBrV9uHsi-PHb9M,2640
 odoo/addons/base_tier_validation/views/tier_definition_view.xml,sha256=ScFV2RkAO2ysXAg4kLODlNJGSP65toR-TCKpe4-WGJo,7780
 odoo/addons/base_tier_validation/views/tier_review_view.xml,sha256=tPzmpz-kbQwOOtJrAcsTJEP9bJLcfzWAITCpI86kZU4,966
@@ -48,7 +48,7 @@ odoo/addons/base_tier_validation/views/tier_validation_exception_view.xml,sha256
 odoo/addons/base_tier_validation/wizard/__init__.py,sha256=52q6-LAjYeJ1Vu5ahon_jnhds9VsoJvYaQCiZc82WKw,95
 odoo/addons/base_tier_validation/wizard/comment_wizard.py,sha256=gj7zCcpe47-2ifxSRlE6okQ1wtq5Ok3JBVg2CtN0ZIU,879
 odoo/addons/base_tier_validation/wizard/comment_wizard_view.xml,sha256=9XFTqrNwDCZH2IEX3HutaznSkBYk-6RERXzUDwObz4I,979
-odoo_addon_base_tier_validation-17.0.2.3.4.1.dist-info/METADATA,sha256=sNDfFUxliIbcEsxMVi5mWdSh2mkQV4QI6cRriMOykRE,9488
-odoo_addon_base_tier_validation-17.0.2.3.4.1.dist-info/WHEEL,sha256=9fEMia4zL7ZuZbnCOrcYogUhmn4XFIVaJ8G4YGI31xc,81
-odoo_addon_base_tier_validation-17.0.2.3.4.1.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
-odoo_addon_base_tier_validation-17.0.2.3.4.1.dist-info/RECORD,,
+odoo_addon_base_tier_validation-17.0.2.4.0.dist-info/METADATA,sha256=ol5MsWlEbHcp5gBBf5b9U15RxMdnrpyQvJgrVckZswY,9486
+odoo_addon_base_tier_validation-17.0.2.4.0.dist-info/WHEEL,sha256=9fEMia4zL7ZuZbnCOrcYogUhmn4XFIVaJ8G4YGI31xc,81
+odoo_addon_base_tier_validation-17.0.2.4.0.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
+odoo_addon_base_tier_validation-17.0.2.4.0.dist-info/RECORD,,