odoo-addon-base-tier-validation 16.0.2.5.1.2__py3-none-any.whl → 16.0.2.6.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:dfed96ae976c733608d5e0c15f74fb31ead32c743435395bfe8fdd2cb5a72377
+   !! source digest: sha256:8e99bb2b477c5c3a3ce8a49b2f854341131b246b0a7b1ea30c4e04acf1dbeaec
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |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": "16.0.2.5.1",
+    "version": "16.0.2.6.0",
     "development_status": "Mature",
     "maintainers": ["LoisRForgeFlow"],
     "category": "Tools",

odoo/addons/base_tier_validation/models/tier_validation.py

@@ -12,7 +12,12 @@ from odoo.exceptions import ValidationError
 from odoo.osv.expression import OR
 from odoo.tools.misc import frozendict
 
-BASE_EXCEPTION_FIELDS = ["message_follower_ids", "access_token", "need_validation"]
+BASE_EXCEPTION_FIELDS = [
+    "message_main_attachment_id",
+    "message_follower_ids",
+    "access_token",
+    "need_validation",
+]
 
 
 class TierValidation(models.AbstractModel):
@@ -21,6 +26,7 @@ class TierValidation(models.AbstractModel):
 
     _tier_validation_buttons_xpath = "/form/header/button[last()]"
     _tier_validation_manual_config = True
+    _tier_validation_company_field = "company_id"
 
     _state_field = "state"
     _state_from = ["draft"]
@@ -220,7 +226,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),
                     ]
                 )
             )
@@ -253,7 +259,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),
                     ]
                 )
             )
@@ -280,7 +286,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),
@@ -636,6 +642,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"]
@@ -645,7 +662,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),
                         ("id", "not in", rec.review_ids.mapped("definition_id").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:dfed96ae976c733608d5e0c15f74fb31ead32c743435395bfe8fdd2cb5a72377
+!! source digest: sha256:8e99bb2b477c5c3a3ce8a49b2f854341131b246b0a7b1ea30c4e04acf1dbeaec
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/16.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-16-0/server-ux-16-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=16.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 company

odoo/addons/base_tier_validation/tests/common.py

@@ -56,6 +56,9 @@ class CommonTierValidation(common.TransactionCase):
                 "perm_unlink": 1,
             }
         )
+        # Create a multi-company
+        cls.main_company = cls.env.ref("base.main_company")
+        cls.other_company = cls.env["res.company"].create({"name": "My Company"})
 
         # Define views to avoid automatic views with all fields.
         for model in cls.test_model._name, cls.test_model_2._name:
@@ -88,6 +91,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"]
@@ -104,6 +115,46 @@ class CommonTierValidation(common.TransactionCase):
         cls.test_record = cls.test_model.create({"test_field": 2.5})
         cls.test_record_2 = cls.test_model_2.create({"test_field": 2.5})
 
+        # Create definition for test 28, 29
+        # 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,
+                "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,
+                "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,
+                "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

@@ -902,7 +902,7 @@ class TierTierValidation(CommonTierValidation):
             )
         self.assertEqual(self.test_record.test_validation_field, 4)
 
