[IMP] core: move SUPERUSER_ID

odoo/odoo#182371
odoo · Oct 1, 2024 · d614691 · d614691
1 parent 0833a35
commit d614691
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/testing.py b/src/testing.py
@@ -154,7 +154,7 @@ def setUp(self):
         super().setUp()
         self._setup_registry()
         self.cr = self.registry.cursor()
-        self.env = api.Environment(self.cr, odoo.SUPERUSER_ID, {})
+        self.env = api.Environment(self.cr, api.SUPERUSER_ID, {})
         self.addCleanup(self.env.clear)
         self.addCleanup(self.cr.close)
 

diff --git a/src/util/orm.py b/src/util/orm.py
@@ -22,8 +22,12 @@
     from mock import patch
 
 try:
-    from odoo import SUPERUSER_ID, modules, release
+    try:
+        from odoo.api import SUPERUSER_ID
+    except ImportError:
+        from odoo import SUPERUSER_ID
     from odoo import fields as ofields
+    from odoo import modules, release
 except ImportError:
     from openerp import SUPERUSER_ID, modules, release
 

diff --git a/src/util/report.py b/src/util/report.py
@@ -27,7 +27,11 @@
     Markup = None
 
 try:
-    from odoo import SUPERUSER_ID, release
+    try:
+        from odoo.api import SUPERUSER_ID
+    except ImportError:
+        from odoo import SUPERUSER_ID
+    from odoo import release
     from odoo.tools import html_escape
     from odoo.tools.mail import html_sanitize
 except ImportError: