From 707db790b77ea0a4b6da8894fb44f904c6149bc1 Mon Sep 17 00:00:00 2001 From: Andhitia Rama Date: Sat, 22 Oct 2016 17:46:55 +0700 Subject: [PATCH 1/7] [ADD][8.0] mrp_production_raw_material_procurement_group --- .../README.rst | 84 ++++++++++++ .../__init__.py | 5 + .../__openerp__.py | 18 +++ .../models/__init__.py | 5 + .../models/mrp_production.py | 33 +++++ .../tests/__init__.py | 5 + .../tests/test_mrp_production.py | 128 ++++++++++++++++++ .../views/mrp_production_views.xml | 22 +++ 8 files changed, 300 insertions(+) create mode 100644 mrp_production_raw_material_procurement_group/README.rst create mode 100644 mrp_production_raw_material_procurement_group/__init__.py create mode 100644 mrp_production_raw_material_procurement_group/__openerp__.py create mode 100644 mrp_production_raw_material_procurement_group/models/__init__.py create mode 100644 mrp_production_raw_material_procurement_group/models/mrp_production.py create mode 100644 mrp_production_raw_material_procurement_group/tests/__init__.py create mode 100644 mrp_production_raw_material_procurement_group/tests/test_mrp_production.py create mode 100644 mrp_production_raw_material_procurement_group/views/mrp_production_views.xml diff --git a/mrp_production_raw_material_procurement_group/README.rst b/mrp_production_raw_material_procurement_group/README.rst new file mode 100644 index 000000000..2a31a9261 --- /dev/null +++ b/mrp_production_raw_material_procurement_group/README.rst @@ -0,0 +1,84 @@ +.. 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 + +============== +{module_title} +============== + +This module extends the functionality of ... to support ... +and to allow you to ... + +Installation +============ + +To install this module, you need to: + +#. Do this ... + +Configuration +============= + +To configure this module, you need to: + +#. Go to ... + +.. figure:: path/to/local/image.png + :alt: alternative description + :width: 600 px + +Usage +===== + +To use this module, you need to: + +#. Go to ... + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/{repo_id}/{branch} + +.. repo_id is available in https://github.com/OCA/maintainer-tools/blob/master/tools/repos_with_ids.txt +.. branch is "8.0" for example + +Known issues / Roadmap +====================== + +* ... + +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. + +Credits +======= + +Images +------ + +* Odoo Community Association: `Icon `_. + +Contributors +------------ + +* Firstname Lastname +* Second Person + +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 https://odoo-community.org. diff --git a/mrp_production_raw_material_procurement_group/__init__.py b/mrp_production_raw_material_procurement_group/__init__.py new file mode 100644 index 000000000..dfd08accc --- /dev/null +++ b/mrp_production_raw_material_procurement_group/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 OpenSynergy Indonesia +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import models diff --git a/mrp_production_raw_material_procurement_group/__openerp__.py b/mrp_production_raw_material_procurement_group/__openerp__.py new file mode 100644 index 000000000..0316cf4be --- /dev/null +++ b/mrp_production_raw_material_procurement_group/__openerp__.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 OpenSynergy Indonesia +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +{ + "name": "Create Procurement Group On Manufacturing Order", + "version": "8.0.1.0.0", + "category": "Manufacturing", + "website": "https://opensynergy-indonesia.com/", + "author": "OpenSynergy Indonesia, Odoo Community Association (OCA)", + "license": "AGPL-3", + "installable": True, + "depends": [ + "mrp", + ], + "data": [ + "views/mrp_production_views.xml", + ], +} diff --git a/mrp_production_raw_material_procurement_group/models/__init__.py b/mrp_production_raw_material_procurement_group/models/__init__.py new file mode 100644 index 000000000..3b25f06f2 --- /dev/null +++ b/mrp_production_raw_material_procurement_group/models/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 OpenSynergy Indonesia +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import mrp_production diff --git a/mrp_production_raw_material_procurement_group/models/mrp_production.py b/mrp_production_raw_material_procurement_group/models/mrp_production.py new file mode 100644 index 000000000..40602f21d --- /dev/null +++ b/mrp_production_raw_material_procurement_group/models/mrp_production.py @@ -0,0 +1,33 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 OpenSynergy Indonesia +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from openerp import models, fields, api + + +class MrpProduction(models.Model): + _inherit = "mrp.production" + + raw_material_procurement_group_id = fields.Many2one( + string="Raw Material Procurement Group", + comodel_name="procurement.group", + ) + + @api.model + def _make_consume_line_from_data( + self, + production, product, uom_id, qty, + uos_id, uos_qty): + + move_id = super(MrpProduction, self)._make_consume_line_from_data( + production, product, uom_id, qty, + uos_id, uos_qty) + obj_move = self.env["stock.move"] + move = obj_move.browse(move_id) + if move.procure_method == "make_to_stock": + return move_id + if not production.raw_material_procurement_group_id: + return move_id + move.write( + {"group_id": production.raw_material_procurement_group_id.id}) + return move_id diff --git a/mrp_production_raw_material_procurement_group/tests/__init__.py b/mrp_production_raw_material_procurement_group/tests/__init__.py new file mode 100644 index 000000000..0d87d0677 --- /dev/null +++ b/mrp_production_raw_material_procurement_group/tests/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 OpenSynergy Indonesia +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import test_mrp_production diff --git a/mrp_production_raw_material_procurement_group/tests/test_mrp_production.py b/mrp_production_raw_material_procurement_group/tests/test_mrp_production.py new file mode 100644 index 000000000..004502af4 --- /dev/null +++ b/mrp_production_raw_material_procurement_group/tests/test_mrp_production.py @@ -0,0 +1,128 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 OpenSynergy Indonesia +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from openerp.tests.common import TransactionCase + + +class MrpProductionCase(TransactionCase): + def setUp(self, *args, **kwargs): + super(MrpProductionCase, self).setUp(*args, **kwargs) + + self.obj_group = self.env["procurement.group"] + self.obj_mo = self.env["mrp.production"] + + self.warehouse1 = self.env.ref("stock.warehouse0") + self.warehouse2 = self.env["stock.warehouse"].create({ + "name": "X Warehouse", + "code": "X WH", + "reception_steps": "one_step", + "delivery_steps": "ship_only", + "resupply_from_wh": False, + "default_resupply_wh_id": False, + }) + self.loc_stock_2 = self.warehouse2.lot_stock_id + self.loc_production = self.env.ref( + "stock.location_production") + self.route = self.env["stock.location.route"].create({ + "name": "X Route", + "sequence": 1, + "product_selectable": True, + }) + self.rule = self.env["procurement.rule"].create({ + "name": "X Production", + "location_id": self.loc_production.id, + "location_src_id": self.loc_stock_2.id, + "procure_method": "make_to_order", + "picking_type_id": self.warehouse2.int_type_id.id, + "action": "move", + "sequence": 1, + "route_id": self.route.id, + }) + self.product1 = self.env.ref("product.product_product_18") + self.product_raw1 = self.env.ref("product.product_product_17") + self.product_raw1.write({ + "route_ids": [(4, self.route.id)], + }) + self.bom1 = self.env.ref("mrp.mrp_bom_3") + self.bom1.write({ + "routing_id": False}) + + def _create_procurement_group( + self, name): + res = { + "name": name, + "move_type": "direct" + } + return self.obj_group.create(res) + + + def _create_mo( + self, + product=False, + bom=False, + src_loc=False, + dest_loc=False, + group=False, + qty=10.0): + if not product: + product = self.product1 + uom = product.uom_id + if not bom: + bom = self.bom1 + if not src_loc: + src_loc = self.loc_stock_2 + if not dest_loc: + dest_loc = self.loc_stock_2 + res = { + "product_id": product.id, + "bom_id": bom.id, + "location_src_id": src_loc.id, + "location_dest_id": dest_loc.id, + "raw_material_procurement_group_id": group, + "product_qty": qty, + "product_uom": uom.id, + } + return self.obj_mo.create(res) + + + def test_1(self): + # Create MO + mo = self._create_mo() + # Click confirm button + mo.signal_workflow("button_confirm") + for raw in mo.move_lines: + self.assertEqual( + raw.location_id, + self.loc_stock_2) + self.assertEqual( + raw.location_dest_id, + self.loc_production) + self.assertEqual( + raw.procure_method, + "make_to_order") + self.assertEqual( + len(raw.group_id), + 0) + + def test_2(self): + group1 = self._create_procurement_group( + "X 001") + # Create MO + mo = self._create_mo( + group=group1.id) + # Click confirm button + mo.signal_workflow("button_confirm") + for raw in mo.move_lines: + self.assertEqual( + raw.location_id, + self.loc_stock_2) + self.assertEqual( + raw.location_dest_id, + self.loc_production) + self.assertEqual( + raw.procure_method, + "make_to_order") + self.assertEqual( + raw.group_id, + group1) diff --git a/mrp_production_raw_material_procurement_group/views/mrp_production_views.xml b/mrp_production_raw_material_procurement_group/views/mrp_production_views.xml new file mode 100644 index 000000000..475e6f348 --- /dev/null +++ b/mrp_production_raw_material_procurement_group/views/mrp_production_views.xml @@ -0,0 +1,22 @@ + + + + + + + + mrp.production form + mrp.production + + + + + + + + + + + + From cf0b15b9f0f4dd88ffe1334d6bf1921f2db79a85 Mon Sep 17 00:00:00 2001 From: Andhitia Rama Date: Sat, 22 Oct 2016 17:55:38 +0700 Subject: [PATCH 2/7] Fix PEP8 --- .../models/mrp_production.py | 2 +- .../tests/test_mrp_production.py | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/mrp_production_raw_material_procurement_group/models/mrp_production.py b/mrp_production_raw_material_procurement_group/models/mrp_production.py index 40602f21d..4259e483d 100644 --- a/mrp_production_raw_material_procurement_group/models/mrp_production.py +++ b/mrp_production_raw_material_procurement_group/models/mrp_production.py @@ -11,7 +11,7 @@ class MrpProduction(models.Model): raw_material_procurement_group_id = fields.Many2one( string="Raw Material Procurement Group", comodel_name="procurement.group", - ) + ) @api.model def _make_consume_line_from_data( diff --git a/mrp_production_raw_material_procurement_group/tests/test_mrp_production.py b/mrp_production_raw_material_procurement_group/tests/test_mrp_production.py index 004502af4..9362b7703 100644 --- a/mrp_production_raw_material_procurement_group/tests/test_mrp_production.py +++ b/mrp_production_raw_material_procurement_group/tests/test_mrp_production.py @@ -6,6 +6,7 @@ from openerp.tests.common import TransactionCase class MrpProductionCase(TransactionCase): + def setUp(self, *args, **kwargs): super(MrpProductionCase, self).setUp(*args, **kwargs) @@ -20,7 +21,7 @@ class MrpProductionCase(TransactionCase): "delivery_steps": "ship_only", "resupply_from_wh": False, "default_resupply_wh_id": False, - }) + }) self.loc_stock_2 = self.warehouse2.lot_stock_id self.loc_production = self.env.ref( "stock.location_production") @@ -28,7 +29,7 @@ class MrpProductionCase(TransactionCase): "name": "X Route", "sequence": 1, "product_selectable": True, - }) + }) self.rule = self.env["procurement.rule"].create({ "name": "X Production", "location_id": self.loc_production.id, @@ -38,12 +39,12 @@ class MrpProductionCase(TransactionCase): "action": "move", "sequence": 1, "route_id": self.route.id, - }) + }) self.product1 = self.env.ref("product.product_product_18") self.product_raw1 = self.env.ref("product.product_product_17") self.product_raw1.write({ "route_ids": [(4, self.route.id)], - }) + }) self.bom1 = self.env.ref("mrp.mrp_bom_3") self.bom1.write({ "routing_id": False}) @@ -53,13 +54,12 @@ class MrpProductionCase(TransactionCase): res = { "name": name, "move_type": "direct" - } + } return self.obj_group.create(res) - def _create_mo( - self, - product=False, + self, + product=False, bom=False, src_loc=False, dest_loc=False, @@ -82,10 +82,9 @@ class MrpProductionCase(TransactionCase): "raw_material_procurement_group_id": group, "product_qty": qty, "product_uom": uom.id, - } + } return self.obj_mo.create(res) - def test_1(self): # Create MO mo = self._create_mo() From 4b20ab3dc07539a8c60a48a111a304a9ea8e39c3 Mon Sep 17 00:00:00 2001 From: Andhitia Rama Date: Sat, 22 Oct 2016 22:41:57 +0700 Subject: [PATCH 3/7] Finishing README.rst --- .../README.rst | 48 ++++++++----------- 1 file changed, 20 insertions(+), 28 deletions(-) diff --git a/mrp_production_raw_material_procurement_group/README.rst b/mrp_production_raw_material_procurement_group/README.rst index 2a31a9261..1d45e58fc 100644 --- a/mrp_production_raw_material_procurement_group/README.rst +++ b/mrp_production_raw_material_procurement_group/README.rst @@ -2,55 +2,48 @@ :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 -============== -{module_title} -============== +=============================================== +Create Procurement Group On Manufacturing Order +=============================================== -This module extends the functionality of ... to support ... -and to allow you to ... +This module adds ability to group manufacturing order's raw material moves, and +other moves created by it's pull flow, by given procurement group. Installation ============ To install this module, you need to: -#. Do this ... +1. Clone the branch 8.0 of the repository https://github.com/OCA/manufacture +2. Add the path to this repository in your configuration (addons-path) +3. Update the module list +4. Go to menu *Setting -> Modules -> Local Modules* +5. Search For *Create Procurement Group On Manufacturing Order* +6. Install the module -Configuration -============= - -To configure this module, you need to: - -#. Go to ... - -.. figure:: path/to/local/image.png - :alt: alternative description - :width: 600 px Usage ===== To use this module, you need to: -#. Go to ... +1. Go to menu *Manufacturing -> Manufacturing -> Manufacturing Orders* +2. Create manufacturing order. Do not forget to fill *Raw Material Procurement Group* +3. When MO is confirmed. Raw material moves with *make to order* procurement method, and it's + other moves created by it's pull flow, will be grouped based on *Raw Material Procurement Group* + given + .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/{repo_id}/{branch} + :target: https://runbot.odoo-community.org/runbot/129/8.0 -.. repo_id is available in https://github.com/OCA/maintainer-tools/blob/master/tools/repos_with_ids.txt -.. branch is "8.0" for example - -Known issues / Roadmap -====================== - -* ... Bug Tracker =========== Bugs are tracked on `GitHub Issues -`_. In case of trouble, please +`_. 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. @@ -65,8 +58,7 @@ Images Contributors ------------ -* Firstname Lastname -* Second Person +* Andhitia Rama Maintainer ---------- From 4ef512dbf805a1071aeabdc16976282130fb69b8 Mon Sep 17 00:00:00 2001 From: Andhitia Rama Date: Sat, 22 Oct 2016 22:46:17 +0700 Subject: [PATCH 4/7] Add icon --- .../static/description/icon.png | Bin 0 -> 9455 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 mrp_production_raw_material_procurement_group/static/description/icon.png diff --git a/mrp_production_raw_material_procurement_group/static/description/icon.png b/mrp_production_raw_material_procurement_group/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 From dce68c74743e868d864a57253742df22a33437ff Mon Sep 17 00:00:00 2001 From: Andhitia Rama Date: Sun, 13 Nov 2016 12:33:42 +0700 Subject: [PATCH 5/7] Add possibility to automatically create procurement group --- .../models/mrp_production.py | 28 +++++++++++++++++++ .../tests/test_mrp_production.py | 28 +++++++++++++++++-- .../views/mrp_production_views.xml | 1 + 3 files changed, 54 insertions(+), 3 deletions(-) diff --git a/mrp_production_raw_material_procurement_group/models/mrp_production.py b/mrp_production_raw_material_procurement_group/models/mrp_production.py index 4259e483d..1e917783c 100644 --- a/mrp_production_raw_material_procurement_group/models/mrp_production.py +++ b/mrp_production_raw_material_procurement_group/models/mrp_production.py @@ -11,7 +11,35 @@ class MrpProduction(models.Model): raw_material_procurement_group_id = fields.Many2one( string="Raw Material Procurement Group", comodel_name="procurement.group", + readonly=True, + states={ + "draft": [("readonly", False)], + }, ) + auto_create_procurement_group = fields.Boolean( + string="Auto Create Procurement Group", + readonly=True, + states={ + "draft": [("readonly", False)], + }, + ) + + @api.multi + def action_confirm(self): + for mo in self: + mo._create_procurement_group() + return super(MrpProduction, self).action_confirm() + + @api.multi + def _create_procurement_group(self): + self.ensure_one() + obj_group = self.env[ + "procurement.group"] + if self.auto_create_procurement_group and \ + not self.raw_material_procurement_group_id: + obj_group.create({ + "name": self.name, + }) @api.model def _make_consume_line_from_data( diff --git a/mrp_production_raw_material_procurement_group/tests/test_mrp_production.py b/mrp_production_raw_material_procurement_group/tests/test_mrp_production.py index 9362b7703..767960e26 100644 --- a/mrp_production_raw_material_procurement_group/tests/test_mrp_production.py +++ b/mrp_production_raw_material_procurement_group/tests/test_mrp_production.py @@ -64,7 +64,8 @@ class MrpProductionCase(TransactionCase): src_loc=False, dest_loc=False, group=False, - qty=10.0): + qty=10.0, + auto=False): if not product: product = self.product1 uom = product.uom_id @@ -82,10 +83,11 @@ class MrpProductionCase(TransactionCase): "raw_material_procurement_group_id": group, "product_qty": qty, "product_uom": uom.id, + "auto_create_procurement_group": auto, } return self.obj_mo.create(res) - def test_1(self): + def test_no_create_group(self): # Create MO mo = self._create_mo() # Click confirm button @@ -104,7 +106,7 @@ class MrpProductionCase(TransactionCase): len(raw.group_id), 0) - def test_2(self): + def test_create_group_manual(self): group1 = self._create_procurement_group( "X 001") # Create MO @@ -125,3 +127,23 @@ class MrpProductionCase(TransactionCase): self.assertEqual( raw.group_id, group1) + + def test_create_group_auto(self): + mo = self._create_mo( + group=False, + auto=True) + # Click confirm button + mo.signal_workflow("button_confirm") + for raw in mo.move_lines: + self.assertEqual( + raw.location_id, + self.loc_stock_2) + self.assertEqual( + raw.location_dest_id, + self.loc_production) + self.assertEqual( + raw.procure_method, + "make_to_order") + self.assertEqual( + raw.group_id, + mo.raw_material_procurement_group_id) diff --git a/mrp_production_raw_material_procurement_group/views/mrp_production_views.xml b/mrp_production_raw_material_procurement_group/views/mrp_production_views.xml index 475e6f348..b60c2dc65 100644 --- a/mrp_production_raw_material_procurement_group/views/mrp_production_views.xml +++ b/mrp_production_raw_material_procurement_group/views/mrp_production_views.xml @@ -12,6 +12,7 @@ + From 24d66f2d3d954d6b4e8a466cb5912e4ff56edaae Mon Sep 17 00:00:00 2001 From: lreficent Date: Fri, 18 Nov 2016 02:56:45 +0100 Subject: [PATCH 6/7] [8.0]-mrp_production_raw_material_procurement_group - Improvements (#1) * [IMP] - When a manufacturing order is copied, do not copy the procurement group - When a manufacturing order is confirm, the procurement group is assigned to the stock moves from raw material location to the routing location. * [IMP] -added some more tests to cover the previous changes. * [FIX] errors in tests --- .../README.rst | 1 + .../models/mrp_production.py | 20 +++++-- .../tests/test_mrp_production.py | 53 +++++++++++++++++++ 3 files changed, 71 insertions(+), 3 deletions(-) diff --git a/mrp_production_raw_material_procurement_group/README.rst b/mrp_production_raw_material_procurement_group/README.rst index 1d45e58fc..46c844805 100644 --- a/mrp_production_raw_material_procurement_group/README.rst +++ b/mrp_production_raw_material_procurement_group/README.rst @@ -59,6 +59,7 @@ Contributors ------------ * Andhitia Rama +* Lois Rilo Maintainer ---------- diff --git a/mrp_production_raw_material_procurement_group/models/mrp_production.py b/mrp_production_raw_material_procurement_group/models/mrp_production.py index 1e917783c..ee1bb964f 100644 --- a/mrp_production_raw_material_procurement_group/models/mrp_production.py +++ b/mrp_production_raw_material_procurement_group/models/mrp_production.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- # Copyright 2016 OpenSynergy Indonesia +# Copyright 2016 Eficent Business and IT Consulting Services, S.L. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from openerp import models, fields, api @@ -12,6 +13,7 @@ class MrpProduction(models.Model): string="Raw Material Procurement Group", comodel_name="procurement.group", readonly=True, + copy=False, states={ "draft": [("readonly", False)], }, @@ -37,9 +39,8 @@ class MrpProduction(models.Model): "procurement.group"] if self.auto_create_procurement_group and \ not self.raw_material_procurement_group_id: - obj_group.create({ - "name": self.name, - }) + self.raw_material_procurement_group_id = obj_group.create({ + "name": self.name}) @api.model def _make_consume_line_from_data( @@ -59,3 +60,16 @@ class MrpProduction(models.Model): move.write( {"group_id": production.raw_material_procurement_group_id.id}) return move_id + + @api.model + def _create_previous_move(self, move_id, product, source_location_id, + dest_location_id): + move_id2 = super(MrpProduction, self)._create_previous_move( + move_id, product, source_location_id, dest_location_id) + move1 = self.env['stock.move'].browse(move_id) + move2 = self.env['stock.move'].browse(move_id2) + if move1.raw_material_production_id.raw_material_procurement_group_id: + move2.group_id = \ + move1.raw_material_production_id.\ + raw_material_procurement_group_id + return move2.id diff --git a/mrp_production_raw_material_procurement_group/tests/test_mrp_production.py b/mrp_production_raw_material_procurement_group/tests/test_mrp_production.py index 767960e26..fa15e3c68 100644 --- a/mrp_production_raw_material_procurement_group/tests/test_mrp_production.py +++ b/mrp_production_raw_material_procurement_group/tests/test_mrp_production.py @@ -147,3 +147,56 @@ class MrpProductionCase(TransactionCase): self.assertEqual( raw.group_id, mo.raw_material_procurement_group_id) + + def test_copy_mo_1(self): + # Create MO + group1 = self._create_procurement_group( + "X 001") + mo = self._create_mo( + group=group1.id) + mo2 = mo.copy() + + self.assertNotEqual( + mo.raw_material_procurement_group_id, + mo2.raw_material_procurement_group_id) + + self.assertEqual( + mo2.raw_material_procurement_group_id.id, False) + + def test_copy_mo_2(self): + # Create MO + mo = self._create_mo(auto=True) + # Click confirm button + mo.signal_workflow("button_confirm") + + self.assertNotEqual( + mo.raw_material_procurement_group_id.id, False) + + self.assertEqual( + mo.raw_material_procurement_group_id.name, mo.name) + + def test_routing(self): + location = self.env['stock.location'].create({ + 'name': 'Shop floor', + }) + routing = self.env['mrp.routing'].create({ + 'name': 'test', + 'location_id': location.id, + }) + self.bom1.write({ + "routing_id": routing.id}) + # Create MO + mo = self._create_mo(auto=True) + mo2 = self._create_mo(auto=True) + # Click confirm button + mo.signal_workflow("button_confirm") + mo2.signal_workflow("button_confirm") + + # Check that the pickings are split by procurement group + pick = self.env['stock.picking'].search( + [('group_id', '=', mo.raw_material_procurement_group_id.id)]) + self.assertNotEqual(pick, False) + + pick2 = self.env['stock.picking'].search( + [('group_id', '=', mo2.raw_material_procurement_group_id.id)]) + self.assertNotEqual(pick2, False) From 8599951ec5899d7350ee300ca48ee80b0327351b Mon Sep 17 00:00:00 2001 From: lreficent Date: Wed, 14 Dec 2016 12:29:43 +0100 Subject: [PATCH 7/7] [FIX] - Allows extensibility when creating procurement groups. - Rename a test. --- .../models/mrp_production.py | 8 ++++++-- .../tests/test_mrp_production.py | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/mrp_production_raw_material_procurement_group/models/mrp_production.py b/mrp_production_raw_material_procurement_group/models/mrp_production.py index ee1bb964f..3e3bf0510 100644 --- a/mrp_production_raw_material_procurement_group/models/mrp_production.py +++ b/mrp_production_raw_material_procurement_group/models/mrp_production.py @@ -32,6 +32,10 @@ class MrpProduction(models.Model): mo._create_procurement_group() return super(MrpProduction, self).action_confirm() + @api.multi + def _prepare_procurement_group(self): + return {"name": self.name} + @api.multi def _create_procurement_group(self): self.ensure_one() @@ -39,8 +43,8 @@ class MrpProduction(models.Model): "procurement.group"] if self.auto_create_procurement_group and \ not self.raw_material_procurement_group_id: - self.raw_material_procurement_group_id = obj_group.create({ - "name": self.name}) + self.raw_material_procurement_group_id = obj_group.create( + self._prepare_procurement_group()) @api.model def _make_consume_line_from_data( diff --git a/mrp_production_raw_material_procurement_group/tests/test_mrp_production.py b/mrp_production_raw_material_procurement_group/tests/test_mrp_production.py index fa15e3c68..7c1a804dd 100644 --- a/mrp_production_raw_material_procurement_group/tests/test_mrp_production.py +++ b/mrp_production_raw_material_procurement_group/tests/test_mrp_production.py @@ -148,7 +148,7 @@ class MrpProductionCase(TransactionCase): raw.group_id, mo.raw_material_procurement_group_id) - def test_copy_mo_1(self): + def test_copy_mo(self): # Create MO group1 = self._create_procurement_group( "X 001") @@ -163,7 +163,7 @@ class MrpProductionCase(TransactionCase): self.assertEqual( mo2.raw_material_procurement_group_id.id, False) - def test_copy_mo_2(self): + def test_group_name(self): # Create MO mo = self._create_mo(auto=True) # Click confirm button