odoo-addon-base-view-inheritance-extension 16.0.1.1.0__py3-none-any.whl → 16.0.1.2.1__py3-none-any.whl

odoo/addons/base_view_inheritance_extension/README.rst

@@ -7,7 +7,7 @@ Extended view inheritance
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:56c707d911c93aace4dc1593e4c0f7de5816cdf8883d581a9cfdf7d500b2de66
+   !! source digest: sha256:2d8fbf4939d14cf8a9a3bd23e9443daf262d094983fe68dd734e477add384199
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Mature-brightgreen.png
@@ -73,6 +73,15 @@ to refer to some xmlid, say ``%(xmlid)s``.
         $domain_to_add
     </attribute>
 
+**Add domain with AND/OR join operator (AND if missed) for key in attrs**
+
+.. code-block:: xml
+
+    <attribute name="$attribute" operation="attrs_domain_add"
+               key="$attrs_key" join_operator="OR">
+        $domain_to_add_to_attrs_key
+    </attribute>
+
 Known issues / Roadmap
 ======================
 
@@ -107,6 +116,7 @@ Contributors
   * Carlos Dauden
 
 * Iván Todorovich <ivan.todorovich@camptocamp.com>
+* Carlos Serra-Toro <carlos.serra@braintec.com>
 
 Maintainers
 ~~~~~~~~~~~

odoo/addons/base_view_inheritance_extension/__manifest__.py

@@ -3,7 +3,7 @@
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
 {
     "name": "Extended view inheritance",
-    "version": "16.0.1.1.0",
+    "version": "16.0.1.2.1",
     "development_status": "Mature",
     "author": "Therp BV,Odoo Community Association (OCA)",
     "license": "LGPL-3",

odoo/addons/base_view_inheritance_extension/models/ir_ui_view.py

@@ -176,6 +176,7 @@ class IrUiView(models.Model):
                 else:
                     new_value = str(expression.AND([old_domain, new_domain]))
                 new_value = self.str2var_domain_text(new_value)
+                old_value = "".join(old_value.splitlines())
             else:
                 # We must ensure that the domain definition has not line breaks because
                 # in update mode the domain cause an invalid syntax error
@@ -189,6 +190,42 @@ class IrUiView(models.Model):
             node.attrib[attribute_name] = new_value
         return source
 
+    @api.model
+    def inheritance_handler_attributes_attrs_domain_add(self, source, specs):
+        """Implement attrs_domain_add
+
+        <attribute name="$attribute" operation="attrs_domain_add"
+                   key="$attrs_key" join_operator="OR">
+            $domain_to_add_to_attrs_key
+        </attribute>
+        """
+        node = self.locate_node(source, specs)
+        for attribute_node in specs:
+            attribute_name = attribute_node.get("name")
+            key = attribute_node.get("key")
+            join_operator = attribute_node.get("join_operator") or "AND"
+            old_value = node.get(attribute_name) or ""
+            if old_value:
+                old_value = ast.literal_eval(
+                    self.var2str_domain_text(old_value.strip())
+                )
+                old_domain_attrs = old_value.get(key)
+                new_domain = ast.literal_eval(
+                    self.var2str_domain_text(attribute_node.text.strip())
+                )
+                if join_operator == "OR":
+                    new_value = expression.OR([old_domain_attrs, new_domain])
+                else:
+                    new_value = expression.AND([old_domain_attrs, new_domain])
+                old_value[key] = new_value
+                new_value = self.str2var_domain_text(str(old_value))
+            else:
+                # We must ensure that the domain definition has not line breaks because
+                # in update mode the domain cause an invalid syntax error
+                new_value = "{'%s': %s}" % (key, attribute_node.text.strip())
+            node.attrib[attribute_name] = new_value
+        return source
+
     @api.model
     def var2str_domain_text(self, domain_str):
         """Replaces var names with str names to allow eval without defined vars"""

odoo/addons/base_view_inheritance_extension/readme/CONTRIBUTORS.rst

@@ -6,3 +6,4 @@
   * Carlos Dauden
 
 * Iván Todorovich <ivan.todorovich@camptocamp.com>
+* Carlos Serra-Toro <carlos.serra@braintec.com>

odoo/addons/base_view_inheritance_extension/readme/USAGE.rst

@@ -31,3 +31,12 @@ to refer to some xmlid, say ``%(xmlid)s``.
                condition="$field_condition" join_operator="OR">
         $domain_to_add
     </attribute>
+
+**Add domain with AND/OR join operator (AND if missed) for key in attrs**
+
+.. code-block:: xml
+
+    <attribute name="$attribute" operation="attrs_domain_add"
+               key="$attrs_key" join_operator="OR">
+        $domain_to_add_to_attrs_key
+    </attribute>

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

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
@@ -367,7 +366,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:56c707d911c93aace4dc1593e4c0f7de5816cdf8883d581a9cfdf7d500b2de66
+!! source digest: sha256:2d8fbf4939d14cf8a9a3bd23e9443daf262d094983fe68dd734e477add384199
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-tools/tree/16.0/base_view_inheritance_extension"><img alt="OCA/server-tools" src="https://img.shields.io/badge/github-OCA%2Fserver--tools-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-tools-16-0/server-tools-16-0-base_view_inheritance_extension"><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-tools&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>This module was written to make it simple to add custom operators for view
@@ -413,6 +412,13 @@ to refer to some xmlid, say <tt class="docutils literal">%(xmlid)s</tt>.</p>
     </span>$domain_to_add<span class="w">
 </span><span class="nt">&lt;/attribute&gt;</span>
 </pre>
+<p><strong>Add domain with AND/OR join operator (AND if missed) for key in attrs</strong></p>
+<pre class="code xml literal-block">
+<span class="nt">&lt;attribute</span><span class="w"> </span><span class="na">name=</span><span class="s">&quot;$attribute&quot;</span><span class="w"> </span><span class="na">operation=</span><span class="s">&quot;attrs_domain_add&quot;</span><span class="w">
+           </span><span class="na">key=</span><span class="s">&quot;$attrs_key&quot;</span><span class="w"> </span><span class="na">join_operator=</span><span class="s">&quot;OR&quot;</span><span class="nt">&gt;</span><span class="w">
+    </span>$domain_to_add_to_attrs_key<span class="w">
+</span><span class="nt">&lt;/attribute&gt;</span>
+</pre>
 </div>
 <div class="section" id="known-issues-roadmap">
 <h1><a class="toc-backref" href="#toc-entry-2">Known issues / Roadmap</a></h1>
@@ -447,6 +453,7 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
 </ul>
 </li>
 <li>Iván Todorovich &lt;<a class="reference external" href="mailto:ivan.todorovich&#64;camptocamp.com">ivan.todorovich&#64;camptocamp.com</a>&gt;</li>
+<li>Carlos Serra-Toro &lt;<a class="reference external" href="mailto:carlos.serra&#64;braintec.com">carlos.serra&#64;braintec.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">

odoo/addons/base_view_inheritance_extension/tests/test_base_view_inheritance_extension.py

@@ -240,3 +240,70 @@ class TestBaseViewInheritanceExtension(TransactionCase):
         )
         with self.assertRaisesRegex(TypeError, "Attribute `domain` is not a dict"):
             self.env["ir.ui.view"].apply_inheritance_specs(source, specs)
+
+    def test_attrs_domain_add_join_operator_or(self):
+        """Test that we can add an OR domain to an existing attrs key."""
+        self._test_attrs_domain_add(join_operator="OR")
+
+    def test_attrs_domain_add_join_operator_and(self):
+        """Test that we can add an AND domain to an existing attrs key."""
+        self._test_attrs_domain_add(join_operator="AND")
+
+    def _test_attrs_domain_add(self, join_operator):
+        """Test that we can add a domain to an existing attrs domain key."""
+        source = etree.fromstring(
+            """
+            <form>
+                <field
+                    name="ref"
+                    attrs="{
+                        'invisible': [('state', '=', 'draft')],
+                        'required': [('state', '=', False)],
+                    }"
+                />
+            </form>
+            """
+        )
+        specs = etree.fromstring(
+            """
+            <field name="ref" position="attributes">
+                <attribute name="attrs" operation="attrs_domain_add"
+                           key="required" join_operator="%s">
+                    [('state', '!=', 'draft')]
+                </attribute>
+            </field>
+            """
+            % (join_operator,)
+        )
+        res = self.env["ir.ui.view"].apply_inheritance_specs(source, specs)
+        self.assertEqual(
+            res.xpath('//field[@name="ref"]')[0].attrib["attrs"],
+            "{'invisible': [('state', '=', 'draft')], "
+            "'required': ['%s', ('state', '=', False), ('state', '!=', 'draft')]}"
+            % ("|" if join_operator == "OR" else "&"),
+        )
+
+    def test_attrs_domain_add_no_attrs(self):
+        """Test attrs_domain_add if there is no attrs: attrs is created."""
+        source = etree.fromstring(
+            """
+            <form>
+                <field name="ref"/>
+            </form>
+            """
+        )
+        specs = etree.fromstring(
+            """
+            <field name="ref" position="attributes">
+                <attribute name="attrs" operation="attrs_domain_add"
+                           key="required" join_operator="OR">
+                    [('state', '!=', 'draft')]
+                </attribute>
+            </field>
+            """
+        )
+        res = self.env["ir.ui.view"].apply_inheritance_specs(source, specs)
+        self.assertEqual(
+            res.xpath('//field[@name="ref"]')[0].attrib["attrs"],
+            "{'required': [('state', '!=', 'draft')]}",
+        )

