[IMP] core: move SUPERUSER_ID

odoo/odoo#182371

src/testing.py

@@ -15,6 +15,12 @@
     from odoo.tests.common import MetaCase
 except ImportError:
     MetaCase = None
+
+try:
+    from odoo.api import SUPERUSER_ID
+except ImportError:
+    from odoo import SUPERUSER_ID
+
 try:
     from unittest.mock import patch
 except ImportError:
@@ -177,7 +183,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, SUPERUSER_ID, {})
         self.addCleanup(self.env.clear)
         self.addCleanup(self.cr.close)
 

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
 

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: