From 5a5cd21ff2b203b0627afb7991916310ef262c28 Mon Sep 17 00:00:00 2001 From: oihane Date: Thu, 13 Aug 2015 11:42:41 +0200 Subject: [PATCH] [IMP] and * Added "partner_selectable" field, so that inspections can by made by partner * Stock inspections are "partner_selectable" * Little view fixing, field was oe_edit_only instead of label * Added partner to creation from stock_picking * Added tests * Picking pack operations automatically created --- quality_control_stock/models/stock_picking.py | 8 +- .../models/stock_picking_type.py | 1 + quality_control_stock/tests/__init__.py | 5 + .../tests/test_quality_control_stock.py | 159 ++++++++++++++++++ 4 files changed, 171 insertions(+), 2 deletions(-) create mode 100644 quality_control_stock/tests/__init__.py create mode 100644 quality_control_stock/tests/test_quality_control_stock.py diff --git a/quality_control_stock/models/stock_picking.py b/quality_control_stock/models/stock_picking.py index 55c132832..b1c9a12b8 100644 --- a/quality_control_stock/models/stock_picking.py +++ b/quality_control_stock/models/stock_picking.py @@ -3,6 +3,8 @@ # For copyright and license notices, see __openerp__.py file in root directory ############################################################################## from openerp import models, fields, api +from openerp.addons.quality_control.models.qc_trigger_line import\ + _filter_trigger_lines class StockPicking(models.Model): @@ -42,9 +44,11 @@ class StockPicking(models.Model): for model in ['qc.trigger.product_category_line', 'qc.trigger.product_template_line', 'qc.trigger.product_line']: + partner = (self.partner_id + if qc_trigger.partner_selectable else False) trigger_lines = trigger_lines.union( self.env[model].get_trigger_line_for_product( - qc_trigger, operation.product_id)) - for trigger_line in trigger_lines: + qc_trigger, operation.product_id, partner=partner)) + for trigger_line in _filter_trigger_lines(trigger_lines): inspection_model._make_inspection(operation, trigger_line) return res diff --git a/quality_control_stock/models/stock_picking_type.py b/quality_control_stock/models/stock_picking_type.py index c09cae31a..385df6afd 100644 --- a/quality_control_stock/models/stock_picking_type.py +++ b/quality_control_stock/models/stock_picking_type.py @@ -15,6 +15,7 @@ class StockPickingType(models.Model): 'name': self.complete_name, 'company_id': self.warehouse_id.company_id.id, 'picking_type': self.id, + 'partner_selectable': True, } return self.env['qc.trigger'].sudo().create(qc_trigger) diff --git a/quality_control_stock/tests/__init__.py b/quality_control_stock/tests/__init__.py new file mode 100644 index 000000000..3dd12a3d9 --- /dev/null +++ b/quality_control_stock/tests/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# (c) 2015 Oihane Crucelaegui - AvanzOSC +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +from . import test_quality_control_stock diff --git a/quality_control_stock/tests/test_quality_control_stock.py b/quality_control_stock/tests/test_quality_control_stock.py new file mode 100644 index 000000000..00c3d0834 --- /dev/null +++ b/quality_control_stock/tests/test_quality_control_stock.py @@ -0,0 +1,159 @@ +# -*- coding: utf-8 -*- +# (c) 2015 Oihane Crucelaegui - AvanzOSC +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +from openerp.tests.common import TransactionCase + + +class TestQualityControl(TransactionCase): + + def setUp(self): + super(TestQualityControl, self).setUp() + self.picking_model = self.env['stock.picking'] + self.operation_model = self.env['stock.pack.operation'] + self.transfer_details_model = self.env['stock.transfer_details'] + self.qc_trigger_model = self.env['qc.trigger'] + self.product = self.env.ref('product.product_product_4') + self.partner1 = self.env.ref('base.res_partner_2') + self.partner2 = self.env.ref('base.res_partner_4') + self.test = self.env.ref('quality_control.qc_test_1') + self.picking_type = self.env.ref('stock.picking_type_out') + self.trigger = self.qc_trigger_model.search( + [('picking_type', '=', self.picking_type.id)]) + move_vals = { + 'name': self.product.name, + 'product_id': self.product.id, + 'product_uom': self.product.uom_id.id, + 'location_id': self.picking_type.default_location_src_id.id, + 'location_dest_id': self.picking_type.default_location_dest_id.id, + } + self.picking1 = self.picking_model.create({ + 'partner_id': self.partner1.id, + 'picking_type_id': self.picking_type.id, + 'move_lines': [(0, 0, move_vals)], + }) + self.picking1.action_confirm() + self.picking1.force_assign() + self.picking1.do_prepare_partial() + + def test_inspection_create_for_product(self): + self.product.qc_triggers = [( + 0, 0, { + 'trigger': self.trigger.id, + 'test': self.test.id, + } + )] + self.picking1.do_transfer() + self.assertEqual(self.picking1.created_inspections, 1, + 'Only one inspection must be created') + + def test_inspection_create_for_template(self): + self.product.product_tmpl_id.qc_triggers = [( + 0, 0, { + 'trigger': self.trigger.id, + 'test': self.test.id, + } + )] + self.picking1.do_transfer() + self.assertEqual(self.picking1.created_inspections, 1, + 'Only one inspection must be created') + + def test_inspection_create_for_category(self): + self.product.categ_id.qc_triggers = [( + 0, 0, { + 'trigger': self.trigger.id, + 'test': self.test.id, + } + )] + self.picking1.do_transfer() + self.assertEqual(self.picking1.created_inspections, 1, + 'Only one inspection must be created') + + def test_inspection_create_for_product_partner(self): + self.product.qc_triggers = [( + 0, 0, { + 'trigger': self.trigger.id, + 'test': self.test.id, + 'partners': [(6, 0, [self.partner1.id])], + } + )] + self.picking1.do_transfer() + self.assertEqual(self.picking1.created_inspections, 1, + 'Only one inspection must be created') + + def test_inspection_create_for_template_partner(self): + self.product.product_tmpl_id.qc_triggers = [( + 0, 0, { + 'trigger': self.trigger.id, + 'test': self.test.id, + 'partners': [(6, 0, [self.partner1.id])], + } + )] + self.picking1.do_transfer() + self.assertEqual(self.picking1.created_inspections, 1, + 'Only one inspection must be created') + + def test_inspection_create_for_category_partner(self): + self.product.categ_id.qc_triggers = [( + 0, 0, { + 'trigger': self.trigger.id, + 'test': self.test.id, + 'partners': [(6, 0, [self.partner1.id])], + } + )] + self.picking1.do_transfer() + self.assertEqual(self.picking1.created_inspections, 1, + 'Only one inspection must be created') + + def test_inspection_create_for_product_wrong_partner(self): + self.product.qc_triggers = [( + 0, 0, { + 'trigger': self.trigger.id, + 'test': self.test.id, + 'partners': [(6, 0, [self.partner2.id])], + } + )] + self.picking1.do_transfer() + self.assertEqual(self.picking1.created_inspections, 0, + 'No inspection must be created') + + def test_inspection_create_for_template_wrong_partner(self): + self.product.product_tmpl_id.qc_triggers = [( + 0, 0, { + 'trigger': self.trigger.id, + 'test': self.test.id, + 'partners': [(6, 0, [self.partner2.id])], + } + )] + self.picking1.do_transfer() + self.assertEqual(self.picking1.created_inspections, 0, + 'No inspection must be created') + + def test_inspection_create_for_category_wrong_partner(self): + self.product.categ_id.qc_triggers = [( + 0, 0, { + 'trigger': self.trigger.id, + 'test': self.test.id, + 'partners': [(6, 0, [self.partner2.id])], + } + )] + self.picking1.do_transfer() + self.assertEqual(self.picking1.created_inspections, 0, + 'No inspection must be created') + + def test_inspection_create_only_one(self): + self.product.qc_triggers = [( + 0, 0, { + 'trigger': self.trigger.id, + 'test': self.test.id, + } + )] + self.product.categ_id.qc_triggers = [( + 0, 0, { + 'trigger': self.trigger.id, + 'test': self.test.id, + } + )] + self.picking1.do_transfer() + self.assertEqual(self.picking1.created_inspections, 1, + 'Only one inspection must be created')