From 005a8e1d4fa3912635f580aa70f2cc8a3affae73 Mon Sep 17 00:00:00 2001 From: oihane Date: Thu, 19 May 2016 09:43:58 +0200 Subject: [PATCH 1/2] [IMP] quality_control_mrp: take product from manufacturing order --- quality_control_mrp/models/qc_inspection.py | 23 ++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/quality_control_mrp/models/qc_inspection.py b/quality_control_mrp/models/qc_inspection.py index 200868ea9..bed017706 100644 --- a/quality_control_mrp/models/qc_inspection.py +++ b/quality_control_mrp/models/qc_inspection.py @@ -8,15 +8,24 @@ from openerp import models, fields, api class QcInspection(models.Model): _inherit = 'qc.inspection' - @api.one @api.depends('object_id') def get_production(self): - self.production = False - if self.object_id: - if self.object_id._name == 'stock.move': - self.production = self.object_id.production_id - elif self.object_id._name == 'mrp.production': - self.production = self.object_id + for inspection in self: + inspection.production = False + if inspection.object_id: + if inspection.object_id._name == 'stock.move': + inspection.production = inspection.object_id.production_id + elif self.object_id._name == 'mrp.production': + inspection.production = inspection.object_id + + @api.depends('object_id') + def _get_product(self): + """Overriden for getting the product from a manufacturing order.""" + for inspection in self: + super(QcInspection, inspection)._get_product() + if inspection.object_id and\ + inspection.object_id._name == 'mrp.production': + inspection.product = inspection.object_id.product_id production = fields.Many2one( comodel_name="mrp.production", compute="get_production", store=True) From 0991016d8c6c4224dd5483b6ae6c845638e196b0 Mon Sep 17 00:00:00 2001 From: oihane Date: Thu, 19 May 2016 10:00:29 +0200 Subject: [PATCH 2/2] [IMP] quality_control_mrp: removed not required code --- quality_control_mrp/models/qc_inspection.py | 1 - quality_control_mrp/views/qc_inspection_view.xml | 3 +++ quality_control_stock/views/qc_inspection_view.xml | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/quality_control_mrp/models/qc_inspection.py b/quality_control_mrp/models/qc_inspection.py index bed017706..4e99b33e0 100644 --- a/quality_control_mrp/models/qc_inspection.py +++ b/quality_control_mrp/models/qc_inspection.py @@ -11,7 +11,6 @@ class QcInspection(models.Model): @api.depends('object_id') def get_production(self): for inspection in self: - inspection.production = False if inspection.object_id: if inspection.object_id._name == 'stock.move': inspection.production = inspection.object_id.production_id diff --git a/quality_control_mrp/views/qc_inspection_view.xml b/quality_control_mrp/views/qc_inspection_view.xml index d806b6a14..5bc886ef3 100644 --- a/quality_control_mrp/views/qc_inspection_view.xml +++ b/quality_control_mrp/views/qc_inspection_view.xml @@ -35,6 +35,9 @@ + + + diff --git a/quality_control_stock/views/qc_inspection_view.xml b/quality_control_stock/views/qc_inspection_view.xml index 3e3d949dc..bc4780e4d 100644 --- a/quality_control_stock/views/qc_inspection_view.xml +++ b/quality_control_stock/views/qc_inspection_view.xml @@ -31,6 +31,10 @@ qc.inspection + + + +