odoo-addon-base-tier-validation 17.0.2.1.1.2__py3-none-any.whl → 17.0.2.1.2__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:7cd893ad4c0ec4a8016552e03b14d5688a73089c9e0249f35340050655889f41
+   !! source digest: sha256:f66a6423b1055e1fd357661ea6165ca35a45086b86b4bb7d7f165500bf957a97
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Mature-brightgreen.png
@@ -260,6 +260,9 @@ Contributors
 -  Evan Soh <evan.soh@omnisoftsolution.com>
 -  Manuel Regidor <manuel.regidor@sygel.es>
 -  Eduardo de Miguel <edu@moduon.team>
+-  `XCG Consulting <https://xcg-consulting.fr>`__:
+
+   -  Houzéfa Abbasbhay
 
 Maintainers
 -----------

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.1.1",
+    "version": "17.0.2.1.2",
     "development_status": "Mature",
     "maintainers": ["LoisRForgeFlow"],
     "category": "Tools",

odoo/addons/base_tier_validation/models/tier_validation.py

@@ -749,16 +749,11 @@ class TierValidation(models.AbstractModel):
     @api.model
     def get_view(self, view_id=None, view_type="form", **options):
         res = super().get_view(view_id=view_id, view_type=view_type, **options)
-
         View = self.env["ir.ui.view"]
-
-        # Override context for postprocessing
-        if view_id and res.get("base_model", self._name) != self._name:
-            View = View.with_context(base_model_name=res["base_model"])
         if view_type == "form" and not self._tier_validation_manual_config:
             doc = etree.XML(res["arch"])
             params = {}
-            all_models = res["models"].copy()
+            all_models = res["models"].copy()  # {modelname(str) ➔ fields(tuple)}
             for node in doc.xpath(self._tier_validation_buttons_xpath):
                 # By default, after the last button of the header
                 # _add_tier_validation_buttons process
@@ -767,6 +762,7 @@ class TierValidation(models.AbstractModel):
                 new_node = etree.fromstring(new_arch)
                 for new_element in new_node:
                     node.addnext(new_element)
+                _merge_view_fields(all_models, new_models)
             for node in doc.xpath("/form/sheet"):
                 # _add_tier_validation_label process
                 new_node = self._add_tier_validation_label(node, params)
@@ -774,18 +770,13 @@ class TierValidation(models.AbstractModel):
                 new_node = etree.fromstring(new_arch)
                 for new_element in new_node:
                     node.addprevious(new_element)
+                _merge_view_fields(all_models, new_models)
                 # _add_tier_validation_reviews process
                 new_node = self._add_tier_validation_reviews(node, params)
                 new_arch, new_models = View.postprocess_and_fields(new_node, self._name)
-                for model in new_models:
-                    if model in all_models:
-                        continue
-                    if model not in res["models"]:
-                        all_models[model] = new_models[model]
-                    else:
-                        all_models[model] = res["models"][model]
                 new_node = etree.fromstring(new_arch)
                 node.append(new_node)
+                _merge_view_fields(all_models, new_models)
             excepted_fields = self._get_all_validation_exceptions()
             for node in doc.xpath("//field[@name][not(ancestor::field)]"):
                 if node.attrib.get("name") in excepted_fields:
@@ -817,3 +808,12 @@ class TierValidation(models.AbstractModel):
                     subtype_xmlid=self._get_requested_notification_subtype(),
                     body=rec._notify_requested_review_body(),
                 )
+
+
+def _merge_view_fields(all_models: dict, new_models: dict):
+    """Merge new_models into all_models. Both are {modelname(str) ➔ fields(tuple)}."""
+    for model, view_fields in new_models.items():
+        if model in all_models:
+            all_models[model] = tuple(set(all_models[model]) | set(view_fields))
+        else:
+            all_models[model] = tuple(view_fields)

odoo/addons/base_tier_validation/readme/CONTRIBUTORS.md

@@ -10,4 +10,6 @@
 - bosd
 - Evan Soh \<<evan.soh@omnisoftsolution.com>\>
 - Manuel Regidor \<<manuel.regidor@sygel.es>\>
