[IMP] util/domains: handle expression domains

Before it was impossible to handle domains defined as
`context.get('key') and [<dom1>] or [<dom2>]`

Example:
```
context.get('default_move_type') in ('out_invoice', 'out_refund', 'out_receipt') and [('sale_ok', '=', True), '|', ('company_id', '=', False), ('company_id', '=', parent.company_id)] or [('purchase_ok', '=', True), '|', ('company_id', '=', False), ('company_id', '=', parent.company_id)]
```

Author: aj-fuentes

src/base/tests/test_util.py

@@ -53,18 +53,28 @@ def setUp(self):
         self.mock_adapter = mock.Mock()
 
     def test_adapt_renamed_field(self):
-        domain = [("user_ids.partner_id.user_ids.partner_id", "=", False)]
+        term = ("user_ids.partner_id.user_ids.partner_id", "=", False)
+        match_term = ("renamed_user_ids.partner_id.renamed_user_ids.partner_id", "=", False)
+
         Filter = self.env["ir.filters"]
         filter1 = Filter.create(
-            {"name": "Test filter for adapt domain", "model_id": "res.partner", "domain": str(domain)}
+            {"name": "Test filter for adapt domain", "model_id": "res.partner", "domain": str([term])}
+        )
+        assert [term] == ast.literal_eval(filter1.domain)
+
+        base_exp = "context.get('context_value') in (1, 2) and [{0}] or ['!', {0}]"
+        base_exp_fallback = "(((context.get('context_value') in (1, 2)) and [{0}]) or ['!', {0}])"
+        filter2 = Filter.create(
+            {"name": "Test filter for adapt domain2", "model_id": "res.partner", "domain": base_exp.format(term)}
         )
-        assert domain == ast.literal_eval(filter1.domain)
+
         util.invalidate(Filter)
         util.rename_field(self.cr, "res.partner", "user_ids", "renamed_user_ids")
-        match_domain = [("renamed_user_ids.partner_id.renamed_user_ids.partner_id", "=", False)]
+
         new_domain = ast.literal_eval(filter1.domain)
+        self.assertEqual([match_term], new_domain)
 
-        self.assertEqual(match_domain, new_domain)
+        self.assertIn(filter2.domain, [base_exp.format(match_term), base_exp_fallback.format(match_term)])
 
     @parametrize(
         [

src/util/domains.py

@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
+import ast
 import collections
 import functools
 import logging
 import re
+import sys
 import warnings
 
 import lxml
@@ -34,7 +36,7 @@
 from .const import NEARLYWARN
 from .helpers import _dashboard_actions, _validate_model, resolve_model_fields_path
 from .inherit import for_each_inherit
-from .misc import SelfPrintEvalContext, version_gte
+from .misc import SelfPrintEvalContext, ast_unparse, literal_replace, version_gte
 from .pg import column_exists, get_value_or_en_translation, table_exists
 from .records import edit_view
 
@@ -100,6 +102,8 @@ def is_leaf(leaf):
     del expression  # unset so it's not used directly
 
 
+AST_CONSTANT_TYPES = (ast.Constant, ast.Str) if sys.version_info < (3, 12) else (ast.Constant,)
+
 _logger = logging.getLogger(__name__)
 DomainField = collections.namedtuple("DomainField", "table domain_column model_select")
 """
@@ -248,6 +252,41 @@ def _replace_path(cr, old, new, src_model, dst_model, path_str):
 
 
 def _adapt_one_domain(cr, target_model, old, new, model, domain, adapter=None, force_adapt=False):
+    if not isinstance(domain, basestring):
+        # defer to the old adapter that replaces invalid terms
+        return _adapt_one_domain_old(cr, target_model, old, new, model, domain, adapter, force_adapt)
+
+    def domain_check(ast_node):
+        if all(
+            (
+                isinstance(term, (ast.Tuple, ast.List))
+                and len(term.elts) == 3
+                and isinstance(term.elts[1], AST_CONSTANT_TYPES)
+            )
+            or isinstance(term, AST_CONSTANT_TYPES)
+            for term in ast_node.elts
+        ) and any(isinstance(term, (ast.Tuple, ast.List)) and len(term.elts) == 3 for term in ast_node.elts):
+            # it looks like a domain, let's adapt it
+            internal_domain = _adapt_one_domain_old(
+                cr,
+                target_model,
+                old,
+                new,
+                model,
+                ast_unparse(ast_node),
+                adapter=adapter,
+                force_adapt=force_adapt,
+            )
+            return ast.parse(unicode(internal_domain), mode="eval").body if internal_domain else ast_node
+        return ast_node
+
+    new_domain = literal_replace(domain, {ast.List([literal_replace.WILDCARD], None): domain_check})
+    if new_domain != domain:
+        return new_domain
+    return None
+
+
+def _adapt_one_domain_old(cr, target_model, old, new, model, domain, adapter=None, force_adapt=False):
     if not adapter:
         adapter = lambda leaf, _, __: [leaf]