Merge PR #155 into master

Signed-off-by jjscarafia

Author: OCA-git-bot

odoo_module_migrate/migration_scripts/migrate_180_190.py

@@ -1,6 +1,65 @@
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl).
 
 from odoo_module_migrate.base_migration_script import BaseMigrationScript
+import re
+
+
+def migrate_expression_to_domain(
+    logger, module_path, module_name, manifest_path, migration_steps, tools
+):
+    """Convert odoo.osv.expression usage to odoo.fields.Domain"""
+    files_to_process = tools.get_files(module_path, (".py",))
+
+    for file in files_to_process:
+        try:
+            content = tools._read_content(file)
+            original_content = content
+
+            content = re.sub(
+                r"from odoo\.osv import expression",
+                "from odoo.fields import Domain",
+                content,
+            )
+
+            content = re.sub(
+                r"from odoo\.osv\.expression import (AND|OR|AND, OR|OR, AND)",
+                "from odoo.fields import Domain",
+                content,
+            )
+
+            content = re.sub(r"expression\.AND\(", "Domain.AND(", content)
+            content = re.sub(r"expression\.OR\(", "Domain.OR(", content)
+
+            content = re.sub(r"(?<!\.)AND\(", "Domain.AND(", content)
+            content = re.sub(r"(?<!\.)OR\(", "Domain.OR(", content)
+
+            content = re.sub(
+                r"from odoo\.fields import Domain, (AND|OR|AND, OR|OR, AND)",
+                "from odoo.fields import Domain",
+                content,
+            )
+
+            lines = content.split("\n")
+            seen_domain_import = False
+            cleaned_lines = []
+
+            for line in lines:
+                if line.strip() == "from odoo.fields import Domain":
+                    if not seen_domain_import:
+                        cleaned_lines.append(line)
+                        seen_domain_import = True
+                else:
+                    cleaned_lines.append(line)
+
+            content = "\n".join(cleaned_lines)
+
+            if content != original_content:
+                tools._write_content(file, content)
+                logger.info(f"Migrated expression imports to Domain in: {file}")
+
+        except Exception as e:
+            logger.error(f"Error processing file {file}: {str(e)}")
+
 
 import ast
 import json
@@ -46,4 +105,7 @@ def build_sql_object(match):
 
 class MigrationScript(BaseMigrationScript):
 
-    _GLOBAL_FUNCTIONS = [upgrade_sql_constraints]
+    _GLOBAL_FUNCTIONS = [
+        upgrade_sql_constraints,
+        migrate_expression_to_domain,
+    ]

tests/data_result/module_180_190/models/__init__.py

@@ -1 +1,2 @@
 from . import res_partner
+from . import sale_order

tests/data_result/module_180_190/models/res_partner.py

@@ -1,4 +1,5 @@
 from odoo import models, fields, api
+from odoo.fields import Domain
 
 
 class ResPartner(models.Model):
@@ -36,3 +37,9 @@ def test_groups_id_usage(self):
         self.create(vals)
 
         return records
+
+    def search_with_expression(self, domain):
+        result = Domain.AND([domain, [('active', '=', True)]])
+        result2 = Domain.AND([result, Domain.OR([[('is_company', '=', True)]])])
+        
+        return self.search(result2)

tests/data_result/module_180_190/models/sale_order.py

@@ -0,0 +1,12 @@
+from odoo import models
+from odoo.fields import Domain
+
+
+class SaleOrder(models.Model):
+    _inherit = "sale.order"
+    
+    def simple_search(self, base_domain):
+        extra_domain = [('state', '=', 'sale')]
+        result1 = Domain.AND([base_domain, extra_domain])
+        result2 = Domain.OR([result1, [('state', '=', 'draft')]])
+        return result2

tests/data_template/module_180/models/__init__.py

@@ -1 +1,2 @@
 from . import res_partner
+from . import sale_order

tests/data_template/module_180/models/res_partner.py

@@ -1,4 +1,6 @@
 from odoo import models, fields, api
+from odoo.osv import expression
+from odoo.osv.expression import AND, OR
 
 
 class ResPartner(models.Model):
@@ -29,3 +31,9 @@ def test_groups_id_usage(self):
         self.create(vals)
 
         return records
+
+    def search_with_expression(self, domain):
+        result = expression.AND([domain, [('active', '=', True)]])
+        result2 = AND([result, OR([[('is_company', '=', True)]])])
+        
+        return self.search(result2)

tests/data_template/module_180/models/sale_order.py

@@ -0,0 +1,12 @@
+from odoo import models
+from odoo.osv import expression
+
+
+class SaleOrder(models.Model):
+    _inherit = "sale.order"
+    
+    def simple_search(self, base_domain):
+        extra_domain = [('state', '=', 'sale')]
+        result1 = expression.AND([base_domain, extra_domain])
+        result2 = expression.OR([result1, [('state', '=', 'draft')]])
+        return result2