Revert "[IMP] *: Define groups on res.users models"

This reverts commit 99f497b390e680629dce3a7e2e282ada74ee9884.

126 files changed, 41 insertions, 1196 deletions

diff --git a/addons/account/__manifest__.py b/addons/account/__manifest__.py
index 9b98ed5ff11..1e31a8a4bf2 100644
--- a/addons/account/__manifest__.py
+++ b/addons/account/__manifest__.py
@@ -65,7 +65,6 @@ Core mechanisms for the accounting modules. To display the menuitems, install th
         'views/account_dashboard_setup_bar.xml',
         'wizard/account_report_tax_view.xml',
         'views/report_tax.xml',
-        'views/res_users_views.xml',
         'data/service_cron_reverse.xml',
         'views/account_fiscal_year_view.xml',
     ],
diff --git a/addons/account/models/__init__.py b/addons/account/models/__init__.py
index 95d9fcbf996..c26691d4d2b 100644
--- a/addons/account/models/__init__.py
+++ b/addons/account/models/__init__.py
@@ -15,4 +15,3 @@ from . import company
 from . import res_config_settings
 from . import account_cash_rounding
 from . import reconciliation_widget
-from . import res_users
diff --git a/addons/account/models/res_users.py b/addons/account/models/res_users.py
deleted file mode 100644
index 53e9c3b5a4a..00000000000
--- a/addons/account/models/res_users.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import fields, models
-
-
-class ResUsers(models.Model):
-    _inherit = 'res.users'
-
-    has_group_warning_account = fields.Boolean(
-        'A warning can be set on a partner (Account)', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='account.group_warning_account')
-
-    has_group_cash_rounding = fields.Boolean(
-        'Allow the cash rounding management', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='account.group_cash_rounding')
-
-    group_account_user = fields.Selection(
-        selection=lambda self: self._get_group_selection('base.module_category_accounting_and_finance'),
-        string='Accounting & Finance', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        category_xml_id='base.module_category_accounting_and_finance')
diff --git a/addons/account/views/res_users_views.xml b/addons/account/views/res_users_views.xml
deleted file mode 100644
index b3a4a15d402..00000000000
--- a/addons/account/views/res_users_views.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <record id="res_users_view_form" model="ir.ui.view">
-        <field name="name">res.users.form.account.inherit</field>
-        <field name="model">res.users</field>
-        <field name="inherit_id" ref="base.view_users_form"/>
-        <field name="priority">40</field>
-        <field name="arch" type="xml">
-            <group name="applications" position="inside">
-                <field name='group_account_user'/>
-            </group>
-            <group name="technical" position="inside">
-                <label for="has_group_warning_account" colspan="3"/>
-                <div>
-                    <field name='has_group_warning_account' colspan="1" class="oe_inline"/>
-                </div>
-                <label for="has_group_cash_rounding" colspan="3"/>
-                <div>
-                    <field name='has_group_cash_rounding' colspan="1" class="oe_inline"/>
-                </div>
-            </group>
-        </field>
-    </record>
-</odoo>
diff --git a/addons/analytic/__manifest__.py b/addons/analytic/__manifest__.py
index 392600a5850..74499219a64 100644
--- a/addons/analytic/__manifest__.py
+++ b/addons/analytic/__manifest__.py
@@ -19,7 +19,6 @@ that have no counterpart in the general financial accounts.
         'security/analytic_security.xml',
         'security/ir.model.access.csv',
         'views/analytic_account_views.xml',
-        'views/res_users_views.xml',
     ],
     'demo': [
         'data/analytic_demo.xml',
diff --git a/addons/analytic/models/__init__.py b/addons/analytic/models/__init__.py
index 2e5e553c626..d1fd64b96f8 100644
--- a/addons/analytic/models/__init__.py
+++ b/addons/analytic/models/__init__.py
@@ -2,4 +2,3 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import analytic_account
-from . import res_users
diff --git a/addons/analytic/models/res_users.py b/addons/analytic/models/res_users.py
deleted file mode 100644
index f1363c0d123..00000000000
--- a/addons/analytic/models/res_users.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import fields, models
-
-
-class ResUsers(models.Model):
-    _inherit = 'res.users'
-
-    has_group_analytic_accounting = fields.Boolean(
-        'Analytic Accounting', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='analytic.group_analytic_accounting')
-
-    has_group_analytic_tags = fields.Boolean(
-        'Analytic Accounting Tags', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='analytic.group_analytic_tags')
diff --git a/addons/analytic/views/res_users_views.xml b/addons/analytic/views/res_users_views.xml
deleted file mode 100644
index 0d4b070cdaf..00000000000
--- a/addons/analytic/views/res_users_views.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <record id="res_users_view_form" model="ir.ui.view">
-        <field name="name">res.users.form.analytic.inherit</field>
-        <field name="model">res.users</field>
-        <field name="inherit_id" ref="base.view_users_form"/>
-        <field name="arch" type="xml">
-            <group name="technical" position="inside">
-                <label for="has_group_analytic_accounting" colspan="3"/>
-                <div>
-                    <field name='has_group_analytic_accounting' colspan="1" class="oe_inline"/>
-                </div>
-                <label for="has_group_analytic_tags" colspan="3"/>
-                <div>
-                    <field name='has_group_analytic_tags' colspan="1" class="oe_inline"/>
-                </div>
-            </group>
-        </field>
-    </record>
-</odoo>
diff --git a/addons/auth_signup/views/res_users_views.xml b/addons/auth_signup/views/res_users_views.xml
index 85be323f340..0a5f43eb8a0 100644
--- a/addons/auth_signup/views/res_users_views.xml
+++ b/addons/auth_signup/views/res_users_views.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-        <record id="res_users_view_form" model="ir.ui.view">
+        <record id="res_users_form_view" model="ir.ui.view">
             <field name="name">res.users.form.inherit</field>
             <field name="model">res.users</field>
             <field name="inherit_id" ref="base.view_users_form"/>
diff --git a/addons/crm/__manifest__.py b/addons/crm/__manifest__.py
index b09e6c9c70d..7ac544a6c75 100644
--- a/addons/crm/__manifest__.py
+++ b/addons/crm/__manifest__.py
@@ -43,7 +43,6 @@
         'report/crm_activity_report_views.xml',
         'report/crm_opportunity_report_views.xml',
         'views/crm_team_views.xml',
-        'views/res_users_views.xml',
     ],
     'demo': [
         'data/crm_demo.xml',
diff --git a/addons/crm/models/res_users.py b/addons/crm/models/res_users.py
index fbbe64501eb..2c94f1c05ab 100644
--- a/addons/crm/models/res_users.py
+++ b/addons/crm/models/res_users.py
@@ -5,11 +5,8 @@ from odoo import fields, models
 
 
 class Users(models.Model):
+
     _inherit = 'res.users'
 
     target_sales_won = fields.Integer('Won in Opportunities Target')
     target_sales_done = fields.Integer('Activities Done Target')
-
-    has_group_use_lead = fields.Boolean(
-        'Show Lead Menu', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='crm.group_use_lead')
diff --git a/addons/crm/views/res_users_views.xml b/addons/crm/views/res_users_views.xml
deleted file mode 100644
index 27c2bf286fa..00000000000
--- a/addons/crm/views/res_users_views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <record id="res_users_view_form" model="ir.ui.view">
-        <field name="name">res.users.form.crm.inherit</field>
-        <field name="model">res.users</field>
-        <field name="inherit_id" ref="base.view_users_form"/>
-        <field name="arch" type="xml">
-            <group name="technical" position="inside">
-                <label for="has_group_use_lead" colspan="3"/>
-                <div>
-                    <field name='has_group_use_lead' colspan="1" class="oe_inline"/>
-                </div>
-            </group>
-        </field>
-    </record>
-</odoo>
diff --git a/addons/event/__manifest__.py b/addons/event/__manifest__.py
index b3662b2f003..e9f22c0f53d 100644
--- a/addons/event/__manifest__.py
+++ b/addons/event/__manifest__.py
@@ -30,8 +30,6 @@ Key Features
         'views/res_config_settings_views.xml',
         'views/event_templates.xml',
         'views/res_partner_views.xml',
-        'views/res_users_views.xml',
-
     ],
     'demo': [
         'data/event_demo.xml',
diff --git a/addons/event/models/__init__.py b/addons/event/models/__init__.py
index 695ce7e13e4..eed59489b26 100644
--- a/addons/event/models/__init__.py
+++ b/addons/event/models/__init__.py
@@ -5,4 +5,3 @@ from . import event
 from . import event_mail
 from . import res_config_settings
 from . import res_partner
-from . import res_users
diff --git a/addons/event/models/res_partner.py b/addons/event/models/res_partner.py
index 03934562824..009b182c1ae 100644
--- a/addons/event/models/res_partner.py
+++ b/addons/event/models/res_partner.py
@@ -3,11 +3,10 @@
 
 from odoo import api, fields, models
 
-
 class ResPartner(models.Model):
     _inherit = 'res.partner'
 
-    event_count = fields.Integer("Events Count", compute='_compute_event_count', help="Number of events the partner has participated.")
+    event_count = fields.Integer("Events", compute='_compute_event_count', help="Number of events the partner has participated.")
 
     def _compute_event_count(self):
         if not self.user_has_groups('event.group_event_user'):
diff --git a/addons/event/models/res_users.py b/addons/event/models/res_users.py
deleted file mode 100644
index 024677bcfe4..00000000000
--- a/addons/event/models/res_users.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import fields, models
-
-
-class ResUsers(models.Model):
-    _inherit = 'res.users'
-
-    group_event_user = fields.Selection(
-        selection=lambda self: self._get_group_selection('base.module_category_event_management'),
-        string='Events', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        category_xml_id='base.module_category_event_management')
diff --git a/addons/event/views/res_users_views.xml b/addons/event/views/res_users_views.xml
deleted file mode 100644
index 20b722bf76a..00000000000
--- a/addons/event/views/res_users_views.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <record id="res_users_view_form" model="ir.ui.view">
-        <field name="name">res.users.form.event.inherit</field>
-        <field name="model">res.users</field>
-        <field name="inherit_id" ref="base.view_users_form"/>
-        <field name="priority">105</field>
-        <field name="arch" type="xml">
-            <group name="applications" position="inside">
-                <field name='group_event_user'/>
-            </group>
-        </field>
-    </record>
-</odoo>
diff --git a/addons/fleet/__manifest__.py b/addons/fleet/__manifest__.py
index b3a33837130..646e28b1294 100644
--- a/addons/fleet/__manifest__.py
+++ b/addons/fleet/__manifest__.py
@@ -36,7 +36,6 @@ Main Features
         'views/fleet_vehicle_cost_views.xml',
         'views/fleet_board_view.xml',
         'views/mail_activity_views.xml',
-        'views/res_users_views.xml',
         'data/fleet_cars_data.xml',
         'data/fleet_data.xml',
         'data/mail_data.xml',
diff --git a/addons/fleet/models/__init__.py b/addons/fleet/models/__init__.py
index 0421e909283..781603220f3 100644
--- a/addons/fleet/models/__init__.py
+++ b/addons/fleet/models/__init__.py
@@ -4,4 +4,3 @@
 from . import fleet_vehicle
 from . import fleet_vehicle_cost
 from . import fleet_vehicle_model
-from . import res_users
diff --git a/addons/fleet/models/res_users.py b/addons/fleet/models/res_users.py
deleted file mode 100644
index 0f031278fb5..00000000000
--- a/addons/fleet/models/res_users.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import fields, models
-
-
-class ResUsers(models.Model):
-    _inherit = 'res.users'
-
-    group_fleet_user = fields.Selection(
-        selection=lambda self: self._get_group_selection('fleet.module_fleet_category'),
-        string='Fleet', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        category_xml_id='fleet.module_fleet_category')
diff --git a/addons/fleet/views/res_users_views.xml b/addons/fleet/views/res_users_views.xml
deleted file mode 100644
index 3cd5e04b63a..00000000000
--- a/addons/fleet/views/res_users_views.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <record id="res_users_view_form" model="ir.ui.view">
-        <field name="name">res.users.form.fleet.inherit</field>
-        <field name="model">res.users</field>
-        <field name="inherit_id" ref="base.view_users_form"/>
-        <field name="priority">100</field>
-        <field name="arch" type="xml">
-            <group name="applications" position="inside">
-                <field name='group_fleet_user'/>
-            </group>
-        </field>
-    </record>
-</odoo>
diff --git a/addons/hr/__manifest__.py b/addons/hr/__manifest__.py
index 6bed1af89a1..fd9e76106fb 100644
--- a/addons/hr/__manifest__.py
+++ b/addons/hr/__manifest__.py
@@ -27,7 +27,6 @@
         'views/hr_views.xml',
         'views/hr_templates.xml',
         'views/res_config_settings_views.xml',
-        'views/res_users_views.xml',
         'data/hr_data.xml',
     ],
     'demo': [
diff --git a/addons/hr/models/res_users.py b/addons/hr/models/res_users.py
index 9b1777c5084..8f371ba3b13 100644
--- a/addons/hr/models/res_users.py
+++ b/addons/hr/models/res_users.py
@@ -11,12 +11,6 @@ class User(models.Model):
 
     employee_ids = fields.One2many('hr.employee', 'user_id', string='Related employees')
 
-    group_hr_user = fields.Selection(
-        selection=lambda self: self._get_group_selection('base.module_category_human_resources'),
-        string="Human Resources", compute='_compute_groups_id', inverse='_inverse_groups_id',
-        category_xml_id='base.module_category_human_resources',
-        help='Officer: The user will be able to approve document created by employees.\nManager: The user will have access to the human resources configuration as well as statistic reports.')
-
     @api.multi
     def write(self, vals):
         """ When renaming admin user, we want its new name propagated to its related employees """
diff --git a/addons/hr/views/res_users_views.xml b/addons/hr/views/res_users_views.xml
deleted file mode 100644
index d68aac97bd2..00000000000
--- a/addons/hr/views/res_users_views.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <record id="res_users_view_form" model="ir.ui.view">
-        <field name="name">res.users.form.hr.inherit</field>
-        <field name="model">res.users</field>
-        <field name="inherit_id" ref="base.view_users_form"/>
-        <field name="priority">50</field>
-        <field name="arch" type="xml">
-            <group name="applications" position="inside">
-                <field name="group_hr_user"/>
-            </group>
-        </field>
-    </record>
-</odoo>
diff --git a/addons/hr_attendance/__manifest__.py b/addons/hr_attendance/__manifest__.py
index fe15c194c92..4637cc7bb61 100644
--- a/addons/hr_attendance/__manifest__.py
+++ b/addons/hr_attendance/__manifest__.py
@@ -26,7 +26,6 @@ actions(Check in/Check out) performed by them.
         'views/hr_department_view.xml',
         'views/hr_employee_view.xml',
         'views/res_config_settings_views.xml',
-        'views/res_users_views.xml',
     ],
     'demo': [
         'data/hr_attendance_demo.xml'
diff --git a/addons/hr_attendance/models/__init__.py b/addons/hr_attendance/models/__init__.py
index 724d7ee23aa..fd62623b92b 100644
--- a/addons/hr_attendance/models/__init__.py
+++ b/addons/hr_attendance/models/__init__.py
@@ -3,4 +3,3 @@
 from . import res_config_settings
 from . import hr_attendance
 from . import hr_employee
-from . import res_users
diff --git a/addons/hr_attendance/models/res_users.py b/addons/hr_attendance/models/res_users.py
deleted file mode 100644
index 34b2450964d..00000000000
--- a/addons/hr_attendance/models/res_users.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import fields, models
-
-
-class ResUsers(models.Model):
-    _inherit = 'res.users'
-
-    has_group_hr_attendance = fields.Boolean(
-        'Manual Attendance', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='hr_attendance.group_hr_attendance',
-        help='The user will gain access to the human resources attendance menu, enabling him to manage his own attendance.')
-
-    has_group_hr_attendance_use_pin = fields.Boolean(
-        'Enable PIN use', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='hr_attendance.group_hr_attendance_use_pin',
-        help='The user will have to enter his PIN to check in and out manually at the company screen.')
-
-    group_hr_attendance_user = fields.Selection(
-        selection=lambda self: self._get_group_selection('base.module_category_hr_attendance'),
-        string='Attendance', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        category_xml_id='base.module_category_hr_attendance')
diff --git a/addons/hr_attendance/views/res_users_views.xml b/addons/hr_attendance/views/res_users_views.xml
deleted file mode 100644
index eb8115fbcf9..00000000000
--- a/addons/hr_attendance/views/res_users_views.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <record id="res_users_view_form" model="ir.ui.view">
-        <field name="name">res.users.form.hr_attendance.inherit</field>
-        <field name="model">res.users</field>
-        <field name="inherit_id" ref="base.view_users_form"/>
-        <field name="priority">80</field>
-        <field name="arch" type="xml">
-            <group name="applications" position="inside">
-                <field name='group_hr_attendance_user'/>
-            </group>
-            <group name="technical" position="inside">
-                <label for="has_group_hr_attendance" colspan="3"/>
-                <div>
-                    <field name='has_group_hr_attendance' colspan="1" class="oe_inline"/>
-                </div>
-                <label for="has_group_hr_attendance_use_pin" colspan="3"/>
-                <div>
-                    <field name='has_group_hr_attendance_use_pin' colspan="1" class="oe_inline"/>
-                </div>
-            </group>
-        </field>
-    </record>
-</odoo>
diff --git a/addons/hr_expense/__manifest__.py b/addons/hr_expense/__manifest__.py
index c9a4184c302..11ae6223152 100644
--- a/addons/hr_expense/__manifest__.py
+++ b/addons/hr_expense/__manifest__.py
@@ -43,7 +43,6 @@ This module also uses analytic accounting and is compatible with the invoice on
         'views/assets.xml',
         'views/res_config_settings_views.xml',
         'views/account_journal_dashboard.xml',
-        'views/res_users_views.xml',
     ],
     'demo': ['data/hr_expense_demo.xml'],
     'installable': True,
