From 6280be10a55568ffd0dabb86c1fe462dae944906 Mon Sep 17 00:00:00 2001 From: RomainLibert Date: Fri, 8 Mar 2019 15:11:41 +0100 Subject: [PATCH] [IMP] hr_payroll: enable color edition on hr benefit types TaskID: 1947281 --- addons/hr_payroll/data/hr_payroll_demo.xml | 5 +- .../hr_payroll/views/hr_work_entry_views.xml | 52 +++++++++++++++---- 2 files changed, 44 insertions(+), 13 deletions(-) diff --git a/addons/hr_payroll/data/hr_payroll_demo.xml b/addons/hr_payroll/data/hr_payroll_demo.xml index 73b21693e40..23199f863a2 100644 --- a/addons/hr_payroll/data/hr_payroll_demo.xml +++ b/addons/hr_payroll/data/hr_payroll_demo.xml @@ -151,7 +151,7 @@ Extra hours WORK300 - 2 + 8 @@ -172,7 +172,7 @@ Sick Time Off LEAVE400 True - 5 + 6 @@ -197,4 +197,3 @@ - diff --git a/addons/hr_payroll/views/hr_work_entry_views.xml b/addons/hr_payroll/views/hr_work_entry_views.xml index deb3e89fd52..cf217a4e60d 100644 --- a/addons/hr_payroll/views/hr_work_entry_views.xml +++ b/addons/hr_payroll/views/hr_work_entry_views.xml @@ -37,7 +37,7 @@ date_stop="date_stop" mode="month" quick_add="False" - color="work_entry_type_id" + color="color" event_limit="5"> @@ -175,20 +175,52 @@ + + hr.work.entry.type.kanban.view + hr.work.entry.type + + + + + +
+ +
+
+ +
+
+ +
+
+
+
+
+
+
+
+ - Generate payslips - - - code - - action = env['hr.payslip.employees'].create({}).compute_sheet() - - + Generate payslips + + + code + + action = env['hr.payslip.employees'].create({}).compute_sheet() + + Work Entry Types hr.work.entry.type - tree,kanban,form + kanban,tree,form