diff --git a/mrp_repair_refurbish/README.rst b/mrp_repair_refurbish/README.rst index c4e70bd68..906d14db2 100644 --- a/mrp_repair_refurbish/README.rst +++ b/mrp_repair_refurbish/README.rst @@ -1,25 +1,46 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :target: https://www.gnu.org/licenses/agpl-3.0-standalone.html - :alt: License: AGPL-3 - ==================== MRP Repair Refurbish ==================== +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fmanufacture-lightgray.png?logo=github + :target: https://github.com/OCA/manufacture/tree/11.0/mrp_repair_refurbish + :alt: OCA/manufacture +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/manufacture-11-0/manufacture-11-0-mrp_repair_refurbish + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/129/11.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + This module adds the ability to obtain refurbished product as a consequence of the repair of a product that was defective. +**Table of contents** + +.. contents:: + :local: Configuration ============= #. For each product that can potentially be refurbished, define the refurbished version in the product form. - #. A default 'Refurbished' virtual location is created during module install, and proposed by default on each product. - Usage ===== @@ -36,43 +57,50 @@ destination location. The components that were added to the repair order will be moved to the 'Refurbish' location. -.. 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/9.0 - - 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 -`_. +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 `_. + +Do not contact contributors directly about support or help with technical issues. Credits ======= +Authors +~~~~~~~ + +* Eficent + Contributors ------------- +~~~~~~~~~~~~ * Jordi Ballester Alomar * Lois Rilo -Maintainer ----------- +Other credits +~~~~~~~~~~~~~ + +The initial development of this module has been financially supported by: + +* Aleph Objects, Inc. + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. .. 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 https://odoo-community.org. +This module is part of the `OCA/manufacture `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/mrp_repair_refurbish/__init__.py b/mrp_repair_refurbish/__init__.py index 3e4baab2f..0650744f6 100644 --- a/mrp_repair_refurbish/__init__.py +++ b/mrp_repair_refurbish/__init__.py @@ -1,5 +1 @@ -# -*- coding: utf-8 -*- -# © 2016 Cyril Gaudin (Camptocamp) -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - from . import models diff --git a/mrp_repair_refurbish/__openerp__.py b/mrp_repair_refurbish/__manifest__.py similarity index 76% rename from mrp_repair_refurbish/__openerp__.py rename to mrp_repair_refurbish/__manifest__.py index b43669dde..61b63513d 100644 --- a/mrp_repair_refurbish/__openerp__.py +++ b/mrp_repair_refurbish/__manifest__.py @@ -1,10 +1,9 @@ -# -*- coding: utf-8 -*- -# © 2016 Cyril Gaudin (Camptocamp) -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +# Copyright 2016-18 Eficent Business and IT Consulting Services S.L. +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). { "name": "MRP Repair Refurbish", "summary": "Create refurbished products during repair", - "version": "9.0.1.0.1", + "version": "11.0.1.0.1", "category": "Manufacturing", "website": "https://github.com/OCA/manufacture", "author": "Eficent, Odoo Community Association (OCA)", diff --git a/mrp_repair_refurbish/data/stock_data.xml b/mrp_repair_refurbish/data/stock_data.xml index 0bba092e2..479c57699 100644 --- a/mrp_repair_refurbish/data/stock_data.xml +++ b/mrp_repair_refurbish/data/stock_data.xml @@ -1,5 +1,5 @@ - + @@ -11,6 +11,7 @@ + - + diff --git a/mrp_repair_refurbish/models/__init__.py b/mrp_repair_refurbish/models/__init__.py index 0a28d40af..3af712765 100644 --- a/mrp_repair_refurbish/models/__init__.py +++ b/mrp_repair_refurbish/models/__init__.py @@ -1,7 +1,3 @@ -# -*- coding: utf-8 -*- -# © 2016 Cyril Gaudin (Camptocamp) -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - from . import product_product from . import product_template from . import mrp_repair diff --git a/mrp_repair_refurbish/models/mrp_repair.py b/mrp_repair_refurbish/models/mrp_repair.py index 2a778aeae..dded10d87 100644 --- a/mrp_repair_refurbish/models/mrp_repair.py +++ b/mrp_repair_refurbish/models/mrp_repair.py @@ -1,32 +1,13 @@ -# -*- coding: utf-8 -*- -# © 2016 Cyril Gaudin (Camptocamp) -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +# Copyright 2017-18 Eficent Business and IT Consulting Services S.L. +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). -from openerp.osv import orm -from openerp import api, fields, models - - -class mrp_repair(orm.Model): - """To inherit using old api is needed here in order to be able to modify - the onchange method for `product_id`. - NOTE: This should be moved to new api in v10, when the standard is also - migrated. - """ - _inherit = 'mrp.repair' - - def onchange_product_id(self, cr, uid, ids, product_id=None): - res = super(mrp_repair, self).onchange_product_id( - cr, uid, ids, product_id=product_id) - product = self.pool['product.product'].browse(cr, uid, product_id) - res['value']['to_refurbish'] = True if \ - product.refurbish_product_id else False - return res +from odoo import api, fields, models class MrpRepair(models.Model): _inherit = 'mrp.repair' - to_refurbish = fields.Boolean('To refurbish') + to_refurbish = fields.Boolean() refurbish_location_dest_id = fields.Many2one( string='Refurbished Delivery Location', comodel_name='stock.location') refurbish_product_id = fields.Many2one( @@ -35,7 +16,13 @@ class MrpRepair(models.Model): string='Refurbished Lot', comodel_name='stock.production.lot') refurbish_move_id = fields.Many2one( string='Refurbished Inventory Move', comodel_name='stock.move') - product_id = fields.Many2one(comodel_name='product.product') + + @api.onchange('product_id') + def onchange_product_id(self): + res = super(MrpRepair, self).onchange_product_id() + self.to_refurbish = True if \ + self.product_id.refurbish_product_id else False + return res @api.onchange('to_refurbish', 'product_id') def _onchange_to_refurbish(self): @@ -48,49 +35,47 @@ class MrpRepair(models.Model): self.refurbish_product_id = False self.refurbish_location_dest_id = False + @api.multi + def _get_refurbish_stock_move_dict(self): + return { + 'name': self.name, + 'product_id': self.refurbish_product_id.id, + 'product_uom': self.product_uom.id or + self.refurbish_product_id.uom_id.id, + 'product_uom_qty': self.product_qty, + 'partner_id': self.address_id and + self.address_id.id or False, + 'location_id': self.location_dest_id.id, + 'location_dest_id': self.refurbish_location_dest_id.id, + 'restrict_lot_id': self.refurbish_lot_id.id, + } + @api.multi def action_repair_done(self): res = super(MrpRepair, self).action_repair_done() for repair in self: if repair.to_refurbish: - move = self.env['stock.move'].create({ - 'name': repair.name, - 'product_id': repair.refurbish_product_id.id, - 'product_uom': repair.product_uom.id or - repair.refurbish_product_id.uom_id.id, - 'product_uom_qty': repair.product_qty, - 'partner_id': repair.address_id and - repair.address_id.id or False, - 'location_id': repair.location_dest_id.id, - 'location_dest_id': repair.refurbish_location_dest_id.id, - 'restrict_lot_id': repair.refurbish_lot_id.id, - }) - move.action_done() + move = self.env['stock.move'].create( + repair._get_refurbish_stock_move_dict()) + move.quantity_done = repair.product_qty + move._action_done() repair.refurbish_move_id = move.id return res -class mrp_repair_line(orm.Model): - """To inherit using old api is needed here in order to be able to modify - the onchange method for `type`. - NOTE: This should be moved to new api in v10, when the standard is also - migrated. - """ +class RepairLine(models.Model): _inherit = 'mrp.repair.line' - def onchange_operation_type(self, cr, uid, ids, type, guarantee_limit, - company_id=False, context=None): - res = super(mrp_repair_line, self).onchange_operation_type( - cr, uid, ids, type, guarantee_limit, company_id=company_id, - context=context) - - if (type == 'add' and 'to_refurbish' in context and + @api.onchange('type', 'repair_id') + def onchange_operation_type(self): + res = super(RepairLine, self).onchange_operation_type() + context = self.env.context + if (self.type == 'add' and 'to_refurbish' in context and context['to_refurbish']): - res['value']['location_dest_id'] = context[ - 'refurbish_location_dest_id'] - elif (type == 'add' and 'to_refurbish' in context and not + self.location_dest_id = context['refurbish_location_dest_id'] + elif (self.type == 'add' and 'to_refurbish' in context and not context['to_refurbish']): - scrap_location_ids = self.pool['stock.location'].search(cr, uid, [ - ('usage', '=', 'customer')], context=context) - res['value']['location_dest_id'] = scrap_location_ids[0] + scrap_location_id = self.env['stock.location'].search([ + ('usage', '=', 'customer')], limit=1) + self.location_dest_id = scrap_location_id return res diff --git a/mrp_repair_refurbish/models/product_product.py b/mrp_repair_refurbish/models/product_product.py index de6462618..4ab246863 100644 --- a/mrp_repair_refurbish/models/product_product.py +++ b/mrp_repair_refurbish/models/product_product.py @@ -1,9 +1,7 @@ -# -*- coding: utf-8 -*- -# © 2017 Eficent Business and IT Consulting Services S.L. -# © 2016 Cyril Gaudin (Camptocamp) -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +# Copyright 2017-18 Eficent Business and IT Consulting Services S.L. +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). -from openerp import fields, models +from odoo import fields, models class ProductProduct(models.Model): diff --git a/mrp_repair_refurbish/models/product_template.py b/mrp_repair_refurbish/models/product_template.py index 225b132b5..a41024d39 100644 --- a/mrp_repair_refurbish/models/product_template.py +++ b/mrp_repair_refurbish/models/product_template.py @@ -1,8 +1,7 @@ -# -*- coding: utf-8 -*- -# © 2016 Cyril Gaudin (Camptocamp) -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +# Copyright 2017-18 Eficent Business and IT Consulting Services S.L. +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). -from openerp import api, fields, models +from odoo import api, fields, models class ProductTemplate(models.Model): @@ -30,14 +29,13 @@ class ProductTemplate(models.Model): for template in unique_variants: template.refurbish_product_id = \ template.product_variant_ids.refurbish_product_id - for template in (self - unique_variants): - template.refurbish_product_id = False - @api.one + @api.multi def _set_refurbish_product(self): - if len(self.product_variant_ids) == 1: - self.product_variant_ids.refurbish_product_id = \ - self.refurbish_product_id + for rec in self: + if len(rec.product_variant_ids) == 1: + rec.product_variant_ids.refurbish_product_id = \ + rec.refurbish_product_id def _search_refurbish_product(self, operator, value): products = self.env['product.product'].search([ diff --git a/mrp_repair_refurbish/readme/CONFIGURE.rst b/mrp_repair_refurbish/readme/CONFIGURE.rst new file mode 100644 index 000000000..1f81d11d0 --- /dev/null +++ b/mrp_repair_refurbish/readme/CONFIGURE.rst @@ -0,0 +1,4 @@ +#. For each product that can potentially be refurbished, define the + refurbished version in the product form. +#. A default 'Refurbished' virtual location is created during module install, + and proposed by default on each product. diff --git a/mrp_repair_refurbish/readme/CONTRIBUTORS.rst b/mrp_repair_refurbish/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..daeadd46d --- /dev/null +++ b/mrp_repair_refurbish/readme/CONTRIBUTORS.rst @@ -0,0 +1,2 @@ +* Jordi Ballester Alomar +* Lois Rilo diff --git a/mrp_repair_refurbish/readme/CREDITS.rst b/mrp_repair_refurbish/readme/CREDITS.rst new file mode 100644 index 000000000..259e3b85f --- /dev/null +++ b/mrp_repair_refurbish/readme/CREDITS.rst @@ -0,0 +1,3 @@ +The initial development of this module has been financially supported by: + +* Aleph Objects, Inc. diff --git a/mrp_repair_refurbish/readme/DESCRIPTION.rst b/mrp_repair_refurbish/readme/DESCRIPTION.rst new file mode 100644 index 000000000..3414dba2b --- /dev/null +++ b/mrp_repair_refurbish/readme/DESCRIPTION.rst @@ -0,0 +1,2 @@ +This module adds the ability to obtain refurbished product as a consequence +of the repair of a product that was defective. diff --git a/mrp_repair_refurbish/readme/USAGE.rst b/mrp_repair_refurbish/readme/USAGE.rst new file mode 100644 index 000000000..6cffafe8e --- /dev/null +++ b/mrp_repair_refurbish/readme/USAGE.rst @@ -0,0 +1,12 @@ +#. Create an MRP repair. +#. Indicate a product to repair, If the product has a proposed refurbished + version, it will be proposed to be used. The destination location +#. Add operations if needed. +#. Complete the repair. + +The initial product will be moved to the 'Scrap' location, and the +refurbished product will be moved from a 'Refurbish' location to the desired +destination location. + +The components that were added to the repair order will be moved to the +'Refurbish' location. diff --git a/mrp_repair_refurbish/static/description/icon.png b/mrp_repair_refurbish/static/description/icon.png new file mode 100644 index 000000000..3a0328b51 Binary files /dev/null and b/mrp_repair_refurbish/static/description/icon.png differ diff --git a/mrp_repair_refurbish/static/description/index.html b/mrp_repair_refurbish/static/description/index.html new file mode 100644 index 000000000..2f153b08c --- /dev/null +++ b/mrp_repair_refurbish/static/description/index.html @@ -0,0 +1,455 @@ + + + + + + +MRP Repair Refurbish + + + +
+

