From a862a07770b8eb02ffcd9f70fb87b2690e62c01a Mon Sep 17 00:00:00 2001 From: John Walsh Date: Wed, 23 Sep 2015 12:27:50 -0700 Subject: [PATCH 1/6] [ADD] mrp_mto_with_stock - initial commit --- mrp_mto_with_stock/__init__.py | 18 ++++++ mrp_mto_with_stock/__openerp__.py | 47 +++++++++++++++ mrp_mto_with_stock/models/__init__.py | 19 ++++++ mrp_mto_with_stock/models/mrp.py | 86 +++++++++++++++++++++++++++ mrp_mto_with_stock/models/stock.py | 17 ++++++ 5 files changed, 187 insertions(+) create mode 100644 mrp_mto_with_stock/__init__.py create mode 100644 mrp_mto_with_stock/__openerp__.py create mode 100644 mrp_mto_with_stock/models/__init__.py create mode 100644 mrp_mto_with_stock/models/mrp.py create mode 100644 mrp_mto_with_stock/models/stock.py diff --git a/mrp_mto_with_stock/__init__.py b/mrp_mto_with_stock/__init__.py new file mode 100644 index 000000000..d0c2e2f37 --- /dev/null +++ b/mrp_mto_with_stock/__init__.py @@ -0,0 +1,18 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. +# +############################################################################## +import models diff --git a/mrp_mto_with_stock/__openerp__.py b/mrp_mto_with_stock/__openerp__.py new file mode 100644 index 000000000..5e408e726 --- /dev/null +++ b/mrp_mto_with_stock/__openerp__.py @@ -0,0 +1,47 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. +# +############################################################################## +{ + 'name': "mrp_mto_with_stock", + + 'summary': """ + Fix Manufacturing orders to pull from stock until qty is zero, + and then create a procurement for them""", + + 'description': """ + Long description of module's purpose + """, + + 'author': "John Walsh", + 'website': "http://github.com/michaeljohn32", + + # Categories can be used to filter modules in modules listing + # Check https://github.com/odoo/odoo/blob/master/openerp/addons/base/module/module_data.xml + # for the full list + 'category': 'Hidden/Dependency', + 'version': '0.1', + + # any module necessary for this one to work correctly + 'depends': ['mrp', 'stock_mts_mto_rule'], + + # always loaded + 'data': [ + ], + # only loaded in demonstration mode + 'demo': [ + ], +} diff --git a/mrp_mto_with_stock/models/__init__.py b/mrp_mto_with_stock/models/__init__.py new file mode 100644 index 000000000..e9ebf62ff --- /dev/null +++ b/mrp_mto_with_stock/models/__init__.py @@ -0,0 +1,19 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. +# +############################################################################## +import stock +import mrp diff --git a/mrp_mto_with_stock/models/mrp.py b/mrp_mto_with_stock/models/mrp.py new file mode 100644 index 000000000..cec522e6c --- /dev/null +++ b/mrp_mto_with_stock/models/mrp.py @@ -0,0 +1,86 @@ +# -*- encoding: utf-8 -*- +from openerp import fields, models, api +import pdb +import logging +_logger = logging.getLogger(__name__) + +class mrp_production(models.Model): + _inherit = 'mrp.production' + +# @api.model +# def _make_consume_line_from_data(self, production, product, uom_id, qty, uos_id, uos_qty): +# '''Confirms stock move or put it in waiting if it's linked to another move. +# @returns list of ids''' +# pdb.set_trace() +# # change the qty to make two moves (if needed) +# res = super(mrp_production, self)._make_consume_line_from_data(production, product, uom_id, uos_id, uos_qty) +# return res + @api.one + def action_confirm(self): + '''Confirms stock move or put it in waiting if it's linked to another move. + @returns list of ids''' +# pdb.set_trace() + # change the qty to make two moves (if needed) + res = super(mrp_production, self).action_confirm() + # try to assign moves (and generate procurements!) + self.action_assign() + return res + + @api.one + def action_assign(self): + '''Reserves available products to the production order + but also creates procurements for more items if we + cannot reserve enough (MTO with stock) + @returns list of ids''' + # reserve all that is available + res = super(mrp_production, self).action_assign() + mtos_route = self.env.ref('stock_mts_mto_rule.route_mto_mts') + for move in self.move_lines: + if move.state == 'confirmed' and mtos_route.id in move.product_id.route_ids.ids: + #This move is waiting availability + + #create a domain + #TODO: check other possible states confirmed/exception? + domain = [('product_id','=', move.product_id.id),('state','=','running'),('move_dest_id','=',move.id)] + if move.group_id: + domain.append(('group_id','=',move.group_id.id)) + procurement = self.env['procurement.order'].search(domain) + if not procurement: + # we need to create a procurement + qty_to_procure = move.remaining_qty - move.reserved_availability + proc_dict = self._prepare_mto_procurement(move, qty_to_procure) + procurement = self.env['procurement.order'].create(proc_dict) + return res + + def _prepare_mto_procurement(self, move, qty): + '''Prepares a procurement for a MTO move + using similar logic to /stock/stock.py/class stock_move/_prepare_procurement_from_move() + + ''' + origin = ((move.group_id and (move.group_id.name) + ":") or "") + ((move.name and move.name + ":") or "") + ('MTO -> Production') + group_id = move.group_id and move.group_id.id or False + + route_ids = [self.env.ref('stock.route_warehouse0_mto')] + return{ + 'name': move.name + ':' + str(move.id), + 'origin': origin, + 'company_id': move.company_id and move.company_id.id or False, + 'date_planned': move.date, + 'product_id': move.product_id.id, + 'product_qty': qty, + 'product_uom': move.product_uom.id, + 'product_uos_qty': qty, #FIXME: (move.product_uos and move.product_uos_qty) or move.product_uom_qty, + 'product_uos': move.product_uom.id, #FIXME:(move.product_uos and move.product_uos.id) or move.product_uom.id, + 'location_id': move.location_id.id, + 'move_dest_id': move.id, + 'group_id': group_id, + 'route_ids':[(4, x.id) for x in route_ids], + 'warehouse_id': move.warehouse_id.id or (move.picking_type_id and move.picking_type_id.warehouse_id.id or False), + 'priority': move.priority, + } + + + + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/mrp_mto_with_stock/models/stock.py b/mrp_mto_with_stock/models/stock.py new file mode 100644 index 000000000..f67c7b522 --- /dev/null +++ b/mrp_mto_with_stock/models/stock.py @@ -0,0 +1,17 @@ +# -*- encoding: utf-8 -*- +from openerp import fields, models, api +import pdb + +class stock_move(models.Model): + _inherit = 'stock.move' + + @api.multi + def action_confirm(self): + '''Confirms stock move or put it in waiting if it's linked to another move. + @returns list of ids''' + res = super(stock_move, self).action_confirm() + return res + + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + From 376a2450c735ebb502fc4a3ceab5874d9fae3440 Mon Sep 17 00:00:00 2001 From: lreficent Date: Wed, 26 Apr 2017 18:38:39 +0200 Subject: [PATCH 2/6] [9.0][IMP] mrp_mto_with_stock: adapt to OCA and minor fixes. --- mrp_mto_with_stock/README.rst | 70 ++++++++++++++++++++ mrp_mto_with_stock/__init__.py | 24 ++----- mrp_mto_with_stock/__openerp__.py | 61 +++++------------- mrp_mto_with_stock/models/__init__.py | 25 ++----- mrp_mto_with_stock/models/mrp.py | 93 ++++++++++++--------------- mrp_mto_with_stock/models/stock.py | 17 ----- 6 files changed, 138 insertions(+), 152 deletions(-) create mode 100644 mrp_mto_with_stock/README.rst delete mode 100644 mrp_mto_with_stock/models/stock.py diff --git a/mrp_mto_with_stock/README.rst b/mrp_mto_with_stock/README.rst new file mode 100644 index 000000000..a065cad4a --- /dev/null +++ b/mrp_mto_with_stock/README.rst @@ -0,0 +1,70 @@ +.. 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 + +================== +MRP MTO with Stock +================== + +This module extends the functionality of Manufacturing to support the creation +of procurements when there is no stock available. This allow you to pull from +stock until the quantity on hand is zero, and then create a procurement +for fulfill the MO requirements. + +Configuration +============= + +To configure this module, you need to: + +#. Go to the products you want to follow this behaviour. +#. In the view form got to the tab *Inventory* and check the box for the + route *Make To Order + Make To Stock*. + +Usage +===== + +To use this module, you need to: + +#. Go to *Manufacturing* and create a Manufacturing Order. +#. Click on *Confirm Production*. + +.. 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 smash it by providing detailed and welcomed feedback. + +Credits +======= + +Images +------ + +* Odoo Community Association: `Icon `_. + +Contributors +------------ + +* John Walsh +* Lois Rilo + +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_mto_with_stock/__init__.py b/mrp_mto_with_stock/__init__.py index d0c2e2f37..a7129c69a 100644 --- a/mrp_mto_with_stock/__init__.py +++ b/mrp_mto_with_stock/__init__.py @@ -1,18 +1,6 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# 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 General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see http://www.gnu.org/licenses/. -# -############################################################################## -import models +# -*- coding: utf-8 -*- +# Copyright 2017 Eficent Business and IT Consulting Services S.L. +# Copyright 2015 John Walsh +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import models diff --git a/mrp_mto_with_stock/__openerp__.py b/mrp_mto_with_stock/__openerp__.py index 5e408e726..3235afb03 100644 --- a/mrp_mto_with_stock/__openerp__.py +++ b/mrp_mto_with_stock/__openerp__.py @@ -1,47 +1,18 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# 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 General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see http://www.gnu.org/licenses/. -# -############################################################################## +# -*- coding: utf-8 -*- +# Copyright 2017 Eficent Business and IT Consulting Services S.L. +# Copyright 2015 John Walsh +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + { - 'name': "mrp_mto_with_stock", - - 'summary': """ - Fix Manufacturing orders to pull from stock until qty is zero, - and then create a procurement for them""", - - 'description': """ - Long description of module's purpose - """, - - 'author': "John Walsh", - 'website': "http://github.com/michaeljohn32", - - # Categories can be used to filter modules in modules listing - # Check https://github.com/odoo/odoo/blob/master/openerp/addons/base/module/module_data.xml - # for the full list - 'category': 'Hidden/Dependency', - 'version': '0.1', - - # any module necessary for this one to work correctly - 'depends': ['mrp', 'stock_mts_mto_rule'], - - # always loaded - 'data': [ - ], - # only loaded in demonstration mode - 'demo': [ - ], + "name": "MRP MTO with Stock", + "summary": "Fix Manufacturing orders to pull from stock until qty is " + "zero, and then create a procurement for them.", + "author": "John Walsh, Eficent, Odoo Community Association (OCA)", + "website": "https://odoo-community.org/", + "category": "Manufacturing", + "version": "9.0.1.0.0", + "license": "AGPL-3", + "application": False, + "installable": True, + "depends": ["mrp", "stock_mts_mto_rule"], } diff --git a/mrp_mto_with_stock/models/__init__.py b/mrp_mto_with_stock/models/__init__.py index e9ebf62ff..f5102a7f2 100644 --- a/mrp_mto_with_stock/models/__init__.py +++ b/mrp_mto_with_stock/models/__init__.py @@ -1,19 +1,6 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# 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 General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see http://www.gnu.org/licenses/. -# -############################################################################## -import stock -import mrp +# -*- coding: utf-8 -*- +# Copyright 2017 Eficent Business and IT Consulting Services S.L. +# Copyright 2015 John Walsh +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import mrp diff --git a/mrp_mto_with_stock/models/mrp.py b/mrp_mto_with_stock/models/mrp.py index cec522e6c..a2d5565b7 100644 --- a/mrp_mto_with_stock/models/mrp.py +++ b/mrp_mto_with_stock/models/mrp.py @@ -1,67 +1,62 @@ -# -*- encoding: utf-8 -*- -from openerp import fields, models, api -import pdb +# -*- coding: utf-8 -*- +# Copyright 2017 Eficent Business and IT Consulting Services S.L. +# Copyright 2015 John Walsh +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from openerp import api, models import logging _logger = logging.getLogger(__name__) -class mrp_production(models.Model): + +class MrpProduction(models.Model): _inherit = 'mrp.production' -# @api.model -# def _make_consume_line_from_data(self, production, product, uom_id, qty, uos_id, uos_qty): -# '''Confirms stock move or put it in waiting if it's linked to another move. -# @returns list of ids''' -# pdb.set_trace() -# # change the qty to make two moves (if needed) -# res = super(mrp_production, self)._make_consume_line_from_data(production, product, uom_id, uos_id, uos_qty) -# return res @api.one def action_confirm(self): - '''Confirms stock move or put it in waiting if it's linked to another move. - @returns list of ids''' -# pdb.set_trace() + """Confirms stock move or put it in waiting if it's linked to another move. + @returns list of ids""" # change the qty to make two moves (if needed) - res = super(mrp_production, self).action_confirm() + res = super(MrpProduction, self).action_confirm() # try to assign moves (and generate procurements!) self.action_assign() return res @api.one def action_assign(self): - '''Reserves available products to the production order - but also creates procurements for more items if we - cannot reserve enough (MTO with stock) - @returns list of ids''' - # reserve all that is available - res = super(mrp_production, self).action_assign() + """Reserves available products to the production order but also reates + procurements for more items if we cannot reserve enough (MTO with + stock). + @returns list of ids""" + # reserve all that is available (standard behaviour): + res = super(MrpProduction, self).action_assign() + # try to create procurements: mtos_route = self.env.ref('stock_mts_mto_rule.route_mto_mts') for move in self.move_lines: - if move.state == 'confirmed' and mtos_route.id in move.product_id.route_ids.ids: - #This move is waiting availability - - #create a domain - #TODO: check other possible states confirmed/exception? - domain = [('product_id','=', move.product_id.id),('state','=','running'),('move_dest_id','=',move.id)] + if (move.state == 'confirmed' and mtos_route.id in + move.product_id.route_ids.ids): + domain = [('product_id', '=', move.product_id.id), + ('state', '=', 'running'), + ('move_dest_id', '=', move.id)] if move.group_id: - domain.append(('group_id','=',move.group_id.id)) + domain.append(('group_id', '=', move.group_id.id)) procurement = self.env['procurement.order'].search(domain) if not procurement: - # we need to create a procurement - qty_to_procure = move.remaining_qty - move.reserved_availability - proc_dict = self._prepare_mto_procurement(move, qty_to_procure) - procurement = self.env['procurement.order'].create(proc_dict) + qty_to_procure = (move.remaining_qty - + move.reserved_availability) + proc_dict = self._prepare_mto_procurement( + move, qty_to_procure) + self.env['procurement.order'].create(proc_dict) return res - - def _prepare_mto_procurement(self, move, qty): - '''Prepares a procurement for a MTO move - using similar logic to /stock/stock.py/class stock_move/_prepare_procurement_from_move() - - ''' - origin = ((move.group_id and (move.group_id.name) + ":") or "") + ((move.name and move.name + ":") or "") + ('MTO -> Production') - group_id = move.group_id and move.group_id.id or False - route_ids = [self.env.ref('stock.route_warehouse0_mto')] - return{ + def _prepare_mto_procurement(self, move, qty): + """Prepares a procurement for a MTO product.""" + origin = ((move.group_id and move.group_id.name + ":") or "") + \ + ((move.name and move.name + ":") or "") + 'MTO -> Production' + group_id = move.group_id and move.group_id.id or False + route_ids = self.env.ref('stock.route_warehouse0_mto') + warehouse_id = (move.warehouse_id.id or (move.picking_type_id and + move.picking_type_id.warehouse_id.id or False)) + return { 'name': move.name + ':' + str(move.id), 'origin': origin, 'company_id': move.company_id and move.company_id.id or False, @@ -69,18 +64,10 @@ class mrp_production(models.Model): 'product_id': move.product_id.id, 'product_qty': qty, 'product_uom': move.product_uom.id, - 'product_uos_qty': qty, #FIXME: (move.product_uos and move.product_uos_qty) or move.product_uom_qty, - 'product_uos': move.product_uom.id, #FIXME:(move.product_uos and move.product_uos.id) or move.product_uom.id, 'location_id': move.location_id.id, 'move_dest_id': move.id, 'group_id': group_id, - 'route_ids':[(4, x.id) for x in route_ids], - 'warehouse_id': move.warehouse_id.id or (move.picking_type_id and move.picking_type_id.warehouse_id.id or False), + 'route_ids': [(6, 0, route_ids.ids)], + 'warehouse_id': warehouse_id, 'priority': move.priority, } - - - - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - diff --git a/mrp_mto_with_stock/models/stock.py b/mrp_mto_with_stock/models/stock.py deleted file mode 100644 index f67c7b522..000000000 --- a/mrp_mto_with_stock/models/stock.py +++ /dev/null @@ -1,17 +0,0 @@ -# -*- encoding: utf-8 -*- -from openerp import fields, models, api -import pdb - -class stock_move(models.Model): - _inherit = 'stock.move' - - @api.multi - def action_confirm(self): - '''Confirms stock move or put it in waiting if it's linked to another move. - @returns list of ids''' - res = super(stock_move, self).action_confirm() - return res - - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - From 2c9ee842ae2800dfdf6e4bbc88ed736e2abdc19c Mon Sep 17 00:00:00 2001 From: lreficent Date: Wed, 3 May 2017 19:00:33 +0200 Subject: [PATCH 3/6] [9.0][REW] mrp_mto_with_stock: Rework to remove dependency and enhance flexibility --- mrp_mto_with_stock/README.rst | 5 +++-- mrp_mto_with_stock/__openerp__.py | 3 ++- mrp_mto_with_stock/models/__init__.py | 1 + mrp_mto_with_stock/models/mrp.py | 5 ++--- mrp_mto_with_stock/models/product_template.py | 15 ++++++++++++++ .../views/product_template_view.xml | 20 +++++++++++++++++++ 6 files changed, 43 insertions(+), 6 deletions(-) create mode 100644 mrp_mto_with_stock/models/product_template.py create mode 100644 mrp_mto_with_stock/views/product_template_view.xml diff --git a/mrp_mto_with_stock/README.rst b/mrp_mto_with_stock/README.rst index a065cad4a..fdce71d4b 100644 --- a/mrp_mto_with_stock/README.rst +++ b/mrp_mto_with_stock/README.rst @@ -17,8 +17,9 @@ Configuration To configure this module, you need to: #. Go to the products you want to follow this behaviour. -#. In the view form got to the tab *Inventory* and check the box for the - route *Make To Order + Make To Stock*. +#. In the view form go to the tab *Inventory* and set the *Manufacturing + MTO/MTS Locations*. Any other location not specified here will have the + standard behavior. Usage ===== diff --git a/mrp_mto_with_stock/__openerp__.py b/mrp_mto_with_stock/__openerp__.py index 3235afb03..928dbc421 100644 --- a/mrp_mto_with_stock/__openerp__.py +++ b/mrp_mto_with_stock/__openerp__.py @@ -14,5 +14,6 @@ "license": "AGPL-3", "application": False, "installable": True, - "depends": ["mrp", "stock_mts_mto_rule"], + "depends": ["mrp"], + "data": ['views/product_template_view.xml'], } diff --git a/mrp_mto_with_stock/models/__init__.py b/mrp_mto_with_stock/models/__init__.py index f5102a7f2..709cb97b3 100644 --- a/mrp_mto_with_stock/models/__init__.py +++ b/mrp_mto_with_stock/models/__init__.py @@ -4,3 +4,4 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from . import mrp +from . import product_template diff --git a/mrp_mto_with_stock/models/mrp.py b/mrp_mto_with_stock/models/mrp.py index a2d5565b7..87d1c082f 100644 --- a/mrp_mto_with_stock/models/mrp.py +++ b/mrp_mto_with_stock/models/mrp.py @@ -30,10 +30,9 @@ class MrpProduction(models.Model): # reserve all that is available (standard behaviour): res = super(MrpProduction, self).action_assign() # try to create procurements: - mtos_route = self.env.ref('stock_mts_mto_rule.route_mto_mts') for move in self.move_lines: - if (move.state == 'confirmed' and mtos_route.id in - move.product_id.route_ids.ids): + if (move.state == 'confirmed' and move.location_id in + move.product_id.mrp_mts_mto_location_ids): domain = [('product_id', '=', move.product_id.id), ('state', '=', 'running'), ('move_dest_id', '=', move.id)] diff --git a/mrp_mto_with_stock/models/product_template.py b/mrp_mto_with_stock/models/product_template.py new file mode 100644 index 000000000..11099600d --- /dev/null +++ b/mrp_mto_with_stock/models/product_template.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Eficent Business and IT Consulting Services S.L. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from openerp import fields, models + + +class ProductTemplate(models.Model): + _inherit = 'product.template' + + mrp_mts_mto_location_ids = fields.Many2many( + comodel_name='stock.location', + string='Manufacturing MTO/MTS Locations', + help='These manufacturing locations will create procurements when ' + 'there is no stock availale in the source location.') diff --git a/mrp_mto_with_stock/views/product_template_view.xml b/mrp_mto_with_stock/views/product_template_view.xml new file mode 100644 index 000000000..cbe221f8f --- /dev/null +++ b/mrp_mto_with_stock/views/product_template_view.xml @@ -0,0 +1,20 @@ + + + + + + + product.template.form - mrp_mto_with_stock + extension + product.template + + + + + + + + + From 739917637eaaad0551924374b52559fc484fa710 Mon Sep 17 00:00:00 2001 From: Jordi Ballester Date: Sun, 23 Jul 2017 07:11:58 +0200 Subject: [PATCH 4/6] [IMP] should not auto-confirm the MO. Added test cases --- mrp_mto_with_stock/README.rst | 2 +- mrp_mto_with_stock/models/__init__.py | 2 +- .../models/{mrp.py => mrp_production.py} | 13 +- mrp_mto_with_stock/tests/__init__.py | 5 + .../tests/test_mrp_mto_with_stock.py | 139 ++++++++++++++++++ 5 files changed, 147 insertions(+), 14 deletions(-) rename mrp_mto_with_stock/models/{mrp.py => mrp_production.py} (85%) create mode 100644 mrp_mto_with_stock/tests/__init__.py create mode 100644 mrp_mto_with_stock/tests/test_mrp_mto_with_stock.py diff --git a/mrp_mto_with_stock/README.rst b/mrp_mto_with_stock/README.rst index fdce71d4b..4b92df24e 100644 --- a/mrp_mto_with_stock/README.rst +++ b/mrp_mto_with_stock/README.rst @@ -9,7 +9,7 @@ MRP MTO with Stock This module extends the functionality of Manufacturing to support the creation of procurements when there is no stock available. This allow you to pull from stock until the quantity on hand is zero, and then create a procurement -for fulfill the MO requirements. +to fulfill the MO requirements. Configuration ============= diff --git a/mrp_mto_with_stock/models/__init__.py b/mrp_mto_with_stock/models/__init__.py index 709cb97b3..c4a684fa2 100644 --- a/mrp_mto_with_stock/models/__init__.py +++ b/mrp_mto_with_stock/models/__init__.py @@ -3,5 +3,5 @@ # Copyright 2015 John Walsh # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from . import mrp +from . import mrp_production from . import product_template diff --git a/mrp_mto_with_stock/models/mrp.py b/mrp_mto_with_stock/models/mrp_production.py similarity index 85% rename from mrp_mto_with_stock/models/mrp.py rename to mrp_mto_with_stock/models/mrp_production.py index 87d1c082f..281fc9ea8 100644 --- a/mrp_mto_with_stock/models/mrp.py +++ b/mrp_mto_with_stock/models/mrp_production.py @@ -11,19 +11,9 @@ _logger = logging.getLogger(__name__) class MrpProduction(models.Model): _inherit = 'mrp.production' - @api.one - def action_confirm(self): - """Confirms stock move or put it in waiting if it's linked to another move. - @returns list of ids""" - # change the qty to make two moves (if needed) - res = super(MrpProduction, self).action_confirm() - # try to assign moves (and generate procurements!) - self.action_assign() - return res - @api.one def action_assign(self): - """Reserves available products to the production order but also reates + """Reserves available products to the production order but also creates procurements for more items if we cannot reserve enough (MTO with stock). @returns list of ids""" @@ -34,7 +24,6 @@ class MrpProduction(models.Model): if (move.state == 'confirmed' and move.location_id in move.product_id.mrp_mts_mto_location_ids): domain = [('product_id', '=', move.product_id.id), - ('state', '=', 'running'), ('move_dest_id', '=', move.id)] if move.group_id: domain.append(('group_id', '=', move.group_id.id)) diff --git a/mrp_mto_with_stock/tests/__init__.py b/mrp_mto_with_stock/tests/__init__.py new file mode 100644 index 000000000..f8065ee2e --- /dev/null +++ b/mrp_mto_with_stock/tests/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Eficent Business and IT Consulting Services S.L. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import test_mrp_mto_with_stock diff --git a/mrp_mto_with_stock/tests/test_mrp_mto_with_stock.py b/mrp_mto_with_stock/tests/test_mrp_mto_with_stock.py new file mode 100644 index 000000000..464195aa9 --- /dev/null +++ b/mrp_mto_with_stock/tests/test_mrp_mto_with_stock.py @@ -0,0 +1,139 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Eficent Business and IT Consulting Services S.L. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from openerp.tests.common import TransactionCase +from openerp import fields + + +class TestMrpMtoWithStock(TransactionCase): + def setUp(self, *args, **kwargs): + super(TestMrpMtoWithStock, self).setUp(*args, **kwargs) + self.production_model = self.env['mrp.production'] + self.bom_model = self.env['mrp.bom'] + self.stock_location_stock = self.env.ref('stock.stock_location_stock') + self.manufacture_route = self.env.ref( + 'mrp.route_warehouse0_manufacture') + self.uom_unit = self.env.ref('product.product_uom_unit') + + self.product_fp = self.env['product.product'].create({ + 'name': 'FP', + 'type': 'product', + 'uom_id': self.uom_unit.id, + 'route_ids': [(4, self.manufacture_route.id)] + }) + self.product_c1 = self.env['product.product'].create({ + 'name': 'C1', + 'type': 'product', + 'uom_id': self.uom_unit.id, + 'route_ids': [(4, self.manufacture_route.id)] + }) + self.product_c2 = self.env['product.product'].create({ + 'name': 'C2', + 'type': 'product', + 'uom_id': self.uom_unit.id, + }) + self._update_product_qty(self.product_c2, + self.stock_location_stock, 10) + + self.bom_fp = self.env['mrp.bom'].create({ + 'product_id': self.product_fp.id, + 'product_tmpl_id': self.product_fp.product_tmpl_id.id, + 'bom_line_ids': ([ + (0, 0, { + 'product_id': self.product_c1.id, + 'product_qty': 1, + 'product_uom': self.uom_unit.id + }), + (0, 0, { + 'product_id': self.product_c2.id, + 'product_qty': 1, + 'product_uom': self.uom_unit.id + }), + ]) + }) + + self.bom_c1 = self.env['mrp.bom'].create({ + 'product_id': self.product_c1.id, + 'product_tmpl_id': self.product_c1.product_tmpl_id.id, + 'bom_line_ids': ([(0, 0, { + 'product_id': self.product_c2.id, + 'product_qty': 1, + 'product_uom': self.uom_unit.id + })]) + }) + self.product_c1.mrp_mts_mto_location_ids = [ + (6, 0, [self.stock_location_stock.id])] + + def _update_product_qty(self, product, location, quantity): + """Update Product 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 create_procurement(self, name, product): + values = { + 'name': name, + 'date_planned': fields.Datetime.now(), + 'product_id': product.id, + 'product_qty': 4.0, + 'product_uom': product.uom_id.id, + 'warehouse_id': self.env.ref('stock.warehouse0').id, + 'location_id': self.stock_location_stock.id, + 'route_ids': [ + (4, self.env.ref('mrp.route_warehouse0_manufacture').id, 0)], + } + return self.env['procurement.order'].create(values) + + def test_manufacture(self): + + procurement_fp = self.create_procurement('TEST/01', self.product_fp) + production_fp = procurement_fp.production_id + self.assertEqual(production_fp.state, 'confirmed') + + production_fp.action_assign() + self.assertEqual(production_fp.state, 'confirmed') + + procurement_c1 = self.env['procurement.order'].search( + [('product_id', '=', self.product_c1.id), + ('move_dest_id', 'in', production_fp.move_lines.ids)], limit=1) + self.assertEquals(len(procurement_c1), 1) + + procurement_c2 = self.env['procurement.order'].search( + [('product_id', '=', self.product_c2.id), + ('move_dest_id', 'in', production_fp.move_lines.ids)], limit=1) + self.assertEquals(len(procurement_c2), 0) + + procurement_c1.run() + production_c1 = procurement_c1.production_id + self.assertEqual(production_c1.state, 'confirmed') + + production_c1.action_assign() + self.assertEqual(production_c1.state, 'ready') + + procurement_c2 = self.env['procurement.order'].search( + [('product_id', '=', self.product_c2.id), + ('move_dest_id', 'in', production_c1.move_lines.ids)], limit=1) + self.assertEquals(len(procurement_c2), 0) + + wizard = self.env['mrp.product.produce'].create({ + 'product_id': self.product_c1.id, + 'product_qty': 1, + }) + self.env['mrp.production'].action_produce( + production_c1.id, 1, 'consume_produce', wizard) + production_c1.refresh() + self.assertEqual(production_fp.state, 'confirmed') + + wizard = self.env['mrp.product.produce'].create({ + 'product_id': self.product_c1.id, + 'product_qty': 3, + }) + self.env['mrp.production'].action_produce( + production_c1.id, 3, 'consume_produce', wizard) + production_c1.refresh() + self.assertEqual(production_fp.state, 'ready') From 7571492df0c9e49751394bd895d58b62bb2bf238 Mon Sep 17 00:00:00 2001 From: lreficent Date: Mon, 24 Jul 2017 13:28:36 +0200 Subject: [PATCH 5/6] add contributor email --- mrp_mto_with_stock/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mrp_mto_with_stock/README.rst b/mrp_mto_with_stock/README.rst index 4b92df24e..6d17ccada 100644 --- a/mrp_mto_with_stock/README.rst +++ b/mrp_mto_with_stock/README.rst @@ -52,7 +52,7 @@ Images Contributors ------------ -* John Walsh +* John Walsh * Lois Rilo Maintainer From 588511765c4a09d90118a3118e216b56ce3bfab3 Mon Sep 17 00:00:00 2001 From: Florian da Costa Date: Thu, 27 Jul 2017 10:46:26 +0200 Subject: [PATCH 6/6] Migrate and improve mrp_to_mto_with_stock to version 10 --- mrp_mto_with_stock/README.rst | 24 +- .../{__openerp__.py => __manifest__.py} | 8 +- mrp_mto_with_stock/demo/product.xml | 128 ++++++++++ mrp_mto_with_stock/models/__init__.py | 1 + mrp_mto_with_stock/models/mrp_production.py | 94 ++++++-- mrp_mto_with_stock/models/product_template.py | 2 +- mrp_mto_with_stock/models/stock_warehouse.py | 16 ++ .../tests/test_mrp_mto_with_stock.py | 219 ++++++++++-------- mrp_mto_with_stock/views/stock_warehouse.xml | 17 ++ 9 files changed, 381 insertions(+), 128 deletions(-) rename mrp_mto_with_stock/{__openerp__.py => __manifest__.py} (78%) create mode 100644 mrp_mto_with_stock/demo/product.xml create mode 100644 mrp_mto_with_stock/models/stock_warehouse.py create mode 100644 mrp_mto_with_stock/views/stock_warehouse.xml diff --git a/mrp_mto_with_stock/README.rst b/mrp_mto_with_stock/README.rst index 6d17ccada..fa154d0f2 100644 --- a/mrp_mto_with_stock/README.rst +++ b/mrp_mto_with_stock/README.rst @@ -7,9 +7,16 @@ MRP MTO with Stock ================== This module extends the functionality of Manufacturing to support the creation -of procurements when there is no stock available. This allow you to pull from -stock until the quantity on hand is zero, and then create a procurement -to fulfill the MO requirements. +of procurements only for a part of the raw material. +It has 2 modes. The default one allow you to pull +from stock until the quantity on hand is zero, and then create a procurement +to fulfill the MO requirements. In this mode, the created procurements must +be the ones fulfilling the MO that has generated it. +The other mode is based on the forecast quantity. It will allow to pull from +stock until the forecast quantity is zero and then create a procurement for +the missing products. In this mode, there is no link between the procurement +created and MO that has generated it. The procurement may be used to fulfill +another MO. Configuration ============= @@ -21,17 +28,23 @@ To configure this module, you need to: MTO/MTS Locations*. Any other location not specified here will have the standard behavior. +If you want to use the second mode, based on forecast quantity +#. Go to the warehouse you want to follow this behaviour. +#. In the view form go to the tab *Warehouse Configuration* and set the + *MRP MTO with forecast stock*. You still need to configure the products + like described in last step. + Usage ===== To use this module, you need to: #. Go to *Manufacturing* and create a Manufacturing Order. -#. Click on *Confirm Production*. +#. Click on *Check availability*. .. 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 + :target: https://runbot.odoo-community.org/runbot/129/10.0 Bug Tracker =========== @@ -54,6 +67,7 @@ Contributors * John Walsh * Lois Rilo +* Florian da Costa Maintainer ---------- diff --git a/mrp_mto_with_stock/__openerp__.py b/mrp_mto_with_stock/__manifest__.py similarity index 78% rename from mrp_mto_with_stock/__openerp__.py rename to mrp_mto_with_stock/__manifest__.py index 928dbc421..ef669a7fb 100644 --- a/mrp_mto_with_stock/__openerp__.py +++ b/mrp_mto_with_stock/__manifest__.py @@ -10,10 +10,14 @@ "author": "John Walsh, Eficent, Odoo Community Association (OCA)", "website": "https://odoo-community.org/", "category": "Manufacturing", - "version": "9.0.1.0.0", + "version": "10.0.1.0.0", "license": "AGPL-3", "application": False, "installable": True, "depends": ["mrp"], - "data": ['views/product_template_view.xml'], + "data": [ + 'views/product_template_view.xml', + 'views/stock_warehouse.xml', + ], + "demo": ['demo/product.xml'], } diff --git a/mrp_mto_with_stock/demo/product.xml b/mrp_mto_with_stock/demo/product.xml new file mode 100644 index 000000000..4a4d61a8c --- /dev/null +++ b/mrp_mto_with_stock/demo/product.xml @@ -0,0 +1,128 @@ + + + + + + + TOP + + 600.00 + 400.00 + product + + + TODO + MANUF + + + + + Subproduct 1 + + 300.00 + 100.00 + product + + + TODO + MANUF 1-1 + + + + + + Subproduct 2 + + 100.00 + 30.00 + product + + + TODO + MANUF 1-2 + + + + + + Subproduct 1-1 + + 10.00 + 3.00 + product + + + TODO + MANUF 1-1-1 + + + + + Subproduct 2-1 + + 10.00 + 3.00 + product + + + TODO + MANUF 1-2-1 + + + + + + + 10 + + + + + 5 + + 1 + + + + + + 2 + + 1 + + + + + + + 10 + + + + + 2 + + 1 + + + + + + + 10 + + + + + 4 + + 1 + + + + + diff --git a/mrp_mto_with_stock/models/__init__.py b/mrp_mto_with_stock/models/__init__.py index c4a684fa2..c617a225f 100644 --- a/mrp_mto_with_stock/models/__init__.py +++ b/mrp_mto_with_stock/models/__init__.py @@ -5,3 +5,4 @@ from . import mrp_production from . import product_template +from . import stock_warehouse diff --git a/mrp_mto_with_stock/models/mrp_production.py b/mrp_mto_with_stock/models/mrp_production.py index 281fc9ea8..dc6a585f5 100644 --- a/mrp_mto_with_stock/models/mrp_production.py +++ b/mrp_mto_with_stock/models/mrp_production.py @@ -3,7 +3,7 @@ # Copyright 2015 John Walsh # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from openerp import api, models +from odoo import api, models import logging _logger = logging.getLogger(__name__) @@ -11,32 +11,69 @@ _logger = logging.getLogger(__name__) class MrpProduction(models.Model): _inherit = 'mrp.production' - @api.one + @api.multi + def _adjust_procure_method(self): + # Si location => By pass method... + super(MrpProduction, self)._adjust_procure_method() + + @api.multi def action_assign(self): """Reserves available products to the production order but also creates procurements for more items if we cannot reserve enough (MTO with stock). - @returns list of ids""" + @returns True""" # reserve all that is available (standard behaviour): res = super(MrpProduction, self).action_assign() # try to create procurements: - for move in self.move_lines: - if (move.state == 'confirmed' and move.location_id in - move.product_id.mrp_mts_mto_location_ids): - domain = [('product_id', '=', move.product_id.id), - ('move_dest_id', '=', move.id)] - if move.group_id: - domain.append(('group_id', '=', move.group_id.id)) - procurement = self.env['procurement.order'].search(domain) - if not procurement: - qty_to_procure = (move.remaining_qty - - move.reserved_availability) - proc_dict = self._prepare_mto_procurement( - move, qty_to_procure) - self.env['procurement.order'].create(proc_dict) + move_obj = self.env['stock.move'] + for production in self: + warehouse = production.location_src_id.get_warehouse() + mto_with_no_move_dest_id = warehouse.mrp_mto_mts_forecast_qty + for move in self.move_raw_ids: + if (move.state == 'confirmed' and move.location_id in + move.product_id.mrp_mts_mto_location_ids and not + mto_with_no_move_dest_id): + domain = [('product_id', '=', move.product_id.id), + ('move_dest_id', '=', move.id)] + if move.group_id: + domain.append(('group_id', '=', move.group_id.id)) + procurement = self.env['procurement.order'].search(domain) + if not procurement: + # We have to split the move because we can't have + # a part of the move that have ancestors and not the + # other else it won't ever be reserved. + qty_to_procure = (move.remaining_qty - + move.reserved_availability) + if qty_to_procure < move.product_uom_qty: + move.do_unreserve() + new_move_id = move.split( + qty_to_procure, + restrict_lot_id=move.restrict_lot_id, + restrict_partner_id=move.restrict_partner_id) + new_move = move_obj.browse( + new_move_id) + move.action_assign() + else: + new_move = move + + proc_dict = self._prepare_mto_procurement( + new_move, qty_to_procure, + mto_with_no_move_dest_id) + self.env['procurement.order'].create(proc_dict) + + if (move.state == 'confirmed' and move.location_id in + move.product_id.mrp_mts_mto_location_ids and + move.procure_method == 'make_to_stock' and + mto_with_no_move_dest_id): + qty_to_procure = production.get_mto_qty_to_procure(move) + if qty_to_procure > 0.0: + proc_dict = self._prepare_mto_procurement( + move, qty_to_procure, mto_with_no_move_dest_id) + proc_dict.pop('move_dest_id', None) + self.env['procurement.order'].create(proc_dict) return res - def _prepare_mto_procurement(self, move, qty): + def _prepare_mto_procurement(self, move, qty, mto_with_no_move_dest_id): """Prepares a procurement for a MTO product.""" origin = ((move.group_id and move.group_id.name + ":") or "") + \ ((move.name and move.name + ":") or "") + 'MTO -> Production' @@ -44,7 +81,7 @@ class MrpProduction(models.Model): route_ids = self.env.ref('stock.route_warehouse0_mto') warehouse_id = (move.warehouse_id.id or (move.picking_type_id and move.picking_type_id.warehouse_id.id or False)) - return { + vals = { 'name': move.name + ':' + str(move.id), 'origin': origin, 'company_id': move.company_id and move.company_id.id or False, @@ -53,9 +90,26 @@ class MrpProduction(models.Model): 'product_qty': qty, 'product_uom': move.product_uom.id, 'location_id': move.location_id.id, - 'move_dest_id': move.id, 'group_id': group_id, 'route_ids': [(6, 0, route_ids.ids)], 'warehouse_id': warehouse_id, 'priority': move.priority, } + if not mto_with_no_move_dest_id: + vals['move_dest_id'] = move.id + return vals + + @api.multi + def get_mto_qty_to_procure(self, move): + self.ensure_one() + stock_location_id = move.location_id.id + move_location = move.with_context(location=stock_location_id) + virtual_available = move_location.product_id.virtual_available + qty_available = move.product_id.uom_id._compute_quantity( + virtual_available, move.product_uom) + if qty_available >= 0: + return 0.0 + else: + if abs(qty_available) < move.product_uom_qty: + return abs(qty_available) + return move.product_uom_qty diff --git a/mrp_mto_with_stock/models/product_template.py b/mrp_mto_with_stock/models/product_template.py index 11099600d..a6e1142bf 100644 --- a/mrp_mto_with_stock/models/product_template.py +++ b/mrp_mto_with_stock/models/product_template.py @@ -2,7 +2,7 @@ # Copyright 2017 Eficent Business and IT Consulting Services S.L. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from openerp import fields, models +from odoo import fields, models class ProductTemplate(models.Model): diff --git a/mrp_mto_with_stock/models/stock_warehouse.py b/mrp_mto_with_stock/models/stock_warehouse.py new file mode 100644 index 000000000..75d3f30f0 --- /dev/null +++ b/mrp_mto_with_stock/models/stock_warehouse.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Akretion +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class StockWarehouse(models.Model): + _inherit = 'stock.warehouse' + + mrp_mto_mts_forecast_qty = fields.Boolean( + string="MRP MTO with forecast stock", + help="When you use Mrp_mto_with_stock, the procurement creation is " + "based on reservable stock by default. Check this option if " + "you prefer base it on the forecast stock. In this case, the " + "created procurements won't be linked to the raw material moves") diff --git a/mrp_mto_with_stock/tests/test_mrp_mto_with_stock.py b/mrp_mto_with_stock/tests/test_mrp_mto_with_stock.py index 464195aa9..c9d844cde 100644 --- a/mrp_mto_with_stock/tests/test_mrp_mto_with_stock.py +++ b/mrp_mto_with_stock/tests/test_mrp_mto_with_stock.py @@ -2,11 +2,11 @@ # Copyright 2017 Eficent Business and IT Consulting Services S.L. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from openerp.tests.common import TransactionCase -from openerp import fields +from odoo.tests.common import TransactionCase class TestMrpMtoWithStock(TransactionCase): + def setUp(self, *args, **kwargs): super(TestMrpMtoWithStock, self).setUp(*args, **kwargs) self.production_model = self.env['mrp.production'] @@ -15,55 +15,27 @@ class TestMrpMtoWithStock(TransactionCase): self.manufacture_route = self.env.ref( 'mrp.route_warehouse0_manufacture') self.uom_unit = self.env.ref('product.product_uom_unit') + self.warehouse = self.env.ref('stock.warehouse0') - self.product_fp = self.env['product.product'].create({ - 'name': 'FP', - 'type': 'product', - 'uom_id': self.uom_unit.id, - 'route_ids': [(4, self.manufacture_route.id)] - }) - self.product_c1 = self.env['product.product'].create({ - 'name': 'C1', - 'type': 'product', - 'uom_id': self.uom_unit.id, - 'route_ids': [(4, self.manufacture_route.id)] - }) - self.product_c2 = self.env['product.product'].create({ - 'name': 'C2', - 'type': 'product', - 'uom_id': self.uom_unit.id, - }) - self._update_product_qty(self.product_c2, - self.stock_location_stock, 10) + self.top_product = self.env.ref( + 'mrp_mto_with_stock.product_product_manufacture_1') + self.subproduct1 = self.env.ref( + 'mrp_mto_with_stock.product_product_manufacture_1_1') + self.subproduct2 = self.env.ref( + 'mrp_mto_with_stock.product_product_manufacture_1_2') + self.subproduct_1_1 = self.env.ref( + 'mrp_mto_with_stock.product_product_manufacture_1_1_1') - self.bom_fp = self.env['mrp.bom'].create({ - 'product_id': self.product_fp.id, - 'product_tmpl_id': self.product_fp.product_tmpl_id.id, - 'bom_line_ids': ([ - (0, 0, { - 'product_id': self.product_c1.id, - 'product_qty': 1, - 'product_uom': self.uom_unit.id - }), - (0, 0, { - 'product_id': self.product_c2.id, - 'product_qty': 1, - 'product_uom': self.uom_unit.id - }), - ]) - }) + self.main_bom = self.env.ref( + 'mrp_mto_with_stock.mrp_bom_manuf_1') - self.bom_c1 = self.env['mrp.bom'].create({ - 'product_id': self.product_c1.id, - 'product_tmpl_id': self.product_c1.product_tmpl_id.id, - 'bom_line_ids': ([(0, 0, { - 'product_id': self.product_c2.id, - 'product_qty': 1, - 'product_uom': self.uom_unit.id - })]) - }) - self.product_c1.mrp_mts_mto_location_ids = [ - (6, 0, [self.stock_location_stock.id])] + def _get_production_vals(self): + return { + 'product_id': self.top_product.id, + 'product_qty': 1, + 'product_uom_id': self.uom_unit.id, + 'bom_id': self.main_bom.id, + } def _update_product_qty(self, product, location, quantity): """Update Product quantity.""" @@ -75,65 +47,112 @@ class TestMrpMtoWithStock(TransactionCase): product_qty.change_product_qty() return product_qty - def create_procurement(self, name, product): - values = { - 'name': name, - 'date_planned': fields.Datetime.now(), - 'product_id': product.id, - 'product_qty': 4.0, - 'product_uom': product.uom_id.id, - 'warehouse_id': self.env.ref('stock.warehouse0').id, - 'location_id': self.stock_location_stock.id, - 'route_ids': [ - (4, self.env.ref('mrp.route_warehouse0_manufacture').id, 0)], - } - return self.env['procurement.order'].create(values) + def test_manufacture_with_forecast_stock(self): + """ + Test Manufacture mto with stock based on forecast quantity + and no link between sub assemblies MO's and Main MO raw material + """ - def test_manufacture(self): + self.warehouse.mrp_mto_mts_forecast_qty = True - procurement_fp = self.create_procurement('TEST/01', self.product_fp) - production_fp = procurement_fp.production_id - self.assertEqual(production_fp.state, 'confirmed') + self._update_product_qty(self.subproduct1, self.stock_location_stock, + 2) + self._update_product_qty(self.subproduct2, self.stock_location_stock, + 4) - production_fp.action_assign() - self.assertEqual(production_fp.state, 'confirmed') + self.production = self.production_model.create( + self._get_production_vals()) - procurement_c1 = self.env['procurement.order'].search( - [('product_id', '=', self.product_c1.id), - ('move_dest_id', 'in', production_fp.move_lines.ids)], limit=1) - self.assertEquals(len(procurement_c1), 1) + # Create MO and check it create sub assemblie MO. + self.production.action_assign() - procurement_c2 = self.env['procurement.order'].search( - [('product_id', '=', self.product_c2.id), - ('move_dest_id', 'in', production_fp.move_lines.ids)], limit=1) - self.assertEquals(len(procurement_c2), 0) + self.assertEqual(self.production.availability, 'partially_available') - procurement_c1.run() - production_c1 = procurement_c1.production_id - self.assertEqual(production_c1.state, 'confirmed') + self.assertEquals(self.subproduct1.virtual_available, 0) - production_c1.action_assign() - self.assertEqual(production_c1.state, 'ready') + procurement_subproduct1 = self.env['procurement.order'].search( + [('product_id', '=', self.subproduct1.id), + ('group_id', '=', self.production.procurement_group_id.id)]) - procurement_c2 = self.env['procurement.order'].search( - [('product_id', '=', self.product_c2.id), - ('move_dest_id', 'in', production_c1.move_lines.ids)], limit=1) - self.assertEquals(len(procurement_c2), 0) + self.assertEquals(len(procurement_subproduct1), 1) + self.assertEquals(procurement_subproduct1.product_qty, 3) - wizard = self.env['mrp.product.produce'].create({ - 'product_id': self.product_c1.id, - 'product_qty': 1, - }) - self.env['mrp.production'].action_produce( - production_c1.id, 1, 'consume_produce', wizard) - production_c1.refresh() - self.assertEqual(production_fp.state, 'confirmed') + production_sub1 = procurement_subproduct1.production_id + self.assertEqual(production_sub1.state, 'confirmed') + self.assertEqual(production_sub1.product_qty, 3) - wizard = self.env['mrp.product.produce'].create({ - 'product_id': self.product_c1.id, - 'product_qty': 3, - }) - self.env['mrp.production'].action_produce( - production_c1.id, 3, 'consume_produce', wizard) - production_c1.refresh() - self.assertEqual(production_fp.state, 'ready') + self._update_product_qty(self.subproduct1, self.stock_location_stock, + 7) + + # Create second MO and check it does not create procurement + self.production2 = self.production_model.create( + self._get_production_vals()) + self.production2.action_assign() + procurement_subproduct1_2 = self.env['procurement.order'].search( + [('product_id', '=', self.subproduct1.id), + ('group_id', '=', self.production2.procurement_group_id.id)]) + self.assertEquals(len(procurement_subproduct1_2), 0) + self.assertEquals(self.production2.availability, 'assigned') + self.production2.do_unreserve() + + self.assertEquals(self.subproduct1.virtual_available, 0) + + self.production.action_assign() + # We check if first MO is able to assign it self even if it has + # previously generate procurements, it would not be the case in the + # other mode (without mrp_mto_mts_reservable_stock on warehouse) + self.assertEquals(self.production.availability, 'assigned') + + self.assertEquals(self.subproduct1.virtual_available, 0) + + def test_manufacture_with_reservable_stock(self): + """ + Test Manufacture mto with stock based on reservable stock + and there is a link between sub assemblies MO's and Main MO raw + materi al + """ + + self._update_product_qty(self.subproduct1, self.stock_location_stock, + 2) + self._update_product_qty(self.subproduct2, self.stock_location_stock, + 4) + + self.production = self.production_model.create( + self._get_production_vals()) + + self._update_product_qty(self.subproduct_1_1, + self.stock_location_stock, 50) + + # Create MO and check it create sub assemblie MO. + self.production.action_assign() + self.assertEqual(self.production.state, 'confirmed') + + procurement_sub1 = self.env['procurement.order'].search( + [('product_id', '=', self.subproduct1.id), + ('move_dest_id', 'in', self.production.move_raw_ids.ids)]) + self.assertEquals(len(procurement_sub1), 1) + + procurement_sub2 = self.env['procurement.order'].search( + [('product_id', '=', self.subproduct2.id), + ('move_dest_id', 'in', self.production.move_raw_ids.ids)]) + self.assertEquals(len(procurement_sub2), 0) + + production_sub1 = procurement_sub1.production_id + self.assertEqual(production_sub1.product_qty, 3) + production_sub1.action_assign() + self.assertEqual(production_sub1.availability, 'assigned') + + wizard_obj = self.env['mrp.product.produce'] + default_fields = ['lot_id', 'product_id', 'product_uom_id', + 'product_tracking', 'consume_line_ids', + 'production_id', 'product_qty', 'serial'] + wizard_vals = wizard_obj.with_context(active_id=production_sub1.id).\ + default_get(default_fields) + + wizard = wizard_obj.create(wizard_vals) + wizard.do_produce() + self.assertTrue(production_sub1.check_to_done) + self.assertEquals(self.subproduct1.qty_available, 2) + production_sub1.button_mark_done() + self.assertEquals(self.subproduct1.qty_available, 5) + self.assertEqual(self.production.availability, 'assigned') diff --git a/mrp_mto_with_stock/views/stock_warehouse.xml b/mrp_mto_with_stock/views/stock_warehouse.xml new file mode 100644 index 000000000..68a4266ce --- /dev/null +++ b/mrp_mto_with_stock/views/stock_warehouse.xml @@ -0,0 +1,17 @@ + + + + + + + stock.warehouse + + + + + + + + +