From d83890dd1462ff12079fb002e7ef78cfa7817377 Mon Sep 17 00:00:00 2001
From: Yannick Tivisse <yti@odoo.com>
Date: Fri, 17 May 2019 15:09:37 +0000
Subject: [PATCH] [IMP] hr: Display certificate on employee form

closes odoo/odoo#33496

Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 addons/hr/models/hr.py        | 2 +-
 addons/hr/models/res_users.py | 8 +++++++-
 addons/hr/views/hr_views.xml  | 5 +++++
 addons/hr/views/res_users.xml | 5 +++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/addons/hr/models/hr.py b/addons/hr/models/hr.py
index 458c4171c15..9537910cfff 100644
--- a/addons/hr/models/hr.py
+++ b/addons/hr/models/hr.py
@@ -160,7 +160,7 @@ class Employee(models.Model):
         ('bachelor', 'Bachelor'),
         ('master', 'Master'),
         ('other', 'Other'),
-    ], 'Certificate Level', default='master', groups="hr.group_hr_user", tracking=True)
+    ], 'Certificate Level', default='other', groups="hr.group_hr_user", tracking=True)
     study_field = fields.Char("Field of Study", placeholder='Computer Science', groups="hr.group_hr_user", tracking=True)
     study_school = fields.Char("School", groups="hr.group_hr_user", tracking=True)
     emergency_contact = fields.Char("Emergency Contact", groups="hr.group_hr_user", tracking=True)
diff --git a/addons/hr/models/res_users.py b/addons/hr/models/res_users.py
index c67ff842e51..e966a491894 100644
--- a/addons/hr/models/res_users.py
+++ b/addons/hr/models/res_users.py
@@ -48,6 +48,9 @@ class User(models.Model):
     additional_note = fields.Text(related='employee_id.additional_note', readonly=False, related_sudo=False)
     barcode = fields.Char(related='employee_id.barcode', readonly=False, related_sudo=False)
     pin = fields.Char(related='employee_id.pin', readonly=False, related_sudo=False)
+    certificate = fields.Selection(related='employee_id.certificate', readonly=False, related_sudo=False)
+    study_field = fields.Char(related='employee_id.study_field', readonly=False, related_sudo=False)
+    study_school = fields.Char(related='employee_id.study_school', readonly=False, related_sudo=False)
     employee_warning = fields.Char("Missing employee warning", compute='_compute_employee_warning')
 
     @api.depends('groups_id', 'employee_ids', 'active')
@@ -109,7 +112,10 @@ class User(models.Model):
             'visa_no',
             'work_email',
             'work_location',
-            'work_phone'
+            'work_phone',
+            'certificate',
+            'study_field',
+            'study_school',
         ]
 
         init_res = super(User, self).__init__(pool, cr)
diff --git a/addons/hr/views/hr_views.xml b/addons/hr/views/hr_views.xml
index 14e3c009eb4..81609ef89a5 100644
--- a/addons/hr/views/hr_views.xml
+++ b/addons/hr/views/hr_views.xml
@@ -253,6 +253,11 @@
                                         <field name="spouse_complete_name" attrs="{'invisible': [('marital', 'not in', ['married', 'cohabitant'])]}" groups="hr.group_hr_user"/>
                                         <field name="spouse_birthdate" attrs="{'invisible': [('marital', 'not in', ['married', 'cohabitant'])]}" groups="hr.group_hr_user"/>
                                     </group>
+                                    <group string="Education">
+                                        <field name="certificate"/>
+                                        <field name="study_field"/>
+                                        <field name="study_school"/>
+                                    </group>
                                     <group string="Dependant">
                                         <field name="children"/>
                                     </group>
diff --git a/addons/hr/views/res_users.xml b/addons/hr/views/res_users.xml
index 7453d294d22..7a93c6745a7 100644
--- a/addons/hr/views/res_users.xml
+++ b/addons/hr/views/res_users.xml
@@ -104,6 +104,11 @@
                                         <field name="spouse_complete_name" attrs="{'invisible': [('marital', 'not in', ['married', 'cohabitant'])]}"/>
                                         <field name="spouse_birthdate" attrs="{'invisible': [('marital', 'not in', ['married', 'cohabitant'])]}"/>
                                     </group>
+                                    <group string="Education">
+                                        <field name="certificate"/>
+                                        <field name="study_field"/>
+                                        <field name="study_school"/>
+                                    </group>
                                     <group string="Dependant">
                                         <field name="children"/>
                                     </group>