From 9ce244819cfffde8bab8f9abc9767c4bd728de4b Mon Sep 17 00:00:00 2001 From: Antonio Espinosa Date: Wed, 17 Feb 2016 15:50:04 +0100 Subject: [PATCH 1/3] [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) From de6219057d1d90fdd6a2045b80b7ec09a91c36e0 Mon Sep 17 00:00:00 2001 From: Antonio Espinosa Date: Wed, 17 Feb 2016 18:06:12 +0100 Subject: [PATCH 2/3] Add copyright and contributor --- mrp_project/README.rst | 1 + mrp_project/models/hr_analytic_timesheet.py | 1 + mrp_project/models/project_task_work.py | 1 + 3 files changed, 3 insertions(+) diff --git a/mrp_project/README.rst b/mrp_project/README.rst index 19c48965f..e995a7a55 100644 --- a/mrp_project/README.rst +++ b/mrp_project/README.rst @@ -54,6 +54,7 @@ Contributors * Daniel Campos * Pedro M. Baeza +* Antonio Espinosa Maintainer ---------- diff --git a/mrp_project/models/hr_analytic_timesheet.py b/mrp_project/models/hr_analytic_timesheet.py index 0fcfc93eb..8ce2d9bb5 100644 --- a/mrp_project/models/hr_analytic_timesheet.py +++ b/mrp_project/models/hr_analytic_timesheet.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- # (c) 2016 Daniel Dico +# (c) 2016 Antiun Ingenieria S.L. - Antonio Espinosa # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html from openerp import models, api diff --git a/mrp_project/models/project_task_work.py b/mrp_project/models/project_task_work.py index 1b1c4e162..f680f4bcd 100644 --- a/mrp_project/models/project_task_work.py +++ b/mrp_project/models/project_task_work.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- # (c) 2015 Pedro M. Baeza - Serv. Tecnol. Avanzados +# (c) 2016 Antiun Ingenieria S.L. - Antonio Espinosa # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html from openerp import models, fields, api From 11bc40d2f44e7ea123b9778440d2780f57db1168 Mon Sep 17 00:00:00 2001 From: Antonio Espinosa Date: Thu, 18 Feb 2016 12:03:10 +0100 Subject: [PATCH 3/3] Increment version number --- mrp_project/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mrp_project/__openerp__.py b/mrp_project/__openerp__.py index f6e5d2f06..668df1acb 100644 --- a/mrp_project/__openerp__.py +++ b/mrp_project/__openerp__.py @@ -6,7 +6,7 @@ { "name": "MRP Project Link", "summary": "Link production with projects", - "version": "8.0.1.1.1", + "version": "8.0.1.2.0", "depends": [ "mrp_analytic", "project",