[MERGE] forward port branch saas-11.2 up to 42659dc70c2

1 files changed, 5 insertions, 6 deletions

diff --git a/addons/website/models/ir_model_fields.py b/addons/website/models/ir_model_fields.py
index 1e963bf650e..51f5c2a7dc5 100644
--- a/addons/website/models/ir_model_fields.py
+++ b/addons/website/models/ir_model_fields.py
@@ -1,17 +1,15 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details
 
-from odoo import api, models
+from odoo import models
 
 
 # This is a nasty hack, targeted for V11 only
 class IrModelFields(models.Model):
     _inherit = 'ir.model.fields'
 
-    @api.multi
     def unlink(self):
-        # Prevent the deletion of social_* fields defined in res.company if
-        # the other module is installed
+        # Prevent the deletion of some `shared` fields... -_-
         social = (
             'social_facebook',
             'social_github',
@@ -23,8 +21,9 @@ class IrModelFields(models.Model):
 
         self = self.filtered(
             lambda rec: not (
-                rec.model == 'res.company' and
-                rec.name in social
+                (rec.model == 'res.company' and rec.name in social)
+                or (rec.model == 'res.config.settings'
+                    and rec.name == 'auth_signup_uninvited')
             )
         )
         return super(IrModelFields, self).unlink()