diff --git a/cor_custom/report/project_hours_report.py b/cor_custom/report/project_hours_report.py index b347d84..ca280e1 100755 --- a/cor_custom/report/project_hours_report.py +++ b/cor_custom/report/project_hours_report.py @@ -28,7 +28,7 @@ class BudgetHrsAnalysis(models.Model): for record in self: name = record.project_id and record.project_id.name or '' if record.employee_id.name: - name = record.employee_id.name + '/' + name + name = record.employee_id.name + '/' + name + '/' + record.hours_type res.append((record.id, name)) return res diff --git a/cor_custom/report/project_hours_report_view.xml b/cor_custom/report/project_hours_report_view.xml index cce1b1b..8aeb24a 100755 --- a/cor_custom/report/project_hours_report_view.xml +++ b/cor_custom/report/project_hours_report_view.xml @@ -75,6 +75,10 @@ mode="month"> + + + + @@ -105,7 +109,7 @@ - diff --git a/cor_custom/security/cor_custom_security.xml b/cor_custom/security/cor_custom_security.xml index 003bbe9..8ecd9a9 100755 --- a/cor_custom/security/cor_custom_security.xml +++ b/cor_custom/security/cor_custom_security.xml @@ -20,19 +20,19 @@ --> - + - - Administrator + @@ -80,7 +80,7 @@ - + - + Project: view Consultant: Own User @@ -133,15 +133,16 @@ Project: view Consultant: Manager User - [('project_id.user_id','=',user.id)] + [(1,'=',1)] +