From b79c5b17e34159a60eb4923f904a5ff07bfb2a83 Mon Sep 17 00:00:00 2001
From: Dossogne Bertrand <bedo@odoo.com>
Date: Fri, 18 Feb 2022 12:47:35 +0000
Subject: [PATCH] [IMP] hr_skills: improve appraisal usability

after this commit:
- you are able to create new skills from an appraisal form
- you select skills more easily

taskID #2766619 [Appraisals] Skills usability

closes odoo/odoo#84892

Related: odoo/enterprise#24518
Signed-off-by: Kevin Baptiste <kba@odoo.com>
---
 addons/hr_skills/models/hr_skills.py          |  2 +-
 addons/hr_skills/security/ir.model.access.csv |  2 +-
 addons/hr_skills/views/hr_views.xml           | 21 ++++++++++++++++++-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/addons/hr_skills/models/hr_skills.py b/addons/hr_skills/models/hr_skills.py
index 040b121c37d..3a1d44fddfc 100644
--- a/addons/hr_skills/models/hr_skills.py
+++ b/addons/hr_skills/models/hr_skills.py
@@ -12,7 +12,7 @@ class Skill(models.Model):
 
     name = fields.Char(required=True)
     sequence = fields.Integer(default=10)
-    skill_type_id = fields.Many2one('hr.skill.type', ondelete='cascade')
+    skill_type_id = fields.Many2one('hr.skill.type', required=True, ondelete='cascade')
 
     def name_get(self):
         if not self._context.get('from_skill_dropdown'):
diff --git a/addons/hr_skills/security/ir.model.access.csv b/addons/hr_skills/security/ir.model.access.csv
index fe696ae6dfc..b8b13907533 100644
--- a/addons/hr_skills/security/ir.model.access.csv
+++ b/addons/hr_skills/security/ir.model.access.csv
@@ -8,7 +8,7 @@ access_hr_skill_type_employee,hr.skill.type.employee,model_hr_skill_type,base.gr
 access_hr_skill_level,hr.skill.level,model_hr_skill_level,hr.group_hr_user,1,1,1,1
 access_hr_skill_level_employee,hr.skill.level.employee,model_hr_skill_level,base.group_user,1,0,0,0
 access_hr_skill,hr.skill,model_hr_skill,hr.group_hr_user,1,1,1,1
-access_hr_skill_employee,hr.skill.employee,model_hr_skill,base.group_user,1,0,0,0
+access_hr_skill_employee,hr.skill.employee,model_hr_skill,base.group_user,1,0,1,0
 access_hr_employee_skill,hr.employee.skill,model_hr_employee_skill,hr.group_hr_user,1,1,1,1
 access_hr_employee_skill_employee,hr.employee.skill,model_hr_employee_skill,base.group_user,1,1,1,1
 access_hr_employee_skill_report,hr.employee.skill.report,model_hr_employee_skill_report,hr.group_hr_user,1,0,0,0
diff --git a/addons/hr_skills/views/hr_views.xml b/addons/hr_skills/views/hr_views.xml
index d303b181d4e..13c8b7ac3a3 100644
--- a/addons/hr_skills/views/hr_views.xml
+++ b/addons/hr_skills/views/hr_views.xml
@@ -232,6 +232,7 @@
         <field name="arch" type="xml">
             <tree string="Skill Levels">
                 <field name="name"/>
+                <field name="skill_type_id"/>
             </tree>
         </field>
     </record>
@@ -293,12 +294,30 @@
         <field name="arch" type="xml">
             <form string="Skills">
                 <sheet>
-                    <field name="name"/>
+                    <group>
+                        <field name="name"/>
+                        <field name="skill_type_id"/>
+                    </group>
                 </sheet>
             </form>
         </field>
     </record>
 
+    <record id="hr_skill_view_search" model="ir.ui.view">
+        <field name="name">hr.skill.view.search</field>
+        <field name="model">hr.skill</field>
+        <field name="arch" type="xml">
+            <search string="Search Skill">
+                <field name="name" string="Skill"/>
+                <field name="skill_type_id" string="Skill Type"/>
+                <separator/>
+                <group expand="0" string="Group By...">
+                        <filter string="Skill Type" name="group_skill_type_id" domain="[]" context="{'group_by':'skill_type_id'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
     <record id="hr_skill_type_view_tree" model="ir.ui.view">
         <field name="name">hr.skill.type.tree</field>
         <field name="model">hr.skill.type</field>