diff --git a/addons/hr_expense/models/__init__.py b/addons/hr_expense/models/__init__.py
index 5a1b4fcd975..af1e04d2dd2 100644
--- a/addons/hr_expense/models/__init__.py
+++ b/addons/hr_expense/models/__init__.py
@@ -7,4 +7,3 @@ from . import hr_expense
 from . import product_template
 from . import res_config_settings
 from . import account_journal_dashboard
-from . import res_users
diff --git a/addons/hr_expense/models/res_users.py b/addons/hr_expense/models/res_users.py
deleted file mode 100644
index 84324e182f1..00000000000
--- a/addons/hr_expense/models/res_users.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import fields, models
-
-
-class ResUsers(models.Model):
-    _inherit = 'res.users'
-
-    group_hr_expense_user = fields.Selection(
-        selection=lambda self: self._get_group_selection('base.module_category_hr_expense'),
-        string='Expenses', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        category_xml_id='base.module_category_hr_expense')
diff --git a/addons/hr_expense/views/res_users_views.xml b/addons/hr_expense/views/res_users_views.xml
deleted file mode 100644
index 4225955c135..00000000000
--- a/addons/hr_expense/views/res_users_views.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <record id="res_users_view_form" model="ir.ui.view">
-        <field name="name">res.users.form.hr_expense.inherit</field>
-        <field name="model">res.users</field>
-        <field name="inherit_id" ref="base.view_users_form"/>
-        <field name="priority">65</field>
-        <field name="arch" type="xml">
-            <group name="applications" position="inside">
-                <field name='group_hr_expense_user'/>
-            </group>
-        </field>
-    </record>
-</odoo>
diff --git a/addons/hr_holidays/__manifest__.py b/addons/hr_holidays/__manifest__.py
index 946035e1309..ce575c9b5b9 100644
--- a/addons/hr_holidays/__manifest__.py
+++ b/addons/hr_holidays/__manifest__.py
@@ -39,7 +39,6 @@ A synchronization with an internal agenda (Meetings of the CRM module) is also p
         'views/hr_leave_type_views.xml',
         'views/hr_leave_allocation_views.xml',
         'views/mail_activity_views.xml',
-        'views/res_users_views.xml',
 
         'wizard/hr_holidays_summary_department_views.xml',
         'wizard/hr_holidays_summary_employees_views.xml',
diff --git a/addons/hr_holidays/models/__init__.py b/addons/hr_holidays/models/__init__.py
index 0465a571c55..621aeccd08b 100644
--- a/addons/hr_holidays/models/__init__.py
+++ b/addons/hr_holidays/models/__init__.py
@@ -6,4 +6,3 @@ from . import hr
 from . import hr_leave
 from . import hr_leave_allocation
 from . import hr_leave_type
-from . import res_users
diff --git a/addons/hr_holidays/models/res_users.py b/addons/hr_holidays/models/res_users.py
deleted file mode 100644
index d38d6c63d82..00000000000
--- a/addons/hr_holidays/models/res_users.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import fields, models
-
-
-class ResUsers(models.Model):
-    _inherit = 'res.users'
-
-    group_hr_holidays_user = fields.Selection(
-        selection=lambda self: self._get_group_selection('base.module_category_hr_holidays'),
-        string='Leaves', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        category_xml_id='base.module_category_hr_holidays')
diff --git a/addons/hr_holidays/views/res_users_views.xml b/addons/hr_holidays/views/res_users_views.xml
deleted file mode 100644
index 354a681e7c4..00000000000
--- a/addons/hr_holidays/views/res_users_views.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <record id="res_users_view_form" model="ir.ui.view">
-        <field name="name">res.users.form.hr_holidays.inherit</field>
-        <field name="model">res.users</field>
-        <field name="inherit_id" ref="base.view_users_form"/>
-        <field name="priority">55</field>
-        <field name="arch" type="xml">
-            <group name="applications" position="inside">
-                <field name='group_hr_holidays_user'/>
-            </group>
-        </field>
-    </record>
-</odoo>
diff --git a/addons/hr_payroll/__manifest__.py b/addons/hr_payroll/__manifest__.py
index 7225b046dc3..f0584b9474b 100644
--- a/addons/hr_payroll/__manifest__.py
+++ b/addons/hr_payroll/__manifest__.py
@@ -29,7 +29,6 @@
         'views/report_contributionregister_templates.xml',
         'views/report_payslip_templates.xml',
         'views/report_payslipdetails_templates.xml',
