diff --git a/scrap_reason_code/README.rst b/scrap_reason_code/README.rst index ff1580d32..306be9e5a 100644 --- a/scrap_reason_code/README.rst +++ b/scrap_reason_code/README.rst @@ -14,16 +14,16 @@ Scrap Reason Code :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fstock--logistics--warehouse-lightgray.png?logo=github - :target: https://github.com/OCA/stock-logistics-warehouse/tree/11.0/scrap_reason_code + :target: https://github.com/OCA/stock-logistics-warehouse/tree/13.0/scrap_reason_code :alt: OCA/stock-logistics-warehouse .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/stock-logistics-warehouse-11-0/stock-logistics-warehouse-11-0-scrap_reason_code + :target: https://translation.odoo-community.org/projects/stock-logistics-warehouse-13-0/stock-logistics-warehouse-13-0-scrap_reason_code :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/153/11.0 + :target: https://runbot.odoo-community.org/runbot/153/13.0 :alt: Try me on Runbot -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| |badge5| Adds a reason code for scrapping operations and an interface for the user to create scrap codes @@ -37,7 +37,7 @@ Usage ===== In the Inventory module, open the Configuration menu and select Scrap Reason Codes. -Create the required scrap reason codes. Under Operations, select Scrap. Click the +Create the required scrap reason codes. Under Operations, select Scrap. Click the create button to create a new scrap order. You will see a reason code field on the scrap form which will allow you to select any of the scrap codes you created previously. @@ -65,6 +65,7 @@ Contributors * Michael Allen * Bhavesh Odedra * Balaji Kannan +* Serpent Consulting Services Pvt. Ltd. Other credits ~~~~~~~~~~~~~ @@ -92,8 +93,8 @@ promote its widespread use. Current `maintainer `__: -|maintainer-bodedra| +|maintainer-bodedra| -This module is part of the `OCA/stock-logistics-warehouse `_ project on GitHub. +This module is part of the `OCA/stock-logistics-warehouse `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/scrap_reason_code/__init__.py b/scrap_reason_code/__init__.py index f1ef2417f..69f7babdf 100644 --- a/scrap_reason_code/__init__.py +++ b/scrap_reason_code/__init__.py @@ -1,5 +1,3 @@ -# Copyright (C) 2019 IBM Corp. -# Copyright (C) 2019 Open Source Integrators # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from . import models diff --git a/scrap_reason_code/__manifest__.py b/scrap_reason_code/__manifest__.py index 67b31a6d0..70fc6c9c4 100644 --- a/scrap_reason_code/__manifest__.py +++ b/scrap_reason_code/__manifest__.py @@ -1,26 +1,20 @@ -# Copyright (C) 2019 IBM Corp. -# Copyright (C) 2019 Open Source Integrators # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { - 'name': 'Scrap Reason Code', - 'version': '11.0.1.0.0', - 'license': 'AGPL-3', - 'summary': 'Reason code for scrapping', - 'author': 'Open Source Integrators, Odoo Community Association (OCA)', - 'website': 'https://github.com/OCA/stock-logistics-warehouse', - 'category': 'Warehouse Management', - 'depends': [ - 'stock', + "name": "Scrap Reason Code", + "version": "13.0.1.0.0", + "license": "AGPL-3", + "summary": "Reason code for scrapping", + "author": "Open Source Integrators, Odoo Community Association (OCA)", + "website": "https://github.com/OCA/stock-logistics-warehouse", + "category": "Warehouse Management", + "depends": ["stock"], + "data": [ + "security/ir.model.access.csv", + "views/reason_code_view.xml", + "views/stock_scrap_views.xml", + "views/stock_move_views.xml", ], - 'data': [ - 'security/ir.model.access.csv', - 'views/reason_code_view.xml', - 'views/stock_scrap_views.xml', - 'views/stock_move_views.xml', - ], - 'auto_install': False, - 'application': False, - 'maintainers': ['bodedra'], - 'installable': True, + "maintainers": ["bodedra"], + "installable": True, } diff --git a/scrap_reason_code/models/__init__.py b/scrap_reason_code/models/__init__.py index 53bbfcf54..b00bb13c9 100644 --- a/scrap_reason_code/models/__init__.py +++ b/scrap_reason_code/models/__init__.py @@ -1,5 +1,3 @@ -# Copyright (C) 2019 IBM Corp. -# Copyright (C) 2019 Open Source Integrators # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from . import reason_code diff --git a/scrap_reason_code/models/reason_code.py b/scrap_reason_code/models/reason_code.py index 24d4be085..0ce5e797d 100644 --- a/scrap_reason_code/models/reason_code.py +++ b/scrap_reason_code/models/reason_code.py @@ -6,11 +6,13 @@ from odoo import fields, models class ReasonCode(models.Model): - _name = 'reason.code' - _description = 'Reason Code' + _name = "reason.code" + _description = "Reason Code" name = fields.Char("Code", required=True) description = fields.Text("Description") location_id = fields.Many2one( - 'stock.location', string="Scrap Location", - domain="[('scrap_location', '=', True)]") + "stock.location", + string="Scrap Location", + domain="[('scrap_location', '=', True)]", + ) diff --git a/scrap_reason_code/models/stock_move.py b/scrap_reason_code/models/stock_move.py index e8129a070..d5ed6c8dc 100644 --- a/scrap_reason_code/models/stock_move.py +++ b/scrap_reason_code/models/stock_move.py @@ -6,6 +6,6 @@ from odoo import fields, models class StockMove(models.Model): - _inherit = 'stock.move' + _inherit = "stock.move" - reason_code_id = fields.Many2one('reason.code', string='Reason code') + reason_code_id = fields.Many2one("reason.code", string="Reason code") diff --git a/scrap_reason_code/models/stock_scrap.py b/scrap_reason_code/models/stock_scrap.py index 80688f107..c1de7d6af 100644 --- a/scrap_reason_code/models/stock_scrap.py +++ b/scrap_reason_code/models/stock_scrap.py @@ -6,35 +6,38 @@ from odoo import api, fields, models class StockScrap(models.Model): - _inherit = 'stock.scrap' + _inherit = "stock.scrap" reason_code_id = fields.Many2one( - 'reason.code', string='Reason Code', - states={'done': [('readonly', True)]}) + "reason.code", string="Reason Code", states={"done": [("readonly", True)]} + ) scrap_location_id = fields.Many2one( - 'stock.location', 'Scrap Location', - required=True, readonly=True) + "stock.location", "Scrap Location", required=True, readonly=True + ) def _prepare_move_values(self): res = super(StockScrap, self)._prepare_move_values() - res['reason_code_id'] = self.reason_code_id.id + res["reason_code_id"] = self.reason_code_id.id return res - @api.onchange('reason_code_id') + @api.onchange("reason_code_id") def _onchange_reason_code_id(self): if self.reason_code_id.location_id: self.scrap_location_id = self.reason_code_id.location_id - @api.multi def write(self, vals): - if 'reason_code_id' in vals: - self.scrap_location_id = self.env['reason.code'].browse( - vals.get('reason_code_id')).location_id + if "reason_code_id" in vals: + self.scrap_location_id = ( + self.env["reason.code"].browse(vals.get("reason_code_id")).location_id + ) return super(StockScrap, self).write(vals) @api.model def create(self, vals): - if 'reason_code_id' in vals: - vals['scrap_location_id'] = self.env['reason.code'].browse( - vals.get('reason_code_id')).location_id.id + if "reason_code_id" in vals: + vals["scrap_location_id"] = ( + self.env["reason.code"] + .browse(vals.get("reason_code_id")) + .location_id.id + ) return super(StockScrap, self).create(vals) diff --git a/scrap_reason_code/readme/CONTRIBUTORS.rst b/scrap_reason_code/readme/CONTRIBUTORS.rst index f25219b6c..944b4defa 100644 --- a/scrap_reason_code/readme/CONTRIBUTORS.rst +++ b/scrap_reason_code/readme/CONTRIBUTORS.rst @@ -1,3 +1,4 @@ * Michael Allen * Bhavesh Odedra * Balaji Kannan +* Serpent Consulting Services Pvt. Ltd. diff --git a/scrap_reason_code/readme/USAGE.rst b/scrap_reason_code/readme/USAGE.rst index ae3b62e86..d7beb75ef 100644 --- a/scrap_reason_code/readme/USAGE.rst +++ b/scrap_reason_code/readme/USAGE.rst @@ -1,4 +1,4 @@ In the Inventory module, open the Configuration menu and select Scrap Reason Codes. -Create the required scrap reason codes. Under Operations, select Scrap. Click the +Create the required scrap reason codes. Under Operations, select Scrap. Click the create button to create a new scrap order. You will see a reason code field on the scrap form which will allow you to select any of the scrap codes you created previously. diff --git a/scrap_reason_code/tests/__init__.py b/scrap_reason_code/tests/__init__.py index 4d7662f4b..29507951a 100644 --- a/scrap_reason_code/tests/__init__.py +++ b/scrap_reason_code/tests/__init__.py @@ -1,5 +1,3 @@ -# Copyright (C) 2019 IBM Corp. -# Copyright (C) 2019 Open Source Integrators # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from . import test_scrap_reason_code diff --git a/scrap_reason_code/tests/test_scrap_reason_code.py b/scrap_reason_code/tests/test_scrap_reason_code.py index 5ba262188..a90507c30 100644 --- a/scrap_reason_code/tests/test_scrap_reason_code.py +++ b/scrap_reason_code/tests/test_scrap_reason_code.py @@ -9,72 +9,94 @@ class StockScrap(TransactionCase): def setUp(self): super(StockScrap, self).setUp() - self.stock_location = self.env.ref('stock.stock_location_stock') - self.customer_location = self.env.ref('stock.stock_location_customers') - self.scrapped_location = self.env.ref('stock.stock_location_scrapped') + self.stock_location = self.env.ref("stock.stock_location_stock") + self.customer_location = self.env.ref("stock.stock_location_customers") + stock_location_locations_virtual = self.env["stock.location"].create( + {"name": "Virtual Locations", "usage": "view", "posz": 1} + ) + self.scrapped_location = self.env["stock.location"].create( + { + "name": "Scrapped", + "location_id": stock_location_locations_virtual.id, + "scrap_location": True, + "usage": "inventory", + } + ) - self.scrap_product = self.env['product.product'].create({ - 'name': 'Scrap Product A', - 'type': 'product', - 'categ_id': self.env.ref('product.product_category_all').id, - }) + self.scrap_product = self.env["product.product"].create( + { + "name": "Scrap Product A", + "type": "product", + "categ_id": self.env.ref("product.product_category_all").id, + } + ) - self.reason_code = self.env['reason.code'].create({ - 'name': 'DM300', - 'description': 'Product is damage', - 'location_id': self.scrapped_location.id - }) + self.reason_code = self.env["reason.code"].create( + { + "name": "DM300", + "description": "Product is damage", + "location_id": self.scrapped_location.id, + } + ) - self.uom_unit = self.env.ref('product.product_uom_unit') + self.uom_unit = self.env.ref("uom.product_uom_unit") def test_scrap_reason_code(self): - """ Scrap the product of a picking. Then modify the + """Scrap the product of a picking. Then modify the done linked stock move and ensure the scrap quantity is also updated and verify scrap reason code """ - self.env['stock.quant']._update_available_quantity(self.scrap_product, - self.stock_location, - 10) - partner = self.env['res.partner'].create({'name': 'BOdedra'}) - picking = self.env['stock.picking'].create({ - 'name': 'A single picking with one move to scrap', - 'location_id': self.stock_location.id, - 'location_dest_id': self.customer_location.id, - 'partner_id': partner.id, - 'picking_type_id': self.env.ref('stock.picking_type_out').id, - }) - move1 = self.env['stock.move'].create({ - 'name': 'A move to confirm and scrap its product', - 'location_id': self.stock_location.id, - 'location_dest_id': self.customer_location.id, - 'product_id': self.scrap_product.id, - 'product_uom': self.uom_unit.id, - 'product_uom_qty': 1.0, - 'picking_id': picking.id, - }) + self.env["stock.quant"]._update_available_quantity( + self.scrap_product, self.stock_location, 10 + ) + partner = self.env["res.partner"].create({"name": "BOdedra"}) + picking = self.env["stock.picking"].create( + { + "name": "A single picking with one move to scrap", + "location_id": self.stock_location.id, + "location_dest_id": self.customer_location.id, + "partner_id": partner.id, + "picking_type_id": self.env.ref("stock.picking_type_out").id, + } + ) + move1 = self.env["stock.move"].create( + { + "name": "A move to confirm and scrap its product", + "location_id": self.stock_location.id, + "location_dest_id": self.customer_location.id, + "product_id": self.scrap_product.id, + "product_uom": self.uom_unit.id, + "product_uom_qty": 1.0, + "picking_id": picking.id, + } + ) move1._action_confirm() - self.assertEqual(move1.state, 'confirmed') - scrap = self.env['stock.scrap'].create({ - 'product_id': self.scrap_product.id, - 'product_uom_id': self.scrap_product.uom_id.id, - 'scrap_qty': 5, - 'picking_id': picking.id, - 'reason_code_id': self.reason_code.id - }) + self.assertEqual(move1.state, "confirmed") + scrap = self.env["stock.scrap"].create( + { + "product_id": self.scrap_product.id, + "product_uom_id": self.scrap_product.uom_id.id, + "scrap_qty": 5, + "picking_id": picking.id, + "reason_code_id": self.reason_code.id, + } + ) scrap._onchange_reason_code_id() scrap.do_scrap() self.assertEqual(len(picking.move_lines), 2) - scrapped_move = picking.move_lines.filtered( - lambda m: m.state == 'done') - self.assertTrue(scrapped_move, 'No scrapped move created.') - self.assertEqual(scrapped_move.scrap_ids.ids, [scrap.id], - 'Wrong scrap linked to the move.') - self.assertEqual(scrap.scrap_qty, 5, - 'Scrap quantity has been modified and is not ' - 'correct anymore.') + scrapped_move = picking.move_lines.filtered(lambda m: m.state == "done") + self.assertTrue(scrapped_move, "No scrapped move created.") + self.assertEqual( + scrapped_move.scrap_ids.ids, [scrap.id], "Wrong scrap linked to the move." + ) + self.assertEqual( + scrap.scrap_qty, + 5, + "Scrap quantity has been modified and is not " "correct anymore.", + ) move = scrap.move_id self.assertEqual(move.reason_code_id.id, self.reason_code.id) scrapped_move.quantity_done = 8 - self.assertEqual(scrap.scrap_qty, 8, 'Scrap quantity is not updated.') + self.assertEqual(scrap.scrap_qty, 8, "Scrap quantity is not updated.") diff --git a/scrap_reason_code/views/reason_code_view.xml b/scrap_reason_code/views/reason_code_view.xml index a17923e37..3c457a87c 100644 --- a/scrap_reason_code/views/reason_code_view.xml +++ b/scrap_reason_code/views/reason_code_view.xml @@ -1,4 +1,3 @@ - @@ -38,7 +37,6 @@ Scrap Reason Codes reason.code - form tree,form diff --git a/scrap_reason_code/views/stock_move_views.xml b/scrap_reason_code/views/stock_move_views.xml index bbbfe7d74..fd7e18e75 100644 --- a/scrap_reason_code/views/stock_move_views.xml +++ b/scrap_reason_code/views/stock_move_views.xml @@ -1,24 +1,7 @@ - - - - - stock.move.reason.code.form - stock.move - - - - - - - - - - - stock.reason.code.form stock.move diff --git a/scrap_reason_code/views/stock_scrap_views.xml b/scrap_reason_code/views/stock_scrap_views.xml index 0cf363ded..8a0706087 100644 --- a/scrap_reason_code/views/stock_scrap_views.xml +++ b/scrap_reason_code/views/stock_scrap_views.xml @@ -1,4 +1,3 @@ -