From cbe2c987bbc98f99238a7f54018b75fec1b1d84d Mon Sep 17 00:00:00 2001 From: oihane Date: Mon, 2 Nov 2015 18:09:19 +0100 Subject: [PATCH] [IMP] quality_control_stock: adapted to OCA * more tests to increase coveralls [IMP] quality_control_stock: * added demo data * replaced unlink method by ondelete="cascade" * required changes --- quality_control_stock/README.rst | 47 +++++++++ quality_control_stock/__init__.py | 5 +- quality_control_stock/__openerp__.py | 52 ++++------ .../i18n/quality_control_stock.pot | 99 ------------------- quality_control_stock/models/__init__.py | 5 +- quality_control_stock/models/qc_inspection.py | 9 +- quality_control_stock/models/qc_trigger.py | 8 +- quality_control_stock/models/stock_picking.py | 6 +- .../models/stock_picking_type.py | 13 +-- .../models/stock_production_lot.py | 6 +- .../tests/test_quality_control_stock.py | 88 +++++++++++++++-- .../views/stock_picking_view.xml | 4 +- .../views/stock_production_lot_view.xml | 2 + 13 files changed, 172 insertions(+), 172 deletions(-) delete mode 100644 quality_control_stock/i18n/quality_control_stock.pot diff --git a/quality_control_stock/README.rst b/quality_control_stock/README.rst index 937772c0e..116962b20 100644 --- a/quality_control_stock/README.rst +++ b/quality_control_stock/README.rst @@ -1,3 +1,8 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +=================================== Stock extension for quality control =================================== @@ -5,6 +10,48 @@ This module defines triggers that creates inspections when stock moves are done. It also adds some shortcuts on picking and lots to these inspections. + +Usage +===== + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/129/8.0 + + +Known issues / Roadmap +====================== + +* Put trigger in all languages. + + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed feedback `here `_. + + +Credits +======= + Contributors ------------ * Pedro M. Baeza +* Oihane Crucelaegui + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +To contribute to this module, please visit http://odoo-community.org. diff --git a/quality_control_stock/__init__.py b/quality_control_stock/__init__.py index 86bcf7d2e..15f6ce448 100644 --- a/quality_control_stock/__init__.py +++ b/quality_control_stock/__init__.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- -############################################################################## -# For copyright and license notices, see __openerp__.py file in root directory -############################################################################## +# (c) 2014 Serv. Tec. Avanzados - Pedro M. Baeza +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html from . import models from openerp import SUPERUSER_ID diff --git a/quality_control_stock/__openerp__.py b/quality_control_stock/__openerp__.py index c00356e92..f1eaa316d 100644 --- a/quality_control_stock/__openerp__.py +++ b/quality_control_stock/__openerp__.py @@ -1,45 +1,31 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# Copyright (c) -# 2014 Serv. Tec. Avanzados - Pedro M. Baeza (http://www.serviciosbaeza.com) -# 2014 AvanzOsc (http://www.avanzosc.es) -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published -# by the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## +# -*- coding: utf-8 -*- +# (c) 2014 Serv. Tec. Avanzados - Pedro M. Baeza +# (c) 2014 Oihane Crucelaegui - AvanzOSC +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html { "name": "Quality control - Stock", - "version": "1.0", - "author": "OdooMRP team," - "AvanzOSC," - "Serv. Tecnol. Avanzados - Pedro M. Baeza", + "version": "8.0.1.0.0", + "category": "Quality control", + "license": "AGPL-3", + "author": "OdooMRP team, " + "AvanzOSC, " + "Serv. Tecnol. Avanzados - Pedro M. Baeza, " + "Odoo Community Association (OCA)", "website": "http://www.odoomrp.com", "contributors": [ - "Pedro M. Baeza ", + "Oihane Crucelaegui ", ], - "category": "Quality control", "depends": [ - 'quality_control', - 'stock', + "quality_control", + "stock", ], "data": [ - 'data/quality_control_stock_data.xml', - 'views/qc_inspection_view.xml', - 'views/stock_picking_view.xml', - 'views/stock_production_lot_view.xml', + "data/quality_control_stock_data.xml", + "views/qc_inspection_view.xml", + "views/stock_picking_view.xml", + "views/stock_production_lot_view.xml", ], "post_init_hook": "post_init_hook", "installable": True, diff --git a/quality_control_stock/i18n/quality_control_stock.pot b/quality_control_stock/i18n/quality_control_stock.pot deleted file mode 100644 index 2f4ec2a15..000000000 --- a/quality_control_stock/i18n/quality_control_stock.pot +++ /dev/null @@ -1,99 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * quality_control_stock -# -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 8.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-10 19:26+0000\n" -"PO-Revision-Date: 2014-12-10 19:26+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" - -#. module: quality_control_stock -#: help:stock.production.lot,qc_inspections:0 -msgid "Inspections related to this lot." -msgstr "" - -#. module: quality_control_stock -#: help:stock.picking,qc_inspections:0 -msgid "Inspections related to this picking." -msgstr "" - -#. module: quality_control_stock -#: view:qc.inspection:quality_control_stock.qc_inspection_search_view_putvalid -#: field:qc.inspection,lot:0 -#: view:qc.inspection.line:quality_control_stock.qc_inspection_line_search_stock_view -#: field:qc.inspection.line,lot:0 -msgid "Lot" -msgstr "" - -#. module: quality_control_stock -#: model:ir.model,name:quality_control_stock.model_stock_production_lot -msgid "Lot/Serial" -msgstr "" - -#. module: quality_control_stock -#: view:qc.inspection:quality_control_stock.qc_inspection_search_view_putvalid -#: field:qc.inspection,picking:0 -#: view:qc.inspection.line:quality_control_stock.qc_inspection_line_search_stock_view -#: field:qc.inspection.line,picking:0 -msgid "Picking" -msgstr "" - -#. module: quality_control_stock -#: field:qc.trigger,picking_type:0 -msgid "Picking type" -msgstr "" - -#. module: quality_control_stock -#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_lot_done -msgid "Quality inspection from lot done" -msgstr "" - -#. module: quality_control_stock -#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_lot_passed -msgid "Quality inspection from lot passed" -msgstr "" - -#. module: quality_control_stock -#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_picking_done -msgid "Quality inspection from picking done" -msgstr "" - -#. module: quality_control_stock -#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_picking_passed -msgid "Quality inspection from picking passed" -msgstr "" - -#. module: quality_control_stock -#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_lot -msgid "Quality inspections from lot" -msgstr "" - -#. module: quality_control_stock -#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_lot_failed -msgid "Quality inspections from lot failed" -msgstr "" - -#. module: quality_control_stock -#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_picking -msgid "Quality inspections from picking" -msgstr "" - -#. module: quality_control_stock -#: model:ir.actions.act_window,name:quality_control_stock.action_qc_inspection_per_picking_failed -msgid "Quality inspections from picking failed" -msgstr "" - -#. module: quality_control_stock -#: view:stock.picking:quality_control_stock.stock_picking_qc_view -#: view:stock.production.lot:quality_control_stock.stock_lot_qc_view -msgid "inspections" -msgstr "" - diff --git a/quality_control_stock/models/__init__.py b/quality_control_stock/models/__init__.py index bf7cb46e4..61f4c2b9e 100644 --- a/quality_control_stock/models/__init__.py +++ b/quality_control_stock/models/__init__.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- -############################################################################## -# For copyright and license notices, see __openerp__.py file in root directory -############################################################################## +# (c) 2014 Serv. Tec. Avanzados - Pedro M. Baeza +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html from . import qc_trigger from . import qc_inspection diff --git a/quality_control_stock/models/qc_inspection.py b/quality_control_stock/models/qc_inspection.py index 22a7466a3..a7bd4cc52 100644 --- a/quality_control_stock/models/qc_inspection.py +++ b/quality_control_stock/models/qc_inspection.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -############################################################################## -# For copyright and license notices, see __openerp__.py file in root directory -############################################################################## +# (c) 2014 Serv. Tec. Avanzados - Pedro M. Baeza +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + from openerp import models, fields, api @@ -28,8 +28,7 @@ class QcInspection(models.Model): if self.object_id._name == 'stock.pack.operation': self.lot = self.object_id.lot_id elif self.object_id._name == 'stock.move': - if self.object_id.lot_ids: - self.lot = self.object_id.lot_ids[0] + self.lot = self.object_id.lot_ids[:1] @api.one @api.depends('object_id') diff --git a/quality_control_stock/models/qc_trigger.py b/quality_control_stock/models/qc_trigger.py index e53003749..5c0d7816e 100644 --- a/quality_control_stock/models/qc_trigger.py +++ b/quality_control_stock/models/qc_trigger.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -############################################################################## -# For copyright and license notices, see __openerp__.py file in root directory -############################################################################## +# (c) 2014 Serv. Tec. Avanzados - Pedro M. Baeza +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + from openerp import models, fields @@ -9,4 +9,4 @@ class QcTrigger(models.Model): _inherit = 'qc.trigger' picking_type = fields.Many2one( - comodel_name="stock.picking.type", readonly=True) + comodel_name="stock.picking.type", readonly=True, ondelete="cascade") diff --git a/quality_control_stock/models/stock_picking.py b/quality_control_stock/models/stock_picking.py index b1c9a12b8..1583d9bd6 100644 --- a/quality_control_stock/models/stock_picking.py +++ b/quality_control_stock/models/stock_picking.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -############################################################################## -# For copyright and license notices, see __openerp__.py file in root directory -############################################################################## +# (c) 2014 Serv. Tec. Avanzados - Pedro M. Baeza +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + from openerp import models, fields, api from openerp.addons.quality_control.models.qc_trigger_line import\ _filter_trigger_lines diff --git a/quality_control_stock/models/stock_picking_type.py b/quality_control_stock/models/stock_picking_type.py index 385df6afd..7010cf3ba 100644 --- a/quality_control_stock/models/stock_picking_type.py +++ b/quality_control_stock/models/stock_picking_type.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -############################################################################## -# For copyright and license notices, see __openerp__.py file in root directory -############################################################################## +# (c) 2014 Serv. Tec. Avanzados - Pedro M. Baeza +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + from openerp import models, api @@ -11,7 +11,6 @@ class StockPickingType(models.Model): @api.multi def _create_qc_trigger(self): qc_trigger = { - # Synchronize all translations 'name': self.complete_name, 'company_id': self.warehouse_id.company_id.id, 'picking_type': self.id, @@ -34,9 +33,3 @@ class StockPickingType(models.Model): [('picking_type', '=', self.id)]) qc_trigger.name = self.complete_name return res - - @api.multi - def unlink(self): - self.env['qc.trigger'].sudo().search( - [('picking_type', '=', self.id)]).unlink() - return super(StockPickingType, self).unlink() diff --git a/quality_control_stock/models/stock_production_lot.py b/quality_control_stock/models/stock_production_lot.py index ed67fb25f..aeff0ad90 100644 --- a/quality_control_stock/models/stock_production_lot.py +++ b/quality_control_stock/models/stock_production_lot.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -############################################################################## -# For copyright and license notices, see __openerp__.py file in root directory -############################################################################## +# (c) 2014 Serv. Tec. Avanzados - Pedro M. Baeza +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + from openerp import models, fields, api diff --git a/quality_control_stock/tests/test_quality_control_stock.py b/quality_control_stock/tests/test_quality_control_stock.py index 00c3d0834..000dcf43c 100644 --- a/quality_control_stock/tests/test_quality_control_stock.py +++ b/quality_control_stock/tests/test_quality_control_stock.py @@ -10,16 +10,27 @@ 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.inspection_model = self.env['qc.inspection'] self.qc_trigger_model = self.env['qc.trigger'] + self.picking_type_model = self.env['stock.picking.type'] 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.sequence = self.env.ref('stock.seq_type_picking_out') + inspection_lines = ( + self.inspection_model._prepare_inspection_lines(self.test)) + self.inspection1 = self.inspection_model.create({ + 'name': 'Test Inspection', + 'inspection_lines': inspection_lines, + }) self.trigger = self.qc_trigger_model.search( [('picking_type', '=', self.picking_type.id)]) + self.lot = self.env['stock.production.lot'].create({ + 'name': 'Lot for tests', + 'product_id': self.product.id, + }) move_vals = { 'name': self.product.name, 'product_id': self.product.id, @@ -35,6 +46,9 @@ class TestQualityControl(TransactionCase): self.picking1.action_confirm() self.picking1.force_assign() self.picking1.do_prepare_partial() + for line in self.picking1.pack_operation_ids.filtered( + lambda r: r.product_id == self.product): + line.write({'lot_id': self.lot.id}) def test_inspection_create_for_product(self): self.product.qc_triggers = [( @@ -46,6 +60,8 @@ class TestQualityControl(TransactionCase): self.picking1.do_transfer() self.assertEqual(self.picking1.created_inspections, 1, 'Only one inspection must be created') + self.assertEqual(self.picking1.qc_inspections[:1].test, self.test, + 'Wrong test picked when creating inspection.') def test_inspection_create_for_template(self): self.product.product_tmpl_id.qc_triggers = [( @@ -57,6 +73,8 @@ class TestQualityControl(TransactionCase): self.picking1.do_transfer() self.assertEqual(self.picking1.created_inspections, 1, 'Only one inspection must be created') + self.assertEqual(self.picking1.qc_inspections[:1].test, self.test, + 'Wrong test picked when creating inspection.') def test_inspection_create_for_category(self): self.product.categ_id.qc_triggers = [( @@ -68,49 +86,57 @@ class TestQualityControl(TransactionCase): self.picking1.do_transfer() self.assertEqual(self.picking1.created_inspections, 1, 'Only one inspection must be created') + self.assertEqual(self.picking1.qc_inspections[:1].test, self.test, + 'Wrong test picked when creating inspection.') 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])], + 'partners': [(6, 0, self.partner1.ids)], } )] self.picking1.do_transfer() self.assertEqual(self.picking1.created_inspections, 1, 'Only one inspection must be created') + self.assertEqual(self.picking1.qc_inspections[:1].test, self.test, + 'Wrong test picked when creating inspection.') 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])], + 'partners': [(6, 0, self.partner1.ids)], } )] self.picking1.do_transfer() self.assertEqual(self.picking1.created_inspections, 1, 'Only one inspection must be created') + self.assertEqual(self.picking1.qc_inspections[:1].test, self.test, + 'Wrong test picked when creating inspection.') 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])], + 'partners': [(6, 0, self.partner1.ids)], } )] self.picking1.do_transfer() self.assertEqual(self.picking1.created_inspections, 1, 'Only one inspection must be created') + self.assertEqual(self.picking1.qc_inspections[:1].test, self.test, + 'Wrong test picked when creating inspection.') 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])], + 'partners': [(6, 0, self.partner2.ids)], } )] self.picking1.do_transfer() @@ -122,7 +148,7 @@ class TestQualityControl(TransactionCase): 0, 0, { 'trigger': self.trigger.id, 'test': self.test.id, - 'partners': [(6, 0, [self.partner2.id])], + 'partners': [(6, 0, self.partner2.ids)], } )] self.picking1.do_transfer() @@ -134,7 +160,7 @@ class TestQualityControl(TransactionCase): 0, 0, { 'trigger': self.trigger.id, 'test': self.test.id, - 'partners': [(6, 0, [self.partner2.id])], + 'partners': [(6, 0, self.partner2.ids)], } )] self.picking1.do_transfer() @@ -157,3 +183,49 @@ class TestQualityControl(TransactionCase): self.picking1.do_transfer() self.assertEqual(self.picking1.created_inspections, 1, 'Only one inspection must be created') + self.assertEqual(self.picking1.qc_inspections[:1].test, self.test, + 'Wrong test picked when creating inspection.') + self.assertEqual(self.lot.created_inspections, 1, + 'Only one inspection must be created') + self.assertEqual(self.lot.qc_inspections[:1].test, self.test, + 'Wrong test picked when creating inspection.') + + def test_picking_type(self): + picking_type = self.picking_type_model.create({ + 'name': 'Test Picking Type', + 'sequence_id': self.sequence.id, + 'code': 'outgoing', + }) + trigger = self.qc_trigger_model.search( + [('picking_type', '=', picking_type.id)]) + self.assertEqual(len(trigger), 1, + 'One trigger must have been created.') + self.assertEqual(trigger.name, picking_type.complete_name, + 'Trigger name must match picking type name.') + picking_type.write({ + 'name': 'Test Name Change', + }) + self.assertEqual(trigger.name, picking_type.complete_name, + 'Trigger name must match picking type name.') + + def test_qc_inspection_picking(self): + self.inspection1.write({ + 'object_id': '%s,%d' % (self.picking1._model, + self.picking1.id), + }) + self.assertEquals(self.inspection1.picking, + self.picking1) + + def test_qc_inspection_stock_move(self): + self.inspection1.write({ + 'object_id': '%s,%d' % (self.picking1.move_lines[:1]._model, + self.picking1.move_lines[:1].id), + }) + self.assertEquals(self.inspection1.picking, + self.picking1) + self.assertEquals(self.inspection1.lot, + self.picking1.move_lines[:1].lot_ids[:1]) + self.assertEquals(self.inspection1.product, + self.picking1.move_lines[:1].product_id) + self.assertEquals(self.inspection1.qty, + self.picking1.move_lines[:1].product_qty) diff --git a/quality_control_stock/views/stock_picking_view.xml b/quality_control_stock/views/stock_picking_view.xml index 1c53c4d06..1ebb16078 100644 --- a/quality_control_stock/views/stock_picking_view.xml +++ b/quality_control_stock/views/stock_picking_view.xml @@ -34,6 +34,8 @@ stock.picking.qc.view stock.picking +