-        'views/res_users_views.xml',
     ],
     'demo': ['data/hr_payroll_demo.xml'],
 }
diff --git a/addons/hr_payroll/models/__init__.py b/addons/hr_payroll/models/__init__.py
index 5c4f1a7008e..99a241743cf 100644
--- a/addons/hr_payroll/models/__init__.py
+++ b/addons/hr_payroll/models/__init__.py
@@ -6,4 +6,3 @@ from . import hr_employee
 from . import res_config_settings
 from . import hr_salary_rule
 from . import hr_payslip
-from . import res_users
diff --git a/addons/hr_payroll/models/res_users.py b/addons/hr_payroll/models/res_users.py
deleted file mode 100644
index 3c2fe5c78d4..00000000000
--- a/addons/hr_payroll/models/res_users.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import fields, models
-
-
-class ResUsers(models.Model):
-    _inherit = 'res.users'
-
-    group_hr_payroll_user = fields.Selection(
-        selection=lambda self: self._get_group_selection('base.module_category_hr_payroll'),
-        string='Payroll', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        category_xml_id='base.module_category_hr_payroll')
diff --git a/addons/hr_payroll/views/res_users_views.xml b/addons/hr_payroll/views/res_users_views.xml
deleted file mode 100644
index 5d5fd491325..00000000000
--- a/addons/hr_payroll/views/res_users_views.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <record id="res_users_view_form" model="ir.ui.view">
-        <field name="name">res.users.form.hr_payroll.inherit</field>
-        <field name="model">res.users</field>
-        <field name="inherit_id" ref="base.view_users_form"/>
-        <field name="priority">95</field>
-        <field name="arch" type="xml">
-            <group name="applications" position="inside">
-                <field name='group_hr_payroll_user'/>
-            </group>
-        </field>
-    </record>
-</odoo>
diff --git a/addons/hr_recruitment/__manifest__.py b/addons/hr_recruitment/__manifest__.py
index 27664fcd4ad..ea329b7ba54 100644
--- a/addons/hr_recruitment/__manifest__.py
+++ b/addons/hr_recruitment/__manifest__.py
@@ -27,7 +27,6 @@
         'views/hr_department_views.xml',
         'views/hr_job_views.xml',
         'views/mail_activity_views.xml',
-        'views/res_users_views.xml',
     ],
     'demo': [
         'data/hr_recruitment_demo.xml',
diff --git a/addons/hr_recruitment/models/__init__.py b/addons/hr_recruitment/models/__init__.py
index d1bf3c8234b..078e032e222 100644
--- a/addons/hr_recruitment/models/__init__.py
+++ b/addons/hr_recruitment/models/__init__.py
@@ -4,4 +4,3 @@ from . import hr_employee
 from . import hr_job
 from . import res_config_settings
 from . import calendar
-from . import res_users
diff --git a/addons/hr_recruitment/models/res_users.py b/addons/hr_recruitment/models/res_users.py
deleted file mode 100644
index a251cbcdcad..00000000000
--- a/addons/hr_recruitment/models/res_users.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import fields, models
-
-
-class ResUsers(models.Model):
-    _inherit = 'res.users'
-
-    group_hr_recruitment_user = fields.Selection(
-        selection=lambda self: self._get_group_selection('base.module_category_hr_recruitment'),
-        string='Recruitment', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        category_xml_id='base.module_category_hr_recruitment')
diff --git a/addons/hr_recruitment/views/res_users_views.xml b/addons/hr_recruitment/views/res_users_views.xml
deleted file mode 100644
index ea5eb7cef39..00000000000
--- a/addons/hr_recruitment/views/res_users_views.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <record id="res_users_view_form" model="ir.ui.view">
-        <field name="name">res.users.form.hr_recruitment.inherit</field>
-        <field name="model">res.users</field>
-        <field name="inherit_id" ref="base.view_users_form"/>
-        <field name="priority">60</field>
-        <field name="arch" type="xml">
-            <group name="applications" position="inside">
-                <field name='group_hr_recruitment_user'/>
-            </group>
-        </field>
-    </record>
-</odoo>
diff --git a/addons/hr_timesheet/__manifest__.py b/addons/hr_timesheet/__manifest__.py
index 6c0a654f5f1..1b35f5f5c35 100644
--- a/addons/hr_timesheet/__manifest__.py
+++ b/addons/hr_timesheet/__manifest__.py
@@ -31,7 +31,6 @@ up a management by affair.
         'report/hr_timesheet_report_view.xml',
         'report/report_timesheet_templates.xml',
         'views/hr_views.xml',
-        'views/res_users_views.xml',
         'data/hr_timesheet_data.xml',
     ],
     'demo': [
diff --git a/addons/hr_timesheet/models/__init__.py b/addons/hr_timesheet/models/__init__.py
index b8bfb2333b9..11998476ce2 100644
--- a/addons/hr_timesheet/models/__init__.py
+++ b/addons/hr_timesheet/models/__init__.py
@@ -6,4 +6,3 @@ from . import hr
 from . import hr_timesheet
 from . import res_config_settings
 from . import project
-from . import res_users
diff --git a/addons/hr_timesheet/models/res_users.py b/addons/hr_timesheet/models/res_users.py
deleted file mode 100644
index f5eb9addcb3..00000000000
--- a/addons/hr_timesheet/models/res_users.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import fields, models
-
-
-class ResUsers(models.Model):
-    _inherit = 'res.users'
-
-    group_hr_timesheet_user = fields.Selection(
-        selection=lambda self: self._get_group_selection('base.module_category_hr_timesheet'),
-        string='Timesheets', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        category_xml_id='base.module_category_hr_timesheet')
diff --git a/addons/hr_timesheet/views/res_users_views.xml b/addons/hr_timesheet/views/res_users_views.xml
deleted file mode 100644
index c44ab31980d..00000000000
--- a/addons/hr_timesheet/views/res_users_views.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <record id="res_users_view_form" model="ir.ui.view">
-        <field name="name">res.users.form.hr_timesheet.inherit</field>
-        <field name="model">res.users</field>
-        <field name="inherit_id" ref="base.view_users_form"/>
-        <field name="priority">70</field>
-        <field name="arch" type="xml">
-            <group name="applications" position="inside">
-                <field name='group_hr_timesheet_user'/>
-            </group>
-        </field>
-    </record>
-</odoo>
diff --git a/addons/im_livechat/__manifest__.py b/addons/im_livechat/__manifest__.py
index 352f18c36b4..c85b2ac330c 100644
--- a/addons/im_livechat/__manifest__.py
+++ b/addons/im_livechat/__manifest__.py
@@ -25,7 +25,6 @@ Help your customers with this chat, and analyse their feedback.
         "views/mail_channel_views.xml",
         "views/im_livechat_channel_views.xml",
         "views/im_livechat_channel_templates.xml",
-        "views/res_users_views.xml",
         "report/im_livechat_report_channel_views.xml",
         "report/im_livechat_report_operator_views.xml"
     ],
diff --git a/addons/im_livechat/models/__init__.py b/addons/im_livechat/models/__init__.py
index 380ebfbfc00..7ed0b5e53f9 100644
--- a/addons/im_livechat/models/__init__.py
+++ b/addons/im_livechat/models/__init__.py
@@ -3,4 +3,3 @@ from . import im_livechat_channel
 from . import ir_autovacuum
 from . import mail_channel
 from . import rating
-from . import res_users
diff --git a/addons/im_livechat/models/res_users.py b/addons/im_livechat/models/res_users.py
deleted file mode 100644
index af9f066dbc7..00000000000
--- a/addons/im_livechat/models/res_users.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import fields, models
-
-
-class ResUsers(models.Model):
-    _inherit = 'res.users'
-
-    group_im_livechat_user = fields.Selection(
-        selection=lambda self: self._get_group_selection('im_livechat.module_category_im_livechat'),
-        string='Live Support', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        category_xml_id='im_livechat.module_category_im_livechat',
-        help='User: The user will be able to join support channels.\nManager: The user will be able to delete support channels.')
diff --git a/addons/im_livechat/views/res_users_views.xml b/addons/im_livechat/views/res_users_views.xml
deleted file mode 100644
index 57209008b8e..00000000000
--- a/addons/im_livechat/views/res_users_views.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <record id="res_users_view_form" model="ir.ui.view">
-        <field name="name">res.users.form.im_livechat.inherit</field>
-        <field name="model">res.users</field>
-        <field name="inherit_id" ref="base.view_users_form"/>
-        <field name="priority">125</field>
-        <field name="arch" type="xml">
-            <group name="applications" position="inside">
-                <field name='group_im_livechat_user'/>
-            </group>
-        </field>
-    </record>
-</odoo>
diff --git a/addons/l10n_be_intrastat/__manifest__.py b/addons/l10n_be_intrastat/__manifest__.py
index 0e472995ea4..cc276b059a3 100644
--- a/addons/l10n_be_intrastat/__manifest__.py
+++ b/addons/l10n_be_intrastat/__manifest__.py
@@ -17,7 +17,6 @@ Based on invoices.
         'security/l10n_be_intrastat_security.xml',
         'security/ir.model.access.csv',
         'views/l10n_be_intrastat_view.xml',
-        'views/res_users_views.xml',
         'wizard/l10n_be_intrastat_declaration_view.xml',
     ],
 }
