[MERGE] forward port branch saas-14 up to 153ae5e8b83

2 files changed, 14 insertions, 1 deletions

diff --git a/addons/stock/__init__.py b/addons/stock/__init__.py
index ddac13e1a0e..bb5953c4834 100644
--- a/addons/stock/__init__.py
+++ b/addons/stock/__init__.py
@@ -4,4 +4,16 @@
 import controllers
 import models
 import report
-import wizard
\ No newline at end of file
+import wizard
+
+
+from odoo import api, SUPERUSER_ID
+
+
+# TODO: Apply proper fix & remove in master
+def pre_init_hook(cr):
+    env = api.Environment(cr, SUPERUSER_ID, {})
+    env['ir.model.data'].search([
+        ('model', 'like', '%stock%'),
+        ('module', '=', 'stock')
+    ]).unlink()
diff --git a/addons/stock/__manifest__.py b/addons/stock/__manifest__.py
index 9729e82be32..8f9a088fbf9 100644
--- a/addons/stock/__manifest__.py
+++ b/addons/stock/__manifest__.py
@@ -101,4 +101,5 @@ Dashboard / Reports for Inventory Management will include:
     'installable': True,
     'application': True,
     'auto_install': False,
+    'pre_init_hook': 'pre_init_hook',
 }