{odoo_addon_base_view_inheritance_extension-16.0.1.1.0.dist-info → odoo_addon_base_view_inheritance_extension-16.0.1.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-base-view-inheritance-extension
-Version: 16.0.1.1.0
+Version: 16.0.1.2.1
 Summary: Adds more operators for view inheritance
 Home-page: https://github.com/OCA/server-tools
 Author: Therp BV,Odoo Community Association (OCA)
@@ -25,7 +25,7 @@ Extended view inheritance
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:56c707d911c93aace4dc1593e4c0f7de5816cdf8883d581a9cfdf7d500b2de66
+   !! source digest: sha256:2d8fbf4939d14cf8a9a3bd23e9443daf262d094983fe68dd734e477add384199
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Mature-brightgreen.png
@@ -91,6 +91,15 @@ to refer to some xmlid, say ``%(xmlid)s``.
         $domain_to_add
     </attribute>
 
+**Add domain with AND/OR join operator (AND if missed) for key in attrs**
+
+.. code-block:: xml
+
+    <attribute name="$attribute" operation="attrs_domain_add"
+               key="$attrs_key" join_operator="OR">
+        $domain_to_add_to_attrs_key
+    </attribute>
+
 Known issues / Roadmap
 ======================
 
@@ -125,6 +134,7 @@ Contributors
   * Carlos Dauden
 
 * Iván Todorovich <ivan.todorovich@camptocamp.com>
+* Carlos Serra-Toro <carlos.serra@braintec.com>
 
 Maintainers
 ~~~~~~~~~~~

{odoo_addon_base_view_inheritance_extension-16.0.1.1.0.dist-info → odoo_addon_base_view_inheritance_extension-16.0.1.2.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
-odoo/addons/base_view_inheritance_extension/README.rst,sha256=s4SK60OIEUpRCYl5j3Lrr9n4-4OCelf2iFyY3pC7Tv4,4059
+odoo/addons/base_view_inheritance_extension/README.rst,sha256=xZcGLfthaxIoLHtfL6dMnpZ6ojWzYCwcRWVGC4bphzI,4371
 odoo/addons/base_view_inheritance_extension/__init__.py,sha256=X9EJGOE2GtZbS0G82PtSXmWSZ_R8jEM0rlJTDliQjp4,21
-odoo/addons/base_view_inheritance_extension/__manifest__.py,sha256=Ca1864xMAWhDjammHW65ShRb_59XN3XIMHQMTzG5jO4,616
+odoo/addons/base_view_inheritance_extension/__manifest__.py,sha256=185VxDJxD7lHpQN1GhX4SRbQ7_-rjcLsL3ve6plcDSg,616
 odoo/addons/base_view_inheritance_extension/demo/ir_ui_view.xml,sha256=MHPVOGOM6XnNOTsq0ylz1B5r0sPJpRKHLan3K2mZ6sA,1200
 odoo/addons/base_view_inheritance_extension/i18n/base_view_inheritance_extension.pot,sha256=fs9N7L3F1tQYphJ4_BoE725z8zXA0ULVEIW4-qsQRTw,1031
 odoo/addons/base_view_inheritance_extension/i18n/ca.po,sha256=7ncEf2XfOWoOIlU7jysZhKYtd1KEF7oUHABgxJeEm9Q,1443
@@ -12,16 +12,16 @@ odoo/addons/base_view_inheritance_extension/i18n/it.po,sha256=342XK5tLJJavpToQ_T
 odoo/addons/base_view_inheritance_extension/i18n/sl.po,sha256=YjMtgl3N0bkOH8ngh_FMy7m-vxpNXt12WWiHYSmnFhY,1446
 odoo/addons/base_view_inheritance_extension/i18n/tr.po,sha256=S3G6M2N5DNbiTpctuhlJ14hfKa_BJ_v0Ju-4cHu7eQQ,1453
 odoo/addons/base_view_inheritance_extension/models/__init__.py,sha256=SjKfc8ocbCImvP5DpGQbS0hWmQRYPjtzJdyio6TPII0,25
-odoo/addons/base_view_inheritance_extension/models/ir_ui_view.py,sha256=MGk_4Y-jJNky5SlwklDNRnJyztnng0EPpMffGXcv048,8191
-odoo/addons/base_view_inheritance_extension/readme/CONTRIBUTORS.rst,sha256=c9RfnEkKnqbGzA9LVlOz37yIL6hsprsap_73E5_kqyQ,204
+odoo/addons/base_view_inheritance_extension/models/ir_ui_view.py,sha256=AIeWfScFWgfylcFwL8QPwX3HnIQ2YrkgvhPho_M33cc,9903
+odoo/addons/base_view_inheritance_extension/readme/CONTRIBUTORS.rst,sha256=er1wsP0tAgTprk5TY_A9qnHgOIfb9-v9CgD6ooWGifg,252
 odoo/addons/base_view_inheritance_extension/readme/DESCRIPTION.rst,sha256=pamURJDYfLUcZtHl0ZvXTtzKO1LvHlhhYIND05AMzbk,88
 odoo/addons/base_view_inheritance_extension/readme/ROADMAP.rst,sha256=Cz02ovrYCAgtqjY3nTSnikVgWaKPcWLP-bsuJxCTlKw,56
-odoo/addons/base_view_inheritance_extension/readme/USAGE.rst,sha256=Hbr5TnkYHTP2Ek3PnlL1h7fL11hOX7tnoaOSObfh3Y8,835
+odoo/addons/base_view_inheritance_extension/readme/USAGE.rst,sha256=qVIT8mE5xZVenXbqbWFEqx9bwbF4w-2jgEzdBYKSkAg,1099
 odoo/addons/base_view_inheritance_extension/static/description/icon.png,sha256=6xBPJauaFOF0KDHfHgQopSc28kKvxMaeoQFQWZtfZDo,9455
-odoo/addons/base_view_inheritance_extension/static/description/index.html,sha256=loy9GN6OOMvPfMm6NupcLrEbYf0hfEIrM69gJinkL_k,15475
+odoo/addons/base_view_inheritance_extension/static/description/index.html,sha256=POPtPAJ_RZSS4HMIdl1j3NjWWLWAW4bblHWrmgekwMg,16318
 odoo/addons/base_view_inheritance_extension/tests/__init__.py,sha256=kTcGsgnWhpM7vII3sEdNX5XVxDHHqRc5KdrxInG6GSw,51
-odoo/addons/base_view_inheritance_extension/tests/test_base_view_inheritance_extension.py,sha256=vl07csg7Q9ZNtlnOgnL3AiyNEo7OHpcSdhxULPZuV5k,8618
-odoo_addon_base_view_inheritance_extension-16.0.1.1.0.dist-info/METADATA,sha256=-2LxoLluRkOiFSDwsNRS_zutag5wmP_suaRYNK6Rc5E,4698
-odoo_addon_base_view_inheritance_extension-16.0.1.1.0.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-odoo_addon_base_view_inheritance_extension-16.0.1.1.0.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
-odoo_addon_base_view_inheritance_extension-16.0.1.1.0.dist-info/RECORD,,
+odoo/addons/base_view_inheritance_extension/tests/test_base_view_inheritance_extension.py,sha256=4_43OP09f63VK-3B_iErrGqUj_UCcC4p6I3_YibhP_g,11114
+odoo_addon_base_view_inheritance_extension-16.0.1.2.1.dist-info/METADATA,sha256=7PnLA0RquY9BgQ16T1WSRsSnliXczldWyHzaIDzaqE0,5010
+odoo_addon_base_view_inheritance_extension-16.0.1.2.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+odoo_addon_base_view_inheritance_extension-16.0.1.2.1.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
+odoo_addon_base_view_inheritance_extension-16.0.1.2.1.dist-info/RECORD,,

{odoo_addon_base_view_inheritance_extension-16.0.1.1.0.dist-info → odoo_addon_base_view_inheritance_extension-16.0.1.2.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any