[MERGE] forward port branch saas-11.4 up to 1199451606c

5 files changed, 2 insertions, 47 deletions

diff --git a/addons/project/__manifest__.py b/addons/project/__manifest__.py
index a2d56f1624f..530cb4fb8b8 100644
--- a/addons/project/__manifest__.py
+++ b/addons/project/__manifest__.py
@@ -32,7 +32,6 @@
         'views/project_assets.xml',
         'views/project_portal_templates.xml',
         'views/project_rating_templates.xml',
-        'views/res_users_views.xml',
         'data/digest_data.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 5a94820d26e..c796777486b 100644
--- a/addons/project/models/__init__.py
+++ b/addons/project/models/__init__.py
@@ -4,5 +4,4 @@
 from . import project
 from . import res_config_settings
 from . import res_partner
-from . import res_users
 from . import digest
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/security/project_security.xml b/addons/project/security/project_security.xml
index f064bd6ba86..ca80bbbd615 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -16,10 +16,12 @@
 
     <record id="group_subtask_project" model="res.groups">
         <field name="name">Use Subtasks</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
     <record id="group_project_rating" model="res.groups">
         <field name="name">Use Rating on Project</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
 <data noupdate="1">
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>