-- Eduardo de Miguel \<<edu@moduon.team>\>
+- Eduardo de Miguel \<<edu@moduon.team>\>
+- [XCG Consulting](https://xcg-consulting.fr):
+  - Houzéfa Abbasbhay

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:7cd893ad4c0ec4a8016552e03b14d5688a73089c9e0249f35340050655889f41
+!! source digest: sha256:f66a6423b1055e1fd357661ea6165ca35a45086b86b4bb7d7f165500bf957a97
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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
@@ -614,6 +614,10 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
 <li>Evan Soh &lt;<a class="reference external" href="mailto:evan.soh&#64;omnisoftsolution.com">evan.soh&#64;omnisoftsolution.com</a>&gt;</li>
 <li>Manuel Regidor &lt;<a class="reference external" href="mailto:manuel.regidor&#64;sygel.es">manuel.regidor&#64;sygel.es</a>&gt;</li>
 <li>Eduardo de Miguel &lt;<a class="reference external" href="mailto:edu&#64;moduon.team">edu&#64;moduon.team</a>&gt;</li>
+<li><a class="reference external" href="https://xcg-consulting.fr">XCG Consulting</a>:<ul>
+<li>Houzéfa Abbasbhay</li>
+</ul>
+</li>
 </ul>
 </div>
 <div class="section" id="maintainers">

odoo/addons/base_tier_validation/tests/common.py

@@ -57,6 +57,24 @@ class CommonTierValidation(common.TransactionCase):
             }
         )
 
