diff --git a/addons/mail/models/res_users.py b/addons/mail/models/res_users.py index 58037fe43b8..64e0d1cd746 100644 --- a/addons/mail/models/res_users.py +++ b/addons/mail/models/res_users.py @@ -18,11 +18,6 @@ class Users(models.Model): _inherit = ['res.users'] _description = 'Users' - alias_id = fields.Many2one('mail.alias', 'Alias', ondelete="set null", required=False, - help="Email address internally associated with this user. Incoming "\ - "emails will appear in the user's notifications.", copy=False, auto_join=True) - alias_contact = fields.Selection( - string='Alias Contact Security', related='alias_id.alias_contact', readonly=False) notification_type = fields.Selection([ ('email', 'Handle by Emails'), ('inbox', 'Handle in Odoo')], @@ -64,8 +59,8 @@ GROUP BY channel_moderator.res_users_id""", [tuple(self.ids)]) def __init__(self, pool, cr): """ Override of __init__ to add access rights on notification_email_send - and alias fields. Access rights are disabled by default, but allowed - on some specific fields defined in self.SELF_{READ/WRITE}ABLE_FIELDS. + fields. Access rights are disabled by default, but allowed on some + specific fields defined in self.SELF_{READ/WRITE}ABLE_FIELDS. """ init_res = super(Users, self).__init__(pool, cr) # duplicate list to avoid modifying the original reference diff --git a/addons/mail/views/res_users_views.xml b/addons/mail/views/res_users_views.xml index c2d3d9ce825..f402858a1b5 100644 --- a/addons/mail/views/res_users_views.xml +++ b/addons/mail/views/res_users_views.xml @@ -26,10 +26,6 @@ - - - - diff --git a/addons/mail_bot/views/res_users_views.xml b/addons/mail_bot/views/res_users_views.xml index f82b2b96f72..36bb1abf22c 100644 --- a/addons/mail_bot/views/res_users_views.xml +++ b/addons/mail_bot/views/res_users_views.xml @@ -21,7 +21,7 @@ - +