[IMP] empty

addons/hr/models/hr_employee.py

@@ -549,8 +549,7 @@ def _compute_legal_name(self):
     @api.depends('current_version_id')
     @api.depends_context('version_id')
     def _compute_version_id(self):
-        context_version_id = self.env.context.get('version_id', False)
-        context_version = self.env['hr.version'].browse(context_version_id).exists() if context_version_id else self.env['hr.version']
+        context_version = self.env['hr.version'].browse(self.env.context.get('version_id', False))
 
         for employee in self:
             if context_version.employee_id == self:

addons/hr/static/src/components/button_new_contract/button_new_contract.xml

@@ -3,7 +3,7 @@
     <t t-name="hr.ButtonNewContract">
         <span class="w-100 d-flex justify-content-end">
             <button class="btn btn-link p-0 o_field_widget text-end w-auto" t-on-click="onClickNewContractBtn"
-                    t-ref="datetime-picker-target-new-contract" t-if="props.record.resId and props.record.data.contract_date_start">New Contract</button>
+                    t-ref="datetime-picker-target-new-contract" t-if="props.record.resId">New Contract</button>
         </span>
     </t>
 </template>

addons/hr/tests/test_hr_version.py

@@ -523,27 +523,6 @@ def test_multi_edit_other_and_contract_date_sync(self):
             self.assertEqual(version.job_id.id, jobB.id)
             self.assertEqual(version.contract_date_end, date(2020, 9, 30))
 
