diff --git a/cor_custom/models/project_hours.py b/cor_custom/models/project_hours.py index 9604fb3..6f88ee3 100755 --- a/cor_custom/models/project_hours.py +++ b/cor_custom/models/project_hours.py @@ -15,7 +15,6 @@ class ProjectConsultantHrs(models.Model): _order = 'employee_id, end_date desc' project_id = fields.Many2one('project.project', string="Project", required=True) - user_id = fields.Many2one('res.user', related='project_id.user_id') employee_id = fields.Many2one('hr.employee', string="Consultant", required=True) start_date = fields.Date('Start Date', required=True) end_date = fields.Date('End Date', required=True) diff --git a/cor_custom/report/project_hours_report.py b/cor_custom/report/project_hours_report.py index b347d84..22add7e 100755 --- a/cor_custom/report/project_hours_report.py +++ b/cor_custom/report/project_hours_report.py @@ -13,6 +13,7 @@ class BudgetHrsAnalysis(models.Model): _auto = False project_id = fields.Many2one('project.project', string='Project', readonly=True) + user_id = fields.Many2one('res.user', related='project_id.user_id') employee_id = fields.Many2one('hr.employee', string='Consultant', readonly=True) start_date = fields.Date(string='Start Date', readonly=True) end_date = fields.Date(string='End Date', readonly=True) diff --git a/cor_custom/report/project_hours_report_view.xml b/cor_custom/report/project_hours_report_view.xml index cce1b1b..c6f91f1 100755 --- a/cor_custom/report/project_hours_report_view.xml +++ b/cor_custom/report/project_hours_report_view.xml @@ -8,6 +8,7 @@
+ @@ -25,6 +26,7 @@ + diff --git a/cor_custom/views/project_hours_view.xml b/cor_custom/views/project_hours_view.xml index 575441c..ff44311 100755 --- a/cor_custom/views/project_hours_view.xml +++ b/cor_custom/views/project_hours_view.xml @@ -8,7 +8,6 @@ - @@ -27,7 +26,6 @@ -