MRP Repair Refurbish

+ + +

Beta License: AGPL-3 OCA/manufacture Translate me on Weblate Try me on Runbot

+

This module adds the ability to obtain refurbished product as a consequence +of the repair of a product that was defective.

+

Table of contents

+ +
+

Configuration

+
    +
  1. For each product that can potentially be refurbished, define the +refurbished version in the product form.
    2. +
  2. A default ‘Refurbished’ virtual location is created during module install, +and proposed by default on each product.
    3. +
+
+
+

Usage

+
    +
  1. Create an MRP repair.
    2. +
  2. Indicate a product to repair, If the product has a proposed refurbished +version, it will be proposed to be used. The destination location
    3. +
  3. Add operations if needed.
    4. +
  4. Complete the repair.
    5. +
+

The initial product will be moved to the ‘Scrap’ location, and the +refurbished product will be moved from a ‘Refurbish’ location to the desired +destination location.

+

The components that were added to the repair order will be moved to the +‘Refurbish’ location.

+
+
+

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.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Eficent
    • +
+
+
+

Contributors

+ +
+
+

Other credits

+

The initial development of this module has been financially supported by:

+
    +
  • Aleph Objects, Inc.
    • +
+
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

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.

+

This module is part of the OCA/manufacture project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/mrp_repair_refurbish/tests/__init__.py b/mrp_repair_refurbish/tests/__init__.py new file mode 100644 index 000000000..9669c5448 --- /dev/null +++ b/mrp_repair_refurbish/tests/__init__.py @@ -0,0 +1 @@ +from . import test_mrp_repair_refurbish diff --git a/mrp_repair_refurbish/tests/test_mrp_repair_refurbish.py b/mrp_repair_refurbish/tests/test_mrp_repair_refurbish.py new file mode 100644 index 000000000..acf44bafe --- /dev/null +++ b/mrp_repair_refurbish/tests/test_mrp_repair_refurbish.py @@ -0,0 +1,91 @@ +# Copyright 2018 Eficent Business and IT Consulting Services S.L. +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo.tests.common import TransactionCase + + +class TestMrpMtoWithStock(TransactionCase): + + def setUp(self, *args, **kwargs): + super(TestMrpMtoWithStock, self).setUp(*args, **kwargs) + self.repair_obj = self.env['mrp.repair'] + self.repair_line_obj = self.env['mrp.repair.line'] + self.product_obj = self.env['product.product'] + self.move_obj = self.env['stock.move'] + + self.stock_location_stock = self.env.ref('stock.stock_location_stock') + self.customer_location = self.env.ref('stock.stock_location_customers') + self.refurbish_loc = self.env.ref( + 'mrp_repair_refurbish.stock_location_refurbish') + + self.refurbish_product = self.product_obj.create({ + 'name': 'Refurbished Awesome Screen', + 'type': 'product', + }) + self.product = self.product_obj.create({ + 'name': 'Awesome Screen', + 'type': 'product', + 'refurbish_product_id': self.refurbish_product.id, + }) + self.material = self.product_obj.create({ + 'name': 'Materials', + 'type': 'consu', + }) + self._update_product_qty(self.product, self.stock_location_stock, 10.0) + + def _update_product_qty(self, product, location, quantity): + product_qty = self.env['stock.change.product.qty'].create({ + 'location_id': location.id, + 'product_id': product.id, + 'new_quantity': quantity, + }) + product_qty.change_product_qty() + return product_qty + + def test_01_repair_refurbish(self): + """Tests that locations are properly set with a product to + refurbish, then complete repair.""" + repair = self.repair_obj.create({ + 'product_id': self.product.id, + 'product_qty': 3.0, + 'product_uom': self.product.uom_id.id, + 'location_dest_id': self.customer_location.id, + }) + repair.onchange_product_id() + self.assertTrue(repair.to_refurbish) + repair._onchange_to_refurbish() + self.assertEqual(repair.refurbish_location_dest_id, + self.customer_location) + self.assertEqual(repair.location_dest_id, + self.product.property_stock_refurbish) + line = self.repair_line_obj.with_context( + to_refurbish=repair.to_refurbish, + refurbish_location_dest_id=repair.refurbish_location_dest_id, + ).new({ + 'name': 'consume stuff to repair', + 'repair_id': repair.id, + 'type': 'add', + 'product_id': self.material.id, + 'product_uom': self.material.uom_id.id, + 'product_uom_qty': 1.0, + }) + line.onchange_product_id() + line.onchange_operation_type() + self.assertEqual(line.location_id, repair.location_id) + self.assertEqual(line.location_dest_id, self.customer_location) + # Complete repair: + repair.action_validate() + repair.action_repair_start() + repair.action_repair_end() + moves = self.move_obj.search([('reference', '=', repair.name)]) + self.assertEqual(len(moves), 2) + for m in moves: + self.assertEqual(m.state, 'done') + if m.product_id == self.product: + self.assertEqual(m.location_id, self.stock_location_stock) + self.assertEqual(m.location_dest_id, self.refurbish_loc) + elif m.product_id == self.refurbish_product: + self.assertEqual(m.location_id, self.refurbish_loc) + self.assertEqual(m.location_dest_id, self.customer_location) + else: + self.assertTrue(False, "Unexpected move.")