diff --git a/addons/l10n_be_intrastat/models/__init__.py b/addons/l10n_be_intrastat/models/__init__.py
index 2fdf02ead4f..fd6e09f945e 100644
--- a/addons/l10n_be_intrastat/models/__init__.py
+++ b/addons/l10n_be_intrastat/models/__init__.py
@@ -2,4 +2,3 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import l10n_be_intrastat
-from . import res_users
diff --git a/addons/l10n_be_intrastat/models/res_users.py b/addons/l10n_be_intrastat/models/res_users.py
deleted file mode 100644
index 15f52877bea..00000000000
--- a/addons/l10n_be_intrastat/models/res_users.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import fields, models
-
-
-class ResUsers(models.Model):
-    _inherit = 'res.users'
-
-    has_group_intrastat_extended = fields.Boolean(
-        'Intrastat extended', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='l10n_be_intrastat.intrastat_extended')
diff --git a/addons/l10n_be_intrastat/views/res_users_views.xml b/addons/l10n_be_intrastat/views/res_users_views.xml
deleted file mode 100644
index 043d6b8b8c0..00000000000
--- a/addons/l10n_be_intrastat/views/res_users_views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <record id="res_users_view_form" model="ir.ui.view">
-        <field name="name">res.users.form.l10n_be_intrastat.inherit</field>
-        <field name="model">res.users</field>
-        <field name="inherit_id" ref="base.view_users_form"/>
-        <field name="arch" type="xml">
-            <group name="technical" position="inside">
-                <label for="has_group_intrastat_extended" colspan="3"/>
-                <div>
-                    <field name='has_group_intrastat_extended' colspan="1" class="oe_inline"/>
-                </div>
-            </group>
-        </field>
-    </record>
-</odoo>
diff --git a/addons/lunch/__manifest__.py b/addons/lunch/__manifest__.py
index 1c593ffa772..34499700cc6 100644
--- a/addons/lunch/__manifest__.py
+++ b/addons/lunch/__manifest__.py
@@ -29,7 +29,6 @@ If you want to save your employees' time and avoid them to always have coins in
         'views/lunch_templates.xml',
         'wizard/lucky_order_view.xml',
         'views/lunch_views.xml',
-        'views/res_users_views.xml',
         'data/lunch_data.xml',
     ],
     'demo': ['data/lunch_demo.xml'],
diff --git a/addons/lunch/models/__init__.py b/addons/lunch/models/__init__.py
index e16f6c755b9..9824b4ad3b0 100644
--- a/addons/lunch/models/__init__.py
+++ b/addons/lunch/models/__init__.py
@@ -1,4 +1,3 @@
 # -*- coding: utf-8 -*-
 
 from . import lunch
-from . import res_users
diff --git a/addons/lunch/models/res_users.py b/addons/lunch/models/res_users.py
deleted file mode 100644
index 9d3a39d8974..00000000000
--- a/addons/lunch/models/res_users.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import fields, models
-
-
-class ResUsers(models.Model):
-    _inherit = 'res.users'
-
-    group_lunch_user = fields.Selection(
-        selection=lambda self: self._get_group_selection('lunch.module_lunch_category'),
-        string='Lunch', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        category_xml_id='lunch.module_lunch_category')
diff --git a/addons/lunch/views/res_users_views.xml b/addons/lunch/views/res_users_views.xml
deleted file mode 100644
index c414ba40d57..00000000000
--- a/addons/lunch/views/res_users_views.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <record id="res_users_view_form" model="ir.ui.view">
-        <field name="name">res.users.form.lunch.inherit</field>
-        <field name="model">res.users</field>
-        <field name="inherit_id" ref="base.view_users_form"/>
-        <field name="priority">90</field>
-        <field name="arch" type="xml">
-            <group name="applications" position="inside">
-                <field name='group_lunch_user'/>
-            </group>
-        </field>
-    </record>
-</odoo>
diff --git a/addons/maintenance/__manifest__.py b/addons/maintenance/__manifest__.py
index df1be15dfad..d40bdbe3d9e 100644
--- a/addons/maintenance/__manifest__.py
+++ b/addons/maintenance/__manifest__.py
@@ -17,7 +17,6 @@
         'views/maintenance_views.xml',
         'views/maintenance_templates.xml',
         'views/mail_activity_views.xml',
-        'views/res_users_views.xml',
         'data/maintenance_cron.xml',
     ],
     'demo': ['data/maintenance_demo.xml'],
diff --git a/addons/maintenance/models/__init__.py b/addons/maintenance/models/__init__.py
index 155a108ce15..fb9363f4230 100644
--- a/addons/maintenance/models/__init__.py
+++ b/addons/maintenance/models/__init__.py
@@ -1,4 +1,3 @@
 # -*- coding: utf-8 -*-
 
 from . import maintenance
-from . import res_users
diff --git a/addons/maintenance/models/res_users.py b/addons/maintenance/models/res_users.py
deleted file mode 100644
index cac599eda08..00000000000
--- a/addons/maintenance/models/res_users.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import fields, models
-
-
-class ResUsers(models.Model):
-    _inherit = 'res.users'
-
-    has_group_equipment_manager = fields.Boolean(
-        'Equipment Manager', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='maintenance.group_equipment_manager',
-        help='The user will be able to manage equipments.')
diff --git a/addons/maintenance/views/res_users_views.xml b/addons/maintenance/views/res_users_views.xml
deleted file mode 100644
index f606d3ad869..00000000000
--- a/addons/maintenance/views/res_users_views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <record id="res_users_view_form" model="ir.ui.view">
-        <field name="name">res.users.form.maintenance.inherit</field>
-        <field name="model">res.users</field>
-        <field name="inherit_id" ref="base.view_users_form"/>
-        <field name="arch" type="xml">
-            <group name="technical" position="inside">
-                <label for="has_group_equipment_manager" colspan="3"/>
-                <div>
-                    <field name='has_group_equipment_manager' colspan="1" class="oe_inline"/>
-                </div>
-            </group>
-        </field>
-    </record>
-</odoo>
diff --git a/addons/mass_mailing/__manifest__.py b/addons/mass_mailing/__manifest__.py
index 5f820bbf30f..def7d8bda81 100644
--- a/addons/mass_mailing/__manifest__.py
+++ b/addons/mass_mailing/__manifest__.py
@@ -35,7 +35,6 @@
         'views/themes_templates.xml',
         'views/snippets_themes.xml',
         'views/snippets_themes_options.xml',
-        'views/res_users_views.xml',
     ],
     'demo': [
         'data/mass_mailing_demo.xml',
diff --git a/addons/mass_mailing/models/__init__.py b/addons/mass_mailing/models/__init__.py
index baa418a63a9..6afa7a98d09 100644
--- a/addons/mass_mailing/models/__init__.py
+++ b/addons/mass_mailing/models/__init__.py
@@ -8,4 +8,3 @@ from . import mail_thread
 from . import res_config_settings
 from . import mass_mailing_report
 from . import link_tracker
-from . import res_users
diff --git a/addons/mass_mailing/models/res_users.py b/addons/mass_mailing/models/res_users.py
deleted file mode 100644
index 9b9a111c310..00000000000
--- a/addons/mass_mailing/models/res_users.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import fields, models
-
-
-class ResUsers(models.Model):
-    _inherit = 'res.users'
-
-    group_mass_mailing_user = fields.Selection(
-        selection=lambda self: self._get_group_selection('base.module_category_mass_mailing'),
-        string='Mass Mailing', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        category_xml_id='base.module_category_mass_mailing')
-
-    has_group_mass_mailing_campaign = fields.Boolean(
-        'Manage Mass Mailing Campaigns', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='mass_mailing.group_mass_mailing_campaign')
diff --git a/addons/mass_mailing/views/res_users_views.xml b/addons/mass_mailing/views/res_users_views.xml
deleted file mode 100644
index b4bd171931d..00000000000
--- a/addons/mass_mailing/views/res_users_views.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <record id="res_users_view_form" model="ir.ui.view">
-        <field name="name">res.users.form.mass_mailing.inherit</field>
-        <field name="model">res.users</field>
-        <field name="inherit_id" ref="base.view_users_form"/>
-        <field name="priority">110</field>
-        <field name="arch" type="xml">
-            <group name="applications" position="inside">
-                <field name='group_mass_mailing_user'/>
-            </group>
-            <group name="technical" position="inside">
-                <label for="has_group_mass_mailing_campaign" colspan="3"/>
-                <div>
-                    <field name='has_group_mass_mailing_campaign' colspan="1" class="oe_inline"/>
-                </div>
-            </group>
-        </field>
-    </record>
-</odoo>
diff --git a/addons/mrp/__manifest__.py b/addons/mrp/__manifest__.py
index dbaa87464d3..16afba9a5f2 100644
--- a/addons/mrp/__manifest__.py
+++ b/addons/mrp/__manifest__.py
@@ -35,7 +35,6 @@
         'views/res_config_settings_views.xml',
         'views/mrp_templates.xml',
         'views/stock_scrap_views.xml',
-        'views/res_users_views.xml',
         'report/mrp_report_views_main.xml',
         'report/mrp_report_bom_structure.xml',
         'report/mrp_production_templates.xml',
diff --git a/addons/mrp/models/__init__.py b/addons/mrp/models/__init__.py
index 227f3141388..71da913f04c 100644
--- a/addons/mrp/models/__init__.py
+++ b/addons/mrp/models/__init__.py
@@ -18,4 +18,3 @@ from . import stock_picking
 from . import stock_production_lot
 from . import stock_scrap
 from . import stock_warehouse
-from . import res_users
diff --git a/addons/mrp/models/res_users.py b/addons/mrp/models/res_users.py
deleted file mode 100644
index 28ab5647155..00000000000
--- a/addons/mrp/models/res_users.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import fields, models
-
-
-class ResUsers(models.Model):
-    _inherit = 'res.users'
-
-    has_group_mrp_routings = fields.Boolean(
-        'Manage Work Order Operations', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='mrp.group_mrp_routings')
-
-    group_mrp_user = fields.Selection(
-        selection=lambda self: self._get_group_selection('base.module_category_manufacturing'),
-        string='Manufacturing', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        category_xml_id='base.module_category_manufacturing')
diff --git a/addons/mrp/views/res_users_views.xml b/addons/mrp/views/res_users_views.xml
deleted file mode 100644
index b3bec2a27e8..00000000000
--- a/addons/mrp/views/res_users_views.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <record id="res_users_view_form" model="ir.ui.view">
-        <field name="name">res.users.form.mrp.inherit</field>
-        <field name="model">res.users</field>
-        <field name="inherit_id" ref="base.view_users_form"/>
-        <field name="priority">25</field>
-        <field name="arch" type="xml">
-            <group name="applications" position="inside">
-                <field name='group_mrp_user'/>
-            </group>
-            <group name="technical" position="inside">
-                <label for="has_group_mrp_routings" colspan="3"/>
-                <div>
-                    <field name='has_group_mrp_routings' colspan="1" class="oe_inline"/>
-                </div>
-            </group>
-        </field>
-    </record>
-</odoo>
diff --git a/addons/point_of_sale/__manifest__.py b/addons/point_of_sale/__manifest__.py
index 4d7787743cf..9a3b9f4aa60 100644
--- a/addons/point_of_sale/__manifest__.py
+++ b/addons/point_of_sale/__manifest__.py
@@ -35,7 +35,6 @@
         'views/account_statement_view.xml',
         'views/account_statement_report.xml',
         'views/res_config_settings_views.xml',
-        'views/res_users_views.xml',
         'views/res_partner_view.xml',
         'views/report_statement.xml',
         'views/report_userlabel.xml',
diff --git a/addons/point_of_sale/models/res_users.py b/addons/point_of_sale/models/res_users.py
index 05adba44a5d..6fb09e8a44e 100644
--- a/addons/point_of_sale/models/res_users.py
+++ b/addons/point_of_sale/models/res_users.py
@@ -9,11 +9,6 @@ class ResUsers(models.Model):
 
     pos_security_pin = fields.Char(string='Security PIN', size=32, help='A Security PIN used to protect sensible functionality in the Point of Sale')
 
-    group_point_of_sale_user = fields.Selection(
-        selection=lambda self: self._get_group_selection('base.module_category_point_of_sale'),
-        string='Point of Sale', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        category_xml_id='base.module_category_point_of_sale')
-
     @api.constrains('pos_security_pin')
     def _check_pin(self):
         if self.pos_security_pin and not self.pos_security_pin.isdigit():
diff --git a/addons/point_of_sale/views/res_users_views.xml b/addons/point_of_sale/views/res_users_view.xml
index 61a504fae59..84df0988d24 100644
--- a/addons/point_of_sale/views/res_users_views.xml
+++ b/addons/point_of_sale/views/res_users_view.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
-    <record id="res_users_view_form" model="ir.ui.view">
+    <record id="res_users_form_view" model="ir.ui.view">
         <field name="name">res.users.form.view</field>
         <field name="model">res.users</field>
-        <field name="inherit_id" ref="base.view_users_form"/>
-        <field name="priority">130</field>
+        <field name="inherit_id" ref="base.view_users_form" />
         <field name="arch" type="xml">
-            <group name="applications" position="inside">
-                <field name='group_point_of_sale_user'/>
-            </group>
             <notebook position="inside">
                 <page string="Point of Sale">
                     <group>
diff --git a/addons/product/__manifest__.py b/addons/product/__manifest__.py
index c62c9826f46..92637cd5a07 100644
--- a/addons/product/__manifest__.py
+++ b/addons/product/__manifest__.py
@@ -38,7 +38,6 @@ Print product labels with barcode.
         'views/product_pricelist_views.xml',
         'views/res_partner_views.xml',
         'views/product_template_import_templates.xml',
-        'views/res_users_views.xml',
         'report/product_reports.xml',
         'report/product_pricelist_templates.xml',
         'report/product_product_templates.xml',
diff --git a/addons/product/models/__init__.py b/addons/product/models/__init__.py
index d92be9dfb05..57917450de3 100644
--- a/addons/product/models/__init__.py
+++ b/addons/product/models/__init__.py
@@ -15,4 +15,3 @@ from . import product_attribute
 from . import product_pricelist
 from . import res_company
 from . import res_partner
-from . import res_users
diff --git a/addons/product/models/res_users.py b/addons/product/models/res_users.py
deleted file mode 100644
index ee0f0395725..00000000000
--- a/addons/product/models/res_users.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import fields, models
-
-
-class ResUsers(models.Model):
-    _inherit = 'res.users'
-
-    has_group_sale_pricelist = fields.Boolean(
-        'Sales Pricelists', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='product.group_sale_pricelist')
-
-    has_group_pricelist_item = fields.Boolean(
-        'Manage Pricelist Items', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='product.group_pricelist_item')
-
-    has_group_product_pricelist = fields.Boolean(
-        'Pricelists On Product', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='product.group_product_pricelist')
-
-    has_group_stock_packaging = fields.Boolean(
-        'Manage Product Packaging', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='product.group_stock_packaging')
-
-    has_group_product_variant = fields.Boolean(
-        'Manage Product Variants', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='product.group_product_variant')
diff --git a/addons/product/views/res_users_views.xml b/addons/product/views/res_users_views.xml
deleted file mode 100644
index a8c05f84437..00000000000
--- a/addons/product/views/res_users_views.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <record id="res_users_view_form" model="ir.ui.view">
-        <field name="name">res.users.form.product.inherit</field>
-        <field name="model">res.users</field>
-        <field name="inherit_id" ref="base.view_users_form"/>
-        <field name="arch" type="xml">
-            <group name="technical" position="inside">
-                <label for="has_group_sale_pricelist" colspan="3"/>
-                <div>
-                    <field name='has_group_sale_pricelist' colspan="1" class="oe_inline"/>
-                </div>
-                <label for="has_group_pricelist_item" colspan="3"/>
-                <div>
-                    <field name='has_group_pricelist_item' colspan="1" class="oe_inline"/>
-                </div>
-                <label for="has_group_product_pricelist" colspan="3"/>
-                <div>
-                    <field name='has_group_product_pricelist' colspan="1" class="oe_inline"/>
-                </div>
-                <label for="has_group_stock_packaging" colspan="3"/>
-                <div>
-                    <field name='has_group_stock_packaging' colspan="1" class="oe_inline"/>
-                </div>
-                <label for="has_group_product_variant" colspan="3"/>
-                <div>
-                    <field name='has_group_product_variant' colspan="1" class="oe_inline"/>
-                </div>
-            </group>
-        </field>
-    </record>
-</odoo>
diff --git a/addons/project/__manifest__.py b/addons/project/__manifest__.py
index cb4516c221a..3276bd6e7dc 100644
--- a/addons/project/__manifest__.py
+++ b/addons/project/__manifest__.py
@@ -31,7 +31,6 @@
         'views/project_assets.xml',
         'views/project_portal_templates.xml',
         'views/project_rating_templates.xml',
-        'views/res_users_views.xml',
         'data/project_mail_template_data.xml',
         'data/project_data.xml',
     ],
diff --git a/addons/project/models/__init__.py b/addons/project/models/__init__.py
index a37cedf22ab..e202189a304 100644
--- a/addons/project/models/__init__.py
+++ b/addons/project/models/__init__.py
@@ -5,4 +5,3 @@ from . import project
 from . import res_config_settings
 from . import res_company
 from . import res_partner
-from . import res_users
diff --git a/addons/project/models/res_users.py b/addons/project/models/res_users.py
deleted file mode 100644
index f304dc2d826..00000000000
--- a/addons/project/models/res_users.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import fields, models
-
-
-class ResUsers(models.Model):
-    _inherit = 'res.users'
-
-    has_group_subtask_project = fields.Boolean(
-        'Use Subtasks', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='project.group_subtask_project')
-
-    has_group_project_rating = fields.Boolean(
-        'Use Rating on Project', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='project.group_project_rating')
-
-    group_project_user = fields.Selection(
-        selection=lambda self: self._get_group_selection('base.module_category_project_management'),
-        string='Project', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        category_xml_id='base.module_category_project_management')
diff --git a/addons/project/views/res_users_views.xml b/addons/project/views/res_users_views.xml
deleted file mode 100644
index a31d5978ba6..00000000000
--- a/addons/project/views/res_users_views.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <record id="res_users_view_form" model="ir.ui.view">
-        <field name="name">res.users.form.project.inherit</field>
-        <field name="model">res.users</field>
-        <field name="inherit_id" ref="base.view_users_form"/>
-        <field name="priority">5</field>
-        <field name="arch" type="xml">
-            <group name="applications" position="inside">
-                <field name='group_project_user'/>
-            </group>
-            <group name="technical" position="inside">
-                <label for="has_group_subtask_project" colspan="3"/>
-                <div>
-                    <field name='has_group_subtask_project' colspan="1" class="oe_inline"/>
-                </div>
-                <label for="has_group_project_rating" colspan="3"/>
-                <div>
-                    <field name='has_group_project_rating' colspan="1" class="oe_inline"/>
-                </div>
-            </group>
-        </field>
-    </record>
-</odoo>
diff --git a/addons/purchase/__manifest__.py b/addons/purchase/__manifest__.py
index bac5c28fb44..a85b8c9a1f2 100644
--- a/addons/purchase/__manifest__.py
+++ b/addons/purchase/__manifest__.py
@@ -25,7 +25,6 @@
         'report/purchase_report_views.xml',
         'data/mail_template_data.xml',
         'views/portal_templates.xml',
-        'views/res_users_views.xml',
         'report/purchase_order_templates.xml',
         'report/purchase_quotation_templates.xml',
     ],
diff --git a/addons/purchase/models/__init__.py b/addons/purchase/models/__init__.py
index 5aac1667e5d..a641ce05a71 100644
--- a/addons/purchase/models/__init__.py
+++ b/addons/purchase/models/__init__.py
@@ -7,4 +7,3 @@ from . import product
 from . import res_company
 from . import res_config_settings
 from . import res_partner
-from . import res_users
diff --git a/addons/purchase/models/res_users.py b/addons/purchase/models/res_users.py
deleted file mode 100644
index 5264a6fd89e..00000000000
--- a/addons/purchase/models/res_users.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import fields, models
-
-
-class ResUsers(models.Model):
-    _inherit = 'res.users'
-
-    has_group_manage_vendor_price = fields.Boolean(
-        'Manage Vendor Price', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='purchase.group_manage_vendor_price')
-
-    has_group_warning_purchase = fields.Boolean(
-        'A warning can be set on a product or a customer (Purchase)',
-        compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='purchase.group_warning_purchase')
-
-    group_purchase_user = fields.Selection(
-        selection=lambda self: self._get_group_selection('base.module_category_purchase_management'),
-        string='Purchases', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        category_xml_id='base.module_category_purchase_management')
diff --git a/addons/purchase/views/res_users_views.xml b/addons/purchase/views/res_users_views.xml
deleted file mode 100644
index 54e0eb080f5..00000000000
--- a/addons/purchase/views/res_users_views.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <record id="res_users_view_form" model="ir.ui.view">
-        <field name="name">res.users.form.purchase.inherit</field>
-        <field name="model">res.users</field>
-        <field name="inherit_id" ref="base.view_users_form"/>
-        <field name="priority">45</field>
-        <field name="arch" type="xml">
-            <group name="applications" position="inside">
-                <field name='group_purchase_user'/>
-            </group>
-            <group name="technical" position="inside">
-                <label for="has_group_manage_vendor_price" colspan="3"/>
-                <div>
-                    <field name='has_group_manage_vendor_price' colspan="1" class="oe_inline"/>
-                </div>
-                <label for="has_group_warning_purchase" colspan="3"/>
-                <div>
-                    <field name='has_group_warning_purchase' colspan="1" class="oe_inline"/>
-                </div>
-            </group>
-        </field>
-    </record>
-</odoo>
diff --git a/addons/purchase_requisition/tests/test_purchase_requisition.py b/addons/purchase_requisition/tests/test_purchase_requisition.py
index 165eff03d8a..b88a4af5cc9 100644
--- a/addons/purchase_requisition/tests/test_purchase_requisition.py
+++ b/addons/purchase_requisition/tests/test_purchase_requisition.py
@@ -23,11 +23,11 @@ class TestPurchaseRequisition(common.TransactionCase):
         # Create a user as 'Purchase Requisition Manager'
         self.res_users_purchase_requisition_manager = self.ResUser.create({'company_id': self.res_company_id, 'name': 'Purchase requisition Manager', 'login': 'prm', 'email': 'requisition_manager@yourcompany.com'})
         # Added groups for Purchase Requisition Manager.
-        self.res_users_purchase_requisition_manager.groups_id = [(4, self.ref('purchase.group_purchase_manager'), False)]
+        self.res_users_purchase_requisition_manager.group_id = self.ref('purchase.group_purchase_manager')
         # Create a user as 'Purchase Requisition User'
         self.res_users_purchase_requisition_user = self.ResUser.create({'company_id': self.res_company_id, 'name': 'Purchase requisition User', 'login': 'pru', 'email': 'requisition_user@yourcompany.com'})
         # Added groups for Purchase Requisition User.
-        self.res_users_purchase_requisition_user.groups_id = [(4, self.ref('purchase.group_purchase_user'), False)]
+        self.res_users_purchase_requisition_user.group_id = self.ref('purchase.group_purchase_user')
 
         # In order to test process of the purchase requisition ,create requisition
         self.requisition1 = self.env['purchase.requisition'].create({'line_ids': [(0, 0, {'product_id': self.product_09_id, 'product_qty': 10.0, 'product_uom_id': self.product_09_uom_id})]})
diff --git a/addons/sale/__manifest__.py b/addons/sale/__manifest__.py
index 1e78334c26d..17983579339 100644
--- a/addons/sale/__manifest__.py
+++ b/addons/sale/__manifest__.py
@@ -31,7 +31,6 @@ This module contains all the common features of Sales Management and eCommerce.
         'views/sale_portal_templates.xml',
         'views/sale_layout_category_view.xml',
         'views/res_config_settings_views.xml',
-        'views/res_users_views.xml',
     ],
     'demo': [
         'data/sale_demo.xml',
diff --git a/addons/sale/models/__init__.py b/addons/sale/models/__init__.py
index 408ed3ad3b6..5f6e7ba2857 100644
--- a/addons/sale/models/__init__.py
+++ b/addons/sale/models/__init__.py
@@ -12,4 +12,3 @@ from . import sale
 from . import res_config_settings
 from . import sale_layout
 from . import sales_team
-from . import res_users
diff --git a/addons/sale/models/res_users.py b/addons/sale/models/res_users.py
deleted file mode 100644
index 5ff6b06d878..00000000000
--- a/addons/sale/models/res_users.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import fields, models
-
-
-class ResUsers(models.Model):
-    _inherit = 'res.users'
-
-    has_group_warning_sale = fields.Boolean(
-        "A warning can be set on a product or a customer (Sale)",
-        compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='sale.group_warning_sale')
-
-    has_group_sale_layout = fields.Boolean(
-        "Personalize sales order and invoice report",
-        compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='sale.group_sale_layout')
-
-    has_group_delivery_invoice_address = fields.Boolean(
-        "Addresses in Sales Orders",
-        compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='sale.group_delivery_invoice_address')
-
-    has_group_show_price_subtotal = fields.Boolean(
-        "Show line subtotals without taxes (B2B)",
-        compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='sale.group_show_price_subtotal')
-
-    has_group_show_price_total = fields.Boolean(
-        "Show line subtotals with taxes included (B2C)",
-        compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='sale.group_show_price_total')
-
-    has_group_discount_per_so_line = fields.Boolean(
-        "Discount on lines",
-        compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='sale.group_discount_per_so_line')
-
-    has_group_proforma_sales = fields.Boolean(
-        "Pro-forma Invoices",
-        compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='sale.group_proforma_sales')
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 881b462b14e..a4e6796f4a6 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -43,6 +43,12 @@
         <field name="name">Pro-forma Invoices</field>
     </record>
 
+    <record id="group_analytic_accounting" model="res.groups">
+        <field name="name">Analytic Accounting for Sales</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+        <field name="implied_ids" eval="[(4, ref('analytic.group_analytic_accounting'))]"/>
+    </record>
+
     <record model="res.users" id="base.user_root">
         <field eval="[(4,ref('base.group_partner_manager'))]" name="groups_id"/>
     </record>
diff --git a/addons/sale/views/res_users_views.xml b/addons/sale/views/res_users_views.xml
deleted file mode 100644
index a4eae27cc6c..00000000000
--- a/addons/sale/views/res_users_views.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <record id="res_users_view_form" model="ir.ui.view">
-        <field name="name">res.users.form.sale.inherit</field>
-        <field name="model">res.users</field>
-        <field name="inherit_id" ref="base.view_users_form"/>
-        <field name="arch" type="xml">
-            <group name="technical" position="inside">
-                <label for="has_group_warning_sale" colspan="3"/>
-                <div>
-                    <field name='has_group_warning_sale' colspan="1" class="oe_inline"/>
-                </div>
-                <label for="has_group_sale_layout" colspan="3"/>
-                <div>
-                    <field name='has_group_sale_layout' colspan="1" class="oe_inline"/>
-                </div>
-                <label for="has_group_delivery_invoice_address" colspan="3"/>
-                <div>
-                    <field name='has_group_delivery_invoice_address' colspan="1" class="oe_inline"/>
-                </div>
-                <label for="has_group_show_price_subtotal" colspan="3"/>
-                <div>
-                    <field name='has_group_show_price_subtotal' colspan="1" class="oe_inline"/>
-                </div>
-                <label for="has_group_show_price_total" colspan="3"/>
-                <div>
-                    <field name='has_group_show_price_total' colspan="1" class="oe_inline"/>
-                </div>
-                <label for="has_group_discount_per_so_line" colspan="3"/>
-                <div>
-                    <field name='has_group_discount_per_so_line' colspan="1" class="oe_inline"/>
-                </div>
-                <label for="has_group_proforma_sales" colspan="3"/>
-                <div>
-                    <field name='has_group_proforma_sales' colspan="1" class="oe_inline"/>
-                </div>
-                <label for="has_group_proforma_sales" colspan="3"/>
-                <div>
-                    <field name='has_group_proforma_sales' colspan="1" class="oe_inline"/>
-                </div>
-            </group>
-        </field>
-    </record>
-</odoo>
diff --git a/addons/sale_stock/__manifest__.py b/addons/sale_stock/__manifest__.py
index 77a181a7195..c4b41c4ca3b 100644
--- a/addons/sale_stock/__manifest__.py
+++ b/addons/sale_stock/__manifest__.py
@@ -35,7 +35,6 @@ You can choose flexible invoicing methods:
         'views/account_invoice_views.xml',
         'views/sale_stock_portal_template.xml',
         'views/product_template_views.xml',
-        'views/res_users_views.xml',
         'report/sale_order_report_templates.xml',
         'report/stock_report_deliveryslip.xml',
         'data/sale_stock_data.xml',
diff --git a/addons/sale_stock/models/__init__.py b/addons/sale_stock/models/__init__.py
index 9aa9277bfe8..1f11274e77a 100644
--- a/addons/sale_stock/models/__init__.py
+++ b/addons/sale_stock/models/__init__.py
@@ -7,4 +7,3 @@ from . import sale_order
 from . import res_config_settings
 from . import stock
 from . import product_template
-from . import res_users
diff --git a/addons/sale_stock/models/res_users.py b/addons/sale_stock/models/res_users.py
deleted file mode 100644
index 5a1cbd2e1e5..00000000000
--- a/addons/sale_stock/models/res_users.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import fields, models
-
-
-class ResUsers(models.Model):
-    _inherit = 'res.users'
-
-    has_group_route_so_lines = fields.Boolean(
-        'Enable Route on Sales Order Line',
-        compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='sale_stock.group_route_so_lines')
-
-    has_group_display_incoterm = fields.Boolean(
-        'Display incoterms on Sales Order and related invoices',
-        compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='sale_stock.group_display_incoterm')
diff --git a/addons/sale_stock/views/res_users_views.xml b/addons/sale_stock/views/res_users_views.xml
deleted file mode 100644
index 99d64a9f5a8..00000000000
--- a/addons/sale_stock/views/res_users_views.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <record id="res_users_view_form" model="ir.ui.view">
-        <field name="name">res.users.form.sale_stock.inherit</field>
-        <field name="model">res.users</field>
-        <field name="inherit_id" ref="base.view_users_form"/>
-        <field name="arch" type="xml">
-            <group name="technical" position="inside">
-                <label for="has_group_route_so_lines" colspan="3"/>
-                <div>
-                    <field name='has_group_route_so_lines' colspan="1" class="oe_inline"/>
-                </div>
-                <label for="has_group_display_incoterm" colspan="3"/>
-                <div>
-                    <field name='has_group_display_incoterm' colspan="1" class="oe_inline"/>
-                </div>
-            </group>
-        </field>
-    </record>
-</odoo>
diff --git a/addons/sales_team/__manifest__.py b/addons/sales_team/__manifest__.py
index fd8ce74a30c..199b34db0e8 100644
--- a/addons/sales_team/__manifest__.py
+++ b/addons/sales_team/__manifest__.py
@@ -16,7 +16,6 @@ Using this application you can manage Sales Channels  with CRM and/or Sales
              'data/sales_team_data.xml',
              'views/crm_team_views.xml',
              'views/sales_team_dashboard.xml',
-             'views/res_users_views.xml',
              ],
     'demo': ['data/sales_team_demo.xml'],
     'installable': True,
diff --git a/addons/sales_team/models/res_users.py b/addons/sales_team/models/res_users.py
index 50b7e5cd28c..d5e657f2ce5 100644
--- a/addons/sales_team/models/res_users.py
+++ b/addons/sales_team/models/res_users.py
@@ -11,12 +11,6 @@ class ResUsers(models.Model):
         'crm.team', 'Sales Team',
         help='Sales Channel the user is member of. Used to compute the members of a sales channel through the inverse one2many')
 
-    group_sales_team_user = fields.Selection(
-        selection=lambda self: self._get_group_selection('base.module_category_sales_management'),
-        string="Sales", compute='_compute_groups_id', inverse='_inverse_groups_id',
-        category_xml_id='base.module_category_sales_management',
-        help='User: Own Documents Only: the user will have access to his own data in the sales application.\nUser: All Documents: the user will have access to all records of everyone in the sales application.\nManager: the user will have an access to the sales configuration as well as statistic reports.')
-
     @api.model
     def create(self, vals):
         # Assign the new user in the sales team if there's only one sales team of type `Sales`
diff --git a/addons/sales_team/views/res_users_views.xml b/addons/sales_team/views/res_users_views.xml
deleted file mode 100644
index 2bdb98fe0a7..00000000000
--- a/addons/sales_team/views/res_users_views.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <record id="res_users_view_form" model="ir.ui.view">
-        <field name="name">res.users.form.sales_team.inherit</field>
-        <field name="model">res.users</field>
-        <field name="inherit_id" ref="base.view_users_form"/>
-        <field name="priority">1</field>
-        <field name="arch" type="xml">
-            <group name="applications" position="inside">
-                <field name="group_sales_team_user"/>
-            </group>
-        </field>
-    </record>
-</odoo>
diff --git a/addons/stock/__manifest__.py b/addons/stock/__manifest__.py
index 6b3a6b9ad01..7a72bd61cd2 100644
--- a/addons/stock/__manifest__.py
+++ b/addons/stock/__manifest__.py
@@ -63,7 +63,6 @@
         'views/report_stock_traceability.xml',
         'views/stock_template.xml',
         'views/procurement_views.xml',
