diff --git a/addons/hr_payroll/models/hr_benefit.py b/addons/hr_payroll/models/hr_benefit.py index 1862c46d3eb..42d311d8f0b 100644 --- a/addons/hr_payroll/models/hr_benefit.py +++ b/addons/hr_payroll/models/hr_benefit.py @@ -13,6 +13,7 @@ from odoo.addons.resource.models.resource import Intervals class HrBenefit(models.Model): _name = 'hr.benefit' _description = 'hr.benefit' + _order = 'display_warning desc,state,date_start' name = fields.Char(required=True) active = fields.Boolean(default=True) diff --git a/addons/hr_payroll/models/hr_leave.py b/addons/hr_payroll/models/hr_leave.py index 6440b0d1ee5..403a508de1e 100644 --- a/addons/hr_payroll/models/hr_leave.py +++ b/addons/hr_payroll/models/hr_leave.py @@ -22,6 +22,7 @@ class HrLeave(models.Model): 'date_start': leave.date_from, 'date_stop': leave.date_to, 'benefit_type_id': benefit_type.id, + 'display_warning': not bool(benefit_type), 'employee_id': leave.employee_id.id, 'leave_id': self.id, 'state': 'confirmed', diff --git a/addons/hr_payroll/views/hr_benefit_views.xml b/addons/hr_payroll/views/hr_benefit_views.xml index 2802bcc739c..6aa46656a4c 100644 --- a/addons/hr_payroll/views/hr_benefit_views.xml +++ b/addons/hr_payroll/views/hr_benefit_views.xml @@ -107,6 +107,21 @@ if records: + + hr.benefit.tree + hr.benefit + + + + + + + + + + + + hr.benefit.filter hr.benefit @@ -115,7 +130,9 @@ if records: + +