-    def test_delete_version(self):
-        employee = self.env['hr.employee'].create({
-            'name': 'John Doe',
-            'date_version': '2020-01-01',
-        })
-        v1 = employee.version_id
-        v2 = employee.create_version({
-            'date_version': '2021-01-01',
-        })
-        v3 = employee.create_version({
-            'date_version': '2022-01-01',
-        })
-        self.assertEqual(employee.current_version_id, v3)
-
-        v3.unlink()
-        self.assertEqual(employee.current_version_id, v2)
-        v1.unlink()
-        self.assertEqual(employee.current_version_id, v2)
-        with self.assertRaises(ValidationError):
-            v2.unlink()
-
     def test_multi_edit_multi_employees_no_contract(self):
         """
         Test the multi-edit when there is one version per employee, without contract

addons/hr_holidays/models/hr_leave_type.py

@@ -274,14 +274,15 @@ def _search_max_leaves(self, operator, value):
         return [('id', 'in', valid_leaves)]
 
     def _search_virtual_remaining_leaves(self, operator, value):
-        def is_valid(leave_type):
-            return not leave_type.requires_allocation or op(leave_type.virtual_remaining_leaves, value)
         op = PY_OPERATORS.get(operator)
         if not op:
             return NotImplemented
         if operator != 'in':
             value = float(value)
         leave_types = self.env['hr.leave.type'].search([])
+
+        def is_valid(leave_type):
+            return not leave_type.requires_allocation or op(leave_type.virtual_remaining_leaves)
         return [('id', 'in', leave_types.filtered(is_valid).ids)]
 
     @api.depends_context('uid', 'employee_id', 'default_employee_id', 'leave_date_from', 'default_date_from')

addons/hr_holidays/static/src/components/accrual_level/accrual_levels.scss

@@ -10,7 +10,7 @@
 }
 
 .o_accrual {
-  .o_field_accrual, .o_field_selection, .o_field_day_selection, .o_field_filterable_selection {
+  .o_field_accrual, .o_field_selection, .o_field_filterable_selection {
     width: fit-content !important;
 
     &:not(.o_readonly_modifier) > *:first-child {
@@ -20,7 +20,7 @@
       field-sizing: content;
     }
 
-    &:not(.o_field_selection, .o_field_day_selection, .o_field_filterable_selection) > *:first-child {
+    &:not(.o_field_selection, .o_field_filterable_selection) > *:first-child {
       max-width: 8ch;
     }
   }

addons/hr_holidays/views/hr_leave_accrual_views.xml

@@ -36,17 +36,17 @@
                                 </span>
                                 <span name="biyearly" invisible="frequency != 'biyearly'">
                                     on the
-                                    <field nolabel="1" name="first_month_day" class="o_field_accrual" widget="day_selection" month_field="first_month" placeholder="select a day" required="frequency == 'biyearly'"/>
+                                    <field nolabel="1" name="first_month_day" class="o_field_accrual" placeholder="select a day" required="frequency == 'biyearly'"/>
                                     of
                                     <field name="first_month" class="o_field_accrual" placeholder="select a month" required="frequency == 'biyearly'"/>
                                     and the
-                                    <field nolabel="1" name="second_month_day" class="o_field_accrual" widget="day_selection" month_field="second_month" placeholder="select a day" required="frequency == 'biyearly'"/>
+                                    <field nolabel="1" name="second_month_day" class="o_field_accrual" placeholder="select a day" required="frequency == 'biyearly'"/>
                                     of
                                     <field nolabel="1" name="second_month" class="o_field_accrual" placeholder="select a month" required="frequency == 'biyearly'"/>
                                 </span>
                                 <span name="yearly" invisible="frequency != 'yearly'">
                                     on the
-                                    <field nolabel="1" name="yearly_day" class="o_field_accrual" widget="day_selection" month_field="yearly_month" required="frequency == 'yearly'" placeholder="select a day"/>
+                                    <field nolabel="1" name="yearly_day" class="o_field_accrual" required="frequency == 'yearly'" placeholder="select a day"/>
                                     of
                                     <field nolabel="1" name="yearly_month" class="o_field_accrual" required="frequency == 'yearly'" placeholder="select a month"/>
                                 </span>
@@ -192,7 +192,7 @@
                                                options="{'links': {'other': 'carryover_custom_date'}, 'observe': 'carryover'}"/>
                                         <span id="carryover_custom_date">
                                             : the
-                                            <field name="carryover_day" widget="day_selection" month_field="carryover_month" placeholder="select a day"
+                                            <field name="carryover_day" placeholder="select a day"
                                                    required="carryover_date == 'other'"/>
                                             of
                                             <field name="carryover_month" placeholder="select a month"

addons/hr_skills/report/__init__.py

@@ -1,5 +1,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
+from . import hr_employee_certification_report
 from . import hr_employee_cv_report
 from . import hr_employee_skill_history_report
 from . import hr_employee_skill_report

addons/hr_skills/report/hr_employee_certification_report.py

@@ -0,0 +1,47 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import fields, models, tools
+
+
+class HrEmployeeCertificationReport(models.BaseModel):
+    _name = 'hr.employee.certification.report'
+    _auto = False
+    _inherit = ["hr.manager.department.report"]
+    _description = 'Employee Certification Report'
+    _order = 'employee_id, level_progress desc'
+
+    company_id = fields.Many2one('res.company', readonly=True)
+    department_id = fields.Many2one('hr.department', readonly=True)
+
+    skill_id = fields.Many2one('hr.skill', readonly=True)
+    skill_type_id = fields.Many2one('hr.skill.type', readonly=True)
+    skill_level = fields.Char(readonly=True)
+    level_progress = fields.Float(readonly=True, aggregator='avg')
+    active = fields.Boolean(readonly=False)
+
+    def init(self):
+        tools.drop_view_if_exists(self.env.cr, self._table)
+
+        self.env.cr.execute("""
+        CREATE OR REPLACE VIEW %(table)s AS (
+            SELECT
+                row_number() OVER () AS id,
+                e.id AS employee_id,
+                e.company_id AS company_id,
+                v.department_id AS department_id,
+                s.skill_id AS skill_id,
+                s.skill_type_id AS skill_type_id,
+                sl.level_progress / 100.0 AS level_progress,
+                sl.name AS skill_level,
+                (s.valid_to IS NULL OR s.valid_to >= '%(date)s') AND s.valid_from <= '%(date)s' AS active
+            FROM hr_employee e
+            LEFT JOIN hr_version v ON e.current_version_id = v.id
+            LEFT OUTER JOIN hr_employee_skill s ON e.id = s.employee_id
+            LEFT OUTER JOIN hr_skill_level sl ON sl.id = s.skill_level_id
+            LEFT OUTER JOIN hr_skill_type st ON st.id = sl.skill_type_id
+            WHERE e.active AND st.active IS True AND st.is_certification IS TRUE
+        )
+        """ % {
+            'table': self._table,
+            'date': fields.Date.context_today(self)
+        })

addons/hr_skills/report/hr_employee_certification_report_views.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="hr_employee_certification_report_view_pivot" model="ir.ui.view">
+        <field name="model">hr.employee.certification.report</field>
+        <field name="arch" type="xml">
+            <pivot disable_linking="True">
+                <field name="employee_id" type="row"/>
+                <field name="skill_type_id" type="col"/>
+                <field name="skill_id" type="col"/>
+                <field name="level_progress" type="measure" widget="percentage" string="Current Level"/>
+            </pivot>
+        </field>
+    </record>
+
+    <record id="hr_employee_certification_report_view_list" model="ir.ui.view">
+        <field name="model">hr.employee.certification.report</field>
+        <field name="arch" type="xml">
+            <list expand="0" edit="1" editable="bottom">
+                <field name="employee_id" widget="many2one_avatar_employee" options="{'no_create': True, 'no_open': True}"/>
+                <field name="skill_type_id" options="{'no_create': True, 'no_open': True}" string="Certification Type"/>
+                <field name="skill_id" options="{'no_create': True, 'no_open': True}" string="Certification"/>
+                <field name="skill_level" options="{'no_create': True, 'no_open': True}" string="Certification Level"/>
+                <field name="level_progress" widget="percentage" options="{'no_create': True, 'no_open': True}" string="Current Level"/>
+            </list>
+        </field>
+    </record>
+
+    <record id="hr_employee_certification_report_view_search" model="ir.ui.view">
+        <field name="model">hr.employee.certification.report</field>
+        <field name="arch" type="xml">
+            <search>
+                <field name="employee_id"/>
+                <field name="department_id"/>
+                <field name="skill_id" string="Certification"/>
+                <field name="skill_type_id" string="Certification Type"/>
+                <separator/>
+                <filter string="Expired Certification" name="archived" domain="[('active', '=', False)]"/>
+                <separator/>
+                <filter string="Employee" name="employee" context="{'group_by': 'employee_id'}"/>
+                <filter string="Department" name="department" context="{'group_by': 'department_id'}"/>
+                <separator/>
+                <filter string="Certification Type" name="skill_type" context="{'group_by': 'skill_type_id'}"/>
+                <filter string="Certification" name="skill" context="{'group_by': 'skill_id'}"/>
+            </search>
+        </field>
+    </record>
+
+    <record id="hr_employee_certification_report_action" model="ir.actions.act_window">
+        <field name="name">Certification</field>
+        <field name="res_model">hr.employee.certification.report</field>
+        <field name="search_view_id" ref="hr_employee_certification_report_view_search"/>
+        <field name="view_mode">list,pivot</field>
+        <field name="context">{
+            'search_default_employee': 1,
+        }</field>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_empty_folder">
+            </p><p>
+                This report will give you an overview of the certification per Employee.
+                Create them in configuration and add them on the Employee.
+            </p>
+        </field>
+    </record>
+
+    <menuitem
+        id="hr_employee_certification_report_menu"
+        name="Certifications"
+        action="hr_employee_certification_report_action"
+        parent="hr_skills.hr_employee_skill_report_menu"
+        sequence="25"/>
+</odoo>

addons/hr_skills/report/hr_employee_skill_report_views.xml

@@ -89,6 +89,6 @@
         id="hr_employee_skill_inventory_report_menu"
         name="Skills Inventory"
         action="hr_employee_skill_report_action"
-        parent="hr.hr_menu_hr_reports"
+        parent="hr_skills.hr_employee_skill_report_menu"
         sequence="15"/>
 </odoo>

addons/hr_skills/views/hr_views.xml

@@ -595,7 +595,7 @@
         <field name="res_model">hr.employee.skill</field>
         <field name="path">certifications</field>
         <field name="domain">[('is_certification', '=', True), ('company_id', 'in', allowed_company_ids)]</field>
-        <field name="context">{'show_employee': True}</field>
+        <field name="context">{'show_employee': True, 'search_default_group_by_type': 1}</field>
         <field name="view_mode">list,form</field>
         <field name="view_ids" eval="[(5, 0, 0),
             (0, 0, {'view_mode': 'list', 'view_id': False}),
@@ -610,6 +610,12 @@
         sequence="7"
         groups="hr.group_hr_user"/>
 
+    <menuitem
+    id="hr_employee_skill_report_menu"
+    name="Skills"
+    parent="hr.hr_menu_hr_reports"
+    sequence="15"/>
+
     <menuitem
         id="hr_skill_learning_menu"
         name="Learning"