From e5601f8c9b578f0a67542a3919fec979083947ee Mon Sep 17 00:00:00 2001 From: lreficent Date: Tue, 13 Jun 2017 13:56:21 +0200 Subject: [PATCH 01/18] mrp_production_request --- mrp_production_request/README.rst | 95 ++++++++ mrp_production_request/__init__.py | 6 + mrp_production_request/__openerp__.py | 28 +++ .../data/mrp_production_request_sequence.xml | 15 ++ mrp_production_request/models/__init__.py | 9 + .../models/mrp_production.py | 13 + .../models/mrp_production_request.py | 202 ++++++++++++++++ mrp_production_request/models/procurement.py | 51 ++++ mrp_production_request/models/product.py | 14 ++ mrp_production_request/models/stock_move.py | 18 ++ .../security/ir.model.access.csv | 3 + .../mrp_production_request_security.xml | 63 +++++ .../static/description/icon.png | Bin 0 -> 9455 bytes .../views/mrp_production_request_view.xml | 223 ++++++++++++++++++ .../views/mrp_production_view.xml | 18 ++ .../views/procurement_order_view.xml | 17 ++ .../views/product_template_view.xml | 18 ++ mrp_production_request/wizards/__init__.py | 5 + .../mrp_production_request_create_mo.py | 148 ++++++++++++ .../mrp_production_request_create_mo_view.xml | 59 +++++ 20 files changed, 1005 insertions(+) create mode 100644 mrp_production_request/README.rst create mode 100644 mrp_production_request/__init__.py create mode 100644 mrp_production_request/__openerp__.py create mode 100644 mrp_production_request/data/mrp_production_request_sequence.xml create mode 100644 mrp_production_request/models/__init__.py create mode 100644 mrp_production_request/models/mrp_production.py create mode 100644 mrp_production_request/models/mrp_production_request.py create mode 100644 mrp_production_request/models/procurement.py create mode 100644 mrp_production_request/models/product.py create mode 100644 mrp_production_request/models/stock_move.py create mode 100644 mrp_production_request/security/ir.model.access.csv create mode 100644 mrp_production_request/security/mrp_production_request_security.xml create mode 100644 mrp_production_request/static/description/icon.png create mode 100644 mrp_production_request/views/mrp_production_request_view.xml create mode 100644 mrp_production_request/views/mrp_production_view.xml create mode 100644 mrp_production_request/views/procurement_order_view.xml create mode 100644 mrp_production_request/views/product_template_view.xml create mode 100644 mrp_production_request/wizards/__init__.py create mode 100644 mrp_production_request/wizards/mrp_production_request_create_mo.py create mode 100644 mrp_production_request/wizards/mrp_production_request_create_mo_view.xml diff --git a/mrp_production_request/README.rst b/mrp_production_request/README.rst new file mode 100644 index 00000000000..3699ced9d18 --- /dev/null +++ b/mrp_production_request/README.rst @@ -0,0 +1,95 @@ +.. 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 Production Request +====================== + +This module extends the functionality of Manufacturing to allow you to use +Manufacturing Request (MR) as a previous step to Manufacturing Orders (MO). + +Configuration +============= + +To configure this module to automatically generate Manufacturing Requests +from procurement orders instead of directly create manufacturing orders yo +need to: + +#. Go to the products that you want them to trigger manufacturing orders. +#. Go to the *Inventory* tab. +#. Check the route *manufacture* and the box *Manufacturing Request*. + +Usage +===== + +To use this module, you need to: + +#. Go to *Manufacturing > Manufacturing Requests*. +#. Create a manufacturing request or open a existing one (assigned to you or + created from a procurement). +#. If you click on *Request approval* button the user assigned as approver + will added to the thread. +#. If you are the approver you can either click on *Approve* or *Reject* + buttons. +#. Rejecting a MR will cancel associated procurements and propagate this + cancellation. +#. Approving a MR will allow to create manufacturing orders. +#. You can manually set to done a request by clicking in the button *Done*. + +To create MOs from MRs you have to: + +#. Go to approved manufacturing request. +#. Click on the button *Create Manufacturing Order*. +#. In the opened wizard, click on *Compute lines* so you will have a + quantity proposed for creating a MO. This quantity is the maximum quantity + you can produce with the current stock available in the source location. +#. Use the proposed quantity or change it and click on *Create MO* at the + bottom of the wizard. + +.. 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 + +Known issues / Roadmap +====================== + +* Take into account workstations. +* Take into account consumable products. + +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 +------------ + +* Lois Rilo Antelo +* Jordi Ballester + +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_request/__init__.py b/mrp_production_request/__init__.py new file mode 100644 index 00000000000..64f004b8901 --- /dev/null +++ b/mrp_production_request/__init__.py @@ -0,0 +1,6 @@ +# -*- 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 models +from . import wizards diff --git a/mrp_production_request/__openerp__.py b/mrp_production_request/__openerp__.py new file mode 100644 index 00000000000..1b6bfc20d28 --- /dev/null +++ b/mrp_production_request/__openerp__.py @@ -0,0 +1,28 @@ +# -*- 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). +{ + "name": "MRP Request", + "summary": "Allows you to use Manufacturing Request as a previous " + "step to Manufacturing Orders for better manufacture " + "planification.", + "version": "9.0.1.0.0", + "category": "Manufacturing", + "website": "https://github.com/OCA/manufacture", + "author": "Eficent," + "Odoo Community Association (OCA)", + "license": "AGPL-3", + "application": False, + "installable": True, + "depends": ["mrp", "stock_available_unreserved"], + "data": [ + "security/mrp_production_request_security.xml", + "security/ir.model.access.csv", + "data/mrp_production_request_sequence.xml", + "wizards/mrp_production_request_create_mo_view.xml", + "views/mrp_production_request_view.xml", + "views/product_template_view.xml", + "views/procurement_order_view.xml", + "views/mrp_production_view.xml", + ], +} diff --git a/mrp_production_request/data/mrp_production_request_sequence.xml b/mrp_production_request/data/mrp_production_request_sequence.xml new file mode 100644 index 00000000000..9833e2c9286 --- /dev/null +++ b/mrp_production_request/data/mrp_production_request_sequence.xml @@ -0,0 +1,15 @@ + + + + + + + Manufacturing Request + mrp.production.request + MR/%(range_year)s/ + 5 + + + + diff --git a/mrp_production_request/models/__init__.py b/mrp_production_request/models/__init__.py new file mode 100644 index 00000000000..79a8a751eb5 --- /dev/null +++ b/mrp_production_request/models/__init__.py @@ -0,0 +1,9 @@ +# -*- 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 mrp_production_request +from . import mrp_production +from . import procurement +from . import product +from . import stock_move diff --git a/mrp_production_request/models/mrp_production.py b/mrp_production_request/models/mrp_production.py new file mode 100644 index 00000000000..5591a014354 --- /dev/null +++ b/mrp_production_request/models/mrp_production.py @@ -0,0 +1,13 @@ +# -*- 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 MrpProduction(models.Model): + _inherit = "mrp.production" + + mrp_production_request_id = fields.Many2one( + comodel_name="mrp.production.request", + string="Manufacturing Request", copy=False, readonly=True) diff --git a/mrp_production_request/models/mrp_production_request.py b/mrp_production_request/models/mrp_production_request.py new file mode 100644 index 00000000000..f8fbae4e15d --- /dev/null +++ b/mrp_production_request/models/mrp_production_request.py @@ -0,0 +1,202 @@ +# -*- 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 api, fields, models, _ +import openerp.addons.decimal_precision as dp +from openerp.exceptions import UserError + + +class MrpProductionRequest(models.Model): + _name = "mrp.production.request" + _description = "Manufacturing Request" + _inherit = "mail.thread" + + @api.model + def _company_get(self): + company_id = self.env['res.company']._company_default_get(self._name) + return self.env['res.company'].browse(company_id.id) + + @api.model + def _get_default_requested_by(self): + return self.env.user + + @api.model + def create(self, vals): + """Add sequence if name is not defined and subscribe to the thread + the user assigned to the request.""" + if not vals.get('name') or vals.get('name') == '/': + vals['name'] = self.env['ir.sequence'].next_by_code( + 'mrp.production.request') or '/' + res = super(MrpProductionRequest, self).create(vals) + if vals.get('assigned_to'): + res.message_subscribe_users(user_ids=[res.assigned_to.id]) + return res + + @api.multi + def write(self, vals): + res = super(MrpProductionRequest, self).write(vals) + for request in self: + if vals.get('assigned_to'): + self.message_subscribe_users(user_ids=[request.assigned_to.id]) + return res + + @api.onchange('product_id') + def _onchange_product_uom(self): + self.product_uom = self.product_id.uom_id + self.bom_id = self.env['mrp.bom']._bom_find( + product_id=self.product_id.id, properties=[]) + + @api.model + def _get_mo_valid_states(self): + return ['draft', 'confirmed', 'ready', 'in_production', 'done'] + + @api.one + @api.depends('mrp_production_ids', 'mrp_production_ids.state', 'state') + def _compute_manufactured_qty(self): + valid_states = self._get_mo_valid_states() + valid_mo = self.mrp_production_ids.filtered( + lambda mo: mo.state in valid_states).mapped('product_qty') + self.manufactured_qty = sum(valid_mo) + self.pending_qty = max(self.product_qty - self.manufactured_qty, 0.0) + + name = fields.Char( + default="/", required=True, + readonly=True, states={'draft': [('readonly', False)]}) + origin = fields.Char( + string='Source Document', + readonly=True, states={'draft': [('readonly', False)]}) + requested_by = fields.Many2one( + comodel_name='res.users', string='Requested by', + default=_get_default_requested_by, + required=True, track_visibility='onchange', + readonly=True, states={'draft': [('readonly', False)]}) + assigned_to = fields.Many2one( + comodel_name='res.users', string='Approver', + track_visibility='onchange', + readonly=True, states={'draft': [('readonly', False)]}) + description = fields.Text('Description') + date_planned = fields.Date( + string='Planned Date', required=True, track_visibility='onchange', + default=fields.Date.context_today) + company_id = fields.Many2one( + comodel_name='res.company', string='Company', + required=True, default=_company_get) + mrp_production_ids = fields.One2many( + comodel_name="mrp.production", string="Manufacturing Orders", + inverse_name="mrp_production_request_id") + state = fields.Selection( + selection=[("draft", "Draft"), + ("to_approve", "To Be Approved"), + ("approved", "Approved"), + ("done", "Done"), + ("cancel", "Cancelled")], + index=True, track_visibility='onchange', + required=True, copy=False, default='draft') + procurement_id = fields.Many2one( + comodel_name="procurement.order", string="Procurement Order", + readonly=True) + procurement_state = fields.Selection( + related='procurement_id.state', + store=True, readonly=True, string="Procurement State") + product_id = fields.Many2one( + comodel_name="product.product", string="Product", required=True, + domain=[('type', 'in', ['product', 'consu'])], + track_visibility="onchange", + readonly=True, states={'draft': [('readonly', False)]}) + product_tmpl_id = fields.Many2one( + comodel_name='product.template', string='Product Template', + related='product_id.product_tmpl_id') + product_qty = fields.Float( + required=True, track_visibility='onchange', + digits_compute=dp.get_precision('Product Unit of Measure'), + readonly=True, states={'draft': [('readonly', False)]}) + product_uom = fields.Many2one( + comodel_name='product.uom', string='Unit of Measure', + readonly=True, states={'draft': [('readonly', False)]}, + domain="[('category_id', '=', category_uom_id)]") + category_uom_id = fields.Many2one(related="product_uom.category_id") + manufactured_qty = fields.Float( + string="Quantity in Manufacturing Orders", + compute=_compute_manufactured_qty, store=True, + digits_compute=dp.get_precision('Product Unit of Measure'), + readonly=True) + pending_qty = fields.Float( + string="Pending Quantity", compute=_compute_manufactured_qty, + store=True, digits_compute=dp.get_precision('Product Unit of Measure'), + readonly=True) + bom_id = fields.Many2one( + comodel_name="mrp.bom", string="Bill of Materials", required=True, + readonly=True, states={'draft': [('readonly', False)]}) + routing_id = fields.Many2one( + comodel_name='mrp.routing', string='Routing', + on_delete='setnull', readonly=True, + states={'draft': [('readonly', False)]}, + help="The list of operations (list of work centers) to produce " + "the finished product. The routing is mainly used to compute " + "work center costs during operations and to plan future loads " + "on work centers based on production plannification.") + location_src_id = fields.Many2one( + comodel_name='stock.location', string='Raw Materials Location', + default=lambda self: self.env['stock.location'].browse( + self.env['mrp.production']._src_id_default()), + required=True, readonly=True, states={'draft': [('readonly', False)]}) + location_dest_id = fields.Many2one( + comodel_name='stock.location', string='Finished Products Location', + default=lambda self: self.env['stock.location'].browse( + self.env['mrp.production']._dest_id_default()), + required=True, readonly=True, states={'draft': [('readonly', False)]}) + + @api.multi + def button_to_approve(self): + self.write({'state': 'to_approve'}) + return True + + @api.multi + def button_approved(self): + self.write({'state': 'approved'}) + return True + + @api.multi + def button_done(self): + self.write({'state': 'done'}) + return True + + @api.multi + def _check_reset_allowed(self): + if any([s in ['done', 'cancel'] for s in self.mapped( + 'procurement_id.state')]): + raise UserError( + _('You cannot reset a manufacturing request related to ' + 'done or cancelled procurement orders.')) + + @api.multi + def button_draft(self): + self._check_reset_allowed() + self.write({'state': 'draft'}) + return True + + @api.multi + def _check_cancel_allowed(self): + if any([s == 'done' for s in self.mapped( + 'procurement_id.state')]): + raise UserError( + _('You cannot reject a manufacturing request related to ' + 'done procurement orders.')) + + @api.multi + def button_cancel(self): + self._check_cancel_allowed() + self.write({'state': 'cancel'}) + self.mapped('procurement_id').with_context( + from_mrp_production_request=True).cancel() + if not self.env.context.get('cancel_procurement'): + procurements = self.mapped('procurement_id') + procurements.filtered(lambda r: r.state not in ( + 'cancel', 'exception') and not r.rule_id.propagate).write( + {'state': 'exception'}) + moves = procurements.filtered( + lambda r: r.rule_id.propagate).mapped( + 'move_dest_id') + moves.filtered(lambda r: r.state != 'cancel').action_cancel() + return True diff --git a/mrp_production_request/models/procurement.py b/mrp_production_request/models/procurement.py new file mode 100644 index 00000000000..4af6a3f90f5 --- /dev/null +++ b/mrp_production_request/models/procurement.py @@ -0,0 +1,51 @@ +# -*- 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 api, fields, models, _ + + +class ProcurementOrder(models.Model): + _inherit = "procurement.order" + + mrp_production_request_id = fields.Many2one( + comodel_name="mrp.production.request", string="Manufacturing Request", + copy=False) + + @api.model + def _prepare_mrp_production_request(self, procurement): + data = self._prepare_mo_vals(procurement) + data['procurement_id'] = procurement.id + data['state'] = 'to_approve' + return data + + @api.model + def _run(self, procurement): + if (procurement.rule_id and + procurement.rule_id.action == 'manufacture' and + procurement.product_id.mrp_production_request): + if not self.mrp_production_request_id: + request_data = self._prepare_mrp_production_request( + procurement) + req = self.env['mrp.production.request'].create(request_data) + procurement.message_post(body=_( + "Manufacturing Request created")) + procurement.mrp_production_request_id = req.id + return True + return super(ProcurementOrder, self)._run(procurement) + + @api.multi + def propagate_cancels(self): + result = super(ProcurementOrder, self).propagate_cancels() + for procurement in self: + mrp_production_requests = \ + self.env['mrp.production.request'].search([ + ('procurement_id', '=', procurement.id)]) + if mrp_production_requests and not self.env.context.get( + 'from_mrp_production_request'): + mrp_production_requests.button_cancel() + for mr in mrp_production_requests: + mr.message_post( + body=_("Related procurement has been cancelled.")) + procurement.write({'mrp_production_request_id': None}) + return result diff --git a/mrp_production_request/models/product.py b/mrp_production_request/models/product.py new file mode 100644 index 00000000000..5b3be1970fc --- /dev/null +++ b/mrp_production_request/models/product.py @@ -0,0 +1,14 @@ +# -*- 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_production_request = fields.Boolean( + string='Manufacturing Request', help="Check this box to generate " + "manufacturing request instead of generating requests manufacturing " + "orders from procurement.", default=False) diff --git a/mrp_production_request/models/stock_move.py b/mrp_production_request/models/stock_move.py new file mode 100644 index 00000000000..093a928dd0c --- /dev/null +++ b/mrp_production_request/models/stock_move.py @@ -0,0 +1,18 @@ +# -*- 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 api, models + + +class StockMove(models.Model): + _inherit = "stock.move" + + @api.model + def create(self, vals): + if 'production_id' in vals: + production = self.env['mrp.production'].browse( + vals['production_id']) + if production.mrp_production_request_id: + vals['propagate'] = False + return super(StockMove, self).create(vals) diff --git a/mrp_production_request/security/ir.model.access.csv b/mrp_production_request/security/ir.model.access.csv new file mode 100644 index 00000000000..fe6436e96c0 --- /dev/null +++ b/mrp_production_request/security/ir.model.access.csv @@ -0,0 +1,3 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_mrp_production_request_user,mrp.request.user,model_mrp_production_request,group_mrp_production_request_user,1,1,1,1 +access_mrp_production_request_manager,mrp.request.manager,model_mrp_production_request,group_mrp_production_request_manager,1,1,1,1 diff --git a/mrp_production_request/security/mrp_production_request_security.xml b/mrp_production_request/security/mrp_production_request_security.xml new file mode 100644 index 00000000000..1582ade396b --- /dev/null +++ b/mrp_production_request/security/mrp_production_request_security.xml @@ -0,0 +1,63 @@ + + + + + + + + Manufacturing Request + + 20 + + + + User + + + + + + Manager + + + + + + + + + + Manufacturing Request multi-company + + + ['|',('company_id','=',False), + ('company_id','child_of',[user.company_id.id])] + + + + Follow Manufacturing Request + + + + + + + ['|',('requested_by','=',user.id), + ('message_partner_ids', 'in', [user.partner_id.id])] + + + + Manufacturing Request User + + + + + + + [('requested_by','=',user.id)] + + + + diff --git a/mrp_production_request/static/description/icon.png b/mrp_production_request/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 diff --git a/mrp_production_request/views/mrp_production_request_view.xml b/mrp_production_request/views/mrp_production_request_view.xml new file mode 100644 index 00000000000..1bc56716bb9 --- /dev/null +++ b/mrp_production_request/views/mrp_production_request_view.xml @@ -0,0 +1,223 @@ + + + + + + mrp.production.request.form + mrp.production.request + +
+
+
+ + +
+ + +
+
+ + + + + mrp.production.request.tree + mrp.production.request + + + + + + + + + + + + + + + + + + mrp.production.request.search + mrp.production.request + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Manufacturing Requests + ir.actions.act_window + mrp.production.request + form + tree,form + {"search_default_pending":1} + +