-        'views/res_users_views.xml',
         'views/stock_package_level_views.xml',
 
         'data/default_barcode_patterns.xml',
diff --git a/addons/stock/models/__init__.py b/addons/stock/models/__init__.py
index 2fdb7c230ae..015eeb1d3c5 100644
--- a/addons/stock/models/__init__.py
+++ b/addons/stock/models/__init__.py
@@ -19,5 +19,4 @@ from . import stock_traceability
 from . import stock_warehouse
 from . import stock_scrap
 from . import product
-from . import res_users
 from . import stock_package_level
diff --git a/addons/stock/models/res_users.py b/addons/stock/models/res_users.py
deleted file mode 100644
index e6d1ccd5262..00000000000
--- a/addons/stock/models/res_users.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import fields, models
-
-
-class ResUsers(models.Model):
-    _inherit = 'res.users'
-
-    has_group_stock_multi_locations = fields.Boolean(
-        'Manage Multiple Stock Locations',
-        compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='stock.group_stock_multi_locations')
-
-    has_group_stock_multi_warehouses = fields.Boolean(
-        'Manage Multiple Warehouses',
-        compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='stock.group_stock_multi_warehouses')
-
-    has_group_production_lot = fields.Boolean(
-        'Manage Lots / Serial Numbers',
-        compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='stock.group_production_lot')
-
-    has_group_tracking_lot = fields.Boolean(
-        'Manage Packages',
-        compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='stock.group_tracking_lot')
-
-    has_group_adv_location = fields.Boolean(
-        'Manage Push and Pull inventory flows',
-        compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='stock.group_adv_location')
-
-    has_group_tracking_owner = fields.Boolean(
-        'Manage Different Stock Owners',
-        compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='stock.group_tracking_owner')
-
-    has_group_warning_stock = fields.Boolean(
-        'A warning can be set on a partner (Stock)',
-        compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='stock.group_warning_stock')
-
-    group_stock_user = fields.Selection(
-        selection=lambda self: self._get_group_selection('base.module_category_warehouse_management'),
-        string='Inventory', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        category_xml_id='base.module_category_warehouse_management')
diff --git a/addons/stock/views/res_users_views.xml b/addons/stock/views/res_users_views.xml
deleted file mode 100644
index 7d736825fc0..00000000000
--- a/addons/stock/views/res_users_views.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <record id="res_users_view_form" model="ir.ui.view">
-        <field name="name">res.users.form.stock.inherit</field>
-        <field name="model">res.users</field>
-        <field name="inherit_id" ref="base.view_users_form"/>
-        <field name="priority">15</field>
-        <field name="arch" type="xml">
-            <group name="applications" position="inside">
-                <field name='group_stock_user'/>
-            </group>
-            <group name="technical" position="inside">
-                <label for="has_group_stock_multi_locations" colspan="3"/>
-                <div>
-                    <field name='has_group_stock_multi_locations' colspan="1" class="oe_inline"/>
-                </div>
-                <label for="has_group_stock_multi_warehouses" colspan="3"/>
-                <div>
-                    <field name='has_group_stock_multi_warehouses' colspan="1" class="oe_inline"/>
-                </div>
-                <label for="has_group_production_lot" colspan="3"/>
-                <div>
-                    <field name='has_group_production_lot' colspan="1" class="oe_inline"/>
-                </div>
-                <label for="has_group_tracking_lot" colspan="3"/>
-                <div>
-                    <field name='has_group_tracking_lot' colspan="1" class="oe_inline"/>
-                </div>
-                <label for="has_group_adv_location" colspan="3"/>
-                <div>
-                    <field name='has_group_adv_location' colspan="1" class="oe_inline"/>
-                </div>
-                <label for="has_group_tracking_owner" colspan="3"/>
-                <div>
-                    <field name='has_group_tracking_owner' colspan="1" class="oe_inline"/>
-                </div>
-                <label for="has_group_warning_stock" colspan="3"/>
-                <div>
-                    <field name='has_group_warning_stock' colspan="1" class="oe_inline"/>
-                </div>
-            </group>
-        </field>
-    </record>
-</odoo>
diff --git a/addons/survey/__manifest__.py b/addons/survey/__manifest__.py
index 78290313cbf..38fa932d670 100644
--- a/addons/survey/__manifest__.py
+++ b/addons/survey/__manifest__.py
@@ -1,4 +1,3 @@
-
 # -*- encoding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
@@ -24,7 +23,6 @@ sent mails with personal token for the invitation of the survey.
         'views/survey_views.xml',
         'views/survey_templates.xml',
         'views/survey_result.xml',
-        'views/res_users_views.xml',
         'wizard/survey_email_compose_message.xml',
         'data/survey_stages.xml',
     ],
diff --git a/addons/survey/models/__init__.py b/addons/survey/models/__init__.py
index 1acf09ab8d1..26edfafe8ad 100644
--- a/addons/survey/models/__init__.py
+++ b/addons/survey/models/__init__.py
@@ -3,4 +3,3 @@
 
 from . import survey
 from . import ir_autovacuum
-from . import res_users
diff --git a/addons/survey/models/res_users.py b/addons/survey/models/res_users.py
deleted file mode 100644
index 939db447151..00000000000
--- a/addons/survey/models/res_users.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import fields, models
-
-
-class ResUsers(models.Model):
-    _inherit = 'res.users'
-
-    group_survey_user = fields.Selection(
-        selection=lambda self: self._get_group_selection('base.module_category_survey'),
-        string='Survey', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        category_xml_id='base.module_category_survey')
diff --git a/addons/survey/views/res_users_views.xml b/addons/survey/views/res_users_views.xml
deleted file mode 100644
index dd60ccd8fae..00000000000
--- a/addons/survey/views/res_users_views.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <record id="res_users_view_form" model="ir.ui.view">
-        <field name="name">res.users.form.survey.inherit</field>
-        <field name="model">res.users</field>
-        <field name="inherit_id" ref="base.view_users_form"/>
-        <field name="priority">115</field>
-        <field name="arch" type="xml">
-            <group name="applications" position="inside">
-                <field name='group_survey_user'/>
-            </group>
-        </field>
-    </record>
-</odoo>
diff --git a/addons/uom/__manifest__.py b/addons/uom/__manifest__.py
index 0ecdf757599..390682370b9 100644
--- a/addons/uom/__manifest__.py
+++ b/addons/uom/__manifest__.py
@@ -15,7 +15,6 @@ This is the base module for managing Units of measure.
         'security/uom_security.xml',
         'security/ir.model.access.csv',
         'views/uom_uom_views.xml',
-        'views/res_users_views.xml',
     ],
     'installable': True,
     'auto_install': False,
diff --git a/addons/uom/models/__init__.py b/addons/uom/models/__init__.py
index 4b4c458ea60..357b0410c00 100644
--- a/addons/uom/models/__init__.py
+++ b/addons/uom/models/__init__.py
@@ -2,4 +2,3 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import uom_uom
-from . import res_users
diff --git a/addons/uom/models/res_users.py b/addons/uom/models/res_users.py
deleted file mode 100644
index 8281b78ef14..00000000000
--- a/addons/uom/models/res_users.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import fields, models
-
-
-class ResUsers(models.Model):
-    _inherit = 'res.users'
-
-    has_group_uom = fields.Boolean(
-        'Manage Multiple Units of Measure', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='uom.group_uom')
diff --git a/addons/uom/views/res_users_views.xml b/addons/uom/views/res_users_views.xml
deleted file mode 100644
index 55240233a6a..00000000000
--- a/addons/uom/views/res_users_views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <record id="res_users_view_form" model="ir.ui.view">
-        <field name="name">res.users.form.uom.inherit</field>
-        <field name="model">res.users</field>
-        <field name="inherit_id" ref="base.view_users_form"/>
-        <field name="arch" type="xml">
-            <group name="technical" position="inside">
-                <label for="has_group_uom" colspan="3"/>
-                <div>
-                    <field name='has_group_uom' colspan="1" class="oe_inline"/>
-                </div>
-            </group>
-        </field>
-    </record>
-</odoo>
diff --git a/addons/website/__manifest__.py b/addons/website/__manifest__.py
index 119732b0257..fbedd44425b 100644
--- a/addons/website/__manifest__.py
+++ b/addons/website/__manifest__.py
@@ -27,7 +27,6 @@
         'views/website_views.xml',
         'views/res_config_settings_views.xml',
         'views/ir_actions_views.xml',
-        'views/res_users_views.xml',
         'wizard/base_language_install_views.xml',
     ],
     'demo': [
diff --git a/addons/website/models/__init__.py b/addons/website/models/__init__.py
index 349e9792e01..f2a4b0c46cd 100644
--- a/addons/website/models/__init__.py
+++ b/addons/website/models/__init__.py
@@ -10,4 +10,3 @@ from . import ir_ui_view
 from . import res_company
 from . import res_partner
 from . import res_config_settings
-from . import res_users
diff --git a/addons/website/models/res_users.py b/addons/website/models/res_users.py
deleted file mode 100644
index bab898d24c8..00000000000
--- a/addons/website/models/res_users.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import fields, models
-
-
-class ResUsers(models.Model):
-    _inherit = 'res.users'
-
-    group_website_user = fields.Selection(
-        selection=lambda self: self._get_group_selection('base.module_category_website'),
-        string='Website Editor', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        category_xml_id='base.module_category_website')
diff --git a/addons/website/views/res_users_views.xml b/addons/website/views/res_users_views.xml
deleted file mode 100644
index 80dfc371994..00000000000
--- a/addons/website/views/res_users_views.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <record id="res_users_view_form" model="ir.ui.view">
-        <field name="name">res.users.form.website.inherit</field>
-        <field name="model">res.users</field>
-        <field name="inherit_id" ref="base.view_users_form"/>
-        <field name="priority">135</field>
-        <field name="arch" type="xml">
-            <group name="applications" position="inside">
-                <field name="group_website_user"/>
-            </group>
-        </field>
-    </record>
-</odoo>
diff --git a/addons/website_forum/__manifest__.py b/addons/website_forum/__manifest__.py
index d27dd595bce..a34afed27f9 100644
--- a/addons/website_forum/__manifest__.py
+++ b/addons/website_forum/__manifest__.py
@@ -20,7 +20,7 @@ Ask questions, get answers, no distractions
     'data': [
         'data/forum_data.xml',
         'views/forum.xml',
-        'views/res_users_views.xml',
+        'views/res_users.xml',
         'views/website_forum.xml',
         'views/ir_qweb.xml',
         'security/ir.model.access.csv',
diff --git a/addons/website_forum/views/res_users_views.xml b/addons/website_forum/views/res_users.xml
index e5327141f80..e5327141f80 100644
--- a/addons/website_forum/views/res_users_views.xml
+++ b/addons/website_forum/views/res_users.xml
diff --git a/addons/website_mass_mailing/__manifest__.py b/addons/website_mass_mailing/__manifest__.py
index 2b8f63808ff..ac3d34c0e1c 100644
--- a/addons/website_mass_mailing/__manifest__.py
+++ b/addons/website_mass_mailing/__manifest__.py
@@ -16,7 +16,6 @@ Add a snippet in the website builder to subscribe a mass_mailing list
         'views/snippets_templates.xml',
         'views/mass_mailing_view.xml',
         'views/res_config_settings_views.xml',
-        'views/res_users_views.xml',
     ],
     'auto_install': True,
 }