-    def test_27_reevaluate_validation(self):
+    def test_26_reevaluate_validation(self):
         # Create new test record
         test_record = self.test_model.create(
             {"test_field": 100, "test_validation_field": 15}
@@ -946,7 +946,7 @@ class TierTierValidation(CommonTierValidation):
         self.assertEqual(len(test_record.review_ids), 2)
         self.assertIn(old_review, test_record.review_ids)
 
-    def test_28_reevaluate_validation(self):
+    def test_27_reevaluate_validation(self):
         # Create new test record
         test_record = self.test_model.create(
             {"test_field": 100, "test_validation_field": 15}
@@ -994,6 +994,62 @@ class TierTierValidation(CommonTierValidation):
         self.assertEqual(len(test_record.review_ids), 2)
         self.assertIn(old_review, test_record.review_ids)
 
+    def test_28_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_29_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-16.0.2.5.1.2.dist-info → odoo_addon_base_tier_validation-16.0.2.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-base_tier_validation
-Version: 16.0.2.5.1.2
+Version: 16.0.2.6.0
 Summary: Implement a validation process based on tiers.
 Home-page: https://github.com/OCA/server-ux
 Author: ForgeFlow, Odoo Community Association (OCA)
@@ -23,7 +23,7 @@ Base Tier Validation
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:dfed96ae976c733608d5e0c15f74fb31ead32c743435395bfe8fdd2cb5a72377
+   !! source digest: sha256:8e99bb2b477c5c3a3ce8a49b2f854341131b246b0a7b1ea30c4e04acf1dbeaec
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Mature-brightgreen.png

{odoo_addon_base_tier_validation-16.0.2.5.1.2.dist-info → odoo_addon_base_tier_validation-16.0.2.6.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
-odoo/addons/base_tier_validation/README.rst,sha256=eKZ6cpglgvjBtYuvw1HNSw4QftJB6mBvOnV5bZoCZ60,7996
+odoo/addons/base_tier_validation/README.rst,sha256=Sxxf574eNVV2IkDmBEPnurzl8SGNNml4a8O0tst5Mc8,7996
 odoo/addons/base_tier_validation/__init__.py,sha256=rKfzYX9RhkkCxgh2f0PJLYN45Kw8T8-fwxw1pbjLuug,108
-odoo/addons/base_tier_validation/__manifest__.py,sha256=wN69Ay7UtXO4ZJmaJh1InT5gHgsYoCIQ83pbSlsULD8,2011
+odoo/addons/base_tier_validation/__manifest__.py,sha256=79nt4BfpMiUmxKOtt5pvt3ui3L5i_HOiKCu-1ueo5LM,2011
 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=Ap_T6TSlEoy4uXvycYBt7EA4SbyymwJWlKWiei7S2KQ,32404
@@ -17,7 +17,7 @@ odoo/addons/base_tier_validation/models/res_config_settings.py,sha256=n-i1InkXDc
 odoo/addons/base_tier_validation/models/res_users.py,sha256=JhUZ0NxJ9EPwpkJ-mvsNTrE1avQncGNKqAF-xFxokEo,2638
 odoo/addons/base_tier_validation/models/tier_definition.py,sha256=rcDv7ySDKqBD1ksJ09um_4Reec_Im1MrdotivQ7Q_44,5173
 odoo/addons/base_tier_validation/models/tier_review.py,sha256=a7vMoaN4uWZqN48CmlK9x4ou9Ao0r4i6FuSSqPah6Qw,7329
-odoo/addons/base_tier_validation/models/tier_validation.py,sha256=vLmJXIe4HVzmzj45DZ3UxlC3WgbEVQl12cMYxIjbZl4,32721
+odoo/addons/base_tier_validation/models/tier_validation.py,sha256=IfVARiZPcmw7y9LauVLFMwc96b_1BNRfZNzK79GQ74A,33179
 odoo/addons/base_tier_validation/models/tier_validation_exception.py,sha256=9H_FbTF04IyB2u6a82UAdIPmv_MUcFKmLNVl7UOM1lg,2882
 odoo/addons/base_tier_validation/readme/CONFIGURE.rst,sha256=ABgtWmfnm0QieIj7_ZsvoTHwjaKiZkBLCAjUXJeOnm4,1466
 odoo/addons/base_tier_validation/readme/CONTRIBUTORS.rst,sha256=hyMj4T9es9vnGNmdg-uPF9wc1xGRxC5DU39McI03xjA,479
@@ -27,7 +27,7 @@ odoo/addons/base_tier_validation/readme/ROADMAP.rst,sha256=UWhIpMUTM_ido6s3jZiF8
 odoo/addons/base_tier_validation/security/ir.model.access.csv,sha256=vsKy73mk8r45jzU0fAt_vfM7-JSH7lIAA7JBr1P6FAY,633
 odoo/addons/base_tier_validation/security/tier_validation_security.xml,sha256=eWFwz-osHgYFmVoEVzOSboO9oqUMtQ8oygyaz0os50Y,806
 odoo/addons/base_tier_validation/static/description/icon.png,sha256=6xBPJauaFOF0KDHfHgQopSc28kKvxMaeoQFQWZtfZDo,9455
-odoo/addons/base_tier_validation/static/description/index.html,sha256=2QPtneQYfCQkSxFcGiSImgDDxXO3kc5aub4f0KiYhlw,22306
+odoo/addons/base_tier_validation/static/description/index.html,sha256=ZNC0M7ADQZ-OVswN0jXecbZWAFxuOuGj1dObLtuY2yw,22306
 odoo/addons/base_tier_validation/static/src/js/ir_model.esm.js,sha256=kHSA7CeIt02IZmsKJdn2yZVqKqSyQ6_g6QVmtq5Qo2A,706
 odoo/addons/base_tier_validation/static/src/js/main.esm.js,sha256=ZSHScoLlMQcO6jW9mLVusJOfyH5kJIw4szPK3xU-KHA,263
 odoo/addons/base_tier_validation/static/src/js/review_group_view.esm.js,sha256=G110cBwOwENHBUkuScOB8Xg05D0FzOqlsSl_US0PngA,1677
@@ -45,10 +45,10 @@ odoo/addons/base_tier_validation/static/src/xml/systray.xml,sha256=8W04E80UhUPQp
 odoo/addons/base_tier_validation/static/src/xml/tier_review_template.xml,sha256=o72pPVkPiPmr2KWucaTJahR945MbD4gaYyi3KQn6AyI,6217
 odoo/addons/base_tier_validation/templates/tier_validation_templates.xml,sha256=_LylRMVAyooIRsK8Y-Lanpi_S3ch1Ts9bJkxewKbr3k,4619
 odoo/addons/base_tier_validation/tests/__init__.py,sha256=7tj1DSbPnyA__lAKxvjX53Ll_ZTE8y8Z1bewtZJoURI,166
-odoo/addons/base_tier_validation/tests/common.py,sha256=Jnt8vMSca4XsiUGbnSDXvyKCCP6aeXepI476_2Gg_to,3787
-odoo/addons/base_tier_validation/tests/test_tier_validation.py,sha256=grzh4DxnvBeKZcD9VPAWbWzT_4sLI9Kfm7E-8Xh7630,41296
+odoo/addons/base_tier_validation/tests/common.py,sha256=kCSmRUWy9qcmXfVpJ-ixTOyj7eL4G75x0p25uWEs7to,5918
+odoo/addons/base_tier_validation/tests/test_tier_validation.py,sha256=jOq6eYzzChn6Pwrv2C32mK17S0Ye3Z_cuJEDuvHWGsQ,43356
 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=3usFbhfDhlKIWbVu--3qsbsm52B6RwTP4zy244dY1yk,1757
+odoo/addons/base_tier_validation/tests/tier_validation_tester.py,sha256=zlpJLmxpgnZhpUJ_kFqRVInQftOkgjT3lQ-uzcjn_F0,1818
 odoo/addons/base_tier_validation/views/res_config_settings_views.xml,sha256=Al6XKCN1QGLPcgAaXTvEnSTYkwBrzDGfSRh3CQD4g5Q,4234
 odoo/addons/base_tier_validation/views/tier_definition_view.xml,sha256=KAuJ6EiqNd0vG-eUVZKQLpVME011pDdjDYw93nPr0J8,7450
 odoo/addons/base_tier_validation/views/tier_review_view.xml,sha256=tPzmpz-kbQwOOtJrAcsTJEP9bJLcfzWAITCpI86kZU4,966
@@ -56,7 +56,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-16.0.2.5.1.2.dist-info/METADATA,sha256=ntsDh2daN4M7Q-8yLvLaBvyWW7UwCXiaNdiA5NewvgU,8580
-odoo_addon_base_tier_validation-16.0.2.5.1.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-odoo_addon_base_tier_validation-16.0.2.5.1.2.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
-odoo_addon_base_tier_validation-16.0.2.5.1.2.dist-info/RECORD,,
+odoo_addon_base_tier_validation-16.0.2.6.0.dist-info/METADATA,sha256=6yz3lwvb6Y8vxcpBqT7K3e4rpsua2o1pHEDLw5vcBHc,8578
+odoo_addon_base_tier_validation-16.0.2.6.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+odoo_addon_base_tier_validation-16.0.2.6.0.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
+odoo_addon_base_tier_validation-16.0.2.6.0.dist-info/RECORD,,