+        # Define views to avoid automatic views with all fields.
+        for model in cls.test_model._name, cls.test_model_2._name:
+            cls.env["ir.ui.view"].create(
+                {
+                    "model": model,
+                    "name": f"Demo view for {model}",
+                    "arch": """<form>
+                    <header>
+                        <button name="action_confirm" type="object" string="Confirm" />
+                        <field name="state" widget="statusbar" />
+                    </header>
+                    <sheet>
+                        <field name="test_field" />
+                    </sheet>
+                    </form>""",
+                }
+            )
+
         # Create users:
         group_ids = cls.env.ref("base.group_system").ids
         cls.test_user_1 = cls.env["res.users"].create(

odoo/addons/base_tier_validation/tests/test_tier_validation.py

@@ -978,23 +978,6 @@ class TierTierValidation(CommonTierValidation):
 @tagged("at_install")
 class TierTierValidationView(CommonTierValidation):
     def test_view_manual(self):
-        # We need to add a view in order to ensure that an automatic view with all
-        # fields is not created
-        self.env["ir.ui.view"].create(
-            {
-                "model": self.test_record._name,
-                "name": "Demo view",
-                "arch": """<form>
-            <header>
-                <button name="action_confirm" type="object" string="Confirm" />
-                <field name="state" widget="statusbar" />
-            </header>
-            <sheet>
-                <field name="test_field" />
-            </sheet>
-            </form>""",
-            }
-        )
         view = self.env[self.test_record._name].get_view(False, "form")
         with Form(self.test_record) as f:
             self.assertNotIn("review_ids", f._values)
@@ -1004,23 +987,6 @@ class TierTierValidationView(CommonTierValidation):
             self.assertFalse(form.xpath("//button[@name='request_validation']"))
 
     def test_view_automatic(self):
-        # We need to add a view in order to ensure that an automatic view with all
-        # fields is not created
-        self.env["ir.ui.view"].create(
-            {
-                "model": self.test_record_2._name,
-                "name": "Demo view",
-                "arch": """<form>
-            <header>
-                <button name="action_confirm" type="object" string="Confirm" />
-                <field name="state" widget="statusbar" />
-            </header>
-            <sheet>
-                <field name="test_field" />
-            </sheet>
-            </form>""",
-            }
-        )
         view = self.env[self.test_record_2._name].get_view(False, "form")
         with Form(self.test_record_2) as f:
             self.assertIn("review_ids", f._values)
@@ -1028,3 +994,13 @@ class TierTierValidationView(CommonTierValidation):
             self.assertTrue(form.xpath("//field[@name='review_ids']"))
             self.assertTrue(form.xpath("//field[@name='can_review']"))
             self.assertTrue(form.xpath("//button[@name='request_validation']"))
+
+    def test_get_view(self):
+        view = self.test_record_2.get_view()
+        model = "tier.validation.tester2"
+        self.assertEqual(view["model"], model)
+        self.assertEqual(view["models"].keys(), {model, "tier.review"})
+        self.assertIn("id", view["models"][model])
+        self.assertIn("need_validation", view["models"][model])
+        self.assertIn("next_review", view["models"][model])
+        self.assertIn("review_ids", view["models"][model])

{odoo_addon_base_tier_validation-17.0.2.1.1.2.dist-info → odoo_addon_base_tier_validation-17.0.2.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-base_tier_validation
-Version: 17.0.2.1.1.2
+Version: 17.0.2.1.2
 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:7cd893ad4c0ec4a8016552e03b14d5688a73089c9e0249f35340050655889f41
+   !! source digest: sha256:f66a6423b1055e1fd357661ea6165ca35a45086b86b4bb7d7f165500bf957a97
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Mature-brightgreen.png
@@ -276,6 +276,9 @@ Contributors
 -  Evan Soh <evan.soh@omnisoftsolution.com>
 -  Manuel Regidor <manuel.regidor@sygel.es>
 -  Eduardo de Miguel <edu@moduon.team>
+-  `XCG Consulting <https://xcg-consulting.fr>`__:
+
+   -  Houzéfa Abbasbhay
 
 Maintainers
 -----------

{odoo_addon_base_tier_validation-17.0.2.1.1.2.dist-info → odoo_addon_base_tier_validation-17.0.2.1.2.dist-info}/RECORD

@@ -1,6 +1,6 @@
-odoo/addons/base_tier_validation/README.rst,sha256=b7egJBq94kMcpK1xQBNz_5B8jUDSObnO8gjucA-HS-8,8551
+odoo/addons/base_tier_validation/README.rst,sha256=byryeO7xRWxuAAWzsMdLdzhjRqgThVBJM7Mzvlt8CN0,8628
 odoo/addons/base_tier_validation/__init__.py,sha256=rKfzYX9RhkkCxgh2f0PJLYN45Kw8T8-fwxw1pbjLuug,108
-odoo/addons/base_tier_validation/__manifest__.py,sha256=-X_LhicXVWXfdmx9dtMa80L6J3Qkyv0uPDxGpj8MkbA,1658
+odoo/addons/base_tier_validation/__manifest__.py,sha256=-zSDv2kPPaigdPk2XfPVsrgG1Js0UpmB5J1wNxIKtcQ,1658
 odoo/addons/base_tier_validation/data/mail_data.xml,sha256=UKzkLT8rYrFuThdp43v7nLW5SOco4vvIIAhbB_IAQZs,1414
 odoo/addons/base_tier_validation/i18n/base_tier_validation.pot,sha256=kMrxSb-JBx09Ips79-X6pyC0yPsc-fEQ8W_1Zv9z1wM,31554
 odoo/addons/base_tier_validation/i18n/es.po,sha256=foXNBuNeOITckWNhyRzAi_MnAAcH0TL17il_MM2x2xc,37396
@@ -16,17 +16,17 @@ odoo/addons/base_tier_validation/models/res_config_settings.py,sha256=xMdQiCfU5p
 odoo/addons/base_tier_validation/models/res_users.py,sha256=JhUZ0NxJ9EPwpkJ-mvsNTrE1avQncGNKqAF-xFxokEo,2638
 odoo/addons/base_tier_validation/models/tier_definition.py,sha256=I-HeOZopA1n-bISs28XDeAosUrTnhL_mp_TB3awb2w0,4168
 odoo/addons/base_tier_validation/models/tier_review.py,sha256=vuR832VVM-ZUDm-4j9zK1BSNnL0JfesxBSLyhW4Zia8,6754
-odoo/addons/base_tier_validation/models/tier_validation.py,sha256=iLSmswQy7pr8loUi6QNeY1tRCJYGodGU21TR9Vi_xTg,32863
+odoo/addons/base_tier_validation/models/tier_validation.py,sha256=ahNgJJAfULCescQrih72IPvGbzpBrdr7iPL9IAiY6oY,32943
 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=J7LBj933qFHjWwQrkaxWQUhFE-O3rqObqyRw96H5dpc,545
+odoo/addons/base_tier_validation/readme/CONTRIBUTORS.md,sha256=DJp09K9mooM4Qy1fPUVPjAU02fUNudXVeTRzA2gxOoA,616
 odoo/addons/base_tier_validation/readme/DESCRIPTION.md,sha256=nFbYOx89EsI26v6NJF9d-Wm-X2YtHduSRlV5Euk3WWc,651
 odoo/addons/base_tier_validation/readme/HISTORY.md,sha256=P8GfoUhYG7QGIpa8Z0L67E3YEeZBFQCwpDXnt5WG-DY,1332
 odoo/addons/base_tier_validation/readme/ROADMAP.md,sha256=HRRQQuOlSeOF5yfqG0KuANnvrde8y6Suz2pbrXB1OyU,864
 odoo/addons/base_tier_validation/security/ir.model.access.csv,sha256=g6B58IuYYqxD54e9I9vyre7mD74tkpauqTqMAH4Oey0,1134
 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=7orMqzmZ9B3wiZ_8s_2txRQx2l6TSRZ5iQhjPHHFXoo,23060
+odoo/addons/base_tier_validation/static/description/index.html,sha256=VNG2i-bVPQtUAJbO5YtIC0x69nMBpUxjvqrF272f-wo,23191
 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
@@ -35,8 +35,8 @@ 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=3z2_lQ9JiDSFDam4p24qDw5j02iaPb4m2naxv9DkbGA,122
-odoo/addons/base_tier_validation/tests/common.py,sha256=Q0g3zv6cYrSPx8QHwsikFxRmi7TtmuUr4ID_9WvImd8,4504
-odoo/addons/base_tier_validation/tests/test_tier_validation.py,sha256=7l1kfCv31dqzNgAirZMaQM5OVvaA2OvJ7uAc0O7PLYw,41566
+odoo/addons/base_tier_validation/tests/common.py,sha256=9KAJHlWXLj9TDX2ZM_J5WhDC53jTojRiObPKxc4bcFI,5211
+odoo/addons/base_tier_validation/tests/test_tier_validation.py,sha256=t4FQSrDPCP9JpwcIvCXFqNhzEezqFmb73e-5xbEDuTY,40830
 odoo/addons/base_tier_validation/tests/tier_validation_tester.py,sha256=3usFbhfDhlKIWbVu--3qsbsm52B6RwTP4zy244dY1yk,1757
 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=FHpO2tW8FYKQffayERVlQEJH_ip8baZ7nC1NcFDsP7Y,7635
@@ -45,7 +45,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.1.1.2.dist-info/METADATA,sha256=luw89gKJhpPufKiuS1eLrhUZgISq-8PcR1i8dJ6OJNU,9149
-odoo_addon_base_tier_validation-17.0.2.1.1.2.dist-info/WHEEL,sha256=8Rd4enx1PCuyDWP4SABqO5Fv8rpaknqp3VzjoFFLa6c,83
-odoo_addon_base_tier_validation-17.0.2.1.1.2.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
-odoo_addon_base_tier_validation-17.0.2.1.1.2.dist-info/RECORD,,
+odoo_addon_base_tier_validation-17.0.2.1.2.dist-info/METADATA,sha256=UnNgzSyraZF3AycUDQfMGQc322qryTKoi9nJrtOeeLw,9224
+odoo_addon_base_tier_validation-17.0.2.1.2.dist-info/WHEEL,sha256=8Rd4enx1PCuyDWP4SABqO5Fv8rpaknqp3VzjoFFLa6c,83
+odoo_addon_base_tier_validation-17.0.2.1.2.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
+odoo_addon_base_tier_validation-17.0.2.1.2.dist-info/RECORD,,