+ Click to start a new purchase request process. +

+ A Manufacturing Request is an instruction to production to produce + a certain quantity of a given product. +

+ + + + + + + + Refresh Quantities + True + ir.actions.server + + code + self._compute_manufactured_qty(cr, uid, context.get('active_ids', []), context=context) + + + + Compute Quantities + + + action + + mrp.production.request + client_action_multi + + + diff --git a/mrp_production_request/views/mrp_production_view.xml b/mrp_production_request/views/mrp_production_view.xml new file mode 100644 index 00000000000..3a083d6026c --- /dev/null +++ b/mrp_production_request/views/mrp_production_view.xml @@ -0,0 +1,18 @@ + + + + + + mrp.production.form - mrp_production_request + mrp.production + + + + + + + + + diff --git a/mrp_production_request/views/procurement_order_view.xml b/mrp_production_request/views/procurement_order_view.xml new file mode 100644 index 00000000000..3ef2859c169 --- /dev/null +++ b/mrp_production_request/views/procurement_order_view.xml @@ -0,0 +1,17 @@ + + + + + + procurement.order.form - mrp_production_request + procurement.order + + + + + + + + + diff --git a/mrp_production_request/views/product_template_view.xml b/mrp_production_request/views/product_template_view.xml new file mode 100644 index 00000000000..417c7f8fc83 --- /dev/null +++ b/mrp_production_request/views/product_template_view.xml @@ -0,0 +1,18 @@ + + + + + + product.template.form - mrp_production_request + product.template + + + + + + + + + diff --git a/mrp_production_request/wizards/__init__.py b/mrp_production_request/wizards/__init__.py new file mode 100644 index 00000000000..3646876129f --- /dev/null +++ b/mrp_production_request/wizards/__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 mrp_production_request_create_mo diff --git a/mrp_production_request/wizards/mrp_production_request_create_mo.py b/mrp_production_request/wizards/mrp_production_request_create_mo.py new file mode 100644 index 00000000000..42ee1cfded5 --- /dev/null +++ b/mrp_production_request/wizards/mrp_production_request_create_mo.py @@ -0,0 +1,148 @@ +# -*- 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 api, fields, models, _ +import openerp.addons.decimal_precision as dp +from openerp.exceptions import UserError + + +class MrpProductionRequestCreateMo(models.TransientModel): + _name = "mrp.production.request.create.mo" + _description = "Wizard to create Manufacturing Orders" + + @api.multi + def compute_product_line_ids(self): + self.product_line_ids.unlink() + res = self._prepare_lines() + product_lines = res[0] + # workcenter_lines = res[1] # TODO: expand with workcenter_lines + for line in product_lines: + self.env['mrp.production.request.create.mo.line'].create( + self._prepare_product_line(line)) + # reset workcenter_lines in production order + # for line in workcenter_lines: + # line['production_id'] = production.id + # workcenter_line_obj.create(cr, uid, line, context) + self._get_mo_qty() + return {"type": "ir.actions.do_nothing"} + + def _prepare_lines(self): + """Get the components (product_lines) and Work Centers Utilisation + (workcenter_lines) needed for manufacturing the given a BoM. + :return: product_lines, workcenter_lines + """ + bom_obj = self.env['mrp.bom'] + uom_obj = self.env['product.uom'] + bom_point = self.bom_id + if not bom_point: + raise UserError(_("Manufacture Request does not have a Bill of " + "Materials defined.")) + factor = uom_obj._compute_qty( + self.mrp_production_request_id.product_uom.id, self.pending_qty, + bom_point.product_uom.id) + return bom_obj._bom_explode( + bom_point, self.mrp_production_request_id.product_id, + factor / bom_point.product_qty, + routing_id=self.mrp_production_request_id.routing_id.id) + + @api.one + def _get_mo_qty(self): + """Propose a qty to create a MO available to produce.""" + bottle_neck = min(self.product_line_ids.mapped('bottle_neck_factor')) + bottle_neck = max(min(1, bottle_neck), 0) + self.mo_qty = self.pending_qty * bottle_neck + + mrp_production_request_id = fields.Many2one( + comodel_name="mrp.production.request", readonly=True) + bom_id = fields.Many2one( + related='mrp_production_request_id.bom_id', readonly=True) + mo_qty = fields.Float( + string="Quantity", + digits_compute=dp.get_precision("Product Unit of Measure")) + pending_qty = fields.Float( + related="mrp_production_request_id.pending_qty", + digits_compute=dp.get_precision("Product Unit of Measure")) + product_uom = fields.Many2one( + related="mrp_production_request_id.product_uom") + product_line_ids = fields.One2many( + comodel_name="mrp.production.request.create.mo.line", + string="Products needed", + inverse_name="mrp_production_request_create_mo_id", readonly=True) + + def _prepare_product_line(self, pl): + return { + 'product_id': pl['product_id'], + 'product_qty': pl['product_qty'], + 'product_uom': pl['product_uom'], + 'mrp_production_request_create_mo_id': self.id, + 'location_id': self.mrp_production_request_id.location_src_id.id, + } + + @api.multi + def _prepare_manufacturing_order(self): + self.ensure_one() + request_id = self.mrp_production_request_id + return { + 'product_id': request_id.product_id.id, + 'bom_id': request_id.bom_id.id, + 'product_qty': self.mo_qty, + 'product_uom': self.product_uom.id, + 'mrp_production_request_id': self.mrp_production_request_id.id, + 'origin': request_id.origin, + 'location_src_id': request_id.location_src_id.id, + 'location_dest_id': request_id.location_dest_id.id, + 'routing_id': request_id.routing_id.id, + 'move_prod_id': request_id.procurement_id.move_dest_id.id or False, + 'date_planned': request_id.date_planned, + 'company_id': request_id.company_id.id, + } + + @api.multi + def create_mo(self): + self.ensure_one() + vals = self._prepare_manufacturing_order() + mo = self.env['mrp.production'].create(vals) + # Open resulting MO: + action = self.env.ref('mrp.mrp_production_action').read()[0] + res = self.env.ref('mrp.mrp_production_form_view') + action.update({ + 'res_id': mo and mo.id, + 'views': [(res and res.id or False, 'form')], + }) + return action + + +class MrpProductionRequestCreateMoLine(models.TransientModel): + _name = "mrp.production.request.create.mo.line" + + @api.one + def _compute_available_qty(self): + product_available = self.product_id.with_context( + location=self.location_id.id)._product_available()[ + self.product_id.id]['qty_available_not_res'] + res = self.product_uom._compute_qty( + self.product_id.product_tmpl_id.uom_id.id, product_available, + self.product_uom.id) + self.available_qty = res + + @api.one + def _compute_bottle_neck_factor(self): + if self.product_qty: + self.bottle_neck_factor = self.available_qty / self.product_qty + + product_id = fields.Many2one( + comodel_name='product.product', string='Product', required=True) + product_qty = fields.Float( + string='Quantity Required', required=True, + digits_compute=dp.get_precision('Product Unit of Measure')) + product_uom = fields.Many2one( + comodel_name='product.uom', string='UoM', required=True) + mrp_production_request_create_mo_id = fields.Many2one( + comodel_name='mrp.production.request.create.mo') + available_qty = fields.Float( + string='Quantity Available', compute=_compute_available_qty, + digits_compute=dp.get_precision('Product Unit of Measure')) + bottle_neck_factor = fields.Float(compute=_compute_bottle_neck_factor) + location_id = fields.Many2one(comodel_name='stock.location', + required=True) diff --git a/mrp_production_request/wizards/mrp_production_request_create_mo_view.xml b/mrp_production_request/wizards/mrp_production_request_create_mo_view.xml new file mode 100644 index 00000000000..9808a4bdb1e --- /dev/null +++ b/mrp_production_request/wizards/mrp_production_request_create_mo_view.xml @@ -0,0 +1,59 @@ + + + + + + mrp.production.request.create.mo.form + mrp.production.request.create.mo + +
+ + + + +