From 9ce244819cfffde8bab8f9abc9767c4bd728de4b Mon Sep 17 00:00:00 2001 From: Antonio Espinosa Date: Wed, 17 Feb 2016 15:50:04 +0100 Subject: [PATCH] [IMP] Set workorder in analytic.line related with a task from a work order --- mrp_project/__openerp__.py | 3 ++- mrp_project/models/hr_analytic_timesheet.py | 5 ++++- mrp_project/models/project_task_work.py | 6 ++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/mrp_project/__openerp__.py b/mrp_project/__openerp__.py index 47f7dd49b..f6e5d2f06 100644 --- a/mrp_project/__openerp__.py +++ b/mrp_project/__openerp__.py @@ -6,10 +6,11 @@ { "name": "MRP Project Link", "summary": "Link production with projects", - "version": "8.0.1.1.0", + "version": "8.0.1.1.1", "depends": [ "mrp_analytic", "project", + "project_timesheet", ], 'license': 'AGPL-3', "images": [], diff --git a/mrp_project/models/hr_analytic_timesheet.py b/mrp_project/models/hr_analytic_timesheet.py index 765df5807..0fcfc93eb 100644 --- a/mrp_project/models/hr_analytic_timesheet.py +++ b/mrp_project/models/hr_analytic_timesheet.py @@ -10,7 +10,10 @@ class HrAnalyticTimesheet(models.Model): @api.model def create(self, vals): - production = self._context.get('production', False) + production = self.env.context.get('production', False) + workorder = self.env.context.get('workorder', False) vals['mrp_production_id'] = vals.get( 'mrp_production_id', False) or production and production.id + vals['workorder'] = vals.get( + 'workorder', False) or workorder and workorder.id return super(HrAnalyticTimesheet, self).create(vals) diff --git a/mrp_project/models/project_task_work.py b/mrp_project/models/project_task_work.py index b7326b4f1..1b1c4e162 100644 --- a/mrp_project/models/project_task_work.py +++ b/mrp_project/models/project_task_work.py @@ -28,3 +28,9 @@ class ProjectTaskWork(models.Model): task = self.env['project.task'].browse(task_id) res['value'] = {'user_id': task.user_id.id} return res + + @api.model + def _create_analytic_entries(self, vals): + task = self.env['project.task'].browse(vals.get('task_id', False)) + return super(ProjectTaskWork, self.with_context( + workorder=task.workorder))._create_analytic_entries(vals)