From d584589c89a202fe0f1b1518f43a1b2b4af073ce Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Wed, 10 Dec 2014 23:37:12 +0100 Subject: [PATCH] Merge branch '8.0' of github.com:odoomrp/odoomrp-wip into 8.0 --- quality_control_stock/__openerp__.py | 1 + quality_control_stock/models/qc_trigger.py | 2 +- quality_control_stock/models/stock_picking.py | 1 - quality_control_stock/models/stock_picking_type.py | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/quality_control_stock/__openerp__.py b/quality_control_stock/__openerp__.py index b51c02c86..d0b38c80a 100644 --- a/quality_control_stock/__openerp__.py +++ b/quality_control_stock/__openerp__.py @@ -34,6 +34,7 @@ 'stock', ], "data": [ + 'data/quality_control_stock_data.xml', 'views/qc_inspection_view.xml', 'views/stock_picking_view.xml', 'views/stock_production_lot_view.xml', diff --git a/quality_control_stock/models/qc_trigger.py b/quality_control_stock/models/qc_trigger.py index 21a8dd887..e53003749 100644 --- a/quality_control_stock/models/qc_trigger.py +++ b/quality_control_stock/models/qc_trigger.py @@ -9,4 +9,4 @@ class QcTrigger(models.Model): _inherit = 'qc.trigger' picking_type = fields.Many2one( - comodel_name="stock.picking.type", readonly=True) \ No newline at end of file + comodel_name="stock.picking.type", readonly=True) diff --git a/quality_control_stock/models/stock_picking.py b/quality_control_stock/models/stock_picking.py index aa63a3f70..f81ca56d3 100644 --- a/quality_control_stock/models/stock_picking.py +++ b/quality_control_stock/models/stock_picking.py @@ -47,4 +47,3 @@ class StockPicking(models.Model): for test in tests: inspection_model._make_inspection(operation, test) return res - diff --git a/quality_control_stock/models/stock_picking_type.py b/quality_control_stock/models/stock_picking_type.py index 72079e43d..c09cae31a 100644 --- a/quality_control_stock/models/stock_picking_type.py +++ b/quality_control_stock/models/stock_picking_type.py @@ -2,7 +2,7 @@ ############################################################################## # For copyright and license notices, see __openerp__.py file in root directory ############################################################################## -from openerp import models, fields, api +from openerp import models, api class StockPickingType(models.Model): @@ -38,4 +38,4 @@ class StockPickingType(models.Model): def unlink(self): self.env['qc.trigger'].sudo().search( [('picking_type', '=', self.id)]).unlink() - return super(StockPickingType, self).unlink() \ No newline at end of file + return super(StockPickingType, self).unlink()