diff --git a/addons/website_mass_mailing/models/__init__.py b/addons/website_mass_mailing/models/__init__.py
index d70758fc817..c9e39e466ca 100644
--- a/addons/website_mass_mailing/models/__init__.py
+++ b/addons/website_mass_mailing/models/__init__.py
@@ -3,4 +3,3 @@
 
 from . import res_config_settings
 from . import mass_mailing_list
-from . import res_users
diff --git a/addons/website_mass_mailing/models/res_users.py b/addons/website_mass_mailing/models/res_users.py
deleted file mode 100644
index 6024234dfb9..00000000000
--- a/addons/website_mass_mailing/models/res_users.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import fields, models
-
-
-class ResUsers(models.Model):
-    _inherit = 'res.users'
-
-    has_group_website_popup_on_exit = fields.Boolean(
-        'Use subscription pop up on the website',
-        compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='website_mass_mailing.group_website_popup_on_exit')
diff --git a/addons/website_mass_mailing/views/res_users_views.xml b/addons/website_mass_mailing/views/res_users_views.xml
deleted file mode 100644
index dc0b20a84f0..00000000000
--- a/addons/website_mass_mailing/views/res_users_views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <record id="res_users_view_form" model="ir.ui.view">
-        <field name="name">res.users.form.website_mass_mailing.inherit</field>
-        <field name="model">res.users</field>
-        <field name="inherit_id" ref="base.view_users_form"/>
-        <field name="arch" type="xml">
-            <group name="technical" position="inside">
-                <label for="has_group_website_popup_on_exit" colspan="3"/>
-                <div>
-                    <field name='has_group_website_popup_on_exit' colspan="1" class="oe_inline"/>
-                </div>
-            </group>
-        </field>
-    </record>
-</odoo>
diff --git a/odoo/addons/base/data/ir_module_category_data.xml b/odoo/addons/base/data/ir_module_category_data.xml
index cf6a7ecc10c..c1b7ba90bdb 100644
--- a/odoo/addons/base/data/ir_module_category_data.xml
+++ b/odoo/addons/base/data/ir_module_category_data.xml
@@ -178,6 +178,16 @@
             <field name="sequence">100</field>
         </record>
 
+        <record model="ir.module.category" id="module_category_usability">
+            <field name="name">Extra Rights</field>
+            <field name="sequence">101</field>
+        </record>
+
+        <record model="ir.module.category" id="module_category_extra">
+            <field name="name">Other Extra Rights</field>
+            <field name="sequence">102</field>
+        </record>
+
         <!-- add applications to base groups -->
         <record model="res.groups" id="group_erp_manager">
             <field name="category_id" ref="module_category_administration"/>
diff --git a/odoo/addons/base/data/res_users_demo.xml b/odoo/addons/base/data/res_users_demo.xml
index d5977f63173..aa632b5bac8 100644
--- a/odoo/addons/base/data/res_users_demo.xml
+++ b/odoo/addons/base/data/res_users_demo.xml
@@ -72,9 +72,6 @@
             <field name="groups_id" eval="[(5,)]"/><!-- Avoid auto-including this user in any default group -->
         </record>
 
-        <record id="base.group_user" model="res.groups"><!-- Remove the demo user for the internal_user group -->
-            <field name="users" eval="[(3,ref('demo_user0'))]"/>
-        </record>
         <record id="base.group_portal" model="res.groups"><!-- Add the demo user to the portal (and therefore to the portal member group) -->
             <field name="users" eval="[(4,ref('demo_user0'))]"/>
         </record>
diff --git a/odoo/addons/base/models/res_users.py b/odoo/addons/base/models/res_users.py
index dc3851a58dd..8d2084b71e2 100644
--- a/odoo/addons/base/models/res_users.py
+++ b/odoo/addons/base/models/res_users.py
@@ -222,36 +222,6 @@ class Users(models.Model):
     name = fields.Char(related='partner_id.name', inherited=True)
     email = fields.Char(related='partner_id.email', inherited=True)
 
-    group_base_user = fields.Selection(
-        selection=lambda self: self._get_group_selection('base.module_category_user_type'),
-        string="User type", compute='_compute_groups_id', inverse='_inverse_groups_id',
-        category_xml_id='base.module_category_user_type')
-
-    group_administration_user = fields.Selection(
-        selection=lambda self: self._get_group_selection('base.module_category_administration'),
-        string="Administration", compute='_compute_groups_id', inverse='_inverse_groups_id',
-        category_xml_id='base.module_category_administration')
-
-    has_group_multi_company = fields.Boolean(
-        'Multi Companies', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='base.group_multi_company')
-
-    has_group_multi_currency = fields.Boolean(
-        'Multi Currencies', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='base.group_multi_currency')
-
-    has_group_no_one = fields.Boolean(
-        'Technical Features', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='base.group_no_one')
-
-    has_group_partner_manager = fields.Boolean(
-        'Contact Creation', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='base.group_partner_manager')
-
-    has_group_private_addresses = fields.Boolean(
-        'Access to Private Addresses', compute='_compute_groups_id', inverse='_inverse_groups_id',
-        group_xml_id='base.group_private_addresses')
-
     _sql_constraints = [
         ('login_key', 'UNIQUE (login)',  'You can not have two users with the same login !')
     ]
@@ -751,7 +721,6 @@ class GroupsImplied(models.Model):
     @api.multi
     def write(self, values):
         res = super(GroupsImplied, self).write(values)
-
         if values.get('users') or values.get('implied_ids'):
             # add all implied groups (to all users of each group)
             for group in self:
diff --git a/odoo/addons/base/views/res_users_views.xml b/odoo/addons/base/views/res_users_views.xml
index ebf1f72479f..bda551350ee 100644
--- a/odoo/addons/base/views/res_users_views.xml
+++ b/odoo/addons/base/views/res_users_views.xml
@@ -141,6 +141,11 @@
                             <field name="company_id" context="{'user_preference': 0}" groups="base.group_multi_company"/>
                         </div>
                         <group>
+                            <label for="groups_id" string="Access Rights"
+                                    attrs="{'invisible': [('id', '>', 0)]}" groups="base.group_no_one"/>
+                            <div attrs="{'invisible': [('id', '>', 0)]}" groups="base.group_no_one">
+                                <field name="groups_id" readonly="1" widget="many2many_tags" options="{'color_field': 'color'}" style="display: inline;"/> You will be able to define additional access rights by editing the newly created user under the Settings / Users menu.
+                            </div>
                             <field name="phone" widget="phone"/>
                             <field name="mobile" widget="phone"/>
                         </group>
@@ -185,40 +190,12 @@
                         </div>
                         <notebook colspan="4">
                             <page name="access_rights" string="Access Rights">
-                                <group string="User Type" name="user_type" groups="base.group_no_one">
-                                    <field name="group_base_user" groups="base.group_no_one"/>
-                                </group>
                                 <group string="Multi Companies" attrs="{'invisible': [('companies_count', '&lt;=', 1)]}">
                                     <field string="Allowed Companies" name="company_ids" widget="many2many_tags" options="{'no_create': True}"/>
                                     <field string="Current Company" name="company_id" context="{'user_preference': 0}"/>
                                     <field string="Companies count" name="companies_count" invisible="1"/>
                                 </group>
-                                <group string="Application Accesses" name="applications"/>
-                                <group string="Technical Settings" name="technical" groups="base.group_no_one" col="8">
-                                    <!-- TODO: Hide the no_one group -->
-                                    <label for="has_group_no_one" colspan="3"/>
-                                    <div>
-                                        <field name='has_group_no_one' colspan="1" class="oe_inline"/>
-                                    </div>
-                                </group>
-                                <group string="Extra Rights" name="extra" groups="base.group_no_one" col="8">
-                                    <label for="has_group_multi_company" colspan="3"/>
-                                    <div>
-                                        <field name='has_group_multi_company' colspan="1" class="oe_inline"/>
-                                    </div>
-                                    <label for="has_group_multi_currency" colspan="3"/>
-                                    <div>
-                                        <field name='has_group_multi_currency' colspan="1" class="oe_inline"/>
-                                    </div>
-                                    <label for="has_group_partner_manager" colspan="3"/>
-                                    <div>
-                                        <field name='has_group_partner_manager' colspan="1" class="oe_inline"/>
-                                    </div>
-                                    <label for="has_group_private_addresses" colspan="3"/>
-                                    <div>
-                                        <field name="has_group_private_addresses" colspan="1" class="oe_inline"/>
-                                    </div>
-                                </group>
+                                <field name="groups_id"/>
                             </page>
                             <page string="Preferences">
                                 <group>
@@ -235,27 +212,12 @@
                                     <field name="signature"/>
                                 </group>
                             </page>
-                            <page string="Groups" groups="base.group_no_one">
-                                <group>
-                                    <field name="groups_id"/>
-                                </group>
-                            </page>
                         </notebook>
                     </sheet>
                 </form>
             </field>
         </record>
-        <record id="res_users_view_form_administation" model="ir.ui.view">
-            <field name="name">res.users.view.form.administration</field>
-            <field name="model">res.users</field>
-            <field name="inherit_id" ref="view_users_form"/>
-            <field name="priority">1000</field>
-            <field name="arch" type="xml">
-                <group name="applications" position="inside">
-                    <field name="group_administration_user"/>
-                </group>
-            </field>
-        </record>
+
         <record id="view_users_tree" model="ir.ui.view">
             <field name="name">res.users.tree</field>
             <field name="model">res.users</field>
@@ -315,6 +277,16 @@
                 </search>
             </field>
         </record>
+        <record id="user_groups_view" model="ir.ui.view">
+            <field name="name">res.users.groups</field>
+            <field name="model">res.users</field>
+            <field name="inherit_id" ref="view_users_form"/>
+            <field name="arch" type="xml">
+                <!-- dummy, will be modified by groups -->
+                <field name="groups_id" position="after"/>
+            </field>
+        </record>
+        <!-- dummy update on group, to force the view above to be update -->
         <record model="res.groups" id="group_no_one"/>
         <record id="action_res_users" model="ir.actions.act_window">
             <field name="name">Users</field>