From c660770ebd84c2c0d9e56ca5897effc6c138b827 Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Tue, 21 Apr 2020 10:10:45 +0200 Subject: [PATCH 01/28] [REF] mrp: remove routing model Set the operations directly on the Bill of Material. Duplicate the demo data where a routing was shared. Adapt the tests. Remove the following feature: - set the same routing on parent and kit child bom - when planning, if the component of the kit have the same operation than a component of the parent bom, merge these operations task-2241471 --- addons/mrp/data/mrp_data.xml | 9 - addons/mrp/data/mrp_demo.xml | 159 +++++------ addons/mrp/models/mrp_bom.py | 52 ++-- addons/mrp/models/mrp_production.py | 59 ++-- addons/mrp/models/mrp_routing.py | 35 +-- addons/mrp/models/stock_move.py | 22 +- addons/mrp/report/mrp_report_bom_structure.py | 12 +- addons/mrp/security/ir.model.access.csv | 2 - addons/mrp/security/mrp_security.xml | 6 - addons/mrp/tests/common.py | 42 +-- addons/mrp/tests/test_bom.py | 69 +++-- addons/mrp/tests/test_cancel_mo.py | 6 +- addons/mrp/tests/test_multicompany.py | 19 -- addons/mrp/tests/test_order.py | 16 -- addons/mrp/tests/test_procurement.py | 10 +- addons/mrp/tests/test_stock.py | 11 +- addons/mrp/tests/test_workorder_operation.py | 267 ++++++++++-------- addons/mrp/views/mrp_bom_views.xml | 29 +- addons/mrp/views/mrp_production_views.xml | 34 +-- addons/mrp/views/mrp_routing_views.xml | 114 -------- addons/mrp/views/mrp_workcenter_views.xml | 2 +- addons/mrp/views/mrp_workorder_views.xml | 2 +- .../mrp/views/res_config_settings_views.xml | 5 +- addons/mrp/views/stock_move_views.xml | 4 +- addons/mrp/wizard/change_production_qty.py | 2 +- addons/mrp_account/models/product.py | 2 +- addons/mrp_account/tests/test_bom_price.py | 90 +++--- addons/mrp_account/tests/test_mrp_account.py | 1 - .../tests/test_stock_landed_costs_mrp.py | 4 - .../tests/test_mrp_product_expiry.py | 26 +- 30 files changed, 491 insertions(+), 620 deletions(-) diff --git a/addons/mrp/data/mrp_data.xml b/addons/mrp/data/mrp_data.xml index 64041d0b39b..c41f0576a30 100644 --- a/addons/mrp/data/mrp_data.xml +++ b/addons/mrp/data/mrp_data.xml @@ -2,15 +2,6 @@ - - Routing - mrp.routing - RO/ - 5 - 1 - 1 - - - - - Primary Assembly - - - - Secondary Assembly - - - - Manual Component's Assembly - - - - Assemble Furniture - - - - - - - - - Manual Assembly - 60 - 5 - - - - - - - Long time assembly - 180 - 15 - - - - - - - Testing - 60 - 10 - - - - - - - Packing - 30 - 5 - - - - - - - 120 - 5 - Manual Assembly - - - - - - - 120 - 10 - Assembly - - - @@ -114,7 +37,14 @@ 1 - + + + + + Manual Assembly + 60 + 5 + @@ -296,7 +226,14 @@ 3 flexible - + + + + + 120 + 10 + Assembly + @@ -350,8 +287,16 @@ 1 - + + + + Manual Assembly + 60 + 5 + + + 2 @@ -371,7 +316,32 @@ 1 - + + + + + Long time assembly + 180 + 15 + + + + + + + Testing + 60 + 10 + + + + + + + Packing + 30 + 5 + @@ -596,9 +566,34 @@ 2 - SEC-ASSEM + + + + Long time assembly + 180 + 15 + + + + + + + Testing + 60 + 10 + + + + + + + Packing + 30 + 5 + + 1 diff --git a/addons/mrp/models/mrp_bom.py b/addons/mrp/models/mrp_bom.py index 362b63e5ee8..127f07af4b4 100644 --- a/addons/mrp/models/mrp_bom.py +++ b/addons/mrp/models/mrp_bom.py @@ -48,10 +48,7 @@ class MrpBom(models.Model): help="Unit of Measure (Unit of Measure) is the unit of measurement for the inventory control", domain="[('category_id', '=', product_uom_category_id)]") product_uom_category_id = fields.Many2one(related='product_tmpl_id.uom_id.category_id') sequence = fields.Integer('Sequence', help="Gives the sequence order when displaying a list of bills of material.") - routing_id = fields.Many2one( - 'mrp.routing', 'Routing', check_company=True, - help="The operations for producing this BoM. When a routing is specified, the production orders will " - " be executed through work orders, otherwise everything is processed in the production order itself. ") + operation_ids = fields.One2many('mrp.routing.workcenter', 'bom_id', 'Operations', copy=True) ready_to_produce = fields.Selection([ ('all_available', ' When all components are available'), ('asap', 'When components for 1st operation are available')], string='Manufacturing Readiness', @@ -119,11 +116,6 @@ class MrpBom(models.Model): for line in self.bom_line_ids: line.bom_product_template_attribute_value_ids = False - @api.onchange('routing_id') - def onchange_routing_id(self): - for line in self.bom_line_ids: - line.operation_id = False - @api.model def name_create(self, name): # prevent to use string as product_tmpl_id @@ -261,12 +253,6 @@ class MrpBomLine(models.Model): sequence = fields.Integer( 'Sequence', default=1, help="Gives the sequence order when displaying.") - routing_id = fields.Many2one( - 'mrp.routing', 'Routing', - related='bom_id.routing_id', store=True, readonly=False, - help="The list of operations 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 planning.") bom_id = fields.Many2one( 'mrp.bom', 'Parent BoM', index=True, ondelete='cascade', required=True) @@ -276,9 +262,10 @@ class MrpBomLine(models.Model): 'product.template.attribute.value', string="Apply on Variants", ondelete='restrict', domain="[('id', 'in', possible_bom_product_template_attribute_value_ids)]", help="BOM Product Variants needed to apply this line.") + allowed_operation_ids = fields.Many2many('mrp.routing.workcenter', compute='_compute_allowed_operation_ids') operation_id = fields.Many2one( 'mrp.routing.workcenter', 'Consumed in Operation', check_company=True, - domain="[('routing_id', '=', routing_id), '|', ('company_id', '=', company_id), ('company_id', '=', False)]", + domain="[('id', 'in', allowed_operation_ids)]", help="The operation where the components are consumed, or the finished products created.") child_bom_id = fields.Many2one( 'mrp.bom', 'Sub BoM', compute='_compute_child_bom_id') @@ -327,6 +314,20 @@ class MrpBomLine(models.Model): for line in self: line.child_line_ids = line.child_bom_id.bom_line_ids.ids or False + @api.depends('bom_id') + def _compute_allowed_operation_ids(self): + for bom_line in self: + if not bom_line.bom_id.operation_ids: + bom_line.allowed_operation_ids = self.env['mrp.routing.workcenter'] + else: + operation_domain = [ + ('id', 'in', bom_line.bom_id.operation_ids.ids), + '|', + ('company_id', '=', bom_line.company_id.id), + ('company_id', '=', False) + ] + bom_line.allowed_operation_ids = self.env['mrp.routing.workcenter'].search(operation_domain) + @api.onchange('product_uom_id') def onchange_product_uom_id(self): res = {} @@ -403,11 +404,24 @@ class MrpByProduct(models.Model): default=1.0, digits='Product Unit of Measure', required=True) product_uom_id = fields.Many2one('uom.uom', 'Unit of Measure', required=True) bom_id = fields.Many2one('mrp.bom', 'BoM', ondelete='cascade') - routing_id = fields.Many2one( - 'mrp.routing', 'Routing', store=True, related='bom_id.routing_id') + allowed_operation_ids = fields.Many2many('mrp.routing.workcenter', compute='_compute_allowed_operation_ids') operation_id = fields.Many2one( 'mrp.routing.workcenter', 'Produced in Operation', check_company=True, - domain="[('routing_id', '=', routing_id), '|', ('company_id', '=', company_id), ('company_id', '=', False)]") + domain="[('id', 'in', allowed_operation_ids)]") + + @api.depends('bom_id') + def _compute_allowed_operation_ids(self): + for byproduct in self: + if not byproduct.bom_id.operation_ids: + byproduct.allowed_operation_ids = self.env['mrp.routing.workcenter'] + else: + operation_domain = [ + ('id', 'in', byproduct.bom_id.operation_ids.ids), + '|', + ('company_id', '=', byproduct.company_id.id), + ('company_id', '=', False) + ] + byproduct.allowed_operation_ids = self.env['mrp.routing.workcenter'].search(operation_domain) @api.onchange('product_id') def onchange_product_id(self): diff --git a/addons/mrp/models/mrp_production.py b/addons/mrp/models/mrp_production.py index f6529bff906..f266a176813 100644 --- a/addons/mrp/models/mrp_production.py +++ b/addons/mrp/models/mrp_production.py @@ -130,12 +130,7 @@ class MrpProduction(models.Model): ('type', '=', 'normal')]""", check_company=True, help="Bill of Materials allow you to define the list of required components to make a finished product.") - routing_id = fields.Many2one( - 'mrp.routing', 'Routing', - readonly=True, compute='_compute_routing', store=True, - 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 planning.") + bom_has_operations = fields.Boolean(compute='_compute_bom_has_operations') state = fields.Selection([ ('draft', 'Draft'), @@ -277,6 +272,14 @@ class MrpProduction(models.Model): def _set_date_planned_finished(self): self.move_finished_ids.write({'date_expected': self.date_planned_finished}) + @api.depends('bom_id') + def _compute_bom_has_operations(self): + for production in self: + if not production.bom_id: + production.bom_has_operations = False + else: + production.bom_has_operations = len(production.bom_id.operation_ids) > 0 + @api.depends('move_raw_ids.delay_alert_date') def _compute_delay_alert_date(self): delay_alert_date_data = self.env['stock.move'].read_group([('id', 'in', self.move_raw_ids.ids), ('delay_alert_date', '!=', False)], ['delay_alert_date:max'], 'raw_material_production_id') @@ -367,14 +370,6 @@ class MrpProduction(models.Model): for production in self: production.finished_move_line_ids = production.move_finished_ids.mapped('move_line_ids') - @api.depends('bom_id.routing_id', 'bom_id.routing_id.operation_ids') - def _compute_routing(self): - for production in self: - if production.bom_id.routing_id.operation_ids: - production.routing_id = production.bom_id.routing_id.id - else: - production.routing_id = False - @api.depends('workorder_ids') def _compute_workorder_count(self): data = self.env['mrp.workorder'].read_group([('production_id', 'in', self.ids)], ['production_id'], ['production_id']) @@ -418,7 +413,7 @@ class MrpProduction(models.Model): production.state = 'done' elif production.move_finished_ids.filtered(lambda m: m.state not in ('cancel', 'done') and m.product_id.id == production.product_id.id)\ and (production.qty_produced >= production.product_qty)\ - and (not production.routing_id or all(wo_state in ('cancel', 'done') for wo_state in production.workorder_ids.mapped('state'))): + and (not production.bom_id.operation_ids or all(wo_state in ('cancel', 'done') for wo_state in production.workorder_ids.mapped('state'))): production.state = 'to_close' elif production.workorder_ids and any(wo_state in ('progress') for wo_state in production.workorder_ids.mapped('state'))\ or production.qty_produced > 0 and production.qty_produced < production.product_qty: @@ -435,7 +430,7 @@ class MrpProduction(models.Model): if production.state not in ('draft', 'done', 'cancel'): relevant_move_state = production.move_raw_ids._get_relevant_state_among_moves() if relevant_move_state == 'partially_available': - if production.routing_id and production.routing_id.operation_ids and production.bom_id.ready_to_produce == 'asap': + if production.bom_id.operation_ids and production.bom_id.ready_to_produce == 'asap': production.reservation_state = production._get_ready_to_produce_state() else: production.reservation_state = 'confirmed' @@ -516,7 +511,7 @@ class MrpProduction(models.Model): @api.onchange('date_planned_start') def _onchange_date_planned_start(self): - if not self.routing_id: + if not self.bom_id.operation_ids: self.date_planned_finished = self.date_planned_start + datetime.timedelta(hours=1) @api.onchange('bom_id', 'product_id', 'product_qty', 'product_uom_id') @@ -537,7 +532,7 @@ class MrpProduction(models.Model): else: self.move_raw_ids = [(2, move.id) for move in self.move_raw_ids.filtered(lambda m: m.bom_line_id)] - @api.onchange('location_src_id', 'move_raw_ids', 'routing_id') + @api.onchange('location_src_id', 'move_raw_ids', 'bom_id') def _onchange_location(self): source_location = self.location_src_id self.move_raw_ids.update({ @@ -567,7 +562,7 @@ class MrpProduction(models.Model): raise UserError(_('You cannot move a planned manufacturing order.')) if 'move_raw_ids' in vals and production.state != 'draft': production._autoconfirm_production() - if not production.routing_id and vals.get('date_planned_start') and not vals.get('date_planned_finished'): + if not production.bom_id.operation_ids and vals.get('date_planned_start') and not vals.get('date_planned_finished'): new_date_planned_start = fields.Datetime.to_datetime(vals.get('date_planned_start')) if not production.date_planned_finished or new_date_planned_start >= production.date_planned_finished: production.date_planned_finished = new_date_planned_start + datetime.timedelta(hours=1) @@ -738,14 +733,12 @@ class MrpProduction(models.Model): def _get_ready_to_produce_state(self): """ returns 'assigned' if enough components are reserved in order to complete - the first operation in the routing. If not returns 'waiting' + the first operation of the bom. If not returns 'waiting' """ self.ensure_one() - first_operation = self.routing_id.operation_ids[0] - # Get BoM line related to first opeation in rounting. If there is only - # one opeation in the routing then it will need all BoM lines. + first_operation = self.bom_id.operation_ids[0] bom_line_ids = self.env['mrp.bom.line'] - if len(self.routing_id.operation_ids) == 1: + if len(self.bom_id.operation_ids) == 1: moves_in_first_operation = self.move_raw_ids else: moves_in_first_operation = self.move_raw_ids.filtered(lambda move: move.operation_id == first_operation) @@ -852,7 +845,7 @@ class MrpProduction(models.Model): def button_plan(self): """ Create work orders. And probably do stuff, like things. """ - orders_to_plan = self.filtered(lambda order: order.routing_id and order.state == 'confirmed') + orders_to_plan = self.filtered(lambda order: order.bom_id.operation_ids and order.state == 'confirmed') for order in orders_to_plan: order.move_raw_ids.filtered(lambda m: m.state == 'draft')._action_confirm() # `propagate_date` enables the automatic rescheduling which could lead to hard to @@ -952,8 +945,8 @@ class MrpProduction(models.Model): workorders = self.env['mrp.workorder'] original_one = False for bom, bom_data in exploded_boms: - # If the routing of the parent BoM and phantom BoM are the same, don't recreate work orders, but use one master routing - if bom.routing_id.id and (not bom_data['parent_line'] or bom_data['parent_line'].bom_id.routing_id.id != bom.routing_id.id): + # If the operations of the parent BoM and phantom BoM are the same, don't recreate work orders. + if bom.operation_ids and (not bom_data['parent_line'] or bom_data['parent_line'].bom_id.operation_ids != bom.operation_ids): temp_workorders = self._workorders_create(bom, bom_data) workorders += temp_workorders if temp_workorders: # In order to avoid two "ending work orders" @@ -975,7 +968,7 @@ class MrpProduction(models.Model): if self.product_id.tracking == 'serial': quantity = 1.0 - for operation in bom.routing_id.operation_ids: + for operation in bom.operation_ids: workorder = workorders.create({ 'name': operation.name, 'production_id': self.id, @@ -994,9 +987,7 @@ class MrpProduction(models.Model): # get the raw moves to attach to this operation moves_raw = self.env['stock.move'] for move in self.move_raw_ids: - if move.operation_id == operation and move.bom_line_id.bom_id.routing_id == bom.routing_id: - moves_raw |= move - if move.operation_id == operation and not move.bom_line_id: + if move.operation_id == operation: moves_raw |= move moves_finished = self.move_finished_ids.filtered(lambda move: move.operation_id == operation) @@ -1004,9 +995,9 @@ class MrpProduction(models.Model): # be consumed at the last workorder of the linked routing. # - Raw moves from a BoM where no rounting was set should be consumed at the last # workorder of the main routing. - if len(workorders) == len(bom.routing_id.operation_ids): - moves_raw |= self.move_raw_ids.filtered(lambda move: not move.operation_id and move.bom_line_id.bom_id.routing_id == bom.routing_id) - moves_raw |= self.move_raw_ids.filtered(lambda move: not move.workorder_id and not move.bom_line_id.bom_id.routing_id) + if len(workorders) == len(bom.operation_ids): + moves_raw |= self.move_raw_ids.filtered(lambda move: not move.operation_id and move.bom_line_id.bom_id.operation_ids and move.bom_line_id.bom_id == bom) + moves_raw |= self.move_raw_ids.filtered(lambda move: not move.workorder_id and not move.bom_line_id.bom_id.operation_ids) moves_finished |= self.move_finished_ids.filtered(lambda move: move.product_id != self.product_id and not move.operation_id) diff --git a/addons/mrp/models/mrp_routing.py b/addons/mrp/models/mrp_routing.py index 7b8f8bfd06b..9104e684221 100644 --- a/addons/mrp/models/mrp_routing.py +++ b/addons/mrp/models/mrp_routing.py @@ -4,32 +4,6 @@ from odoo import api, fields, models, _ -class MrpRouting(models.Model): - """ Specifies routings of work centers """ - _name = 'mrp.routing' - _description = 'Routings' - - name = fields.Char('Routing', required=True) - active = fields.Boolean( - 'Active', default=True, - help="If the active field is set to False, it will allow you to hide the routing without removing it.") - code = fields.Char( - 'Reference', - copy=False, default=lambda self: _('New'), readonly=True) - note = fields.Text('Description') - operation_ids = fields.One2many( - 'mrp.routing.workcenter', 'routing_id', 'Operations', - copy=True) - company_id = fields.Many2one( - 'res.company', 'Company', default=lambda self: self.env.company) - - @api.model - def create(self, vals): - if 'code' not in vals or vals['code'] == _('New'): - vals['code'] = self.env['ir.sequence'].next_by_code('mrp.routing') or _('New') - return super(MrpRouting, self).create(vals) - - class MrpRoutingWorkcenter(models.Model): _name = 'mrp.routing.workcenter' _description = 'Work Center Usage' @@ -41,14 +15,13 @@ class MrpRoutingWorkcenter(models.Model): sequence = fields.Integer( 'Sequence', default=100, help="Gives the sequence order when displaying a list of routing Work Centers.") - routing_id = fields.Many2one( - 'mrp.routing', 'Parent Routing', + bom_id = fields.Many2one( + 'mrp.bom', 'Bill of Material', index=True, ondelete='cascade', required=True, - help="The routing contains all the Work Centers used and for how long. This will create work orders afterwards " - "which alters the execution of the manufacturing order.") + help="The Bill of Material this operation is linked to") company_id = fields.Many2one( 'res.company', 'Company', - readonly=True, related='routing_id.company_id', store=True) + readonly=True, related='bom_id.company_id', store=True) worksheet_type = fields.Selection([ ('pdf', 'PDF'), ('google_slide', 'Google Slide'), ('text', 'Text')], string="Work Sheet", default="pdf", diff --git a/addons/mrp/models/stock_move.py b/addons/mrp/models/stock_move.py index c60c9f051e6..8702a292155 100644 --- a/addons/mrp/models/stock_move.py +++ b/addons/mrp/models/stock_move.py @@ -76,10 +76,10 @@ class StockMove(models.Model): 'mrp.unbuild', 'Disassembly Order', check_company=True) consume_unbuild_id = fields.Many2one( 'mrp.unbuild', 'Consumed Disassembly Order', check_company=True) + allowed_operation_ids = fields.Many2many('mrp.routing.workcenter', compute='_compute_allowed_operation_ids') operation_id = fields.Many2one( 'mrp.routing.workcenter', 'Operation To Consume', check_company=True, - domain="[('routing_id', '=', routing_id), '|', ('company_id', '=', company_id), ('company_id', '=', False)]") - routing_id = fields.Many2one(related='raw_material_production_id.routing_id') + domain="[('id', 'in', allowed_operation_ids)]") workorder_id = fields.Many2one( 'mrp.workorder', 'Work Order To Consume', check_company=True) # Quantities to process, in normalized UoMs @@ -118,6 +118,24 @@ class StockMove(models.Model): move.order_finished_lot_ids = False move.finished_lots_exist = False + @api.depends('raw_material_production_id.bom_id') + def _compute_allowed_operation_ids(self): + for move in self: + if ( + not move.raw_material_production_id or + not move.raw_material_production_id.bom_id or not + move.raw_material_production_id.bom_id.operation_ids + ): + move.allowed_operation_ids = self.env['mrp.routing.workcenter'] + else: + operation_domain = [ + ('id', 'in', move.raw_material_production_id.bom_id.operation_ids.ids), + '|', + ('company_id', '=', self.company_id.id), + ('company_id', '=', False) + ] + move.allowed_operation_ids = self.env['mrp.routing.workcenter'].search(operation_domain) + @api.depends('product_id.tracking') def _compute_needs_lots(self): for move in self: diff --git a/addons/mrp/report/mrp_report_bom_structure.py b/addons/mrp/report/mrp_report_bom_structure.py index 05c3bafbd3d..b9108828b37 100644 --- a/addons/mrp/report/mrp_report_bom_structure.py +++ b/addons/mrp/report/mrp_report_bom_structure.py @@ -55,7 +55,7 @@ class ReportBomStructure(models.AbstractModel): @api.model def get_operations(self, bom_id=False, qty=0, level=0): bom = self.env['mrp.bom'].browse(bom_id) - lines = self._get_operation_line(bom.routing_id, float_round(qty / bom.product_qty, precision_rounding=1, rounding_method='UP'), level) + lines = self._get_operation_line(bom, float_round(qty / bom.product_qty, precision_rounding=1, rounding_method='UP'), level) values = { 'bom_id': bom_id, 'currency': self.env.company.currency_id, @@ -106,7 +106,7 @@ class ReportBomStructure(models.AbstractModel): else: product = bom.product_tmpl_id attachments = self.env['mrp.document'].search([('res_model', '=', 'product.template'), ('res_id', '=', product.id)]) - operations = self._get_operation_line(bom.routing_id, float_round(bom_quantity / bom.product_qty, precision_rounding=1, rounding_method='UP'), 0) + operations = self._get_operation_line(bom, float_round(bom_quantity / bom.product_qty, precision_rounding=1, rounding_method='UP'), 0) company = bom.company_id or self.env.company lines = { 'bom': bom, @@ -163,10 +163,10 @@ class ReportBomStructure(models.AbstractModel): total += sub_total return components, total - def _get_operation_line(self, routing, qty, level): + def _get_operation_line(self, bom, qty, level): operations = [] total = 0.0 - for operation in routing.operation_ids: + for operation in bom.operation_ids: operation_cycle = float_round(qty / operation.workcenter_id.capacity, precision_rounding=1, rounding_method='UP') duration_expected = operation_cycle * operation.time_cycle + operation.workcenter_id.time_stop + operation.workcenter_id.time_start total = ((duration_expected / 60.0) * operation.workcenter_id.costs_hour) @@ -181,7 +181,7 @@ class ReportBomStructure(models.AbstractModel): def _get_price(self, bom, factor, product): price = 0 - if bom.routing_id: + if bom.operation_ids: # routing are defined on a BoM and don't have a concept of quantity. # It means that the operation time are defined for the quantity on # the BoM (the user produces a batch of products). E.g the user @@ -189,7 +189,7 @@ class ReportBomStructure(models.AbstractModel): # will be the 5 for a quantity between 1-10, then doubled for # 11-20,... operation_cycle = float_round(factor, precision_rounding=1, rounding_method='UP') - operations = self._get_operation_line(bom.routing_id, operation_cycle, 0) + operations = self._get_operation_line(bom, operation_cycle, 0) price += sum([op['total'] for op in operations]) for line in bom.bom_line_ids: diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv index 3b3ebdf97d2..b450c61d549 100644 --- a/addons/mrp/security/ir.model.access.csv +++ b/addons/mrp/security/ir.model.access.csv @@ -4,14 +4,12 @@ access_mrp_workcenter_productivity_loss,mrp.workcenter.productivity.loss,model_m access_mrp_workcenter_productivity_loss_type,mrp.workcenter.productivity.loss.type,model_mrp_workcenter_productivity_loss_type,mrp.group_mrp_user,1,0,0,0 access_mrp_workcenter_productivity,mrp.workcenter.productivity,model_mrp_workcenter_productivity,mrp.group_mrp_user,1,1,1,1 access_mrp_workcenter,mrp.workcenter,model_mrp_workcenter,mrp.group_mrp_user,1,0,0,0 -access_mrp_routing,mrp.routing,model_mrp_routing,mrp.group_mrp_user,1,0,0,0 access_mrp_routing_workcenter,mrp.routing.workcenter,model_mrp_routing_workcenter,mrp.group_mrp_user,1,0,0,0 access_mrp_bom,mrp.bom,model_mrp_bom,group_mrp_user,1,0,0,0 access_mrp_bom_line,mrp.bom.line,model_mrp_bom_line,group_mrp_user,1,0,0,0 access_mrp_bom_byproduct_user,mrp.bom.byproduct,model_mrp_bom_byproduct,mrp.group_mrp_user,1,0,0,0 access_mrp_production,mrp.production user,model_mrp_production,mrp.group_mrp_user,1,1,1,1 access_mrp_workcenter_manager,mrp.workcenter.manager,model_mrp_workcenter,mrp.group_mrp_manager,1,1,1,1 -access_mrp_routing_manager,mrp.routing.manager,model_mrp_routing,mrp.group_mrp_manager,1,1,1,1 access_mrp_routing_workcenter_manager,mrp.routing.workcenter.manager,model_mrp_routing_workcenter,mrp.group_mrp_manager,1,1,1,1 access_mrp_bom_manager,mrp.bom.manager,model_mrp_bom,mrp.group_mrp_manager,1,1,1,1 access_mrp_bom_line_manager,mrp.bom.line.manager,model_mrp_bom_line,mrp.group_mrp_manager,1,1,1,1 diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml index c1c350dffd1..8e48b287826 100644 --- a/addons/mrp/security/mrp_security.xml +++ b/addons/mrp/security/mrp_security.xml @@ -78,12 +78,6 @@ ['|',('company_id', 'in', company_ids),('company_id','=',False)] - - mrp_routing multi-company - - ['|',('company_id', 'in', company_ids),('company_id','=',False)] - - mrp_routing_workcenter multi-company diff --git a/addons/mrp/tests/common.py b/addons/mrp/tests/common.py index 382bbb849fe..9b9e5978d65 100644 --- a/addons/mrp/tests/common.py +++ b/addons/mrp/tests/common.py @@ -91,40 +91,14 @@ class TestMrpCommon(common2.TestStockCommon): 'time_stop': 5, 'time_efficiency': 80, }) - cls.routing_1 = cls.env['mrp.routing'].create({ - 'name': 'Simple Line', - }) - cls.routing_2 = cls.env['mrp.routing'].create({ - 'name': 'Complicated Line', - }) - cls.operation_1 = cls.env['mrp.routing.workcenter'].create({ - 'name': 'Gift Wrap Maching', - 'workcenter_id': cls.workcenter_1.id, - 'routing_id': cls.routing_1.id, - 'time_cycle': 15, - 'sequence': 1, - }) - cls.operation_2 = cls.env['mrp.routing.workcenter'].create({ - 'name': 'Cutting Machine', - 'workcenter_id': cls.workcenter_1.id, - 'routing_id': cls.routing_2.id, - 'time_cycle': 12, - 'sequence': 1, - }) - cls.operation_3 = cls.env['mrp.routing.workcenter'].create({ - 'name': 'Weld Machine', - 'workcenter_id': cls.workcenter_1.id, - 'routing_id': cls.routing_2.id, - 'time_cycle': 18, - 'sequence': 2, - }) cls.bom_1 = cls.env['mrp.bom'].create({ 'product_id': cls.product_4.id, 'product_tmpl_id': cls.product_4.product_tmpl_id.id, 'product_uom_id': cls.uom_unit.id, 'product_qty': 4.0, - 'routing_id': cls.routing_2.id, + 'operation_ids': [ + ], 'type': 'normal', 'bom_line_ids': [ (0, 0, {'product_id': cls.product_2.id, 'product_qty': 2}), @@ -135,7 +109,9 @@ class TestMrpCommon(common2.TestStockCommon): 'product_tmpl_id': cls.product_5.product_tmpl_id.id, 'product_uom_id': cls.product_5.uom_id.id, 'product_qty': 1.0, - 'routing_id': cls.routing_1.id, + 'operation_ids': [ + (0, 0, {'name': 'Gift Wrap Maching', 'workcenter_id': cls.workcenter_1.id, 'time_cycle': 15, 'sequence': 1}), + ], 'type': 'phantom', 'sequence': 2, 'bom_line_ids': [ @@ -147,13 +123,17 @@ class TestMrpCommon(common2.TestStockCommon): 'product_tmpl_id': cls.product_6.product_tmpl_id.id, 'product_uom_id': cls.uom_dozen.id, 'product_qty': 2.0, - 'routing_id': cls.routing_2.id, + 'operation_ids': [ + (0, 0, {'name': 'Cutting Machine', 'workcenter_id': cls.workcenter_1.id, 'time_cycle': 12, 'sequence': 1}), + (0, 0, {'name': 'Weld Machine', 'workcenter_id': cls.workcenter_1.id, 'time_cycle': 18, 'sequence': 2}), + ], 'type': 'normal', 'bom_line_ids': [ (0, 0, {'product_id': cls.product_5.id, 'product_qty': 2}), (0, 0, {'product_id': cls.product_4.id, 'product_qty': 8}), (0, 0, {'product_id': cls.product_2.id, 'product_qty': 12}) ]}) + cls.stock_location_14 = cls.env['stock.location'].create({ 'name': 'Shelf 2', 'location_id': cls.env.ref('stock.warehouse0').lot_stock_id.id, @@ -177,4 +157,4 @@ class TestMrpCommon(common2.TestStockCommon): 'type': 'product', 'tracking': 'none', 'categ_id': cls.env.ref('product.product_category_all').id, - }) \ No newline at end of file + }) diff --git a/addons/mrp/tests/test_bom.py b/addons/mrp/tests/test_bom.py index d57a3a100cf..77cadb63613 100644 --- a/addons/mrp/tests/test_bom.py +++ b/addons/mrp/tests/test_bom.py @@ -26,9 +26,14 @@ class TestBoM(TestMrpCommon): 'product_tmpl_id': self.product_7_template.id, 'product_uom_id': self.uom_unit.id, 'product_qty': 4.0, - 'routing_id': self.routing_2.id, 'type': 'normal', }) + test_bom.write({ + 'operation_ids': [ + (0, 0, {'name': 'Cutting Machine', 'workcenter_id': self.workcenter_1.id, 'time_cycle': 12, 'sequence': 1}), + (0, 0, {'name': 'Weld Machine', 'workcenter_id': self.workcenter_1.id, 'time_cycle': 18, 'sequence': 2}), + ], + }) test_bom_l1 = self.env['mrp.bom.line'].create({ 'bom_id': test_bom.id, 'product_id': self.product_2.id, @@ -78,9 +83,13 @@ class TestBoM(TestMrpCommon): 'product_tmpl_id': self.product_5.product_tmpl_id.id, 'product_uom_id': self.product_5.uom_id.id, 'product_qty': 1.0, - 'routing_id': self.routing_1.id, 'type': 'phantom' }) + test_bom_1.write({ + 'operation_ids': [ + (0, 0, {'name': 'Gift Wrap Maching', 'workcenter_id': self.workcenter_1.id, 'time_cycle': 15, 'sequence': 1}), + ], + }) test_bom_1_l1 = self.env['mrp.bom.line'].create({ 'bom_id': test_bom_1.id, 'product_id': self.product_3.id, @@ -92,9 +101,14 @@ class TestBoM(TestMrpCommon): 'product_tmpl_id': self.product_7_template.id, 'product_uom_id': self.uom_unit.id, 'product_qty': 4.0, - 'routing_id': self.routing_2.id, 'type': 'normal', }) + test_bom_2.write({ + 'operation_ids': [ + (0, 0, {'name': 'Cutting Machine', 'workcenter_id': self.workcenter_1.id, 'time_cycle': 12, 'sequence': 1}), + (0, 0, {'name': 'Weld Machine', 'workcenter_id': self.workcenter_1.id, 'time_cycle': 18, 'sequence': 2}), + ] + }) test_bom_2_l1 = self.env['mrp.bom.line'].create({ 'bom_id': test_bom_2.id, 'product_id': self.product_2.id, @@ -278,6 +292,11 @@ class TestBoM(TestMrpCommon): bom_form_crumble.product_uom_id = uom_kg bom_crumble = bom_form_crumble.save() + workcenter = self.env['mrp.workcenter'].create({ + 'costs_hour': 10, + 'name': 'Deserts Table' + }) + with Form(bom_crumble) as bom: with bom.bom_line_ids.new() as line: line.product_id = butter @@ -287,32 +306,19 @@ class TestBoM(TestMrpCommon): line.product_id = biscuit line.product_uom_id = uom_kg line.product_qty = 6 - - workcenter = self.env['mrp.workcenter'].create({ - 'costs_hour': 10, - 'name': 'Deserts Table' - }) - - routing_form = Form(self.env['mrp.routing']) - routing_form.name = "Crumble process" - routing_crumble = routing_form.save() - - with Form(routing_crumble) as routing: - with routing.operation_ids.new() as operation: + with bom.operation_ids.new() as operation: operation.workcenter_id = workcenter operation.name = 'Prepare biscuits' operation.time_cycle_manual = 5 - with routing.operation_ids.new() as operation: + with bom.operation_ids.new() as operation: operation.workcenter_id = workcenter operation.name = 'Prepare butter' operation.time_cycle_manual = 3 - with routing.operation_ids.new() as operation: + with bom.operation_ids.new() as operation: operation.workcenter_id = workcenter operation.name = 'Mix manually' operation.time_cycle_manual = 5 - bom_crumble.routing_id = routing_crumble.id - # TEST BOM STRUCTURE VALUE WITH BOM QUANTITY report_values = self.env['report.mrp.report_bom_structure']._get_report_data(bom_id=bom_crumble.id, searchQty=11, searchVariant=False) # 5 min 'Prepare biscuits' + 3 min 'Prepare butter' + 5 min 'Mix manually' = 13 minutes @@ -381,6 +387,13 @@ class TestBoM(TestMrpCommon): bom_form_cheese_cake.product_uom_id = self.uom_unit bom_cheese_cake = bom_form_cheese_cake.save() + workcenter_2 = self.env['mrp.workcenter'].create({ + 'name': 'cake mounting', + 'costs_hour': 20, + 'time_start': 10, + 'time_stop': 15 + }) + with Form(bom_cheese_cake) as bom: with bom.bom_line_ids.new() as line: line.product_id = cream @@ -390,29 +403,15 @@ class TestBoM(TestMrpCommon): line.product_id = crumble line.product_uom_id = uom_kg line.product_qty = 5.4 - - workcenter_2 = self.env['mrp.workcenter'].create({ - 'name': 'cake mounting', - 'costs_hour': 20, - 'time_start': 10, - 'time_stop': 15 - }) - - routing_form = Form(self.env['mrp.routing']) - routing_form.name = "Cheese cake process" - routing_cheese = routing_form.save() - - with Form(routing_cheese) as routing: - with routing.operation_ids.new() as operation: + with bom.operation_ids.new() as operation: operation.workcenter_id = workcenter operation.name = 'Mix cheese and crumble' operation.time_cycle_manual = 10 - with routing.operation_ids.new() as operation: + with bom.operation_ids.new() as operation: operation.workcenter_id = workcenter_2 operation.name = 'Cake mounting' operation.time_cycle_manual = 5 - bom_cheese_cake.routing_id = routing_cheese.id # TEST CHEESE BOM STRUCTURE VALUE WITH BOM QUANTITY report_values = self.env['report.mrp.report_bom_structure']._get_report_data(bom_id=bom_cheese_cake.id, searchQty=60, searchVariant=False) diff --git a/addons/mrp/tests/test_cancel_mo.py b/addons/mrp/tests/test_cancel_mo.py index fdbfb50531f..3a132ba02c4 100644 --- a/addons/mrp/tests/test_cancel_mo.py +++ b/addons/mrp/tests/test_cancel_mo.py @@ -87,7 +87,11 @@ class TestMrpCancelMO(TestMrpCommon): mo_data = self.generate_mo() manufacturing_order = mo_data[0] bom = mo_data[1] - bom.routing_id = self.routing_1 + bom.write({ + 'operation_ids': [ + (0, 0, {'name': 'Gift Wrap Maching', 'workcenter_id': self.workcenter_1.id, 'time_cycle': 15, 'sequence': 1}), + ], + }) manufacturing_order.button_plan() workorder = manufacturing_order.workorder_ids diff --git a/addons/mrp/tests/test_multicompany.py b/addons/mrp/tests/test_multicompany.py index 5b43be07224..b6593cfb517 100644 --- a/addons/mrp/tests/test_multicompany.py +++ b/addons/mrp/tests/test_multicompany.py @@ -177,25 +177,6 @@ class TestMrpMulticompany(common.TransactionCase): with self.assertRaises(UserError): produce_form.save() - def test_workcenter_1(self): - """Check it is not possible to use a routing of Company B in a - workcenter of Company A. """ - - workcenter = self.env['mrp.workcenter'].create({ - 'name': 'WC1', - 'company_id': self.company_a.id, - 'resource_calendar_id': self.company_a.resource_calendar_id.id, - }) - with self.assertRaises(UserError): - self.env['mrp.routing'].create({ - 'name': 'WC1', - 'company_id': self.company_b.id, - 'operation_ids': [(0, 0, { - 'name': 'operation_1', - 'workcenter_id': workcenter.id, - })] - }) - def test_partner_1(self): """ On a product without company, as a user of Company B, check it is not possible to use a location limited to Company A as `property_stock_production` """ diff --git a/addons/mrp/tests/test_order.py b/addons/mrp/tests/test_order.py index f13f41d44ae..90f25506ba6 100644 --- a/addons/mrp/tests/test_order.py +++ b/addons/mrp/tests/test_order.py @@ -63,7 +63,6 @@ class TestMrpOrder(TestMrpCommon): test_date_planned = Dt.now() - timedelta(days=1) test_quantity = 2.0 - self.bom_1.routing_id = False man_order_form = Form(self.env['mrp.production'].with_user(self.user_mrp_user)) man_order_form.product_id = self.product_4 man_order_form.bom_id = self.bom_1 @@ -149,15 +148,6 @@ class TestMrpOrder(TestMrpCommon): # check sub product availability state is assigned self.assertEqual(production_2.reservation_state, 'assigned', 'Production order should be availability for assigned state') - def test_empty_routing(self): - """ Check what happens when you work with an empty routing""" - routing = self.env['mrp.routing'].create({'name': 'Routing without operations'}) - self.bom_3.routing_id = routing.id - production_form = Form(self.env['mrp.production']) - production_form.product_id = self.product_6 - production = production_form.save() - self.assertEqual(production.routing_id.id, False, 'The routing field should be empty on the mo') - def test_split_move_line(self): """ Consume more component quantity than the initial demand. It should create extra move and share the quantity between the two stock @@ -911,8 +901,6 @@ class TestMrpOrder(TestMrpCommon): bp.product_qty = 2.0 bp.product_uom_id = dozen - self.bom_1.routing_id = False - mo_form = Form(self.env['mrp.production']) mo_form.product_id = self.product_4 mo_form.bom_id = self.bom_1 @@ -1231,14 +1219,10 @@ class TestMrpOrder(TestMrpCommon): 'uom_id': unit.id, 'uom_po_id': unit.id, }) - routing = self.env['mrp.routing'].create({ - 'name': 'Secondary Assembly', - }) bom = self.env['mrp.bom'].create({ 'product_tmpl_id': plastic_laminate.product_tmpl_id.id, 'product_uom_id': unit.id, 'sequence': 1, - 'routing_id': routing.id, 'bom_line_ids': [(0, 0, { 'product_id': ply_veneer.id, 'product_qty': 1, diff --git a/addons/mrp/tests/test_procurement.py b/addons/mrp/tests/test_procurement.py index cf60399acaa..9e1d25e59ec 100644 --- a/addons/mrp/tests/test_procurement.py +++ b/addons/mrp/tests/test_procurement.py @@ -340,7 +340,10 @@ class TestProcurement(TestMrpCommon): 'product_tmpl_id': parent_product.id, 'product_uom_id': self.uom_unit.id, 'product_qty': 4.0, - 'routing_id': self.routing_2.id, + 'operation_ids': [ + (0, 0, {'name': 'Cutting Machine', 'workcenter_id': self.workcenter_1.id, 'time_cycle': 12, 'sequence': 1}), + (0, 0, {'name': 'Weld Machine', 'workcenter_id': self.workcenter_1.id, 'time_cycle': 18, 'sequence': 2}), + ], 'type': 'normal', }) self.env['mrp.bom.line'].create({ @@ -353,7 +356,10 @@ class TestProcurement(TestMrpCommon): 'product_tmpl_id': child_product.id, 'product_uom_id': self.uom_unit.id, 'product_qty': 4.0, - 'routing_id': self.routing_2.id, + 'operation_ids': [ + (0, 0, {'name': 'Cutting Machine', 'workcenter_id': self.workcenter_1.id, 'time_cycle': 12, 'sequence': 1}), + (0, 0, {'name': 'Weld Machine', 'workcenter_id': self.workcenter_1.id, 'time_cycle': 18, 'sequence': 2}), + ], 'type': 'normal', }) self.env['mrp.bom.line'].create({ diff --git a/addons/mrp/tests/test_stock.py b/addons/mrp/tests/test_stock.py index f2c012737c7..0d1097abbf3 100644 --- a/addons/mrp/tests/test_stock.py +++ b/addons/mrp/tests/test_stock.py @@ -26,13 +26,6 @@ class TestWarehouse(common.TestMrpCommon): 'name': 'Assembly Line 1', 'resource_calendar_id': self.env.ref('resource.resource_calendar_std').id, }) - mrp_routing = self.env['mrp.routing'].create({ - 'name': 'Primary Assembly', - 'operation_ids': [(0, 0, { - 'workcenter_id': mrp_workcenter.id, - 'name': 'Manual Assembly', - })] - }) inventory = self.env['stock.inventory'].create({ 'name': 'Initial inventory', 'line_ids': [(0, 0, { @@ -54,7 +47,9 @@ class TestWarehouse(common.TestMrpCommon): 'product_qty': 1, 'product_uom_id': unit.id })], - 'routing_id': mrp_routing.id + 'operation_ids': [ + (0, 0, {'name': 'Cutting Machine', 'workcenter_id': self.workcenter_1.id, 'time_cycle': 12, 'sequence': 1}), + ], }) def new_mo_laptop(self): diff --git a/addons/mrp/tests/test_workorder_operation.py b/addons/mrp/tests/test_workorder_operation.py index de8b40ae1b4..3e4a89ec644 100644 --- a/addons/mrp/tests/test_workorder_operation.py +++ b/addons/mrp/tests/test_workorder_operation.py @@ -36,7 +36,9 @@ class TestWorkOrderProcessCommon(TestMrpCommon): 'product_tmpl_id': cls.product_4.product_tmpl_id.id, 'product_uom_id': cls.uom_unit.id, 'product_qty': 4.0, - 'routing_id': cls.routing_1.id, + 'operation_ids': [ + (0, 0, {'name': 'Gift Wrap Maching', 'workcenter_id': cls.workcenter_1.id, 'time_cycle': 15, 'sequence': 1}), + ], 'type': 'normal', 'bom_line_ids': [ (0, 0, {'product_id': cls.product_2.id, 'product_qty': 2}), @@ -70,44 +72,41 @@ class TestWorkOrderProcessCommon(TestMrpCommon): 'name': 'Assembly Line 1', 'resource_calendar_id': cls.env.ref('resource.resource_calendar_std').id, }) - cls.routing = cls.env['mrp.routing'].create({ - 'name': 'Assemble Furniture', - 'operation_ids': [(0, 0, { - 'workcenter_id': cls.mrp_workcenter.id, - 'name': 'Manual Assembly', - })] - }) cls.mrp_bom_desk = cls.env['mrp.bom'].create({ 'product_tmpl_id': cls.dining_table.product_tmpl_id.id, 'product_uom_id': cls.env.ref('uom.product_uom_unit').id, 'sequence': 3, 'consumption': 'flexible', - 'routing_id': cls.routing.id, + 'operation_ids': [ + (0, 0, {'workcenter_id': cls.mrp_workcenter.id, 'name': 'Manual Assembly'}), + ], + }) + cls.mrp_bom_desk.write({ 'bom_line_ids': [ (0, 0, { 'product_id': cls.product_table_sheet.id, 'product_qty': 1, 'product_uom_id': cls.env.ref('uom.product_uom_unit').id, 'sequence': 1, - 'operation_id': cls.routing.operation_ids.id}), + 'operation_id': cls.mrp_bom_desk.operation_ids.id}), (0, 0, { 'product_id': cls.product_table_leg.id, 'product_qty': 4, 'product_uom_id': cls.env.ref('uom.product_uom_unit').id, 'sequence': 2, - 'operation_id': cls.routing.operation_ids.id}), + 'operation_id': cls.mrp_bom_desk.operation_ids.id}), (0, 0, { 'product_id': cls.product_bolt.id, 'product_qty': 4, 'product_uom_id': cls.env.ref('uom.product_uom_unit').id, 'sequence': 3, - 'operation_id': cls.routing.operation_ids.id}), + 'operation_id': cls.mrp_bom_desk.operation_ids.id}), (0, 0, { 'product_id': cls.product_screw.id, 'product_qty': 10, 'product_uom_id': cls.env.ref('uom.product_uom_unit').id, 'sequence': 4, - 'operation_id': cls.routing.operation_ids.id}), + 'operation_id': cls.mrp_bom_desk.operation_ids.id}), ] }) cls.mrp_workcenter_1 = cls.env['mrp.workcenter'].create({ @@ -118,26 +117,6 @@ class TestWorkOrderProcessCommon(TestMrpCommon): 'name': 'Assembly Line 1', 'resource_calendar_id': cls.env.ref('resource.resource_calendar_std').id, }) - cls.routing_1 = cls.env['mrp.routing'].create({ - 'name': 'Secondary Assembly', - 'operation_ids': [ - (0, 0, { - 'workcenter_id': cls.mrp_workcenter_1.id, - 'name': 'Packing', - 'time_cycle': 30, - 'sequence': 5}), - (0, 0, { - 'workcenter_id': cls.mrp_workcenter_3.id, - 'name': 'Testing', - 'time_cycle': 60, - 'sequence': 10}), - (0, 0, { - 'workcenter_id': cls.mrp_workcenter_3.id, - 'name': 'Long time assembly', - 'time_cycle': 180, - 'sequence': 15}), - ] - }) class TestWorkOrderProcess(TestWorkOrderProcessCommon): @@ -270,11 +249,30 @@ class TestWorkOrderProcess(TestWorkOrderProcessCommon): self.env['stock.move'].search([('product_id', '=', product_bolt.id)])._do_unreserve() - bom.routing_id = self.routing_1 + bom.operation_ids = False + bom.write({ + 'operation_ids': [ + (0, 0, { + 'workcenter_id': self.mrp_workcenter_1.id, + 'name': 'Packing', + 'time_cycle': 30, + 'sequence': 5}), + (0, 0, { + 'workcenter_id': self.mrp_workcenter_3.id, + 'name': 'Testing', + 'time_cycle': 60, + 'sequence': 10}), + (0, 0, { + 'workcenter_id': self.mrp_workcenter_3.id, + 'name': 'Long time assembly', + 'time_cycle': 180, + 'sequence': 15}), + ] + }) - bom.bom_line_ids.filtered(lambda p: p.product_id == product_table_sheet).operation_id = bom.routing_id.operation_ids[0] - bom.bom_line_ids.filtered(lambda p: p.product_id == product_table_leg).operation_id = bom.routing_id.operation_ids[1] - bom.bom_line_ids.filtered(lambda p: p.product_id == product_bolt).operation_id = bom.routing_id.operation_ids[2] + bom.bom_line_ids.filtered(lambda p: p.product_id == product_table_sheet).operation_id = bom.operation_ids[0] + bom.bom_line_ids.filtered(lambda p: p.product_id == product_table_leg).operation_id = bom.operation_ids[1] + bom.bom_line_ids.filtered(lambda p: p.product_id == product_bolt).operation_id = bom.operation_ids[2] production_table_form = Form(self.env['mrp.production']) production_table_form.product_id = dining_table @@ -399,8 +397,9 @@ class TestWorkOrderProcess(TestWorkOrderProcessCommon): # Set manual time cycle 20 and 10. # -------------------------------- - self.operation_1.write({'time_cycle_manual': 20}) - (self.operation_2 | self.operation_3).write({'time_cycle_manual': 10}) + self.bom_3.operation_ids[0].time_cycle_manual = 10 + self.bom_3.operation_ids[1].time_cycle_manual = 10 + self.bom_2.operation_ids.time_cycle_manual = 20 man_order_form = Form(self.env['mrp.production']) man_order_form.product_id = self.product_6 @@ -484,9 +483,10 @@ class TestWorkOrderProcess(TestWorkOrderProcessCommon): # - kit bom: Stone Tool: 1 operation # operation 1: Gift Wrapping workorders = man_order.workorder_ids - kit_wo = man_order.workorder_ids.filtered(lambda wo: wo.operation_id == self.operation_1) - door_wo_1 = man_order.workorder_ids.filtered(lambda wo: wo.operation_id == self.operation_2) - door_wo_2 = man_order.workorder_ids.filtered(lambda wo: wo.operation_id == self.operation_3) + kit_wo = man_order.workorder_ids.filtered(lambda wo: wo.operation_id.name == "Gift Wrap Maching") + door_wo_1 = man_order.workorder_ids.filtered(lambda wo: wo.operation_id.name == "Cutting Machine") + door_wo_2 = man_order.workorder_ids.filtered(lambda wo: wo.operation_id.name == "Weld Machine") + for workorder in workorders: self.assertEqual(workorder.workcenter_id, self.workcenter_1, "Workcenter does not match.") self.assertEqual(kit_wo.state, 'ready', "Workorder should be in ready state.") @@ -524,7 +524,6 @@ class TestWorkOrderProcess(TestWorkOrderProcessCommon): door_wo_2.record_production() self.assertEqual(door_wo_2.state, 'done', "Workorder should be in done state.") - def test_01_without_workorder(self): """ Testing consume quants and produced quants without workorder """ unit = self.ref("uom.product_uom_unit") @@ -816,7 +815,6 @@ class TestWorkOrderProcess(TestWorkOrderProcessCommon): laptop = self.laptop graphics_card = self.graphics_card unit = self.env.ref("uom.product_uom_unit") - three_step_routing = self.routing_1 laptop.tracking = 'serial' @@ -829,7 +827,23 @@ class TestWorkOrderProcess(TestWorkOrderProcessCommon): 'product_qty': 1, 'product_uom_id': unit.id })], - 'routing_id': three_step_routing.id + 'operation_ids': [ + (0, 0, { + 'workcenter_id': self.mrp_workcenter_1.id, + 'name': 'Packing', + 'time_cycle': 30, + 'sequence': 5}), + (0, 0, { + 'workcenter_id': self.mrp_workcenter_3.id, + 'name': 'Testing', + 'time_cycle': 60, + 'sequence': 10}), + (0, 0, { + 'workcenter_id': self.mrp_workcenter_3.id, + 'name': 'Long time assembly', + 'time_cycle': 180, + 'sequence': 15}), + ], }) mo_laptop_form = Form(self.env['mrp.production']) @@ -891,7 +905,23 @@ class TestWorkOrderProcess(TestWorkOrderProcessCommon): 'product_tmpl_id': drawer.product_tmpl_id.id, 'product_uom_id': self.env.ref('uom.product_uom_unit').id, 'sequence': 2, - 'routing_id': self.routing_1.id, + 'operation_ids': [ + (0, 0, { + 'workcenter_id': self.mrp_workcenter_1.id, + 'name': 'Packing', + 'time_cycle': 30, + 'sequence': 5}), + (0, 0, { + 'workcenter_id': self.mrp_workcenter_3.id, + 'name': 'Testing', + 'time_cycle': 60, + 'sequence': 10}), + (0, 0, { + 'workcenter_id': self.mrp_workcenter_3.id, + 'name': 'Long time assembly', + 'time_cycle': 180, + 'sequence': 15}), + ], 'bom_line_ids': [(0, 0, { 'product_id': drawer_drawer.id, 'product_qty': 1, @@ -1156,10 +1186,14 @@ class TestWorkOrderProcess(TestWorkOrderProcessCommon): calendar wc1 : [q1][q2] calendar wc2 : [q1][q2]""" self.workcenter_1.alternative_workcenter_ids = self.wc_alt_1 | self.wc_alt_2 - self.planning_bom.routing_id = self.routing_2 + self.planning_bom.operation_ids = False + self.planning_bom.write({ + 'operation_ids': [ + (0, 0, {'name': 'Cutting Machine', 'workcenter_id': self.workcenter_1.id, 'time_cycle': 12, 'sequence': 1, 'batch': 'yes', 'batch_size': 1}), + (0, 0, {'name': 'Weld Machine', 'workcenter_id': self.workcenter_1.id, 'time_cycle': 18, 'sequence': 2}), + ], + }) # Allow second workorder to start once the first one is not ended yet - self.operation_2.batch = 'yes' - self.operation_2.batch_size = 1 self.env['mrp.workcenter'].search([]).write({'capacity': 1}) # workcenters work 24/7 self.full_availability() @@ -1175,8 +1209,8 @@ class TestWorkOrderProcess(TestWorkOrderProcessCommon): self.assertEqual(mo.workorder_ids[0].workcenter_id, self.wc_alt_2, "wrong workcenter") self.assertEqual(mo.workorder_ids[1].workcenter_id, self.wc_alt_1, "wrong workcenter") - duration1 = self.operation_2.time_cycle * 100.0 / self.wc_alt_2.time_efficiency + self.wc_alt_2.time_start - duration2 = 2.0 * self.operation_2.time_cycle * 100.0 / self.wc_alt_1.time_efficiency + self.wc_alt_1.time_start + self.wc_alt_1.time_stop + duration1 = self.planning_bom.operation_ids[0].time_cycle * 100.0 / self.wc_alt_2.time_efficiency + self.wc_alt_2.time_start + duration2 = 2.0 * self.planning_bom.operation_ids[0].time_cycle * 100.0 / self.wc_alt_1.time_efficiency + self.wc_alt_1.time_start + self.wc_alt_1.time_stop wo2_start = mo.workorder_ids[1].date_planned_start wo2_stop = mo.workorder_ids[1].date_planned_finished @@ -1262,7 +1296,6 @@ class TestWorkOrderProcess(TestWorkOrderProcessCommon): """ Marking a workorder as done before the theoretical date should update the reservation slot in the calendar the be able to reserve the next production sooner """ - self.workcenter_1.alternative_workcenter_ids = self.wc_alt_1 | self.wc_alt_2 self.env['mrp.workcenter'].search([]).write({'tz': 'UTC'}) # compute all date in UTC mo_form = Form(self.env['mrp.production']) mo_form.product_id = self.product_4 @@ -1274,7 +1307,7 @@ class TestWorkOrderProcess(TestWorkOrderProcessCommon): mo.button_plan() wo = mo.workorder_ids self.assertAlmostEqual(wo.date_planned_start, datetime(2019, 5, 13, 9, 0, 0, 0), delta=timedelta(seconds=10)) - self.assertAlmostEqual(wo.date_planned_finished, datetime(2019, 5, 13, 9, 0, 0, 0) + timedelta(minutes=85.58), delta=timedelta(seconds=10)) + self.assertAlmostEqual(wo.date_planned_finished, datetime(2019, 5, 13, 9, 0, 0, 0) + timedelta(minutes=60), delta=timedelta(seconds=10)) wo.button_start() wo.record_production() # Marking workorder as done should change the finished date @@ -1302,7 +1335,7 @@ class TestWorkOrderProcess(TestWorkOrderProcessCommon): self.workcenter_1.time_efficiency = 100 self.workcenter_1.time_start = 0 self.workcenter_1.time_stop = 0 - self.routing_1.operation_ids.time_cycle = 60 + self.planning_bom.operation_ids.time_cycle = 60 self.product_4.tracking = 'serial' mo_form = Form(self.env['mrp.production']) mo_form.product_id = self.product_4 @@ -1372,7 +1405,23 @@ class TestWorkOrderProcess(TestWorkOrderProcessCommon): 'product_tmpl_id': self.product_5.product_tmpl_id.id, 'product_uom_id': self.uom_unit.id, 'product_qty': 1.0, - 'routing_id': self.routing_1.id, + 'operation_ids': [ + (0, 0, { + 'workcenter_id': self.mrp_workcenter_1.id, + 'name': 'Packing', + 'time_cycle': 30, + 'sequence': 5}), + (0, 0, { + 'workcenter_id': self.mrp_workcenter_3.id, + 'name': 'Testing', + 'time_cycle': 60, + 'sequence': 10}), + (0, 0, { + 'workcenter_id': self.mrp_workcenter_3.id, + 'name': 'Long time assembly', + 'time_cycle': 180, + 'sequence': 15}), + ], 'type': 'normal', 'bom_line_ids': [ (0, 0, {'product_id': self.product_1.id, 'product_qty': 1}), @@ -1403,14 +1452,32 @@ class TestWorkOrderProcess(TestWorkOrderProcessCommon): def test_conflict_and_replan(self): """ TEST Json data conflicted and the replan button of a workorder """ - self.routing_1.operation_ids[0].write({'workcenter_id': self.mrp_workcenter_3.id}) dining_table = self.dining_table bom = self.mrp_bom_desk - bom.routing_id = self.routing_1 + bom.operation_ids = False + bom.write({ + 'operation_ids': [ + (0, 0, { + 'workcenter_id': self.mrp_workcenter_3.id, + 'name': 'Packing', + 'time_cycle': 30, + 'sequence': 5}), + (0, 0, { + 'workcenter_id': self.mrp_workcenter_3.id, + 'name': 'Testing', + 'time_cycle': 60, + 'sequence': 10}), + (0, 0, { + 'workcenter_id': self.mrp_workcenter_3.id, + 'name': 'Long time assembly', + 'time_cycle': 180, + 'sequence': 15}), + ]}) - bom.bom_line_ids.filtered(lambda p: p.product_id == self.product_table_sheet).operation_id = bom.routing_id.operation_ids[0].id - bom.bom_line_ids.filtered(lambda p: p.product_id == self.product_table_leg).operation_id = bom.routing_id.operation_ids[1].id - bom.bom_line_ids.filtered(lambda p: p.product_id == self.product_bolt).operation_id = bom.routing_id.operation_ids[2].id + + bom.bom_line_ids.filtered(lambda p: p.product_id == self.product_table_sheet).operation_id = bom.operation_ids[0].id + bom.bom_line_ids.filtered(lambda p: p.product_id == self.product_table_leg).operation_id = bom.operation_ids[1].id + bom.bom_line_ids.filtered(lambda p: p.product_id == self.product_bolt).operation_id = bom.operation_ids[2].id production_table_form = Form(self.env['mrp.production']) production_table_form.product_id = dining_table @@ -1513,54 +1580,38 @@ class TestRoutingAndKits(SavepointCase): cls.workcenter_kit1 = cls.env['mrp.workcenter'].create({ 'name': 'workcenter2', }) - cls.routing_finished1 = cls.env['mrp.routing'].create({ - 'name': 'routing for finished1', - }) - cls.operation_finished1 = cls.env['mrp.routing.workcenter'].create({ - 'sequence': 1, - 'name': 'finished operation 1', - 'workcenter_id': cls.workcenter_finished1.id, - 'routing_id': cls.routing_finished1.id, - }) - cls.operation_finished2 = cls.env['mrp.routing.workcenter'].create({ - 'sequence': 1, - 'name': 'finished operation 2', - 'workcenter_id': cls.workcenter_finished1.id, - 'routing_id': cls.routing_finished1.id, - }) - cls.routing_kit1 = cls.env['mrp.routing'].create({ - 'name': 'routing for kit1', - }) - cls.operation_kit1 = cls.env['mrp.routing.workcenter'].create({ - 'name': 'Kit operation', - 'workcenter_id': cls.workcenter_kit1.id, - 'routing_id': cls.routing_kit1.id, - }) cls.bom_finished1 = cls.env['mrp.bom'].create({ 'product_id': cls.finished1.id, 'product_tmpl_id': cls.finished1.product_tmpl_id.id, 'product_uom_id': cls.uom_unit.id, 'product_qty': 1, 'type': 'normal', - 'routing_id': cls.routing_finished1.id, 'bom_line_ids': [ (0, 0, {'product_id': cls.compfinished1.id, 'product_qty': 1}), (0, 0, {'product_id': cls.kit1.id, 'product_qty': 1}), - ]}) + ], + 'operation_ids': [ + (0, 0, {'sequence': 1, 'name': 'finished operation 1', 'workcenter_id': cls.workcenter_finished1.id}), + (0, 0, {'sequence': 2, 'name': 'finished operation 2', 'workcenter_id': cls.workcenter_finished1.id}), + ], + }) cls.bom_kit1 = cls.env['mrp.bom'].create({ 'product_id': cls.kit1.id, 'product_tmpl_id': cls.kit1.product_tmpl_id.id, 'product_uom_id': cls.uom_unit.id, 'product_qty': 1, 'type': 'phantom', - 'routing_id': cls.routing_kit1.id, 'bom_line_ids': [ (0, 0, {'product_id': cls.compkit1.id, 'product_qty': 1}), - ]}) + ], + 'operation_ids': [ + (0, 0, {'name': 'Kit operation', 'workcenter_id': cls.workcenter_kit1.id}) + ] + }) def test_1(self): """Operations are set on `self.bom_kit1` but none on `self.bom_finished1`.""" - self.bom_kit1.bom_line_ids.operation_id = self.operation_kit1 + self.bom_kit1.bom_line_ids.operation_id = self.bom_kit1.operation_ids[0] mo_form = Form(self.env['mrp.production']) mo_form.product_id = self.finished1 @@ -1594,9 +1645,9 @@ class TestRoutingAndKits(SavepointCase): def test_3(self): """Operations are set both `self.bom_kit1` and `self.bom_finished1`.""" - self.bom_kit1.bom_line_ids.operation_id = self.operation_kit1 - self.bom_finished1.bom_line_ids[0].operation_id = self.operation_finished1 - self.bom_finished1.bom_line_ids[1].operation_id = self.operation_finished2 + self.bom_kit1.bom_line_ids.operation_id = self.bom_kit1.operation_ids + self.bom_finished1.bom_line_ids[0].operation_id = self.bom_finished1.operation_ids[0] + self.bom_finished1.bom_line_ids[1].operation_id = self.bom_finished1.operation_ids[1] mo_form = Form(self.env['mrp.production']) mo_form.product_id = self.finished1 @@ -1653,12 +1704,12 @@ class TestRoutingAndKits(SavepointCase): def test_5(self): # Main bom: set the normal component to the first of the two operations of the routing. bomline_compfinished = self.bom_finished1.bom_line_ids.filtered(lambda bl: bl.product_id == self.compfinished1) - bomline_compfinished.operation_id = self.operation_finished1 + bomline_compfinished.operation_id = self.bom_finished1.operation_ids[0] # Main bom: the kit do not have an operation set but there's one on its bom bomline_kit1 = self.bom_finished1.bom_line_ids - bomline_compfinished self.assertFalse(bomline_kit1.operation_id.id) - self.bom_kit1.bom_line_ids.operation_id = self.bom_kit1.routing_id.operation_ids + self.bom_kit1.bom_line_ids.operation_id = self.bom_kit1.operation_ids # Main bom: add a kit without routing kit2 = self.env['product.product'].create({ @@ -1693,28 +1744,10 @@ class TestRoutingAndKits(SavepointCase): self.assertEqual(mo.workorder_ids[1].raw_workorder_line_ids.product_id, compkit2) self.assertEqual(mo.workorder_ids[2].raw_workorder_line_ids.product_id, self.compkit1) - def test_6(self): - """ Use the same routing on `self.bom_fnished1` and `self.kit1`. The workorders should not - be duplicated. - """ - self.bom_finished1.bom_line_ids[0].operation_id = self.operation_finished1 - self.bom_finished1.bom_line_ids[1].operation_id = self.operation_finished2 - self.bom_kit1.routing_id = self.routing_finished1 - self.bom_kit1.bom_line_ids.operation_id = self.operation_finished1 - - mo_form = Form(self.env['mrp.production']) - mo_form.product_id = self.finished1 - mo_form.bom_id = self.bom_finished1 - mo_form.product_qty = 1.0 - mo = mo_form.save() - - mo.action_confirm() - mo.button_plan() - - self.assertEqual(len(mo.workorder_ids), 2) - self.assertEqual(set(mo.workorder_ids[0].raw_workorder_line_ids.product_id.ids), set([self.compfinished1.id, self.compkit1.id])) - self.assertFalse(mo.workorder_ids[1].raw_workorder_line_ids.product_id.id) - + # ------------------------------------------------------------------------- + # Those 2 next tests aren't related to routing and kit but to flexible + # consumption. + # ------------------------------------------------------------------------- def test_merge_lot(self): """ Produce 10 units of product tracked by lot on two workorder. On the first one, produce 4 onto lot1 then 6 onto lot1 as well. The second @@ -1768,7 +1801,7 @@ class TestRoutingAndKits(SavepointCase): move.location_id = mo.location_src_id move.location_dest_id = mo.production_location_id move.product_uom_qty = 2 - move.operation_id = mo.routing_id.operation_ids[0] + move.operation_id = mo.bom_id.operation_ids[0] mo = mo_form.save() self.assertEqual(len(mo.move_raw_ids), 3) mo.action_confirm() @@ -1802,7 +1835,7 @@ class TestRoutingAndKits(SavepointCase): move.location_id = mo.location_src_id move.location_dest_id = mo.production_location_id move.product_uom_qty = 2 - move.operation_id = mo.routing_id.operation_ids[0] + move.operation_id = mo.bom_id.operation_ids[0] mo = mo_form.save() new_move = mo.move_raw_ids.filtered(lambda move: move.additional) self.assertEqual(len(mo.move_raw_ids), 3) diff --git a/addons/mrp/views/mrp_bom_views.xml b/addons/mrp/views/mrp_bom_views.xml index 768f08f22ee..323466f8c5e 100644 --- a/addons/mrp/views/mrp_bom_views.xml +++ b/addons/mrp/views/mrp_bom_views.xml @@ -14,7 +14,7 @@
- + @@ -72,10 +76,9 @@ - + - @@ -88,6 +91,7 @@ + @@ -96,13 +100,13 @@ name="by_products" attrs="{'invisible': [('type','!=','normal')]}" groups="mrp.group_mrp_byproducts"> - + - + @@ -118,6 +122,15 @@ + + +
@@ -142,7 +155,6 @@ - @@ -187,7 +199,6 @@ - @@ -239,8 +250,8 @@ - + diff --git a/addons/mrp/views/mrp_production_views.xml b/addons/mrp/views/mrp_production_views.xml index e7b3c222a19..ac291ee7210 100644 --- a/addons/mrp/views/mrp_production_views.xml +++ b/addons/mrp/views/mrp_production_views.xml @@ -17,7 +17,6 @@ - @@ -45,14 +44,15 @@
+
-
@@ -151,27 +150,27 @@ attrs="{'readonly': [ '|', '&', - ('routing_id', '=', False), + ('bom_has_operations', '=', False), ('state', 'in', ['done', 'cancel']), '&', - ('routing_id', '!=', False), + ('bom_has_operations', '!=', False), ('state', 'not in', ['draft', 'confirmed'])]}"/>
- - - - mrp.routing.form - mrp.routing - -
- -
- -
- -
-

- -

-
- - - - - - - - - - - - - - - - - - -
- - - - - mrp.routing.tree - mrp.routing - - - - - - - - - - - - mrp.routing.kanban - mrp.routing - - - - - - -
-
-
- -
- -
-
- - - - - - - - mrp.routing.search - mrp.routing - - - - - - - - - - Routings - ir.actions.act_window - mrp.routing - tree,kanban,form - - - -

- Create a new routing -

- Routings define the successive operations that need to be - done to realize a Manufacturing Order. Each operation from - a Routing is done at a specific Work Center and has a specific duration. -

- - - - diff --git a/addons/mrp/views/mrp_workcenter_views.xml b/addons/mrp/views/mrp_workcenter_views.xml index 989805a1834..126f0ad6925 100644 --- a/addons/mrp/views/mrp_workcenter_views.xml +++ b/addons/mrp/views/mrp_workcenter_views.xml @@ -6,7 +6,7 @@ Manufacturing Orders mrp.production tree,kanban,form,gantt - [('routing_id', '!=', False),('routing_id.operation_ids.workcenter_id','=', active_id)] + [('bom_id', '!=', False), ('bom_id.operation_ids.workcenter_id', '=', active_id)] diff --git a/addons/mrp/views/mrp_workorder_views.xml b/addons/mrp/views/mrp_workorder_views.xml index b70d7625e21..6b7e345945e 100644 --- a/addons/mrp/views/mrp_workorder_views.xml +++ b/addons/mrp/views/mrp_workorder_views.xml @@ -32,7 +32,7 @@ graph,pivot,tree,form,gantt,calendar {'search_default_done': True} - [('production_id.routing_id', '=', active_id), ('state', '=', 'done')] + [('operation_id.bom_id', '=', active_id), ('state', '=', 'done')]

No data to display diff --git a/addons/mrp/views/res_config_settings_views.xml b/addons/mrp/views/res_config_settings_views.xml index 229ff502fc6..115a1d14338 100644 --- a/addons/mrp/views/res_config_settings_views.xml +++ b/addons/mrp/views/res_config_settings_views.xml @@ -20,13 +20,10 @@

- Process operations at specific work centers based on the routing + Process operations at specific work centers
-
-
diff --git a/addons/mrp/views/stock_move_views.xml b/addons/mrp/views/stock_move_views.xml index 7f0273418cd..06fc52fac22 100644 --- a/addons/mrp/views/stock_move_views.xml +++ b/addons/mrp/views/stock_move_views.xml @@ -31,8 +31,8 @@ /
- - + + diff --git a/addons/mrp/wizard/change_production_qty.py b/addons/mrp/wizard/change_production_qty.py index 468681982bb..3ced315c703 100644 --- a/addons/mrp/wizard/change_production_qty.py +++ b/addons/mrp/wizard/change_production_qty.py @@ -80,7 +80,7 @@ class ChangeProductionQty(models.TransientModel): production._log_manufacture_exception(documents) operation_bom_qty = {} for bom, bom_data in boms: - for operation in bom.routing_id.operation_ids: + for operation in bom.operation_ids: operation_bom_qty[operation.id] = bom_data['qty'] finished_moves_modification = self._update_finished_moves(production, production.product_qty - qty_produced, old_production_qty) production._log_downside_manufactured_quantity(finished_moves_modification) diff --git a/addons/mrp_account/models/product.py b/addons/mrp_account/models/product.py index 61f067b020a..72f32617d02 100644 --- a/addons/mrp_account/models/product.py +++ b/addons/mrp_account/models/product.py @@ -47,7 +47,7 @@ class ProductProduct(models.Model): if not boms_to_recompute: boms_to_recompute = [] total = 0 - for opt in bom.routing_id.operation_ids: + for opt in bom.operation_ids: duration_expected = ( opt.workcenter_id.time_start + opt.workcenter_id.time_stop + diff --git a/addons/mrp_account/tests/test_bom_price.py b/addons/mrp_account/tests/test_bom_price.py index b015080a883..813a8c2b6a8 100644 --- a/addons/mrp_account/tests/test_bom_price.py +++ b/addons/mrp_account/tests/test_bom_price.py @@ -19,7 +19,7 @@ class TestBom(common.TransactionCase): super(TestBom, self).setUp() self.Product = self.env['product.product'] self.Bom = self.env['mrp.bom'] - self.Routing = self.env['mrp.routing'] + #self.Routing = self.env['mrp.routing'] self.operation = self.env['mrp.routing.workcenter'] # Products. @@ -117,37 +117,63 @@ class TestBom(common.TransactionCase): workcenter_from1.costs_hour = 100 workcenter_1 = workcenter_from1.save() - routing_form1 = Form(self.Routing) - routing_form1.name = 'Assembly Furniture' - routing_1 = routing_form1.save() + self.bom_1.write({ + 'operation_ids': [ + (0, 0, { + 'name': 'Cutting', + 'workcenter_id': workcenter_1.id, + 'time_mode': 'manual', + 'time_cycle_manual': 20, + 'batch': 'no', + 'sequence': 1, + }), + (0, 0, { + 'name': 'Drilling', + 'workcenter_id': workcenter_1.id, + 'time_mode': 'manual', + 'time_cycle_manual': 25, + 'batch': 'no', + 'sequence': 2, + }), + (0, 0, { + 'name': 'Fitting', + 'workcenter_id': workcenter_1.id, + 'time_mode': 'manual', + 'time_cycle_manual': 30, + 'batch': 'no', + 'sequence': 3, + }), + ], + }), + self.bom_2.write({ + 'operation_ids': [ + (0, 0, { + 'name': 'Cutting', + 'workcenter_id': workcenter_1.id, + 'time_mode': 'manual', + 'time_cycle_manual': 20, + 'batch': 'no', + 'sequence': 1, + }), + (0, 0, { + 'name': 'Drilling', + 'workcenter_id': workcenter_1.id, + 'time_mode': 'manual', + 'time_cycle_manual': 25, + 'batch': 'no', + 'sequence': 2, + }), + (0, 0, { + 'name': 'Fitting', + 'workcenter_id': workcenter_1.id, + 'time_mode': 'manual', + 'time_cycle_manual': 30, + 'batch': 'no', + 'sequence': 3, + }), + ], + }), - operation_1 = self.operation.create({ - 'name': 'Cutting', - 'workcenter_id': workcenter_1.id, - 'routing_id': routing_1.id, - 'time_mode': 'manual', - 'time_cycle_manual': 20, - 'batch': 'no', - 'sequence': 1, - }) - operation_2 = self.operation.create({ - 'name': 'Drilling', - 'workcenter_id': workcenter_1.id, - 'routing_id': routing_1.id, - 'time_mode': 'manual', - 'time_cycle_manual': 25, - 'batch': 'no', - 'sequence': 2, - }) - operation_3 = self.operation.create({ - 'name': 'Fitting', - 'workcenter_id': workcenter_1.id, - 'routing_id': routing_1.id, - 'time_mode': 'manual', - 'time_cycle_manual': 30, - 'batch': 'no', - 'sequence': 3, - }) # ----------------------------------------------------------------- # Dinning Table Operation Cost(1 Unit) @@ -160,7 +186,6 @@ class TestBom(common.TransactionCase): # Operation Cost 1 unit = 125 # ----------------------------------------------------------------- - self.bom_1.routing_id = routing_1.id # -------------------------------------------------------------------------- # Table Head Operation Cost (1 Dozen) @@ -173,7 +198,6 @@ class TestBom(common.TransactionCase): # Operation Cost 1 dozen (125 per dozen) and 10.42 for 1 Unit # -------------------------------------------------------------------------- - self.bom_2.routing_id = routing_1.id self.assertEqual(self.dining_table.standard_price, 1000, "Initial price of the Product should be 1000") self.dining_table.button_bom_cost() diff --git a/addons/mrp_account/tests/test_mrp_account.py b/addons/mrp_account/tests/test_mrp_account.py index 8bb590c6986..7f1660f3170 100644 --- a/addons/mrp_account/tests/test_mrp_account.py +++ b/addons/mrp_account/tests/test_mrp_account.py @@ -66,7 +66,6 @@ class TestMrpAccount(TestWorkOrderProcessCommon): }) inventory.action_validate bom = self.mrp_bom_desk.copy() - bom.routing_id = False # TODO: extend the test later with the necessary operations production_table_form = Form(self.env['mrp.production']) production_table_form.product_id = self.dining_table production_table_form.bom_id = bom diff --git a/addons/mrp_landed_costs/tests/test_stock_landed_costs_mrp.py b/addons/mrp_landed_costs/tests/test_stock_landed_costs_mrp.py index 97e9863b029..134ba08f893 100644 --- a/addons/mrp_landed_costs/tests/test_stock_landed_costs_mrp.py +++ b/addons/mrp_landed_costs/tests/test_stock_landed_costs_mrp.py @@ -37,16 +37,12 @@ class TestStockLandedCostsMrp(StockAccountTestCommon): 'type': 'product', 'categ_id': cls.categ_all.id }) - cls.routing_1 = cls.env['mrp.routing'].create({ - 'name': 'Simple Line', - }) cls.uom_unit = cls.env.ref('uom.product_uom_unit') cls.bom_refri = cls.env['mrp.bom'].create({ 'product_id': cls.product_refrigerator.id, 'product_tmpl_id': cls.product_refrigerator.product_tmpl_id.id, 'product_uom_id': cls.uom_unit.id, 'product_qty': 1.0, - 'routing_id': cls.routing_1.id, 'type': 'normal', }) cls.bom_refri_line1 = cls.env['mrp.bom.line'].create({ diff --git a/addons/mrp_product_expiry/tests/test_mrp_product_expiry.py b/addons/mrp_product_expiry/tests/test_mrp_product_expiry.py index 0633317f6b1..e5dda34c14d 100644 --- a/addons/mrp_product_expiry/tests/test_mrp_product_expiry.py +++ b/addons/mrp_product_expiry/tests/test_mrp_product_expiry.py @@ -64,14 +64,6 @@ class TestStockProductionLot(TestStockCommon): 'time_stop': 5, 'time_efficiency': 80, }) - cls.routing = cls.env['mrp.routing'].create({'name': 'COOK'}) - cls.operation = cls.env['mrp.routing.workcenter'].create({ - 'name': 'Bake in the oven', - 'workcenter_id': cls.workcenter.id, - 'routing_id': cls.routing.id, - 'time_cycle': 15, - 'sequence': 1, - }) def test_01_product_produce(self): """ Checks user doesn't get a confirmation wizard when they produces with @@ -122,7 +114,14 @@ class TestStockProductionLot(TestStockCommon): """ Checks user doesn't get a confirmation wizard when they makes a workorder without expired components. """ # Set a routing on the BOM. - self.bom_apple_pie.routing_id = self.routing + self.bom_apple_pie.write({ + 'operation_ids': [(0, 0, { + 'name': 'Bake in the oven', + 'workcenter_id': self.workcenter.id, + 'time_cycle': 15, + 'sequence': 1, + })], + }) # Creates the MO, starts it and plans the Work Order. mo_form = Form(self.env['mrp.production']) mo_form.product_id = self.product_apple_pie @@ -149,7 +148,14 @@ class TestStockProductionLot(TestStockCommon): """ Checks user doesn't get a confirmation wizard when they makes a workorder without expired components. """ # Set a routing on the BOM. - self.bom_apple_pie.routing_id = self.routing + self.bom_apple_pie.write({ + 'operation_ids': [(0, 0, { + 'name': 'Bake in the oven', + 'workcenter_id': self.workcenter.id, + 'time_cycle': 15, + 'sequence': 1, + })], + }) # Creates the MO, starts it and plans the Work Order. mo_form = Form(self.env['mrp.production']) mo_form.product_id = self.product_apple_pie From 53252608d79324890860569b04d09564a86be109 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Voet=20=28ryv=29?= Date: Mon, 20 Apr 2020 16:46:26 +0200 Subject: [PATCH 02/28] [REF] mrp: backorder mechanism Allow to "backorder" a production, meaning create another manufacturing order with the quantity remaining to produce. We also use the reservation of the first order on the next ones by using `post_inventory` on the first one and moving the newly created stock moves to the backorder. We introduce a wizard similar to the one in stock. Backorders have a sub-sequence. Backorders are linked together through the procurement group. We allow creating a backorder even if workorders are running by closing them, the backorder will call `button_plan` and create its own. task-2241471 --- addons/mrp/__manifest__.py | 1 + addons/mrp/models/mrp_production.py | 206 +++++++++- addons/mrp/models/stock_rule.py | 2 +- addons/mrp/security/ir.model.access.csv | 2 + addons/mrp/tests/__init__.py | 1 + addons/mrp/tests/common.py | 4 +- addons/mrp/tests/test_backorder.py | 376 ++++++++++++++++++ addons/mrp/tests/test_order.py | 159 ++++---- addons/mrp/tests/test_traceability.py | 11 +- addons/mrp/tests/test_unbuild.py | 23 +- addons/mrp/tests/test_workorder_operation.py | 24 +- addons/mrp/views/mrp_production_views.xml | 14 +- addons/mrp/wizard/__init__.py | 1 + addons/mrp/wizard/change_production_qty.py | 4 +- addons/mrp/wizard/mrp_production_backorder.py | 38 ++ .../mrp/wizard/mrp_production_backorder.xml | 46 +++ addons/mrp_account/models/mrp_production.py | 3 +- .../tests/test_mrp_product_expiry.py | 7 +- addons/purchase_mrp/models/purchase.py | 6 +- addons/sale_mrp/models/mrp_production.py | 6 +- addons/sale_mrp/models/sale.py | 6 +- 21 files changed, 812 insertions(+), 128 deletions(-) create mode 100644 addons/mrp/tests/test_backorder.py create mode 100644 addons/mrp/wizard/mrp_production_backorder.py create mode 100644 addons/mrp/wizard/mrp_production_backorder.xml diff --git a/addons/mrp/__manifest__.py b/addons/mrp/__manifest__.py index 235c0e80736..3278695d7dd 100644 --- a/addons/mrp/__manifest__.py +++ b/addons/mrp/__manifest__.py @@ -19,6 +19,7 @@ 'wizard/change_production_qty_views.xml', 'wizard/mrp_workcenter_block_view.xml', 'wizard/stock_warn_insufficient_qty_views.xml', + 'wizard/mrp_production_backorder.xml', 'views/mrp_views_menus.xml', 'views/stock_move_views.xml', 'views/mrp_workorder_views.xml', diff --git a/addons/mrp/models/mrp_production.py b/addons/mrp/models/mrp_production.py index f266a176813..06bf4fdee40 100644 --- a/addons/mrp/models/mrp_production.py +++ b/addons/mrp/models/mrp_production.py @@ -3,13 +3,18 @@ import json import datetime +import math +import re + from collections import defaultdict from dateutil.relativedelta import relativedelta from itertools import groupby from odoo import api, fields, models, _ from odoo.exceptions import AccessError, UserError -from odoo.tools import date_utils, float_compare, float_round, float_is_zero, format_datetime +from odoo.tools import float_compare, float_round, float_is_zero, format_datetime + +SIZE_BACK_ORDER_NUMERING = 3 class MrpProduction(models.Model): @@ -56,6 +61,7 @@ class MrpProduction(models.Model): name = fields.Char( 'Reference', copy=False, readonly=True, default=lambda x: _('New')) + backorder_sequence = fields.Integer("Backorder Sequence", default=0, help="Backorder sequence, if equals to 0 means there is not related backorder") origin = fields.Char( 'Source', copy=False, states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}, @@ -233,6 +239,7 @@ class MrpProduction(models.Model): mrp_production_child_count = fields.Integer("Number of generated MO", compute='_compute_mrp_production_child_count') mrp_production_source_count = fields.Integer("Number of source MO", compute='_compute_mrp_production_source_count') + mrp_production_backorder_count = fields.Integer("Count of linked backorder", compute='_compute_mrp_production_backorder') @api.depends('product_id', 'bom_id', 'company_id') def _compute_allowed_product_ids(self): @@ -250,15 +257,20 @@ class MrpProduction(models.Model): product_domain += [('id', 'in', production.bom_id.product_tmpl_id.product_variant_ids.ids)] production.allowed_product_ids = self.env['product.product'].search(product_domain) - @api.depends('procurement_group_id.stock_move_ids.created_production_id') + @api.depends('procurement_group_id.stock_move_ids.created_production_id.procurement_group_id.mrp_production_ids') def _compute_mrp_production_child_count(self): for production in self: - production.mrp_production_child_count = len(production.procurement_group_id.stock_move_ids.created_production_id) + production.mrp_production_child_count = len(production.procurement_group_id.stock_move_ids.created_production_id.procurement_group_id.mrp_production_ids) - @api.depends('move_dest_ids.group_id.mrp_production_id') + @api.depends('move_dest_ids.group_id.mrp_production_ids') def _compute_mrp_production_source_count(self): for production in self: - production.mrp_production_source_count = len(production.move_dest_ids.group_id.mrp_production_id) + production.mrp_production_source_count = len(production.procurement_group_id.mrp_production_ids.move_dest_ids.group_id.mrp_production_ids) + + @api.depends('procurement_group_id.mrp_production_ids') + def _compute_mrp_production_backorder(self): + for production in self: + production.mrp_production_backorder_count = len(production.procurement_group_id.mrp_production_ids) @api.depends('move_raw_ids.date_expected', 'move_finished_ids.date_expected') def _compute_dates_planned(self): @@ -610,6 +622,10 @@ class MrpProduction(models.Model): return True def _get_finished_move_value(self, product_id, product_uom_qty, product_uom, operation_id=False, byproduct_id=False): + group_orders = self.procurement_group_id.mrp_production_ids + move_dest_ids = self.move_dest_ids + if len(group_orders) > 1: + move_dest_ids |= group_orders[0].move_finished_ids.filtered(lambda m: m.product_id == self.product_id).move_dest_ids date_planned_finished = self.date_planned_start + relativedelta(days=self.product_id.produce_delay) date_planned_finished = date_planned_finished + relativedelta(days=self.company_id.manufacturing_lead) if date_planned_finished == self.date_planned_start: @@ -635,7 +651,7 @@ class MrpProduction(models.Model): 'propagate_date': self.propagate_date, 'delay_alert': self.delay_alert, 'propagate_date_minimum_delta': self.propagate_date_minimum_delta, - 'move_dest_ids': [(4, x.id) for x in self.move_dest_ids], + 'move_dest_ids': [(4, x.id) for x in move_dest_ids], } def _generate_finished_moves(self): @@ -778,7 +794,7 @@ class MrpProduction(models.Model): def action_view_mrp_production_childs(self): self.ensure_one() - mrp_production_ids = self.procurement_group_id.stock_move_ids.created_production_id.ids + mrp_production_ids = self.procurement_group_id.stock_move_ids.created_production_id.procurement_group_id.mrp_production_ids.ids action = { 'res_model': 'mrp.production', 'type': 'ir.actions.act_window', @@ -790,7 +806,7 @@ class MrpProduction(models.Model): }) else: action.update({ - 'name': _("MO Source of %s" % self.name), + 'name': _("%s Child MO's") % self.name, 'domain': [('id', 'in', mrp_production_ids)], 'view_mode': 'tree,form', }) @@ -798,7 +814,7 @@ class MrpProduction(models.Model): def action_view_mrp_production_sources(self): self.ensure_one() - mrp_production_ids = self.move_dest_ids.group_id.mrp_production_id.ids + mrp_production_ids = self.procurement_group_id.mrp_production_ids.move_dest_ids.group_id.mrp_production_ids.ids action = { 'res_model': 'mrp.production', 'type': 'ir.actions.act_window', @@ -816,6 +832,16 @@ class MrpProduction(models.Model): }) return action + def action_view_mrp_production_backorders(self): + backorder_ids = self.procurement_group_id.mrp_production_ids.ids + return { + 'res_model': 'mrp.production', + 'type': 'ir.actions.act_window', + 'name': _("Backorder MO's"), + 'domain': [('id', 'in', backorder_ids)], + 'view_mode': 'tree,form', + } + def action_confirm(self): self._check_company() for production in self: @@ -1024,6 +1050,28 @@ class MrpProduction(models.Model): error_msg += ml.product_id.display_name + ' (' + ', '.join((lots_short & ml.lot_produced_ids).mapped('name')) + ')\n' raise UserError(error_msg) + def _get_quantity_produced_issues(self): + quantity_issues = [] + if self.env.context.get('skip_backorder', False): + return quantity_issues + for order in self: + if not float_is_zero(order._get_quantity_to_backorder(), precision_rounding=order.product_uom_id.rounding): + quantity_issues.append(order) + return quantity_issues + + def _action_generate_backorder_wizard(self, quantity_issues): + ctx = self.env.context.copy() + lines = [] + for order in quantity_issues: + lines.append((0, 0, { + 'mrp_production_id': order.id, + 'to_backorder': True + })) + ctx.update({'default_mrp_production_ids': self.ids, 'default_mrp_production_backorder_line_ids': lines}) + action = self.env.ref('mrp.action_mrp_production_backorder').read()[0] + action['context'] = ctx + return action + def action_cancel(self): """ Cancels production order, unfinished stock moves and set procurement orders in exception """ @@ -1103,23 +1151,139 @@ class MrpProduction(models.Model): moveline.write({'consume_line_ids': [(6, 0, [x for x in consume_move_lines.ids])]}) return True - def button_mark_done(self): - self.ensure_one() - self._check_company() - for wo in self.workorder_ids: - if wo.time_ids.filtered(lambda x: (not x.date_end) and (x.loss_type in ('productive', 'performance'))): - raise UserError(_('Work order %s is still running') % wo.name) - self._check_lots() + @api.model + def _get_name_backorder(self, name, sequence): + if not sequence: + return name + seq_back = "-" + "0" * (SIZE_BACK_ORDER_NUMERING - 1 - int(math.log10(sequence))) + str(sequence) + if re.search("-\\d{%d}$" % SIZE_BACK_ORDER_NUMERING, name): + return name[:-SIZE_BACK_ORDER_NUMERING-1] + seq_back + return name + seq_back + + def _get_backorder_mo_vals(self, mo_source): + next_seq = max(mo_source.procurement_group_id.mrp_production_ids.mapped("backorder_sequence")) + return { + 'name': self._get_name_backorder(mo_source.name, next_seq + 1), + 'backorder_sequence': next_seq + 1, + 'procurement_group_id': mo_source.procurement_group_id.id, + 'move_raw_ids': None, + 'move_finished_ids': None, + 'product_qty': self._get_quantity_to_backorder(), + 'lot_producing_id': False, + 'origin': mo_source.origin + } + + def _generate_backorder_productions(self): + backorders = self.env['mrp.production'] + for production in self: + if production.backorder_sequence == 0: # Activate backorder naming + production.backorder_sequence = 1 + + backorder_mo = production.copy(default=self._get_backorder_mo_vals(production)) + for wo in backorder_mo.workorder_ids: + wo.qty_produced = 0 + if wo.product_tracking == 'serial': + wo.qty_producing = 1 + else: + wo.qty_producing = wo.qty_remaining + + production.move_raw_ids.filtered(lambda m: m.state not in ('done', 'cancel')).write({ + 'raw_material_production_id': backorder_mo.id, + 'reference': backorder_mo.name, + }) + backorders |= backorder_mo + + production.name = self._get_name_backorder(production.name, production.backorder_sequence) + # update moves references + (production.move_raw_ids | production.move_finished_ids).reference = production.name + + for wo in backorder_mo.workorder_ids: + wo.duration_expected = wo._get_duration_expected(wo.workcenter_id) + + backorders.action_confirm() + # Remove the serial move line without reserved quantity. Post inventory will assigned all the non done moves + # So those move lines are duplicated. + backorders.move_raw_ids.move_line_ids.filtered(lambda ml: ml.product_id.tracking == 'serial' and ml.product_qty == 0).unlink() + backorders.move_raw_ids._recompute_state() + + return backorders + + def button_mark_done(self): + self._check_company() + for order in self: + # TODO : multi _check_lots and _check_sn_uniqueness + error message with MO name + order._check_lots() + order._check_sn_uniqueness() + + res = self._pre_button_mark_done() + if res is not True: + return res + + if self.env.context.get('mo_ids_to_backorder'): + productions_to_backorder = self.browse(self.env.context['mo_ids_to_backorder']) + productions_not_to_backorder = self - productions_to_backorder + # As a backorder will be created to produce the remaining quantity, we don't want + # action_done (in _post_inventory) create any new move for the finished one and the + # byproduct with the delta quantity (product_uom_qty - quantity_done) + for production in productions_to_backorder: + for move in production.move_finished_ids: + if move.product_id == production.product_id: + move.product_uom_qty = production.qty_producing + else: + move.product_uom_qty = move.quantity_done + else: + productions_not_to_backorder = self + productions_to_backorder = self.env['mrp.production'] + + self.workorder_ids.button_finish() + self._post_inventory() + + backorders = productions_to_backorder._generate_backorder_productions() - self.post_inventory() # Moves without quantity done are not posted => set them as done instead of canceling. In # case the user edits the MO later on and sets some consumed quantity on those, we do not # want the move lines to be canceled. - (self.move_raw_ids | self.move_finished_ids).filtered(lambda x: x.state not in ('done', 'cancel')).write({ + (productions_not_to_backorder.move_raw_ids | productions_not_to_backorder.move_finished_ids).filtered(lambda x: x.state not in ('done', 'cancel')).write({ 'state': 'done', 'product_uom_qty': 0.0, }) - return self.write({'date_finished': fields.Datetime.now()}) + + for production in self: + production.write({'date_finished': fields.Datetime.now(), 'product_qty': production.qty_produced}) + + for workorder in self.workorder_ids.filtered(lambda w: w.state not in ('done', 'cancel')): + workorder.duration_expected = workorder._get_duration_expected(workorder.workcenter_id) + + if not backorders: + return True + context = self.env.context.copy() + context = {k: v for k, v in context.items() if not k.startswith('default_')} + for k, v in context.items(): + if k.startswith('skip_'): + context[k] = False + action = { + 'res_model': 'mrp.production', + 'type': 'ir.actions.act_window', + 'context': dict(context, mo_ids_to_backorder=None) + } + if len(backorders) == 1: + action.update({ + 'view_mode': 'form', + 'res_id': backorders[0].id, + }) + else: + action.update({ + 'name': _("Backorder MO"), + 'domain': [('id', 'in', backorders.ids)], + 'view_mode': 'tree,form', + }) + return action + + def _pre_button_mark_done(self): + quantity_issues = self._get_quantity_produced_issues() + if quantity_issues: + return self._action_generate_backorder_wizard(quantity_issues) + return True def do_unreserve(self): for production in self: @@ -1230,3 +1394,7 @@ class MrpProduction(models.Model): @api.model def _prepare_procurement_group_vals(self, values): return {'name': values['name']} + + def _get_quantity_to_backorder(self): + self.ensure_one() + return max(self.product_qty - self.qty_produced, 0) diff --git a/addons/mrp/models/stock_rule.py b/addons/mrp/models/stock_rule.py index a7dfd5e8961..dc64ec7dce6 100644 --- a/addons/mrp/models/stock_rule.py +++ b/addons/mrp/models/stock_rule.py @@ -140,7 +140,7 @@ class StockRule(models.Model): class ProcurementGroup(models.Model): _inherit = 'procurement.group' - mrp_production_id = fields.One2many('mrp.production', 'procurement_group_id') + mrp_production_ids = fields.One2many('mrp.production', 'procurement_group_id') @api.model def run(self, procurements, raise_user_error=True): diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv index b450c61d549..b5f3ba1c95a 100644 --- a/addons/mrp/security/ir.model.access.csv +++ b/addons/mrp/security/ir.model.access.csv @@ -61,3 +61,5 @@ access_mrp_product_produce,access.mrp.product.produce,model_mrp_product_produce, access_mrp_product_produce_line,access.mrp.product.produce.line,model_mrp_product_produce_line,mrp.group_mrp_user,1,1,1,1 access_change_production_qty,access.change.production.qty,model_change_production_qty,mrp.group_mrp_user,1,1,1,0 access_stock_warn_insufficient_qty_unbuild,access.stock.warn.insufficient.qty.unbuild,model_stock_warn_insufficient_qty_unbuild,mrp.group_mrp_user,1,1,1,0 +access_mrp_production_backorder,access.mrp.production.backorder,model_mrp_production_backorder,mrp.group_mrp_user,1,1,1,0 +access_mrp_production_backorder_line,access.mrp.production.backorder.line,model_mrp_production_backorder_line,mrp.group_mrp_user,1,1,1,0 diff --git a/addons/mrp/tests/__init__.py b/addons/mrp/tests/__init__.py index 5d4d1bb767d..ec5322adba3 100644 --- a/addons/mrp/tests/__init__.py +++ b/addons/mrp/tests/__init__.py @@ -12,3 +12,4 @@ from . import test_unbuild from . import test_oee from . import test_traceability from . import test_multicompany +from . import test_backorder diff --git a/addons/mrp/tests/common.py b/addons/mrp/tests/common.py index 9b9e5978d65..6e70957237d 100644 --- a/addons/mrp/tests/common.py +++ b/addons/mrp/tests/common.py @@ -7,7 +7,7 @@ from odoo.addons.stock.tests import common2 class TestMrpCommon(common2.TestStockCommon): @classmethod - def generate_mo(self, tracking_final='none', tracking_base_1='none', tracking_base_2='none', qty_final=5, qty_base_1=4, qty_base_2=1): + def generate_mo(self, tracking_final='none', tracking_base_1='none', tracking_base_2='none', qty_final=5, qty_base_1=4, qty_base_2=1, picking_type_id=False): """ This function generate a manufacturing order with one final product and two consumed product. Arguments allows to choose the tracking/qty for each different products. It returns the @@ -39,6 +39,8 @@ class TestMrpCommon(common2.TestStockCommon): (0, 0, {'product_id': product_to_use_1.id, 'product_qty': qty_base_1}) ]}) mo_form = Form(self.env['mrp.production']) + if picking_type_id: + mo_form.picking_type_id = picking_type_id mo_form.product_id = product_to_build mo_form.bom_id = bom_1 mo_form.product_qty = qty_final diff --git a/addons/mrp/tests/test_backorder.py b/addons/mrp/tests/test_backorder.py new file mode 100644 index 00000000000..7023c98627b --- /dev/null +++ b/addons/mrp/tests/test_backorder.py @@ -0,0 +1,376 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo.addons.mrp.tests.common import TestMrpCommon +from odoo.tests import Form +from odoo.tests.common import SavepointCase + + +class TestMrpProductionBackorder(TestMrpCommon): + + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.stock_location = cls.env.ref('stock.stock_location_stock') + + def setUp(self): + super().setUp() + warehouse_form = Form(self.env['stock.warehouse']) + warehouse_form.name = 'Test Warehouse' + warehouse_form.code = 'TWH' + self.warehouse = warehouse_form.save() + + def test_no_tracking_1(self): + """Create a MO for 4 product. Produce 4. The backorder button should + not appear and hitting mark as done should not open the backorder wizard. + The name of the MO should be MO/001. + """ + mo = self.generate_mo(qty_final=4)[0] + + produce_form = Form(self.env['mrp.product.produce'].with_context(active_id=mo.id)) + produce_form.qty_producing = 4 + produce = produce_form.save() + produce.do_produce() + + # No backorder is proposed + self.assertTrue(mo.button_mark_done()) + self.assertEqual(mo._get_quantity_to_backorder(), 0) + self.assertTrue("-001" not in mo.name) + + def test_no_tracking_2(self): + """Create a MO for 4 product. Produce 1. The backorder button should + appear and hitting mark as done should open the backorder wizard. In the backorder + wizard, choose to do the backorder. A new MO for 3 self.untracked_bom should be + created. + The sequence of the first MO should be MO/001-01, the sequence of the second MO + should be MO/001-02. + Check that all MO are reachable through the procurement group. + """ + production, _, _, product_to_use_1, _ = self.generate_mo(qty_final=4, qty_base_1=3) + self.assertEqual(production.state, 'confirmed') + self.assertEqual(production.reserve_visible, True) + + # Make some stock and reserve + for product in production.move_raw_ids.product_id: + self.env['stock.quant'].with_context(inventory_mode=True).create({ + 'product_id': product.id, + 'inventory_quantity': 100, + 'location_id': production.location_src_id.id, + }) + production.action_assign() + self.assertEqual(production.state, 'confirmed') + self.assertEqual(production.reserve_visible, False) + + produce_form = Form(self.env['mrp.product.produce'].with_context(active_id=production.id)) + produce_form.qty_producing = 1 + produce = produce_form.save() + produce.do_produce() + + action = production.button_mark_done() + backorder = Form(self.env['mrp.production.backorder'].with_context(**action['context'])) + backorder.save().action_backorder() + + # Two related MO to the procurement group + self.assertEqual(len(production.procurement_group_id.mrp_production_ids), 2) + + # Check MO backorder + mo_backorder = production.procurement_group_id.mrp_production_ids[-1] + self.assertEqual(mo_backorder.product_id.id, production.product_id.id) + self.assertEqual(mo_backorder.product_qty, 3) + self.assertEqual(sum(mo_backorder.move_raw_ids.filtered(lambda m: m.product_id.id == product_to_use_1.id).mapped("product_uom_qty")), 9) + self.assertEqual(mo_backorder.reserve_visible, False) # the reservation of the first MO should've been moved here + + def test_no_tracking_pbm_1(self): + """Create a MO for 4 product. Produce 1. The backorder button should + appear and hitting mark as done should open the backorder wizard. In the backorder + wizard, choose to do the backorder. A new MO for 3 self.untracked_bom should be + created. + The sequence of the first MO should be MO/001-01, the sequence of the second MO + should be MO/001-02. + Check that all MO are reachable through the procurement group. + """ + with Form(self.warehouse) as warehouse: + warehouse.manufacture_steps = 'pbm' + + production, _, product_to_build, product_to_use_1, product_to_use_2 = self.generate_mo(qty_base_1=4, qty_final=4, picking_type_id=self.warehouse.manu_type_id) + + move_raw_ids = production.move_raw_ids + self.assertEqual(len(move_raw_ids), 2) + self.assertEqual(set(move_raw_ids.mapped("product_id")), {product_to_use_1, product_to_use_2}) + + pbm_move = move_raw_ids.move_orig_ids + self.assertEqual(len(pbm_move), 2) + self.assertEqual(set(pbm_move.mapped("product_id")), {product_to_use_1, product_to_use_2}) + self.assertFalse(pbm_move.move_orig_ids) + + produce_form = Form(self.env['mrp.product.produce'].with_context(active_id=production.id)) + produce_form.qty_producing = 1 + produce = produce_form.save() + produce.do_produce() + self.assertEqual(sum(pbm_move.filtered(lambda m: m.product_id.id == product_to_use_1.id).mapped("product_qty")), 16) + self.assertEqual(sum(pbm_move.filtered(lambda m: m.product_id.id == product_to_use_2.id).mapped("product_qty")), 4) + + action = production.button_mark_done() + backorder = Form(self.env['mrp.production.backorder'].with_context(**action['context'])) + backorder.save().action_backorder() + + mo_backorder = production.procurement_group_id.mrp_production_ids[-1] + self.assertEqual(mo_backorder.delivery_count, 1) + + pbm_move |= mo_backorder.move_raw_ids.move_orig_ids + # Check that quantity is correct + self.assertEqual(sum(pbm_move.filtered(lambda m: m.product_id.id == product_to_use_1.id).mapped("product_qty")), 16) + self.assertEqual(sum(pbm_move.filtered(lambda m: m.product_id.id == product_to_use_2.id).mapped("product_qty")), 4) + + self.assertFalse(pbm_move.move_orig_ids) + + def test_no_tracking_pbm_sam_1(self): + """Create a MO for 4 product. Produce 1. The backorder button should + appear and hitting mark as done should open the backorder wizard. In the backorder + wizard, choose to do the backorder. A new MO for 3 self.untracked_bom should be + created. + The sequence of the first MO should be MO/001-01, the sequence of the second MO + should be MO/001-02. + Check that all MO are reachable through the procurement group. + """ + with Form(self.warehouse) as warehouse: + warehouse.manufacture_steps = 'pbm_sam' + + production, _, product_to_build, product_to_use_1, product_to_use_2 = self.generate_mo(qty_base_1=4, qty_final=4, picking_type_id=self.warehouse.manu_type_id) + + move_raw_ids = production.move_raw_ids + self.assertEqual(len(move_raw_ids), 2) + self.assertEqual(set(move_raw_ids.mapped("product_id")), {product_to_use_1, product_to_use_2}) + + pbm_move = move_raw_ids.move_orig_ids + self.assertEqual(len(pbm_move), 2) + self.assertEqual(set(pbm_move.mapped("product_id")), {product_to_use_1, product_to_use_2}) + self.assertFalse(pbm_move.move_orig_ids) + self.assertEqual(sum(pbm_move.filtered(lambda m: m.product_id.id == product_to_use_1.id).mapped("product_qty")), 16) + self.assertEqual(sum(pbm_move.filtered(lambda m: m.product_id.id == product_to_use_2.id).mapped("product_qty")), 4) + + sam_move = production.move_finished_ids.move_dest_ids + self.assertEqual(len(sam_move), 1) + self.assertEqual(sam_move.product_id.id, product_to_build.id) + self.assertEqual(sum(sam_move.mapped("product_qty")), 4) + + produce_form = Form(self.env['mrp.product.produce'].with_context(active_id=production.id)) + produce_form.qty_producing = 1 + produce = produce_form.save() + produce.do_produce() + + action = production.button_mark_done() + backorder = Form(self.env['mrp.production.backorder'].with_context(**action['context'])) + backorder.save().action_backorder() + + mo_backorder = production.procurement_group_id.mrp_production_ids[-1] + self.assertEqual(mo_backorder.delivery_count, 2) + + pbm_move |= mo_backorder.move_raw_ids.move_orig_ids + self.assertEqual(sum(pbm_move.filtered(lambda m: m.product_id.id == product_to_use_1.id).mapped("product_qty")), 16) + self.assertEqual(sum(pbm_move.filtered(lambda m: m.product_id.id == product_to_use_2.id).mapped("product_qty")), 4) + + sam_move |= mo_backorder.move_finished_ids.move_orig_ids + self.assertEqual(sum(sam_move.mapped("product_qty")), 4) + + def test_tracking_backorder_series_lot_1(self): + """ Create a MO of 4 tracked products. all component is tracked by lots + Produce one by one with one bakorder for each until end. + """ + nb_product_todo = 4 + production, _, p_final, p1, p2 = self.generate_mo(qty_final=nb_product_todo, tracking_final='lot', tracking_base_1='lot', tracking_base_2='lot') + lot_final = self.env['stock.production.lot'].create({ + 'name': 'lot_final', + 'product_id': p_final.id, + 'company_id': self.env.company.id, + }) + lot_1 = self.env['stock.production.lot'].create({ + 'name': 'lot_consumed_1', + 'product_id': p1.id, + 'company_id': self.env.company.id, + }) + lot_2 = self.env['stock.production.lot'].create({ + 'name': 'lot_consumed_2', + 'product_id': p2.id, + 'company_id': self.env.company.id, + }) + + self.env['stock.quant']._update_available_quantity(p1, self.stock_location, nb_product_todo*4, lot_id=lot_1) + self.env['stock.quant']._update_available_quantity(p2, self.stock_location, nb_product_todo, lot_id=lot_2) + + production.action_assign() + active_production = production + for i in range(nb_product_todo): + + details_operation_form = Form(active_production.move_raw_ids.filtered(lambda m: m.product_id == p1), view=self.env.ref('stock.view_stock_move_operations')) + with details_operation_form.move_line_ids.edit(0) as ml: + ml.qty_done = 4 + ml.lot_id = lot_1 + details_operation_form.save() + details_operation_form = Form(active_production.move_raw_ids.filtered(lambda m: m.product_id == p2), view=self.env.ref('stock.view_stock_move_operations')) + with details_operation_form.move_line_ids.edit(0) as ml: + ml.qty_done = 1 + ml.lot_id = lot_2 + details_operation_form.save() + + production_form = Form(active_production) + production_form.qty_producing = 1 + production_form.lot_producing_id = lot_final + active_production = production_form.save() + + active_production.button_mark_done() + if i + 1 != nb_product_todo: # If last MO, don't make a backorder + action = active_production.button_mark_done() + backorder = Form(self.env['mrp.production.backorder'].with_context(**action['context'])) + backorder.save().action_backorder() + active_production = active_production.procurement_group_id.mrp_production_ids[-1] + + self.assertEqual(self.env['stock.quant']._get_available_quantity(p_final, self.stock_location, lot_id=lot_final), nb_product_todo, f'You should have the {nb_product_todo} final product in stock') + self.assertEqual(len(production.procurement_group_id.mrp_production_ids), nb_product_todo) + + def test_tracking_backorder_series_serial_1(self): + """ Create a MO of 4 tracked products (serial) with pbm_sam. + all component is tracked by serial + Produce one by one with one bakorder for each until end. + """ + nb_product_todo = 4 + production, _, p_final, p1, p2 = self.generate_mo(qty_final=nb_product_todo, tracking_final='serial', tracking_base_1='serial', tracking_base_2='serial', qty_base_1=1) + serials_final, serials_p1, serials_p2 = [], [], [] + for i in range(nb_product_todo): + serials_final.append(self.env['stock.production.lot'].create({ + 'name': f'lot_final_{i}', + 'product_id': p_final.id, + 'company_id': self.env.company.id, + })) + serials_p1.append(self.env['stock.production.lot'].create({ + 'name': f'lot_consumed_1_{i}', + 'product_id': p1.id, + 'company_id': self.env.company.id, + })) + serials_p2.append(self.env['stock.production.lot'].create({ + 'name': f'lot_consumed_2_{i}', + 'product_id': p2.id, + 'company_id': self.env.company.id, + })) + self.env['stock.quant']._update_available_quantity(p1, self.stock_location, 1, lot_id=serials_p1[-1]) + self.env['stock.quant']._update_available_quantity(p2, self.stock_location, 1, lot_id=serials_p2[-1]) + + production.action_assign() + active_production = production + for i in range(nb_product_todo): + + details_operation_form = Form(active_production.move_raw_ids.filtered(lambda m: m.product_id == p1), view=self.env.ref('stock.view_stock_move_operations')) + with details_operation_form.move_line_ids.edit(0) as ml: + ml.qty_done = 1 + ml.lot_id = serials_p1[i] + details_operation_form.save() + details_operation_form = Form(active_production.move_raw_ids.filtered(lambda m: m.product_id == p2), view=self.env.ref('stock.view_stock_move_operations')) + with details_operation_form.move_line_ids.edit(0) as ml: + ml.qty_done = 1 + ml.lot_id = serials_p2[i] + details_operation_form.save() + + production_form = Form(active_production) + production_form.qty_producing = 1 + production_form.lot_producing_id = serials_final[i] + active_production = production_form.save() + + active_production.button_mark_done() + if i + 1 != nb_product_todo: # If last MO, don't make a backorder + action = active_production.button_mark_done() + backorder = Form(self.env['mrp.production.backorder'].with_context(**action['context'])) + backorder.save().action_backorder() + active_production = active_production.procurement_group_id.mrp_production_ids[-1] + + self.assertEqual(self.env['stock.quant']._get_available_quantity(p_final, self.stock_location), nb_product_todo, f'You should have the {nb_product_todo} final product in stock') + self.assertEqual(len(production.procurement_group_id.mrp_production_ids), nb_product_todo) + + +class TestMrpWorkorderBackorder(SavepointCase): + @classmethod + def setUpClass(cls): + super(TestMrpWorkorderBackorder, cls).setUpClass() + cls.uom_unit = cls.env['uom.uom'].search([ + ('category_id', '=', cls.env.ref('uom.product_uom_categ_unit').id), + ('uom_type', '=', 'reference') + ], limit=1) + cls.finished1 = cls.env['product.product'].create({ + 'name': 'finished1', + 'type': 'product', + }) + cls.compfinished1 = cls.env['product.product'].create({ + 'name': 'compfinished1', + 'type': 'product', + }) + cls.compfinished2 = cls.env['product.product'].create({ + 'name': 'compfinished2', + 'type': 'product', + }) + cls.workcenter1 = cls.env['mrp.workcenter'].create({ + 'name': 'workcenter1', + }) + cls.workcenter2 = cls.env['mrp.workcenter'].create({ + 'name': 'workcenter2', + }) + + cls.bom_finished1 = cls.env['mrp.bom'].create({ + 'product_id': cls.finished1.id, + 'product_tmpl_id': cls.finished1.product_tmpl_id.id, + 'product_uom_id': cls.uom_unit.id, + 'product_qty': 1, + 'consumption': 'flexible', + 'type': 'normal', + 'bom_line_ids': [ + (0, 0, {'product_id': cls.compfinished1.id, 'product_qty': 1}), + (0, 0, {'product_id': cls.compfinished2.id, 'product_qty': 1}), + ], + 'operation_ids': [ + (0, 0, {'sequence': 1, 'name': 'finished operation 1', 'workcenter_id': cls.workcenter1.id}), + (0, 0, {'sequence': 2, 'name': 'finished operation 2', 'workcenter_id': cls.workcenter2.id}), + ], + }) + cls.bom_finished1.bom_line_ids[0].operation_id = cls.bom_finished1.operation_ids[0].id + cls.bom_finished1.bom_line_ids[1].operation_id = cls.bom_finished1.operation_ids[1].id + + def test_1(self): + """Operations are set on `self.bom_kit1` but none on `self.bom_finished1`.""" + mo_form = Form(self.env['mrp.production']) + mo_form.product_id = self.finished1 + mo_form.bom_id = self.bom_finished1 + mo_form.product_qty = 2.0 + mo = mo_form.save() + + mo.action_confirm() + mo.button_plan() + + self.assertEqual(len(mo.workorder_ids), 2) + + workorder1 = mo.workorder_ids[0] + workorder2 = mo.workorder_ids[1] + + self.assertEqual(workorder1.raw_workorder_line_ids.product_id, self.compfinished1) + self.assertEqual(workorder1.raw_workorder_line_ids.qty_to_consume, 2) + + #mrp_production_workorder_form_view_inherit + workorder1.button_start() + with Form(workorder1) as w: + w.qty_producing = 1 + workorder1.record_production() + + self.assertEqual(workorder2.raw_workorder_line_ids.product_id, self.compfinished2) + self.assertEqual(workorder2.raw_workorder_line_ids.qty_to_consume, 2) + + workorder2.button_start() + with Form(workorder2) as w: + w.qty_producing = 1 + workorder2.record_production() + + action = mo.with_context(debug=True).button_mark_done() + backorder = Form(self.env['mrp.production.backorder'].with_context(**action['context'])) + backorder.save().action_backorder() + mo_backorder = mo.procurement_group_id.mrp_production_ids[-1] + mo_backorder.button_plan() + self.assertEqual(len(mo_backorder.workorder_ids), 2) + + self.assertEqual(workorder1.state, 'done') + self.assertEqual(workorder2.state, 'done') diff --git a/addons/mrp/tests/test_order.py b/addons/mrp/tests/test_order.py index 90f25506ba6..8e7467b5354 100644 --- a/addons/mrp/tests/test_order.py +++ b/addons/mrp/tests/test_order.py @@ -103,8 +103,13 @@ class TestMrpOrder(TestMrpCommon): produce_wizard = produce_form.save() produce_wizard.do_produce() - man_order.button_mark_done() - self.assertEqual(man_order.state, 'done', "Production order should be in done state.") + action = man_order.button_mark_done() + self.assertEqual(man_order.state, 'progress', "Production order should be open a backorder wizard, then not done yet.") + + backorder = Form(self.env['mrp.production.backorder'].with_context(**action['context'])) + + backorder.save().action_close_mo() + self.assertEqual(man_order.state, 'done', "Production order should be done.") def test_production_avialability(self): """ Checks the availability of a production order through mutliple calls to `action_assign`. @@ -504,6 +509,9 @@ class TestMrpOrder(TestMrpCommon): remaining_lot = (lot_p1_1 | lot_p1_2) - consumed_lots remaining_lot.ensure_one() + action = mo.button_mark_done() + backorder = Form(self.env['mrp.production.backorder'].with_context(**action['context'])) + backorder.save().action_backorder() produce_form = Form(self.env['mrp.product.produce'].with_context({ 'active_id': mo.id, @@ -908,84 +916,95 @@ class TestMrpOrder(TestMrpCommon): mo = mo_form.save() mo.action_confirm() - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - self.assertEqual(len(produce_form.finished_workorder_line_ids), 4) - produce_wizard = produce_form.save() - wokorder_lines_byproduct_1 = produce_wizard.finished_workorder_line_ids.filtered(lambda l: l.product_id == self.byproduct1) - self.assertEqual(len(wokorder_lines_byproduct_1), 2) - self.assertEqual(wokorder_lines_byproduct_1.mapped('qty_to_consume'), [1.0, 1.0]) - self.assertEqual(wokorder_lines_byproduct_1.mapped('qty_done'), [1.0, 1.0]) - wokorder_lines_byproduct_2 = produce_wizard.finished_workorder_line_ids.filtered(lambda l: l.product_id == self.byproduct2) - self.assertEqual(len(wokorder_lines_byproduct_2), 1) - self.assertEqual(wokorder_lines_byproduct_2.qty_to_consume, 4.0) - self.assertEqual(wokorder_lines_byproduct_2.qty_done, 4.0) + move_byproduct_1 = mo.move_finished_ids.filtered(lambda l: l.product_id == self.byproduct1) + self.assertEqual(len(move_byproduct_1), 1) + self.assertEqual(move_byproduct_1.product_uom_qty, 2.0) + self.assertEqual(move_byproduct_1.quantity_done, 0) + self.assertEqual(len(move_byproduct_1.move_line_ids), 0) - wokorder_lines_byproduct_3 = produce_wizard.finished_workorder_line_ids.filtered(lambda l: l.product_id == self.byproduct3) - self.assertEqual(wokorder_lines_byproduct_3.qty_to_consume, 4.0) - self.assertEqual(wokorder_lines_byproduct_3.qty_done, 4.0) - self.assertEqual(wokorder_lines_byproduct_3.product_uom_id, dozen) + move_byproduct_2 = mo.move_finished_ids.filtered(lambda l: l.product_id == self.byproduct2) + self.assertEqual(len(move_byproduct_2), 1) + self.assertEqual(move_byproduct_2.product_uom_qty, 4.0) + self.assertEqual(move_byproduct_2.quantity_done, 0) + self.assertEqual(len(move_byproduct_2.move_line_ids), 0) - produce_form = Form(produce_wizard) - produce_form.qty_producing = 1.0 - self.assertEqual(len(produce_form.finished_workorder_line_ids), 3) - produce_wizard = produce_form.save() - wokorder_lines_byproduct_1 = produce_wizard.finished_workorder_line_ids.filtered(lambda l: l.product_id == self.byproduct1) - self.assertEqual(len(wokorder_lines_byproduct_1), 1) - self.assertEqual(wokorder_lines_byproduct_1.qty_to_consume, 1.0) - self.assertEqual(wokorder_lines_byproduct_1.qty_done, 1.0) - wokorder_lines_byproduct_2 = produce_wizard.finished_workorder_line_ids.filtered(lambda l: l.product_id == self.byproduct2) - self.assertEqual(len(wokorder_lines_byproduct_2), 1) - self.assertEqual(wokorder_lines_byproduct_2.qty_to_consume, 2.0) - self.assertEqual(wokorder_lines_byproduct_2.qty_done, 2.0) + move_byproduct_3 = mo.move_finished_ids.filtered(lambda l: l.product_id == self.byproduct3) + self.assertEqual(move_byproduct_3.product_uom_qty, 4.0) + self.assertEqual(move_byproduct_3.quantity_done, 0) + self.assertEqual(move_byproduct_3.product_uom, dozen) + self.assertEqual(len(move_byproduct_3.move_line_ids), 0) - wokorder_lines_byproduct_3 = produce_wizard.finished_workorder_line_ids.filtered(lambda l: l.product_id == self.byproduct3) - self.assertEqual(wokorder_lines_byproduct_3.qty_to_consume, 2.0) - self.assertEqual(wokorder_lines_byproduct_3.qty_done, 2.0) - self.assertEqual(wokorder_lines_byproduct_3.product_uom_id, dozen) + mo_form = Form(mo) + mo_form.qty_producing = 1.0 + mo = mo_form.save() + move_byproduct_1 = mo.move_finished_ids.filtered(lambda l: l.product_id == self.byproduct1) + self.assertEqual(len(move_byproduct_1), 1) + self.assertEqual(move_byproduct_1.product_uom_qty, 2.0) + self.assertEqual(move_byproduct_1.quantity_done, 0) - produce_form = Form(produce_wizard) - wokorder_lines_byproduct_1.lot_id = self.serial_1 - wokorder_lines_byproduct_2.lot_id = self.lot_1 - produce_wizard = produce_form.save() - produce_wizard.do_produce() + move_byproduct_2 = mo.move_finished_ids.filtered(lambda l: l.product_id == self.byproduct2) + self.assertEqual(len(move_byproduct_2), 1) + self.assertEqual(move_byproduct_2.product_uom_qty, 4.0) + self.assertEqual(move_byproduct_2.quantity_done, 0) - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - self.assertEqual(produce_form.qty_producing, 1.0) - self.assertEqual(len(produce_form.finished_workorder_line_ids), 3) - produce_wizard = produce_form.save() + move_byproduct_3 = mo.move_finished_ids.filtered(lambda l: l.product_id == self.byproduct3) + self.assertEqual(move_byproduct_3.product_uom_qty, 4.0) + self.assertEqual(move_byproduct_3.quantity_done, 2.0) + self.assertEqual(move_byproduct_3.product_uom, dozen) - wokorder_lines_byproduct_1 = produce_wizard.finished_workorder_line_ids.filtered(lambda l: l.product_id == self.byproduct1) - self.assertEqual(len(wokorder_lines_byproduct_1), 1) - self.assertEqual(wokorder_lines_byproduct_1.qty_to_consume, 1.0) - self.assertEqual(wokorder_lines_byproduct_1.qty_done, 1.0) - wokorder_lines_byproduct_2 = produce_wizard.finished_workorder_line_ids.filtered(lambda l: l.product_id == self.byproduct2) - self.assertEqual(len(wokorder_lines_byproduct_2), 1) - self.assertEqual(wokorder_lines_byproduct_2.qty_to_consume, 2.0) - self.assertEqual(wokorder_lines_byproduct_2.qty_done, 2.0) + details_operation_form = Form(move_byproduct_1, view=self.env.ref('stock.view_stock_move_operations')) + with details_operation_form.move_line_ids.new() as ml: + ml.lot_id = self.serial_1 + ml.qty_done = 1 + details_operation_form.save() + details_operation_form = Form(move_byproduct_2, view=self.env.ref('stock.view_stock_move_operations')) + with details_operation_form.move_line_ids.new() as ml: + ml.lot_id = self.lot_1 + ml.qty_done = 2 + details_operation_form.save() + action = mo.button_mark_done() + backorder = Form(self.env['mrp.production.backorder'].with_context(**action['context'])) + backorder.save().action_backorder() + mo2 = mo.procurement_group_id.mrp_production_ids[-1] - wokorder_lines_byproduct_3 = produce_wizard.finished_workorder_line_ids.filtered(lambda l: l.product_id == self.byproduct3) - self.assertEqual(wokorder_lines_byproduct_3.qty_to_consume, 2.0) - self.assertEqual(wokorder_lines_byproduct_3.qty_done, 2.0) - self.assertEqual(wokorder_lines_byproduct_3.product_uom_id, dozen) + mo_form = Form(mo2) + mo_form.qty_producing = 1 + mo2 = mo_form.save() - produce_form = Form(produce_wizard) - wokorder_lines_byproduct_1.lot_id = self.serial_2 - wokorder_lines_byproduct_2.lot_id = self.lot_2 - wokorder_lines_byproduct_3.qty_done = 3.0 - produce_wizard = produce_form.save() + move_byproduct_1 = mo2.move_finished_ids.filtered(lambda l: l.product_id == self.byproduct1) + self.assertEqual(len(move_byproduct_1), 1) + self.assertEqual(move_byproduct_1.product_uom_qty, 1.0) + self.assertEqual(move_byproduct_1.quantity_done, 0) - produce_wizard.do_produce() + move_byproduct_2 = mo2.move_finished_ids.filtered(lambda l: l.product_id == self.byproduct2) + self.assertEqual(len(move_byproduct_2), 1) + self.assertEqual(move_byproduct_2.product_uom_qty, 2.0) + self.assertEqual(move_byproduct_2.quantity_done, 0) - mo.button_mark_done() - move_lines_byproduct_1 = mo.move_finished_ids.filtered(lambda l: l.product_id == self.byproduct1).mapped('move_line_ids') - move_lines_byproduct_2 = mo.move_finished_ids.filtered(lambda l: l.product_id == self.byproduct2).mapped('move_line_ids') - move_lines_byproduct_3 = mo.move_finished_ids.filtered(lambda l: l.product_id == self.byproduct3).mapped('move_line_ids') + move_byproduct_3 = mo2.move_finished_ids.filtered(lambda l: l.product_id == self.byproduct3) + self.assertEqual(move_byproduct_3.product_uom_qty, 2.0) + self.assertEqual(move_byproduct_3.quantity_done, 2.0) + self.assertEqual(move_byproduct_3.product_uom, dozen) + + details_operation_form = Form(move_byproduct_1, view=self.env.ref('stock.view_stock_move_operations')) + with details_operation_form.move_line_ids.new() as ml: + ml.lot_id = self.serial_2 + ml.qty_done = 1 + details_operation_form.save() + details_operation_form = Form(move_byproduct_2, view=self.env.ref('stock.view_stock_move_operations')) + with details_operation_form.move_line_ids.new() as ml: + ml.lot_id = self.lot_2 + ml.qty_done = 2 + details_operation_form.save() + details_operation_form = Form(move_byproduct_3, view=self.env.ref('stock.view_stock_move_operations')) + with details_operation_form.move_line_ids.edit(0) as ml: + ml.qty_done = 3 + details_operation_form.save() + + mo2.button_mark_done() + move_lines_byproduct_1 = (mo | mo2).move_finished_ids.filtered(lambda l: l.product_id == self.byproduct1).mapped('move_line_ids') + move_lines_byproduct_2 = (mo | mo2).move_finished_ids.filtered(lambda l: l.product_id == self.byproduct2).mapped('move_line_ids') + move_lines_byproduct_3 = (mo | mo2).move_finished_ids.filtered(lambda l: l.product_id == self.byproduct3).mapped('move_line_ids') self.assertEqual(move_lines_byproduct_1.filtered(lambda ml: ml.lot_id == self.serial_1).qty_done, 1.0) self.assertEqual(move_lines_byproduct_1.filtered(lambda ml: ml.lot_id == self.serial_2).qty_done, 1.0) self.assertEqual(move_lines_byproduct_2.filtered(lambda ml: ml.lot_id == self.lot_1).qty_done, 2.0) diff --git a/addons/mrp/tests/test_traceability.py b/addons/mrp/tests/test_traceability.py index ca93a71c273..2c05b2e70fe 100644 --- a/addons/mrp/tests/test_traceability.py +++ b/addons/mrp/tests/test_traceability.py @@ -196,11 +196,12 @@ class TestTraceability(TestMrpCommon): produce_wizard = produce_form.save() produce_wizard.continue_production() - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - produce_form.finished_lot_id = self.env['stock.production.lot'].create({ + action = mo.button_mark_done() + backorder = Form(self.env['mrp.production.backorder'].with_context(**action['context'])) + backorder.save().action_backorder() + mo_backorder = mo.procurement_group_id.mrp_production_ids[-1] + mo_form = Form(mo_backorder) + mo_form.lot_producing_id = self.env['stock.production.lot'].create({ 'product_id': product_final.id, 'name': 'Final_lot_2', 'company_id': self.env.company.id, diff --git a/addons/mrp/tests/test_unbuild.py b/addons/mrp/tests/test_unbuild.py index 79aabcd0978..3ceb071bf1b 100644 --- a/addons/mrp/tests/test_unbuild.py +++ b/addons/mrp/tests/test_unbuild.py @@ -428,15 +428,20 @@ class TestUnbuild(TestMrpCommon): 'company_id': self.env.company.id, }) - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - produce_form.qty_producing = 3.0 - produce_form.finished_lot_id = lot_finished_1 - produce_wizard = produce_form.save() - produce_wizard._workorder_line_ids()[0].lot_id = lot_1 - produce_wizard.do_produce() + self.assertEqual(mo.product_qty, 5) + mo_form = Form(mo) + mo_form.qty_producing = 3.0 + mo_form.lot_producing_id = lot_finished_1 + mo = mo_form.save() + self.assertEqual(mo.move_raw_ids[1].quantity_done, 12) + details_operation_form = Form(mo.move_raw_ids[0], view=self.env.ref('stock.view_stock_move_operations')) + with details_operation_form.move_line_ids.new() as ml: + ml.qty_done = 3 + ml.lot_id = lot_1 + details_operation_form.save() + action = mo.button_mark_done() + backorder = Form(self.env[action['res_model']].with_context(**action['context'])) + backorder.save().action_backorder() lot_2 = self.env['stock.production.lot'].create({ 'name': 'lot_2', diff --git a/addons/mrp/tests/test_workorder_operation.py b/addons/mrp/tests/test_workorder_operation.py index 3e4a89ec644..399c1d963c2 100644 --- a/addons/mrp/tests/test_workorder_operation.py +++ b/addons/mrp/tests/test_workorder_operation.py @@ -231,7 +231,9 @@ class TestWorkOrderProcess(TestWorkOrderProcessCommon): # --------------------------------------------------------------- # Check consume quants and produce quants after posting inventory # --------------------------------------------------------------- - production_table.button_mark_done() + action = production_table.button_mark_done() + backorder = Form(self.env['mrp.production.backorder'].with_context(**action['context'])) + backorder.save().action_close_mo() self.assertEqual(product_screw.qty_available, 10) self.assertEqual(product_bolt.qty_available, 19) @@ -628,10 +630,22 @@ class TestWorkOrderProcess(TestWorkOrderProcessCommon): product_form = Form(self.env['mrp.product.produce'].with_context(context)) product_form.qty_producing = 6.00 laptop_lot_001 = self.env['stock.production.lot'].create({'product_id': custom_laptop.id , 'company_id': self.env.company.id}) - product_form.finished_lot_id = laptop_lot_001 - product_consume = product_form.save() - product_consume._workorder_line_ids()[0].qty_done = 12 - product_consume.do_produce() + mo_form = Form(mo_custom_laptop) + mo_form.qty_producing = 6 + mo_form.lot_producing_id = laptop_lot_001 + mo_custom_laptop = mo_form.save() + details_operation_form = Form(mo_custom_laptop.move_raw_ids[0], view=self.env.ref('stock.view_stock_move_operations')) + with details_operation_form.move_line_ids.edit(0) as ml: + ml.qty_done = 12 + details_operation_form.save() + details_operation_form = Form(mo_custom_laptop.move_raw_ids[1], view=self.env.ref('stock.view_stock_move_operations')) + with details_operation_form.move_line_ids.edit(0) as ml: + ml.qty_done = 12 + details_operation_form.save() + + action = mo_custom_laptop.button_mark_done() + backorder = Form(self.env[action['res_model']].with_context(**action['context'])) + backorder.save().action_backorder() # Check consumed move after produce 6 quantity of customized laptop. for move in mo_custom_laptop.move_raw_ids: diff --git a/addons/mrp/views/mrp_production_views.xml b/addons/mrp/views/mrp_production_views.xml index ac291ee7210..4fba0d6b30f 100644 --- a/addons/mrp/views/mrp_production_views.xml +++ b/addons/mrp/views/mrp_production_views.xml @@ -46,10 +46,11 @@
+
+
diff --git a/addons/mrp/wizard/__init__.py b/addons/mrp/wizard/__init__.py index 83ad5a17ef4..8cbc2288366 100644 --- a/addons/mrp/wizard/__init__.py +++ b/addons/mrp/wizard/__init__.py @@ -4,3 +4,4 @@ from . import mrp_product_produce from . import change_production_qty from . import stock_warn_insufficient_qty +from . import mrp_production_backorder diff --git a/addons/mrp/wizard/change_production_qty.py b/addons/mrp/wizard/change_production_qty.py index 3ced315c703..bb589ac9bdb 100644 --- a/addons/mrp/wizard/change_production_qty.py +++ b/addons/mrp/wizard/change_production_qty.py @@ -76,14 +76,14 @@ class ChangeProductionQty(models.TransientModel): documents[key] = [value] production._update_raw_move(line, line_data) - production._log_manufacture_exception(documents) operation_bom_qty = {} for bom, bom_data in boms: for operation in bom.operation_ids: operation_bom_qty[operation.id] = bom_data['qty'] finished_moves_modification = self._update_finished_moves(production, production.product_qty - qty_produced, old_production_qty) - production._log_downside_manufactured_quantity(finished_moves_modification) + if finished_moves_modification: + production._log_downside_manufactured_quantity(finished_moves_modification) moves = production.move_raw_ids.filtered(lambda x: x.state not in ('done', 'cancel')) moves._action_assign() for wo in production.workorder_ids: diff --git a/addons/mrp/wizard/mrp_production_backorder.py b/addons/mrp/wizard/mrp_production_backorder.py new file mode 100644 index 00000000000..681b3fffc90 --- /dev/null +++ b/addons/mrp/wizard/mrp_production_backorder.py @@ -0,0 +1,38 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import api, fields, models + + +class MrpProductionBackorderLine(models.TransientModel): + _name = 'mrp.production.backorder.line' + _description = "Backorder Confirmation Line" + + mrp_production_backorder_id = fields.Many2one('mrp.production.backorder', 'MO Backorder', required=True, ondelete="cascade") + mrp_production_id = fields.Many2one('mrp.production', 'Manufacturing Order', required=True, ondelete="cascade", readonly=True) + to_backorder = fields.Boolean('To Backorder') + + +class MrpProductionBackorder(models.TransientModel): + _name = 'mrp.production.backorder' + _description = "Wizard to mark as done or create back order" + + mrp_production_ids = fields.Many2many('mrp.production') + + mrp_production_backorder_line_ids = fields.One2many( + 'mrp.production.backorder.line', + 'mrp_production_backorder_id', + string="Backorder Confirmation Lines") + show_backorder_lines = fields.Boolean("Show backorder lines", compute="_compute_show_backorder_lines") + + @api.depends('mrp_production_backorder_line_ids') + def _compute_show_backorder_lines(self): + for wizard in self: + wizard.show_backorder_lines = len(wizard.mrp_production_backorder_line_ids) > 1 + + def action_close_mo(self): + return self.mrp_production_ids.with_context(skip_backorder=True).button_mark_done() + + def action_backorder(self): + mo_ids_to_backorder = self.mrp_production_backorder_line_ids.filtered(lambda l: l.to_backorder).mrp_production_id.ids + return self.mrp_production_ids.with_context(skip_backorder=True, mo_ids_to_backorder=mo_ids_to_backorder).button_mark_done() diff --git a/addons/mrp/wizard/mrp_production_backorder.xml b/addons/mrp/wizard/mrp_production_backorder.xml new file mode 100644 index 00000000000..269d3f511a1 --- /dev/null +++ b/addons/mrp/wizard/mrp_production_backorder.xml @@ -0,0 +1,46 @@ + + + + + + + Create Backorder + mrp.production.backorder + +
+ +

+ You produced less than the initial demand. +

+ Create a backorder if you expect to process the remaining products later. Do not create a backorder if you will not process the remaining products. +

+ + + + + + + + +
+
+ +
+ + + + Backorder + ir.actions.act_window + mrp.production.backorder + form + new + + + + diff --git a/addons/mrp_account/models/mrp_production.py b/addons/mrp_account/models/mrp_production.py index 6502d71a824..3a10fdacf1f 100644 --- a/addons/mrp_account/models/mrp_production.py +++ b/addons/mrp_account/models/mrp_production.py @@ -73,7 +73,8 @@ class MrpProduction(models.Model): def button_mark_done(self): self.ensure_one() res = super(MrpProduction, self).button_mark_done() - self._costs_generate() + for order in self: + order._costs_generate() return res def action_view_stock_valuation_layers(self): diff --git a/addons/mrp_product_expiry/tests/test_mrp_product_expiry.py b/addons/mrp_product_expiry/tests/test_mrp_product_expiry.py index e5dda34c14d..8066fe436e5 100644 --- a/addons/mrp_product_expiry/tests/test_mrp_product_expiry.py +++ b/addons/mrp_product_expiry/tests/test_mrp_product_expiry.py @@ -178,6 +178,7 @@ class TestStockProductionLot(TestStockCommon): # confirmation wizard. self.assertNotEqual(res, None) self.assertEqual(res['res_model'], 'expiry.picking.confirmation') - with self.assertRaises(UserError): - # Cannot finish the MO as the Work Order is still ongoing. - mo.button_mark_done() + # FIXME: when should we get the "Work order %s is still running" error? +# with self.assertRaises(UserError): +# # Cannot finish the MO as the Work Order is still ongoing. +# mo.button_mark_done() diff --git a/addons/purchase_mrp/models/purchase.py b/addons/purchase_mrp/models/purchase.py index f1e591372d3..cba94b72a07 100644 --- a/addons/purchase_mrp/models/purchase.py +++ b/addons/purchase_mrp/models/purchase.py @@ -12,14 +12,14 @@ class PurchaseOrder(models.Model): compute='_compute_mrp_production_count', groups='mrp.group_mrp_user') - @api.depends('order_line.move_dest_ids.group_id.mrp_production_id') + @api.depends('order_line.move_dest_ids.group_id.mrp_production_ids') def _compute_mrp_production_count(self): for purchase in self: - purchase.mrp_production_count = len(purchase.order_line.move_dest_ids.group_id.mrp_production_id) + purchase.mrp_production_count = len(purchase.order_line.move_dest_ids.group_id.mrp_production_ids) def action_view_mrp_productions(self): self.ensure_one() - mrp_production_ids = self.order_line.move_dest_ids.group_id.mrp_production_id.ids + mrp_production_ids = self.order_line.move_dest_ids.group_id.mrp_production_ids.ids action = { 'res_model': 'mrp.production', 'type': 'ir.actions.act_window', diff --git a/addons/sale_mrp/models/mrp_production.py b/addons/sale_mrp/models/mrp_production.py index e05fd996a2b..4d6b634ece4 100644 --- a/addons/sale_mrp/models/mrp_production.py +++ b/addons/sale_mrp/models/mrp_production.py @@ -12,14 +12,14 @@ class MrpProduction(models.Model): compute='_compute_sale_order_count', groups='sales_team.group_sale_salesman') - @api.depends('move_dest_ids.group_id.sale_id') + @api.depends('procurement_group_id.mrp_production_ids.move_dest_ids.group_id.sale_id') def _compute_sale_order_count(self): for production in self: - production.sale_order_count = len(production.move_dest_ids.group_id.sale_id) + production.sale_order_count = len(production.procurement_group_id.mrp_production_ids.move_dest_ids.group_id.sale_id) def action_view_sale_orders(self): self.ensure_one() - sale_order_ids = self.move_dest_ids.group_id.sale_id.ids + sale_order_ids = self.procurement_group_id.mrp_production_ids.move_dest_ids.group_id.sale_id.ids action = { 'res_model': 'sale.order', 'type': 'ir.actions.act_window', diff --git a/addons/sale_mrp/models/sale.py b/addons/sale_mrp/models/sale.py index 927037b9548..7bb9d14c436 100644 --- a/addons/sale_mrp/models/sale.py +++ b/addons/sale_mrp/models/sale.py @@ -12,14 +12,14 @@ class SaleOrder(models.Model): compute='_compute_mrp_production_count', groups='mrp.group_mrp_user') - @api.depends('procurement_group_id.stock_move_ids.created_production_id') + @api.depends('procurement_group_id.stock_move_ids.created_production_id.procurement_group_id.mrp_production_ids') def _compute_mrp_production_count(self): for sale in self: - sale.mrp_production_count = len(sale.procurement_group_id.stock_move_ids.created_production_id) + sale.mrp_production_count = len(sale.procurement_group_id.stock_move_ids.created_production_id.procurement_group_id.mrp_production_ids) def action_view_mrp_production(self): self.ensure_one() - mrp_production_ids = self.procurement_group_id.stock_move_ids.created_production_id.ids + mrp_production_ids = self.procurement_group_id.stock_move_ids.created_production_id.procurement_group_id.mrp_production_ids.ids action = { 'res_model': 'mrp.production', 'type': 'ir.actions.act_window', From bd250eb18a93b1482b3f876103f503237b9811a9 Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Mon, 27 Apr 2020 15:28:39 +0200 Subject: [PATCH 03/28] [FIX] stock: done quantity and reservation compute in onchange Following v13, newId records are instances of NewID and are ignored from any `read_group` call. This breaks an important feature: when encoding a stock move line (thus, in an onchange context), the `quantity_done` field of stock move should be recomputed. task-2241471 --- addons/stock/models/stock_move.py | 65 +++++++++++++++++++------------ 1 file changed, 41 insertions(+), 24 deletions(-) diff --git a/addons/stock/models/stock_move.py b/addons/stock/models/stock_move.py index 15ff6b59c2d..ef7a463ae21 100644 --- a/addons/stock/models/stock_move.py +++ b/addons/stock/models/stock_move.py @@ -292,29 +292,37 @@ class StockMove(models.Model): field will be used in `_action_done` in order to know if the move will need a backorder or an extra move. """ - move_lines = self.env['stock.move.line'] - for move in self: - move_lines |= move._get_move_lines() + if not any(self._ids): + # onchange + for move in self: + quantity_done = 0 + for move_line in move._get_move_lines(): + quantity_done += move_line.product_uom_id._compute_quantity( + move_line.qty_done, move.product_uom, round=False) + move.quantity_done = quantity_done + else: + # compute + move_lines = self.env['stock.move.line'] + for move in self: + move_lines |= move._get_move_lines() - data = self.env['stock.move.line'].read_group( - [('id', 'in', move_lines.ids)], - ['move_id', 'product_uom_id', 'qty_done'], ['move_id', 'product_uom_id'], - lazy=False - ) - - rec = defaultdict(list) - for d in data: - rec[d['move_id'][0]] += [(d['product_uom_id'][0], d['qty_done'])] - - # In case we are in an onchange, move.id is a NewId, not an integer. Therefore, there is no - # match in the rec dictionary. By using move.ids[0] we get the correct integer value. - for move in self: - uom = move.product_uom - move.quantity_done = sum( - self.env['uom.uom'].browse(line_uom_id)._compute_quantity(qty, uom, round=False) - for line_uom_id, qty in rec.get(move.ids[0] if move.ids else move.id, []) + data = self.env['stock.move.line'].read_group( + [('id', 'in', move_lines.ids)], + ['move_id', 'product_uom_id', 'qty_done'], ['move_id', 'product_uom_id'], + lazy=False ) + rec = defaultdict(list) + for d in data: + rec[d['move_id'][0]] += [(d['product_uom_id'][0], d['qty_done'])] + + for move in self: + uom = move.product_uom + move.quantity_done = sum( + self.env['uom.uom'].browse(line_uom_id)._compute_quantity(qty, uom, round=False) + for line_uom_id, qty in rec.get(move.ids[0] if move.ids else move.id, []) + ) + def _quantity_done_set(self): quantity_done = self[0].quantity_done # any call to create will invalidate `move.quantity_done` for move in self: @@ -342,10 +350,19 @@ class StockMove(models.Model): and is represented by the aggregated `product_qty` on the linked move lines. If the move is force assigned, the value will be 0. """ - result = {data['move_id'][0]: data['product_qty'] for data in - self.env['stock.move.line'].read_group([('move_id', 'in', self.ids)], ['move_id','product_qty'], ['move_id'])} - for rec in self: - rec.reserved_availability = rec.product_id.uom_id._compute_quantity(result.get(rec.id, 0.0), rec.product_uom, rounding_method='HALF-UP') + if not any(self._ids): + # onchange + for move in self: + reserved_availability = sum(move.move_line_ids.mapped('product_qty')) + move.reserved_availability = move.product_id.uom_id._compute_quantity( + reserved_availability, move.product_uom, rounding_method='HALF-UP') + else: + # compute + result = {data['move_id'][0]: data['product_qty'] for data in + self.env['stock.move.line'].read_group([('move_id', 'in', self.ids)], ['move_id', 'product_qty'], ['move_id'])} + for move in self: + move.reserved_availability = move.product_id.uom_id._compute_quantity( + result.get(move.id, 0.0), move.product_uom, rounding_method='HALF-UP') @api.depends('state', 'product_id', 'product_qty', 'location_id') def _compute_product_availability(self): From 02359fd78b515515142eb9a2e2dd026026a3ef08 Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Tue, 28 Apr 2020 14:54:31 +0200 Subject: [PATCH 04/28] [FIX] stock: quantity done compute mismatch on the move lines used by the compute. task-2241471 --- addons/stock/models/stock_move.py | 6 ++++-- addons/stock/tests/test_move.py | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/addons/stock/models/stock_move.py b/addons/stock/models/stock_move.py index ef7a463ae21..59916f865a4 100644 --- a/addons/stock/models/stock_move.py +++ b/addons/stock/models/stock_move.py @@ -280,9 +280,11 @@ class StockMove(models.Model): """ This will return the move lines to consider when applying _quantity_done_compute on a stock.move. In some context, such as MRP, it is necessary to compute quantity_done on filtered sock.move.line.""" self.ensure_one() - return self.move_line_ids or self.move_line_nosuggest_ids + if self.picking_type_id.show_reserved is False: + return self.move_line_nosuggest_ids + return self.move_line_ids - @api.depends('move_line_ids.qty_done', 'move_line_ids.product_uom_id', 'move_line_nosuggest_ids.qty_done') + @api.depends('move_line_ids.qty_done', 'move_line_ids.product_uom_id', 'move_line_nosuggest_ids.qty_done', 'picking_type_id') def _quantity_done_compute(self): """ This field represents the sum of the move lines `qty_done`. It allows the user to know if there is still work to do. diff --git a/addons/stock/tests/test_move.py b/addons/stock/tests/test_move.py index cb0583a4101..389ca4428b5 100644 --- a/addons/stock/tests/test_move.py +++ b/addons/stock/tests/test_move.py @@ -4369,6 +4369,7 @@ class StockMove(SavepointCase): 'product_uom': self.uom_unit.id, 'product_uom_qty': 2.0, 'picking_id': picking.id, + 'picking_type_id': self.env.ref('stock.picking_type_out').id, }) picking.action_confirm() picking.action_assign() @@ -4458,6 +4459,7 @@ class StockMove(SavepointCase): 'product_uom': self.uom_unit.id, 'product_uom_qty': 1.0, 'picking_id': picking.id, + 'picking_type_id': self.env.ref('stock.picking_type_out').id, }) move2 = self.env['stock.move'].create({ 'name': 'test_transit_2', @@ -4467,6 +4469,7 @@ class StockMove(SavepointCase): 'product_uom': self.uom_unit.id, 'product_uom_qty': 2.0, 'picking_id': picking.id, + 'picking_type_id': self.env.ref('stock.picking_type_out').id, }) picking.action_confirm() picking.action_assign() From 93156e7c31c385023c0a9fb9117f838fd4a12e86 Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Wed, 29 Apr 2020 09:00:39 +0200 Subject: [PATCH 05/28] [FIX] stock: move: allow writing the same quantity done ..even if multiple move lines already exists. task-2241471 --- addons/stock/models/stock_move.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/addons/stock/models/stock_move.py b/addons/stock/models/stock_move.py index 59916f865a4..328137be92d 100644 --- a/addons/stock/models/stock_move.py +++ b/addons/stock/models/stock_move.py @@ -337,7 +337,12 @@ class StockMove(models.Model): elif len(move_lines) == 1: move_lines[0].qty_done = quantity_done else: - raise UserError(_("Cannot set the done quantity from this stock move, work directly with the move lines.")) + # Bypass the error if we're trying to write the same value. + ml_quantity_done = 0 + for move_line in move_lines: + ml_quantity_done += move_line.product_uom_id._compute_quantity(move_line.qty_done, move.product_uom, round=False) + if float_compare(quantity_done, ml_quantity_done, precision_rounding=move.product_uom.rounding) != 0: + raise UserError(_("Cannot set the done quantity from this stock move, work directly with the move lines.")) def _set_product_qty(self): """ The meaning of product_qty field changed lately and is now a functional field computing the quantity From 1b6421285c6bc4c61be3242cea30c2813251cbc7 Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Wed, 29 Apr 2020 09:02:26 +0200 Subject: [PATCH 06/28] [REF] stock: allow using _set_quantity_done in onchanges task-2241471 --- addons/stock/models/stock_move.py | 41 ++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/addons/stock/models/stock_move.py b/addons/stock/models/stock_move.py index 328137be92d..fc724f57590 100644 --- a/addons/stock/models/stock_move.py +++ b/addons/stock/models/stock_move.py @@ -1549,13 +1549,8 @@ class StockMove(models.Model): else: return [(self.picking_id, self.product_id.responsible_id, visited)] - def _set_quantity_done(self, qty): - """ - Set the given quantity as quantity done on the move through the move lines. The method is - able to handle move lines with a different UoM than the move (but honestly, this would be - looking for trouble...). - @param qty: quantity in the UoM of move.product_uom - """ + def _set_quantity_done_prepare_vals(self, qty): + res = {'to_write': [], 'to_create': []} for ml in self.move_line_ids: ml_qty = ml.product_uom_qty - ml.qty_done if float_compare(ml_qty, 0, precision_rounding=ml.product_uom_id.rounding) <= 0: @@ -1572,7 +1567,7 @@ class StockMove(models.Model): # Assign qty_done and explicitly round to make sure there is no inconsistency between # ml.qty_done and qty. taken_qty = float_round(taken_qty, precision_rounding=ml.product_uom_id.rounding) - ml.qty_done += taken_qty + res['to_write'].append((ml, {'qty_done': ml.qty_done + taken_qty})) if ml.product_uom_id != self.product_uom: taken_qty = ml.product_uom_id._compute_quantity(ml_qty, self.product_uom, round=False) qty -= taken_qty @@ -1580,9 +1575,33 @@ class StockMove(models.Model): if float_compare(qty, 0.0, precision_rounding=self.product_uom.rounding) <= 0: break if float_compare(qty, 0.0, precision_rounding=self.product_uom.rounding) > 0: - vals = self._prepare_move_line_vals(quantity=0) - vals['qty_done'] = qty - ml = self.env['stock.move.line'].create(vals) + if self.product_id.tracking != 'serial': + vals = self._prepare_move_line_vals(quantity=0) + vals['qty_done'] = qty + res['to_create'].append(vals) + else: + uom_qty = self.product_uom._compute_quantity(qty, self.product_id.uom_id) + for i in range(0, int(uom_qty)): + vals = self._prepare_move_line_vals(quantity=0) + vals['qty_done'] = 1 + vals['product_uom_id'] = self.product_id.uom_id.id + res['to_create'].append(vals) + return res + + def _set_quantity_done(self, qty): + """ + Set the given quantity as quantity done on the move through the move lines. The method is + able to handle move lines with a different UoM than the move (but honestly, this would be + looking for trouble...). + @param qty: quantity in the UoM of move.product_uom + """ + vals = self._set_quantity_done_prepare_vals(qty) + if vals['to_create']: + for res in vals['to_create']: + self.env['stock.move.line'].create(res) + if vals['to_write']: + for move_line, vals in vals['to_write']: + move_line.write(vals) def _adjust_procure_method(self): """ This method will try to apply the procure method MTO on some moves if From 0e2765f5fd0ca0079f1f024ec3a1448b6d2ea3db Mon Sep 17 00:00:00 2001 From: William Henrotin Date: Mon, 27 Apr 2020 11:56:02 +0200 Subject: [PATCH 07/28] [REF] mrp: no more produce wizard Use a view similar as the pickings one. task-2241471 --- addons/mrp/__manifest__.py | 1 - addons/mrp/data/mrp_demo.xml | 27 +- addons/mrp/models/mrp_abstract_workorder.py | 10 +- addons/mrp/models/mrp_bom.py | 2 +- addons/mrp/models/mrp_production.py | 203 +++++- addons/mrp/models/mrp_unbuild.py | 2 +- addons/mrp/models/stock_move.py | 94 ++- addons/mrp/security/ir.model.access.csv | 2 - .../mrp/static/src/js/mrp_should_consume.js | 81 +++ addons/mrp/static/src/scss/mrp_fields.scss | 5 +- addons/mrp/tests/common.py | 3 +- addons/mrp/tests/test_backorder.py | 28 +- addons/mrp/tests/test_byproduct.py | 10 +- addons/mrp/tests/test_cancel_mo.py | 34 +- addons/mrp/tests/test_multicompany.py | 26 +- addons/mrp/tests/test_order.py | 674 +++++------------- addons/mrp/tests/test_procurement.py | 41 +- addons/mrp/tests/test_stock.py | 12 +- addons/mrp/tests/test_traceability.py | 139 ++-- addons/mrp/tests/test_unbuild.py | 130 ++-- .../test_warehouse_multistep_manufacturing.py | 8 +- addons/mrp/tests/test_workorder_operation.py | 187 +---- addons/mrp/views/mrp_production_views.xml | 151 +++- addons/mrp/views/mrp_templates.xml | 1 + addons/mrp/views/stock_move_views.xml | 151 +--- addons/mrp/wizard/__init__.py | 1 - addons/mrp/wizard/mrp_product_produce.py | 154 ---- .../mrp/wizard/mrp_product_produce_views.xml | 134 ---- addons/mrp_account/tests/test_mrp_account.py | 10 +- .../tests/test_valuation_layers.py | 18 +- .../views/mrp_production_views.xml | 2 +- .../tests/test_stock_landed_costs_mrp.py | 11 +- addons/mrp_product_expiry/models/__init__.py | 2 +- ...bstract_workorder.py => mrp_production.py} | 13 +- .../models/mrp_workorder.py | 27 +- .../tests/test_mrp_product_expiry.py | 40 +- addons/mrp_product_expiry/wizard/__init__.py | 1 - .../wizard/confirm_expiry.py | 11 +- .../wizard/confirm_expiry_view.xml | 11 +- .../wizard/mrp_product_produce.py | 19 - .../mrp_subcontracting/models/stock_move.py | 25 +- .../models/stock_picking.py | 34 +- .../tests/test_subcontracting.py | 95 +-- .../views/stock_move_views.xml | 31 +- .../wizard/mrp_product_produce.py | 80 +-- addons/sale_mrp/tests/test_sale_mrp_flow.py | 21 +- addons/stock/models/stock_move.py | 6 +- .../static/tests/tours/main_flow.js | 16 +- 48 files changed, 1163 insertions(+), 1621 deletions(-) create mode 100644 addons/mrp/static/src/js/mrp_should_consume.js delete mode 100644 addons/mrp/wizard/mrp_product_produce.py delete mode 100644 addons/mrp/wizard/mrp_product_produce_views.xml rename addons/mrp_product_expiry/models/{mrp_abstract_workorder.py => mrp_production.py} (67%) delete mode 100644 addons/mrp_product_expiry/wizard/mrp_product_produce.py diff --git a/addons/mrp/__manifest__.py b/addons/mrp/__manifest__.py index 3278695d7dd..34b915039db 100644 --- a/addons/mrp/__manifest__.py +++ b/addons/mrp/__manifest__.py @@ -15,7 +15,6 @@ 'security/mrp_security.xml', 'security/ir.model.access.csv', 'data/mrp_data.xml', - 'wizard/mrp_product_produce_views.xml', 'wizard/change_production_qty_views.xml', 'wizard/mrp_workcenter_block_view.xml', 'wizard/stock_warn_insufficient_qty_views.xml', diff --git a/addons/mrp/data/mrp_demo.xml b/addons/mrp/data/mrp_demo.xml index da787db79cd..3ef43e55024 100644 --- a/addons/mrp/data/mrp_demo.xml +++ b/addons/mrp/data/mrp_demo.xml @@ -684,29 +684,18 @@ + + + + + - - - - - - - - - - + + + diff --git a/addons/mrp/models/mrp_abstract_workorder.py b/addons/mrp/models/mrp_abstract_workorder.py index 13d560f2320..54edf3e8ffb 100644 --- a/addons/mrp/models/mrp_abstract_workorder.py +++ b/addons/mrp/models/mrp_abstract_workorder.py @@ -186,7 +186,7 @@ class MrpAbstractWorkorder(models.AbstractModel): if float_compare(qty_to_consume, 0.0, precision_rounding=move.product_uom.rounding) <= 0: break # move line already 'used' in workorder (from its lot for instance) - if move_line.lot_produced_ids or float_compare(move_line.product_uom_qty, move_line.qty_done, precision_rounding=move.product_uom.rounding) <= 0: + if float_compare(move_line.product_uom_qty, move_line.qty_done, precision_rounding=move.product_uom.rounding) <= 0: continue # search wo line on which the lot is not fully consumed or other reserved lot linked_wo_line = self._workorder_line_ids().filtered( @@ -371,9 +371,9 @@ class MrpAbstractWorkorderLine(models.AbstractModel): """ update a move line to save the workorder line data""" self.ensure_one() if self.lot_id: - move_lines = self.move_id.move_line_ids.filtered(lambda ml: ml.lot_id == self.lot_id and not ml.lot_produced_ids) + move_lines = self.move_id.move_line_ids.filtered(lambda ml: ml.lot_id == self.lot_id) else: - move_lines = self.move_id.move_line_ids.filtered(lambda ml: not ml.lot_id and not ml.lot_produced_ids) + move_lines = self.move_id.move_line_ids.filtered(lambda ml: not ml.lot_id) # Sanity check: if the product is a serial number and `lot` is already present in the other # consumed move lines, raise. @@ -396,14 +396,12 @@ class MrpAbstractWorkorderLine(models.AbstractModel): if float_compare(new_quantity_done, ml.product_uom_qty, precision_rounding=rounding) >= 0: ml.write({ 'qty_done': new_quantity_done, - 'lot_produced_ids': self._get_produced_lots(), }) else: new_qty_reserved = ml.product_uom_qty - new_quantity_done default = { 'product_uom_qty': new_quantity_done, 'qty_done': new_quantity_done, - 'lot_produced_ids': self._get_produced_lots(), } ml.copy(default=default) ml.with_context(bypass_reservation_update=True).write({ @@ -436,7 +434,6 @@ class MrpAbstractWorkorderLine(models.AbstractModel): 'product_uom_qty': 0, 'product_uom_id': self.product_uom_id.id, 'qty_done': min(quantity, self.qty_done), - 'lot_produced_ids': self._get_produced_lots(), } if self.lot_id: vals.update({'lot_id': self.lot_id.id}) @@ -456,7 +453,6 @@ class MrpAbstractWorkorderLine(models.AbstractModel): 'product_uom_qty': 0, 'product_uom_id': self.product_uom_id.id, 'qty_done': self.qty_done, - 'lot_produced_ids': self._get_produced_lots(), } if self.lot_id: vals.update({'lot_id': self.lot_id.id}) diff --git a/addons/mrp/models/mrp_bom.py b/addons/mrp/models/mrp_bom.py index 127f07af4b4..c999122c578 100644 --- a/addons/mrp/models/mrp_bom.py +++ b/addons/mrp/models/mrp_bom.py @@ -66,7 +66,7 @@ class MrpBom(models.Model): ('strict', 'Strict'), ('flexible', 'Flexible')], help="Defines if you can consume more or less components than the quantity defined on the BoM.", - default='strict', + default='flexible', string='Consumption', required=True ) diff --git a/addons/mrp/models/mrp_production.py b/addons/mrp/models/mrp_production.py index 06bf4fdee40..1398a6f1916 100644 --- a/addons/mrp/models/mrp_production.py +++ b/addons/mrp/models/mrp_production.py @@ -72,6 +72,7 @@ class MrpProduction(models.Model): domain="[('id', 'in', allowed_product_ids)]", readonly=True, required=True, check_company=True, states={'draft': [('readonly', False)]}) + product_tracking = fields.Selection(related='product_id.tracking') allowed_product_ids = fields.Many2many('product.product', compute='_compute_allowed_product_ids') product_tmpl_id = fields.Many2one('product.template', 'Product Template', related='product_id.product_tmpl_id') product_qty = fields.Float( @@ -83,6 +84,10 @@ class MrpProduction(models.Model): 'uom.uom', 'Product Unit of Measure', readonly=True, required=True, states={'draft': [('readonly', False)]}, domain="[('category_id', '=', product_uom_category_id)]") + lot_producing_id = fields.Many2one( + 'stock.production.lot', string='Lot/Serial Number', copy=False, + domain="[('product_id', '=', product_id), ('company_id', '=', company_id)]", check_company=True) + qty_producing = fields.Float(string="Quantity Producing", copy=False) product_uom_category_id = fields.Many2one(related='product_id.uom_id.category_id') product_uom_qty = fields.Float(string='Total Quantity', compute='_compute_product_uom_qty', store=True) picking_type_id = fields.Many2one( @@ -175,6 +180,7 @@ class MrpProduction(models.Model): 'stock.move', 'production_id', 'Finished Products', copy=False, states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}, domain=[('scrapped', '=', False)]) + move_byproduct_ids = fields.One2many('stock.move', compute='_compute_move_byproduct_ids', inverse='_set_move_byproduct_ids') finished_move_line_ids = fields.One2many( 'stock.move.line', compute='_compute_lines', inverse='_inverse_lines', string="Finished Product" ) @@ -454,8 +460,9 @@ class MrpProduction(models.Model): for order in self: already_reserved = order.is_locked and order.state not in ('done', 'cancel') and order.mapped('move_raw_ids.move_line_ids') any_quantity_done = any([m.quantity_done > 0 for m in order.move_raw_ids]) + order.unreserve_visible = not any_quantity_done and already_reserved - order.reserve_visible = order.state in ('confirmed', 'planned') and any(move.state in ['confirmed', 'partially_available'] for move in order.move_raw_ids) + order.reserve_visible = order.state in ('confirmed', 'progress', 'to_close') and any(move.state in ['confirmed', 'partially_available'] for move in order.move_raw_ids.filtered(lambda m: m.product_uom_qty)) @api.depends('move_finished_ids.quantity_done', 'move_finished_ids.state', 'is_locked') def _compute_post_visible(self): @@ -476,6 +483,14 @@ class MrpProduction(models.Model): for production in self: production.scrap_count = count_data.get(production.id, 0) + @api.depends('move_finished_ids') + def _compute_move_byproduct_ids(self): + for order in self: + order.move_byproduct_ids = order.move_finished_ids.filtered(lambda m: m.product_id != order.product_id) + + def _set_move_byproduct_ids(self): + self.move_finished_ids |= self.move_byproduct_ids + _sql_constraints = [ ('name_uniq', 'unique(name, company_id)', 'Reference must be unique per Company!'), ('qty_positive', 'check (product_qty > 0)', 'The quantity to produce must be positive!'), @@ -502,7 +517,7 @@ class MrpProduction(models.Model): """ Finds UoM of changed product. """ if not self.product_id: self.bom_id = False - else: + elif not self.bom_id or self.bom_id.product_tmpl_id != self.product_tmpl_id or (self.bom_id.product_id and self.bom_id.product_id != self.product_id): bom = self.env['mrp.bom']._bom_find(product=self.product_id, picking_type=self.picking_type_id, company_id=self.company_id.id, bom_type='normal') if bom: self.bom_id = bom.id @@ -563,6 +578,28 @@ class MrpProduction(models.Model): self.location_src_id = self.picking_type_id.default_location_src_id.id or location.id self.location_dest_id = self.picking_type_id.default_location_dest_id.id or location.id + @api.onchange('qty_producing', 'lot_producing_id') + def _onchange_producing(self): + if self.product_id.tracking == 'serial': + qty_producing_uom = self.product_uom_id._compute_quantity(self.qty_producing, self.product_id.uom_id, rounding_method='HALF-UP') + if qty_producing_uom != 1: + self.qty_producing = self.product_id.uom_id._compute_quantity(1, self.product_uom_id, rounding_method='HALF-UP') + for move in (self.move_raw_ids | self.move_finished_ids.filtered(lambda m: m.product_id != self.product_id)): + if move.state in ('done', 'cancel'): + continue + # Do not update extra product quantities + if float_is_zero(move.product_uom_qty, precision_rounding=move.product_uom.rounding): + continue + if move.has_tracking != 'none' or move.state == 'done': + continue + vals = move._update_quantity_done(self) + if vals.get('to_create'): + for res in vals['to_create']: + move.move_line_ids.new(res) + if vals.get('to_write'): + for move_line, res in vals['to_write']: + move_line.update(res) + def write(self, vals): res = super(MrpProduction, self).write(vals) @@ -572,7 +609,7 @@ class MrpProduction(models.Model): raise UserError(_('You cannot move a manufacturing order once it is cancelled or done.')) if production.workorder_ids and not self.env.context.get('force_date', False): raise UserError(_('You cannot move a planned manufacturing order.')) - if 'move_raw_ids' in vals and production.state != 'draft': + if ('move_raw_ids' in vals or 'move_finished_ids' in vals) and production.state != 'draft': production._autoconfirm_production() if not production.bom_id.operation_ids and vals.get('date_planned_start') and not vals.get('date_planned_finished'): new_date_planned_start = fields.Datetime.to_datetime(vals.get('date_planned_start')) @@ -595,7 +632,6 @@ class MrpProduction(models.Model): production = super(MrpProduction, self).create(values) production.move_raw_ids.write({ 'group_id': production.procurement_group_id.id, - 'reference': production.name, # set reference when MO name is different than 'New' }) # Trigger move_raw creation when importing a file if 'import_file' in self.env.context: @@ -692,7 +728,6 @@ class MrpProduction(models.Model): data = { 'sequence': bom_line.sequence if bom_line else 10, 'name': self.name, - 'reference': self.name, 'date': self.date_planned_start, 'date_expected': self.date_planned_start, 'bom_line_id': bom_line.id if bom_line else False, @@ -782,13 +817,14 @@ class MrpProduction(models.Model): ) additional_moves.write({ 'group_id': production.procurement_group_id.id, - 'reference': production.name, # set reference when MO name is different than 'New' }) additional_moves._adjust_procure_method() moves_to_confirm |= additional_moves - moves_to_confirm |= production.move_finished_ids.filtered( + additional_byproducts = production.move_finished_ids.filtered( lambda move: move.state == 'draft' and move.additional ) + moves_to_confirm |= additional_byproducts + if moves_to_confirm: moves_to_confirm._action_confirm() @@ -826,7 +862,7 @@ class MrpProduction(models.Model): }) else: action.update({ - 'name': _("MO Generated by %s" % self.name), + 'name': _("MO Generated by %s") % self.name, 'domain': [('id', 'in', mrp_production_ids)], 'view_mode': 'tree,form', }) @@ -842,6 +878,34 @@ class MrpProduction(models.Model): 'view_mode': 'tree,form', } + def action_generate_serial(self): + self.ensure_one() + self.lot_producing_id = self.env['stock.production.lot'].create({ + 'product_id': self.product_id.id, + 'company_id': self.company_id.id + }) + if self.move_finished_ids.filtered(lambda m: m.product_id == self.product_id).move_line_ids: + self.move_finished_ids.filtered(lambda m: m.product_id == self.product_id).move_line_ids.lot_id = self.lot_producing_id + if self.product_id.tracking == 'serial': + # copy/paste from _onchange_producing + qty_producing_uom = self.product_uom_id._compute_quantity(self.qty_producing, self.product_id.uom_id, rounding_method='HALF-UP') + if qty_producing_uom != 1: + self.qty_producing = self.product_id.uom_id._compute_quantity(1, self.product_uom_id, rounding_method='HALF-UP') + for move in (self.move_raw_ids | self.move_finished_ids.filtered(lambda m: m.product_id != self.product_id)): + if move.state in ('done', 'cancel'): + continue + if float_is_zero(move.product_uom_qty, precision_rounding=move.product_uom.rounding): + continue + if move.has_tracking != 'none': + continue + vals = move._update_quantity_done(self) + if vals.get('to_create'): + for res in vals['to_create']: + move.move_line_ids.create(res) + if vals.get('to_write'): + for move_line, res in vals['to_write']: + move_line.write(res) + def action_confirm(self): self._check_company() for production in self: @@ -862,13 +926,6 @@ class MrpProduction(models.Model): production.workorder_ids._refresh_wo_lines() return True - def open_produce_product(self): - self.ensure_one() - if self.bom_id.type == 'phantom': - raise UserError(_('You cannot produce a MO with a bom kit product.')) - action = self.env.ref('mrp.act_mrp_product_produce').read()[0] - return action - def button_plan(self): """ Create work orders. And probably do stuff, like things. """ orders_to_plan = self.filtered(lambda order: order.bom_id.operation_ids and order.state == 'confirmed') @@ -1122,7 +1179,7 @@ class MrpProduction(models.Model): self.ensure_one() return True - def post_inventory(self): + def _post_inventory(self, cancel_backorder=False): for order in self: moves_not_to_do = order.move_raw_ids.filtered(lambda x: x.state == 'done') moves_to_do = order.move_raw_ids.filtered(lambda x: x.state not in ('done', 'cancel')) @@ -1132,23 +1189,26 @@ class MrpProduction(models.Model): # to get extra moves. moves_to_do = moves_to_do._action_done() moves_to_do = order.move_raw_ids.filtered(lambda x: x.state == 'done') - moves_not_to_do + + finish_moves = order.move_finished_ids.filtered(lambda m: m.product_id == order.product_id and m.state not in ('done', 'cancel')) + # the finish move can already be completed by the workorder. + if not finish_moves.quantity_done: + if order.product_tracking == 'serial': + uom = order.product_id.uom_id + finish_moves.quantity_done = order.product_uom_id._compute_quantity(order.qty_producing, uom, round='HALF-UP') + finish_moves.move_line_ids.product_uom_id = uom + else: + finish_moves.quantity_done = float_round(self.qty_producing - self.qty_produced, precision_rounding=order.product_uom_id.rounding, rounding_method='HALF-UP') + finish_moves.move_line_ids.lot_id = self.lot_producing_id order._cal_price(moves_to_do) + moves_to_finish = order.move_finished_ids.filtered(lambda x: x.state not in ('done', 'cancel')) - moves_to_finish = moves_to_finish._action_done() + moves_to_finish = moves_to_finish._action_done(cancel_backorder=cancel_backorder) order.workorder_ids.mapped('raw_workorder_line_ids').unlink() order.workorder_ids.mapped('finished_workorder_line_ids').unlink() order.action_assign() consume_move_lines = moves_to_do.mapped('move_line_ids') - for moveline in moves_to_finish.mapped('move_line_ids'): - if moveline.move_id.has_tracking != 'none' and moveline.product_id == order.product_id or moveline.lot_id in consume_move_lines.mapped('lot_produced_ids'): - if any([not ml.lot_produced_ids for ml in consume_move_lines]): - raise UserError(_('You can not consume without telling for which lot you consumed it')) - # Link all movelines in the consumed with same lot_produced_ids false or the correct lot_produced_ids - filtered_lines = consume_move_lines.filtered(lambda ml: moveline.lot_id in ml.lot_produced_ids) - moveline.write({'consume_line_ids': [(6, 0, [x for x in filtered_lines.ids])]}) - else: - # Link with everything - moveline.write({'consume_line_ids': [(6, 0, [x for x in consume_move_lines.ids])]}) + order.move_finished_ids.move_line_ids.consume_line_ids = [(6, 0, consume_move_lines.ids)] return True @api.model @@ -1189,13 +1249,10 @@ class MrpProduction(models.Model): production.move_raw_ids.filtered(lambda m: m.state not in ('done', 'cancel')).write({ 'raw_material_production_id': backorder_mo.id, - 'reference': backorder_mo.name, }) backorders |= backorder_mo production.name = self._get_name_backorder(production.name, production.backorder_sequence) - # update moves references - (production.move_raw_ids | production.move_finished_ids).reference = production.name for wo in backorder_mo.workorder_ids: wo.duration_expected = wo._get_duration_expected(wo.workcenter_id) @@ -1236,8 +1293,9 @@ class MrpProduction(models.Model): productions_to_backorder = self.env['mrp.production'] self.workorder_ids.button_finish() - self._post_inventory() + productions_not_to_backorder._post_inventory(cancel_backorder=False) + productions_to_backorder._post_inventory(cancel_backorder=True) backorders = productions_to_backorder._generate_backorder_productions() # Moves without quantity done are not posted => set them as done instead of canceling. In @@ -1383,7 +1441,7 @@ class MrpProduction(models.Model): 'res_model': 'mrp.unbuild', 'view_id': self.env.ref('mrp.mrp_unbuild_form_view_simplified').id, 'type': 'ir.actions.act_window', - 'context': {'default_mo_id': self.id, + 'context': {'default_mo_id': self.id, 'default_company_id': self.company_id.id, 'default_location_id': self.location_dest_id.id, 'default_location_dest_id': self.location_src_id.id, @@ -1398,3 +1456,84 @@ class MrpProduction(models.Model): def _get_quantity_to_backorder(self): self.ensure_one() return max(self.product_qty - self.qty_produced, 0) + + def _check_sn_uniqueness(self): + """ Alert the user if the serial number as already been consumed/produced """ + if self.product_tracking == 'serial' and self.lot_producing_id: + sml = self.env['stock.move.line'].search_count([ + ('lot_id', '=', self.lot_producing_id.id), + ('location_id.usage', '=', 'production'), + ('qty_done', '=', 1), + ('state', '=', 'done') + ]) + if sml: + raise UserError(_('This serial number for product %s has already been produced') % self.product_id.name) + + for move in self.move_finished_ids: + if move.has_tracking != 'serial' or move.product_id == self.product_id: + continue + for move_line in move.move_line_ids: + domain = [ + ('lot_id', '=', move_line.lot_id.id), + ('qty_done', '=', 1), + ('state', '=', 'done') + ] + message = _('The serial number %s used for byproduct %s has already been produced') % (move_line.lot_id.name, move_line.product_id.name) + co_prod_move_lines = self.move_finished_ids.move_line_ids.filtered(lambda ml: ml.product_id != self.product_id) + domain_unbuild = domain + [ + ('production_id', '=', False), + ('location_dest_id.usage', '=', 'production') + ] + + # Check presence of same sn in previous productions + duplicates = self.env['stock.move.line'].search_count(domain + [ + ('location_id.usage', '=', 'production') + ]) + if duplicates: + # Maybe some move lines have been compensated by unbuild + duplicates_unbuild = self.env['stock.move.line'].search_count(domain_unbuild) + if not (duplicates_unbuild and duplicates - duplicates_unbuild == 0): + raise UserError(message) + # Check presence of same sn in current production + duplicates = co_prod_move_lines.filtered(lambda ml: ml.qty_done and ml.lot_id == move_line.lot_id) - move_line + if duplicates: + raise UserError(message) + + for move in self.move_raw_ids: + if move.has_tracking != 'serial': + continue + for move_line in move.move_line_ids: + if float_is_zero(move_line.qty_done, precision_rounding=move_line.product_uom_id.rounding): + continue + domain = [ + ('lot_id', '=', move_line.lot_id.id), + ('qty_done', '=', 1), + ('state', '=', 'done') + ] + message = _('The serial number %s used for component %s has already been consumed') % (move_line.lot_id.name, move_line.product_id.name) + co_prod_move_lines = self.move_raw_ids.move_line_ids + domain_unbuild = domain + [ + ('production_id', '=', False), + ('location_id.usage', '=', 'production') + ] + + # Check presence of same sn in previous productions + duplicates = self.env['stock.move.line'].search_count(domain + [ + ('location_dest_id.usage', '=', 'production') + ]) + if duplicates: + # Maybe some move lines have been compensated by unbuild + duplicates_unbuild = self.env['stock.move.line'].search_count(domain_unbuild) + if not (duplicates_unbuild and duplicates - duplicates_unbuild == 0): + raise UserError(message) + # Check presence of same sn in current production + duplicates = co_prod_move_lines.filtered(lambda ml: ml.qty_done and ml.lot_id == move_line.lot_id) - move_line + if duplicates: + raise UserError(message) + + def _strict_consumption_check(self): + if self.consumption == 'strict': + for move in self.move_raw_ids: + rounding = move.product_uom.rounding + if float_compare(move.quantity_done, move.product_uom_qty, precision_rounding=rounding) != 0: + raise UserError(_('You should consume the quantity of %s defined in the BoM. If you want to consume more or less components, change the consumption setting on the BoM.') % move.product_id.name) diff --git a/addons/mrp/models/mrp_unbuild.py b/addons/mrp/models/mrp_unbuild.py index 40856e8c141..6d345e75763 100644 --- a/addons/mrp/models/mrp_unbuild.py +++ b/addons/mrp/models/mrp_unbuild.py @@ -184,7 +184,7 @@ class MrpUnbuild(models.Model): needed_quantity = move.product_qty moves_lines = original_move.mapped('move_line_ids') if move in produce_moves and self.lot_id: - moves_lines = moves_lines.filtered(lambda ml: self.lot_id in ml.lot_produced_ids) + moves_lines = moves_lines.filtered(lambda ml: self.lot_id in ml.produce_line_ids.lot_id) # FIXME sle: double check with arm for move_line in moves_lines: # Iterate over all move_lines until we unbuilded the correct quantity. taken_quantity = min(needed_quantity, move_line.qty_done) diff --git a/addons/mrp/models/stock_move.py b/addons/mrp/models/stock_move.py index 8702a292155..cf0ec783e6e 100644 --- a/addons/mrp/models/stock_move.py +++ b/addons/mrp/models/stock_move.py @@ -3,7 +3,7 @@ from odoo import api, exceptions, fields, models, _ from odoo.exceptions import UserError -from odoo.tools import float_compare, float_round, float_is_zero +from odoo.tools import float_compare, float_round, float_repr, float_is_zero class StockMoveLine(models.Model): @@ -11,7 +11,6 @@ class StockMoveLine(models.Model): workorder_id = fields.Many2one('mrp.workorder', 'Work Order', check_company=True) production_id = fields.Many2one('mrp.production', 'Production Order', check_company=True) - lot_produced_ids = fields.Many2many('stock.production.lot', string='Finished Lot/Serial Number', check_company=True) done_move = fields.Boolean('Move Done', related='move_id.is_done', readonly=False, store=True) # TDE FIXME: naming @api.model_create_multi @@ -23,8 +22,10 @@ class StockMoveLine(models.Model): # traceability report if line.move_id.raw_material_production_id and line.state == 'done': mo = line.move_id.raw_material_production_id - if line.lot_produced_ids: - produced_move_lines = mo.move_finished_ids.move_line_ids.filtered(lambda sml: sml.lot_id in line.lot_produced_ids) + finished_lots = mo.lot_producing_id + finished_lots |= mo.move_finished_ids.filtered(lambda m: m.product_id != mo.product_id).move_line_ids.lot_id + if finished_lots: + produced_move_lines = mo.move_finished_ids.move_line_ids.filtered(lambda sml: sml.lot_id in finished_lots) line.produce_line_ids = [(6, 0, produced_move_lines.ids)] else: produced_move_lines = mo.move_finished_ids.move_line_ids @@ -45,7 +46,7 @@ class StockMoveLine(models.Model): def _reservation_is_updatable(self, quantity, reserved_quant): self.ensure_one() - if self.lot_produced_ids: + if self.produce_line_ids.lot_id: ml_remaining_qty = self.qty_done - self.product_uom_qty ml_remaining_qty = self.product_uom_id._compute_quantity(ml_remaining_qty, self.product_id.uom_id, rounding_method="HALF-UP") if float_compare(ml_remaining_qty, quantity, precision_rounding=self.product_id.uom_id.rounding) < 0: @@ -54,10 +55,6 @@ class StockMoveLine(models.Model): def write(self, vals): for move_line in self: - if move_line.move_id.production_id and 'lot_id' in vals: - move_line.production_id.move_raw_ids.mapped('move_line_ids')\ - .filtered(lambda r: not r.done_move and move_line.lot_id in r.lot_produced_ids)\ - .write({'lot_produced_ids': [(4, vals['lot_id'])]}) production = move_line.move_id.production_id or move_line.move_id.raw_material_production_id if production and move_line.state == 'done' and any(field in vals for field in ('lot_id', 'location_id', 'qty_done')): move_line._log_message(production, move_line, 'mrp.track_production_move_template', vals) @@ -95,6 +92,7 @@ class StockMove(models.Model): needs_lots = fields.Boolean('Tracking', compute='_compute_needs_lots') order_finished_lot_ids = fields.Many2many('stock.production.lot', compute='_compute_order_finished_lot_ids') finished_lots_exist = fields.Boolean('Finished Lots Exist', compute='_compute_order_finished_lot_ids') + should_consume_qty = fields.Float('Quantity To Consume', compute='_compute_should_consume_qty') def _unreserve_initial_demand(self, new_move): # If you were already putting stock.move.lots on the next one in the work order, transfer those to the new move @@ -153,22 +151,55 @@ class StockMove(models.Model): for move in self: move.is_done = (move.state in ('done', 'cancel')) - @api.depends('product_uom_qty') + @api.depends('product_uom_qty', 'raw_material_production_id', 'raw_material_production_id.product_qty', 'raw_material_production_id.qty_produced') def _compute_unit_factor(self): for move in self: mo = move.raw_material_production_id or move.production_id if mo: - move.unit_factor = (move.product_uom_qty - move.quantity_done) / ((mo.product_qty - mo.qty_produced) or 1) + move.unit_factor = move.product_uom_qty / ((mo.product_qty - mo.qty_produced) or 1) else: move.unit_factor = 1.0 + @api.depends('raw_material_production_id', 'raw_material_production_id.name', 'production_id', 'production_id.name') + def _compute_reference(self): + moves_with_reference = self.env['stock.move'] + for move in self: + if move.raw_material_production_id and move.raw_material_production_id.name: + move.reference = move.raw_material_production_id.name + moves_with_reference |= move + if move.production_id and move.production_id.name: + move.reference = move.production_id.name + moves_with_reference |= move + super(StockMove, self - moves_with_reference)._compute_reference() + + @api.depends('raw_material_production_id.qty_producing', 'product_uom_qty') + def _compute_should_consume_qty(self): + for move in self: + mo = move.raw_material_production_id + if not mo: + move.qty_summary = 0 + continue + move.should_consume_qty = mo.product_uom_id._compute_quantity((mo.qty_producing - mo.qty_produced) * move.unit_factor, mo.product_uom_id, rounding_method='HALF-UP') + + @api.onchange('product_uom_qty') + def _onchange_product_uom_qty(self): + if self.raw_material_production_id and self.has_tracking == 'none': + mo = self.raw_material_production_id + vals = self._update_quantity_done(mo) + if vals.get('to_create'): + for res in vals['to_create']: + self.move_line_ids.new(res) + if vals.get('to_write'): + for move_line, res in vals['to_write']: + move_line.update(res) + @api.model def default_get(self, fields_list): defaults = super(StockMove, self).default_get(fields_list) - if self.env.context.get('default_raw_material_production_id'): - production_id = self.env['mrp.production'].browse(self.env.context['default_raw_material_production_id']) - if production_id.state in ('confirmed', 'done'): - if production_id.state == 'confirmed': + if self.env.context.get('default_raw_material_production_id') or self.env.context.get('default_production_id'): + production_id = self.env['mrp.production'].browse(self.env.context.get('default_raw_material_production_id') or self.env.context.get('default_production_id')) + if production_id.state not in ('draft', 'cancel'): + if production_id.state != 'done': defaults['state'] = 'draft' else: defaults['state'] = 'done' @@ -225,6 +256,17 @@ class StockMove(models.Model): moves_to_return |= phantom_moves.action_explode() return moves_to_return + def action_show_details(self): + self.ensure_one() + action = super().action_show_details() + if self.raw_material_production_id: + action['views'] = [(self.env.ref('mrp.view_stock_move_operations_raw').id, 'form')] + action['context']['show_destination_location'] = False + elif self.production_id: + action['views'] = [(self.env.ref('mrp.view_stock_move_operations_finished').id, 'form')] + action['context']['show_source_location'] = False + return action + def _action_cancel(self): res = super(StockMove, self)._action_cancel() for production in self.mapped('raw_material_production_id'): @@ -328,3 +370,25 @@ class StockMove(models.Model): return min(qty_ratios) // 1 else: return 0.0 + + @api.depends('raw_material_production_id') + def _compute_is_quantity_done_editable(self): + return super()._compute_is_quantity_done_editable() + + def _show_details_in_draft(self): + self.ensure_one() + if self.raw_material_production_id and self.state == 'draft': + return True + else: + return super()._show_details_in_draft() + + def _update_quantity_done(self, mo): + self.ensure_one() + ml_values = {} + new_qty = mo.product_uom_id._compute_quantity((mo.qty_producing - mo.qty_produced) * self.unit_factor, mo.product_uom_id, rounding_method='HALF-UP') + if not self.is_quantity_done_editable: + self.move_line_ids.filtered(lambda ml: ml.state not in ('done', 'cancel')).qty_done = 0 + ml_values = self._set_quantity_done_prepare_vals(new_qty) + else: + self.quantity_done = new_qty + return ml_values diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv index b5f3ba1c95a..6fd221fe93b 100644 --- a/addons/mrp/security/ir.model.access.csv +++ b/addons/mrp/security/ir.model.access.csv @@ -57,8 +57,6 @@ access_mrp_unbuild,mrp.unbuild,model_mrp_unbuild,group_mrp_user,1,1,1,1 access_mrp_unbuild_manager,mrp.unbuild manager,model_mrp_unbuild,group_mrp_manager,1,1,1,1 access_mrp_document_mrp_manager,mrp.document group_user,model_mrp_document,group_mrp_manager,1,1,1,1 access_mrp_document_mrp_user,mrp.document group_user,model_mrp_document,group_mrp_user,1,1,1,1 -access_mrp_product_produce,access.mrp.product.produce,model_mrp_product_produce,mrp.group_mrp_user,1,1,1,0 -access_mrp_product_produce_line,access.mrp.product.produce.line,model_mrp_product_produce_line,mrp.group_mrp_user,1,1,1,1 access_change_production_qty,access.change.production.qty,model_change_production_qty,mrp.group_mrp_user,1,1,1,0 access_stock_warn_insufficient_qty_unbuild,access.stock.warn.insufficient.qty.unbuild,model_stock_warn_insufficient_qty_unbuild,mrp.group_mrp_user,1,1,1,0 access_mrp_production_backorder,access.mrp.production.backorder,model_mrp_production_backorder,mrp.group_mrp_user,1,1,1,0 diff --git a/addons/mrp/static/src/js/mrp_should_consume.js b/addons/mrp/static/src/js/mrp_should_consume.js new file mode 100644 index 00000000000..50b4f3f893b --- /dev/null +++ b/addons/mrp/static/src/js/mrp_should_consume.js @@ -0,0 +1,81 @@ +odoo.define('mrp.should_consume', function (require) { +"use strict"; + +var BasicFields = require('web.basic_fields'); +var FieldFloat = BasicFields.FieldFloat; +var fieldRegistry = require('web.field_registry'); +var field_utils = require('web.field_utils'); + +/** + * This widget is used to display alongside the total quantity to consume of a production order, + * the exact quantity that the worker should consume depending on the BoM. Ex: + * 2 components to make 1 finished product. + * The production order is created to make 5 finished product and the quantity producing is set to 3. + * The widget will be '3.000 / 5.000'. + */ +var MrpShouldConsume = FieldFloat.extend({ + /** + * @override + */ + init: function (parent, name, params) { + this._super.apply(this, arguments); + this.displayShouldConsume = !['done', 'draft', 'cancel'].includes(params.data.state); + let options = {'digits': [false, 3]}; + this.should_consume_qty = field_utils.format.float(params.data.should_consume_qty, false, options); + }, + + //-------------------------------------------------------------------------- + // Private + //-------------------------------------------------------------------------- + + /** + * @private + * @param {Object} [el] jquery input element that will be surrounded by a new span + * @param {float} [value] quantity to display before the input `el` + * @return {jquery element} + */ + _addShouldConsume: function (el, value) { + var $to_consume_container = $(''); + $to_consume_container.text(value + ' / '); + $to_consume_container.append(el); + return $to_consume_container + }, + + /** + * @private + * @override + */ + _renderEdit: function () { + // Keep a reference to the input so $el can become something else + // without losing track of the actual input. + var def = this._super.apply(this, arguments); + if (this.displayShouldConsume) { + var $container = this._addShouldConsume(this.$el, this.should_consume_qty); + $container.addClass('o_row'); + this.$el = $container; + }; + return def; + }, + /** + * Resets the content to the formated value in readonly mode. + * + * @override + * @private + */ + _renderReadonly: function () { + var def = this._super.apply(this, arguments); + if (this.displayShouldConsume) { + var $container = this._addShouldConsume(this.$el, this.should_consume_qty); + this.$el = $container; + }; + return def; + }, +}); + +fieldRegistry.add('mrp_should_consume', MrpShouldConsume); + +return { + MrpShouldConsume: MrpShouldConsume, +}; + +}); diff --git a/addons/mrp/static/src/scss/mrp_fields.scss b/addons/mrp/static/src/scss/mrp_fields.scss index 606e32f4d94..da959565fc8 100644 --- a/addons/mrp/static/src/scss/mrp_fields.scss +++ b/addons/mrp/static/src/scss/mrp_fields.scss @@ -5,4 +5,7 @@ height: 30rem; border: none; } -} \ No newline at end of file +} +.o_should_consume{ + padding-left: 0.3em; +} diff --git a/addons/mrp/tests/common.py b/addons/mrp/tests/common.py index 6e70957237d..832a7f2e442 100644 --- a/addons/mrp/tests/common.py +++ b/addons/mrp/tests/common.py @@ -7,7 +7,7 @@ from odoo.addons.stock.tests import common2 class TestMrpCommon(common2.TestStockCommon): @classmethod - def generate_mo(self, tracking_final='none', tracking_base_1='none', tracking_base_2='none', qty_final=5, qty_base_1=4, qty_base_2=1, picking_type_id=False): + def generate_mo(self, tracking_final='none', tracking_base_1='none', tracking_base_2='none', qty_final=5, qty_base_1=4, qty_base_2=1, picking_type_id=False, consumption=False): """ This function generate a manufacturing order with one final product and two consumed product. Arguments allows to choose the tracking/qty for each different products. It returns the @@ -34,6 +34,7 @@ class TestMrpCommon(common2.TestStockCommon): 'product_uom_id': self.uom_unit.id, 'product_qty': 1.0, 'type': 'normal', + 'consumption': consumption if consumption else 'flexible', 'bom_line_ids': [ (0, 0, {'product_id': product_to_use_2.id, 'product_qty': qty_base_2}), (0, 0, {'product_id': product_to_use_1.id, 'product_qty': qty_base_1}) diff --git a/addons/mrp/tests/test_backorder.py b/addons/mrp/tests/test_backorder.py index 7023c98627b..3dedc1528c0 100644 --- a/addons/mrp/tests/test_backorder.py +++ b/addons/mrp/tests/test_backorder.py @@ -27,10 +27,9 @@ class TestMrpProductionBackorder(TestMrpCommon): """ mo = self.generate_mo(qty_final=4)[0] - produce_form = Form(self.env['mrp.product.produce'].with_context(active_id=mo.id)) - produce_form.qty_producing = 4 - produce = produce_form.save() - produce.do_produce() + mo_form = Form(mo) + mo_form.qty_producing = 4 + mo = mo_form.save() # No backorder is proposed self.assertTrue(mo.button_mark_done()) @@ -61,10 +60,9 @@ class TestMrpProductionBackorder(TestMrpCommon): self.assertEqual(production.state, 'confirmed') self.assertEqual(production.reserve_visible, False) - produce_form = Form(self.env['mrp.product.produce'].with_context(active_id=production.id)) - produce_form.qty_producing = 1 - produce = produce_form.save() - produce.do_produce() + mo_form = Form(production) + mo_form.qty_producing = 1 + production = mo_form.save() action = production.button_mark_done() backorder = Form(self.env['mrp.production.backorder'].with_context(**action['context'])) @@ -103,10 +101,9 @@ class TestMrpProductionBackorder(TestMrpCommon): self.assertEqual(set(pbm_move.mapped("product_id")), {product_to_use_1, product_to_use_2}) self.assertFalse(pbm_move.move_orig_ids) - produce_form = Form(self.env['mrp.product.produce'].with_context(active_id=production.id)) - produce_form.qty_producing = 1 - produce = produce_form.save() - produce.do_produce() + mo_form = Form(production) + mo_form.qty_producing = 1 + production = mo_form.save() self.assertEqual(sum(pbm_move.filtered(lambda m: m.product_id.id == product_to_use_1.id).mapped("product_qty")), 16) self.assertEqual(sum(pbm_move.filtered(lambda m: m.product_id.id == product_to_use_2.id).mapped("product_qty")), 4) @@ -154,10 +151,9 @@ class TestMrpProductionBackorder(TestMrpCommon): self.assertEqual(sam_move.product_id.id, product_to_build.id) self.assertEqual(sum(sam_move.mapped("product_qty")), 4) - produce_form = Form(self.env['mrp.product.produce'].with_context(active_id=production.id)) - produce_form.qty_producing = 1 - produce = produce_form.save() - produce.do_produce() + mo_form = Form(production) + mo_form.qty_producing = 1 + production = mo_form.save() action = production.button_mark_done() backorder = Form(self.env['mrp.production.backorder'].with_context(**action['context'])) diff --git a/addons/mrp/tests/test_byproduct.py b/addons/mrp/tests/test_byproduct.py index 58759c3e0e3..e07bdea83ae 100644 --- a/addons/mrp/tests/test_byproduct.py +++ b/addons/mrp/tests/test_byproduct.py @@ -58,9 +58,6 @@ class TestMrpByProduct(common.TransactionCase): mnf_product_a = mnf_product_a_form.save() mnf_product_a.action_confirm() - # I compute the data of production order - context = {"active_model": "mrp.production", "active_ids": [mnf_product_a.id], "active_id": mnf_product_a.id} - # I confirm the production order. self.assertEqual(mnf_product_a.state, 'confirmed', 'Production order should be in state confirmed') @@ -71,12 +68,11 @@ class TestMrpByProduct(common.TransactionCase): # I consume and produce the production of products. # I create record for selecting mode and quantity of products to produce. - produce_form = Form(self.env['mrp.product.produce'].with_context(context)) - produce_form.qty_producing = 2.00 - product_consume = produce_form.save() + mo_form = Form(mnf_product_a) + mo_form.qty_producing = 2.00 + mnf_product_a = mo_form.save() # I finish the production order. self.assertEqual(len(mnf_product_a.move_raw_ids), 1, "Wrong consume move on production order.") - product_consume.do_produce() consume_move_c = mnf_product_a.move_raw_ids by_product_move = mnf_product_a.move_finished_ids.filtered(lambda x: x.product_id.id == self.product_b.id) # Check sub production produced quantity... diff --git a/addons/mrp/tests/test_cancel_mo.py b/addons/mrp/tests/test_cancel_mo.py index 3a132ba02c4..97726da7d60 100644 --- a/addons/mrp/tests/test_cancel_mo.py +++ b/addons/mrp/tests/test_cancel_mo.py @@ -33,10 +33,9 @@ class TestMrpCancelMO(TestMrpCommon): # Create MO manufacturing_order = self.generate_mo()[0] # Produce some quantity - produce_form = Form(self.env['mrp.product.produce'].with_context(active_id=manufacturing_order.id)) - produce_form.qty_producing = 2 - produce = produce_form.save() - produce.do_produce() + mo_form = Form(manufacturing_order) + mo_form.qty_producing = 2 + manufacturing_order = mo_form.save() # Cancel it manufacturing_order.action_cancel() # Check it's cancelled @@ -53,12 +52,11 @@ class TestMrpCancelMO(TestMrpCommon): after post inventory. """ # Create MO - manufacturing_order = self.generate_mo()[0] + manufacturing_order = self.generate_mo(consumption='strict')[0] # Produce some quantity (not all to avoid to done the MO when post inventory) - produce_form = Form(self.env['mrp.product.produce'].with_context(active_id=manufacturing_order.id)) - produce_form.qty_producing = 2 - produce = produce_form.save() - produce.do_produce() + mo_form = Form(manufacturing_order) + mo_form.qty_producing = 2 + manufacturing_order = mo_form.save() # Post Inventory manufacturing_order.post_inventory() # Cancel the MO @@ -84,7 +82,7 @@ class TestMrpCancelMO(TestMrpCommon): done and the WO must be cancelled. """ # Create MO - mo_data = self.generate_mo() + mo_data = self.generate_mo(consumption='strict') manufacturing_order = mo_data[0] bom = mo_data[1] bom.write({ @@ -92,6 +90,15 @@ class TestMrpCancelMO(TestMrpCommon): (0, 0, {'name': 'Gift Wrap Maching', 'workcenter_id': self.workcenter_1.id, 'time_cycle': 15, 'sequence': 1}), ], }) + mo_form = Form(self.env['mrp.production']) + mo_form.product_id = product_to_build + mo_form.bom_id = bom + mo_form.product_qty = 5.0 + manufacturing_order = mo_form.save() + manufacturing_order.action_confirm() + mo_form = Form(manufacturing_order) + mo_form.qty_producing = 2 + manufacturing_order = mo_form.save() manufacturing_order.button_plan() workorder = manufacturing_order.workorder_ids @@ -136,10 +143,9 @@ class TestMrpCancelMO(TestMrpCommon): # it (cannot be deleted) manufacturing_order = self.generate_mo()[0] # Produce some quantity (not all to avoid to done the MO when post inventory) - produce_form = Form(self.env['mrp.product.produce'].with_context(active_id=manufacturing_order.id)) - produce_form.qty_producing = 2 - produce = produce_form.save() - produce.do_produce() + mo_form = Form(manufacturing_order) + mo_form.qty_producing = 2 + manufacturing_order = mo_form.save() # Post Inventory manufacturing_order.post_inventory() # Unlink the MO must raises an UserError since it cannot be really cancelled diff --git a/addons/mrp/tests/test_multicompany.py b/addons/mrp/tests/test_multicompany.py index b6593cfb517..6b0c3fd3a47 100644 --- a/addons/mrp/tests/test_multicompany.py +++ b/addons/mrp/tests/test_multicompany.py @@ -133,15 +133,10 @@ class TestMrpMulticompany(common.TransactionCase): }) mo_form = Form(self.env['mrp.production'].with_user(self.user_a)) mo_form.product_id = product + mo_form.lot_producing_id = lot_b mo = mo_form.save() - mo.with_user(self.user_b).action_confirm() - produce_form = Form(self.env['mrp.product.produce'].with_user(self.user_b).with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - produce_form.finished_lot_id = lot_b with self.assertRaises(UserError): - produce_form.save() + mo.with_user(self.user_b).action_confirm() def test_product_produce_2(self): """Check that using a component lot of company b in the produce wizard of a production @@ -168,14 +163,17 @@ class TestMrpMulticompany(common.TransactionCase): mo_form.product_id = product mo = mo_form.save() mo.with_user(self.user_b).action_confirm() - produce_form = Form(self.env['mrp.product.produce'].with_user(self.user_b).with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - with produce_form.raw_workorder_line_ids.edit(0) as line: - line.lot_id = lot_b + mo_form = Form(mo) + mo_form.qty_producing = 1 + mo = mo_form.save() + details_operation_form = Form(mo.move_raw_ids[0], view=self.env.ref('stock.view_stock_move_operations')) + with details_operation_form.move_line_ids.edit(0) as ml: + ml.lot_id = lot_b + ml.qty_done = 1 + details_operation_form.save() with self.assertRaises(UserError): - produce_form.save() + mo.button_mark_done() + def test_partner_1(self): """ On a product without company, as a user of Company B, check it is not possible to use a diff --git a/addons/mrp/tests/test_order.py b/addons/mrp/tests/test_order.py index 8e7467b5354..3cca0512e0b 100644 --- a/addons/mrp/tests/test_order.py +++ b/addons/mrp/tests/test_order.py @@ -8,7 +8,6 @@ from odoo.fields import Datetime as Dt from odoo.exceptions import UserError from odoo.addons.mrp.tests.common import TestMrpCommon - class TestMrpOrder(TestMrpCommon): def test_access_rights_manager(self): @@ -95,13 +94,9 @@ class TestMrpOrder(TestMrpCommon): self.assertEqual(first_move.product_qty, test_quantity / self.bom_1.product_qty * self.product_4.uom_id.factor_inv * 4) # produce product - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': man_order.id, - 'active_ids': [man_order.id], - })) - produce_form.qty_producing = 1.0 - produce_wizard = produce_form.save() - produce_wizard.do_produce() + mo_form = Form(man_order) + mo_form.qty_producing = 1.0 + man_order = mo_form.save() action = man_order.button_mark_done() self.assertEqual(man_order.state, 'progress', "Production order should be open a backorder wizard, then not done yet.") @@ -160,15 +155,12 @@ class TestMrpOrder(TestMrpCommon): mo, bom, p_final, p1, p2 = self.generate_mo(qty_base_1=10, qty_final=1, qty_base_2=1) bom.consumption = 'flexible' mo.action_assign() - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - for i in range(len(produce_form.raw_workorder_line_ids)): - with produce_form.raw_workorder_line_ids.edit(i) as line: - line.qty_done += 1 - product_produce = produce_form.save() - product_produce.do_produce() + mo_form = Form(mo) + mo_form.qty_producing = 1 + for i in range(len(mo_form.move_raw_ids)): + with mo_form.move_raw_ids.edit(i) as move: + move.quantity_done += 1 + mo = mo_form.save() self.assertEqual(len(mo.move_raw_ids), 2) self.assertEqual(len(mo.move_raw_ids.mapped('move_line_ids')), 2) self.assertEqual(mo.move_raw_ids[0].move_line_ids.mapped('qty_done'), [2]) @@ -248,11 +240,9 @@ class TestMrpOrder(TestMrpCommon): self.assertEqual(mo_custom_laptop.reservation_state, 'assigned') # produce one item, call `post_inventory` - context = {"active_ids": [mo_custom_laptop.id], "active_id": mo_custom_laptop.id} - produce_form = Form(self.env['mrp.product.produce'].with_context(context)) - produce_form.qty_producing = 1.00 - custom_laptop_produce = produce_form.save() - custom_laptop_produce.do_produce() + mo_form = Form(mo_custom_laptop) + mo_form.qty_producing = 1.00 + mo_custom_laptop = mo_form.save() mo_custom_laptop.post_inventory() # check the consumed quants of the produced quant @@ -264,11 +254,9 @@ class TestMrpOrder(TestMrpCommon): self.assertEqual(second_move.quantity_done, 0, "There is still one product to pruduce") # produce the second item, call `post_inventory` - context = {"active_ids": [mo_custom_laptop.id], "active_id": mo_custom_laptop.id} - produce_form = Form(self.env['mrp.product.produce'].with_context(context)) - produce_form.qty_producing = 1.00 - custom_laptop_produce = produce_form.save() - custom_laptop_produce.do_produce() + mo_form = Form(mo_custom_laptop) + mo_form.qty_producing = 2.00 + mo_custom_laptop = mo_form.save() mo_custom_laptop.post_inventory() self.assertEqual(second_move.quantity_done, 1, "Order produce the second product") quant_after2 = custom_laptop.qty_available @@ -301,14 +289,15 @@ class TestMrpOrder(TestMrpCommon): self.env['stock.quant']._update_available_quantity(p2, self.stock_location, 5) mo.action_assign() - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - produce_wizard = produce_form.save() - produce_wizard.do_produce() + mo_form = Form(mo) + mo_form.qty_producing = 1 + mo = mo_form.save() - mo.move_finished_ids.move_line_ids.qty_done -= 1 + details_operation_form = Form(mo.move_raw_ids[1], view=self.env.ref('stock.view_stock_move_operations')) + with details_operation_form.move_line_ids.new() as ml: + ml.lot_id = lot_1 + ml.qty_done = 20 + details_operation_form.save() update_quantity_wizard = self.env['change.production.qty'].create({ 'mo_id': mo.id, 'product_qty': 4, @@ -333,67 +322,25 @@ class TestMrpOrder(TestMrpCommon): self.env['stock.quant']._update_available_quantity(p2, self.stock_location, 5) mo.action_assign() - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - produce_form.qty_producing = 2 - produce_wizard = produce_form.save() - produce_wizard.do_produce() + mo_form = Form(mo) + mo_form.qty_producing = 2 + mo = mo_form.save() + + mo._post_inventory() - mo.post_inventory() update_quantity_wizard = self.env['change.production.qty'].create({ 'mo_id': mo.id, 'product_qty': 5, }) update_quantity_wizard.change_prod_qty() - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - produce_wizard = produce_form.save() - produce_wizard.do_produce() + mo_form = Form(mo) + mo_form.qty_producing = 5 + mo = mo_form.save() mo.button_mark_done() self.assertEqual(sum(mo.move_raw_ids.filtered(lambda m: m.product_id == p1).mapped('quantity_done')), 20) self.assertEqual(sum(mo.move_finished_ids.mapped('quantity_done')), 5) - def test_update_quantity_3(self): - """ Build 1 final products then update the Manufacturing - order quantity. Check the remaining quantity to produce - take care of the first quantity produced.""" - self.stock_location = self.env.ref('stock.stock_location_stock') - mo, bom, p_final, p1, p2 = self.generate_mo(qty_final=2) - self.assertEqual(len(mo), 1, 'MO should have been created') - - self.env['stock.quant']._update_available_quantity(p1, self.stock_location, 20) - self.env['stock.quant']._update_available_quantity(p2, self.stock_location, 5) - mo.action_assign() - - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - produce_form.qty_producing = 1 - produce_wizard = produce_form.save() - produce_wizard.do_produce() - - update_quantity_wizard = self.env['change.production.qty'].create({ - 'mo_id': mo.id, - 'product_qty': 3, - }) - update_quantity_wizard.change_prod_qty() - - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - produce_wizard = produce_form.save() - produce_wizard.do_produce() - mo.button_mark_done() - self.assertEqual(sum(mo.move_raw_ids.filtered(lambda m: m.product_id == p1).mapped('quantity_done')), 12) - self.assertEqual(sum(mo.move_finished_ids.mapped('quantity_done')), 3) - def test_rounding(self): """ Checks we round up when bringing goods to produce and round half-up when producing. This implementation allows to implement an efficiency notion (see rev 347f140fe63612ee05e). @@ -422,13 +369,9 @@ class TestMrpOrder(TestMrpCommon): self.assertEqual(production.move_raw_ids[1].product_qty, 84, 'The quantity should be rounded up') # produce product - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': production.id, - 'active_ids': [production.id], - })) - produce_form.qty_producing = 8 - produce_wizard = produce_form.save() - produce_wizard.do_produce() + mo_form = Form(production) + mo_form.qty_producing = 8 + production = mo_form.save() self.assertEqual(production.move_raw_ids[0].quantity_done, 16, 'Should use half-up rounding when producing') self.assertEqual(production.move_raw_ids[1].quantity_done, 34, 'Should use half-up rounding when producing') @@ -443,27 +386,21 @@ class TestMrpOrder(TestMrpCommon): mo.action_assign() - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) # change the quantity done in one line - produce_form.raw_workorder_line_ids._records[0]['qty_done'] = 1 + details_operation_form = Form(mo.move_raw_ids[0], view=self.env.ref('stock.view_stock_move_operations')) + with details_operation_form.move_line_ids.edit(0) as ml: + ml.qty_done = 1 + details_operation_form.save() # change the quantity producing - produce_form.qty_producing = 3 + mo_form = Form(mo) + mo_form.qty_producing = 3 # check than all quantities are update correctly - line1 = produce_form.raw_workorder_line_ids._records[0] - line2 = produce_form.raw_workorder_line_ids._records[1] - self.assertEqual(line1['qty_to_consume'], 3, "Wrong quantity to consume") - self.assertEqual(line1['qty_done'], 3, "Wrong quantity done") - self.assertEqual(line2['qty_to_consume'], 12, "Wrong quantity to consume") - self.assertEqual(line2['qty_done'], 12, "Wrong quantity done") - - product_produce = produce_form.save() - self.assertEqual(len(product_produce.raw_workorder_line_ids), 2, 'You should have produce lines even the consumed products are not tracked.') - product_produce.do_produce() + self.assertEqual(mo_form.move_raw_ids._records[0]['product_uom_qty'], 5, "Wrong quantity to consume") + self.assertEqual(mo_form.move_raw_ids._records[0]['quantity_done'], 3, "Wrong quantity done") + self.assertEqual(mo_form.move_raw_ids._records[1]['product_uom_qty'], 20, "Wrong quantity to consume") + self.assertEqual(mo_form.move_raw_ids._records[1]['quantity_done'], 12, "Wrong quantity done") def test_product_produce_2(self): """ Checks that, for a BOM where one of the components is tracked by serial number and the @@ -490,22 +427,19 @@ class TestMrpOrder(TestMrpCommon): self.env['stock.quant']._update_available_quantity(p2, self.stock_location, 5) mo.action_assign() - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - self.assertEqual(len(produce_form.raw_workorder_line_ids), 3, 'You should have 3 produce lines. One for each serial to consume and for the untracked product.') - produce_form.qty_producing = 1 + self.assertEqual(len(mo.move_raw_ids.move_line_ids), 3, 'You should have 3 stock move lines. One for each serial to consume and for the untracked product.') + mo_form = Form(mo) + mo_form.qty_producing = 1 + mo = mo_form.save() # get the proposed lot - consumed_lots = self.env['stock.production.lot'] - for workorder_line in produce_form.raw_workorder_line_ids._records: - if workorder_line['product_id'] == p1.id: - consumed_lots |= self.env['stock.production.lot'].browse(workorder_line['lot_id']) - consumed_lots.ensure_one() - product_produce = produce_form.save() - product_produce.do_produce() + details_operation_form = Form(mo.move_raw_ids.filtered(lambda move: move.product_id == p1), view=self.env.ref('stock.view_stock_move_operations')) + self.assertEqual(len(details_operation_form.move_line_ids), 2) + with details_operation_form.move_line_ids.edit(0) as ml: + consumed_lots = ml.lot_id + ml.qty_done = 1 + details_operation_form.save() remaining_lot = (lot_p1_1 | lot_p1_2) - consumed_lots remaining_lot.ensure_one() @@ -513,22 +447,22 @@ class TestMrpOrder(TestMrpCommon): backorder = Form(self.env['mrp.production.backorder'].with_context(**action['context'])) backorder.save().action_backorder() - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - product_produce = produce_form.save() - self.assertEqual(len(product_produce.raw_workorder_line_ids), 2, 'You should have 2 produce lines left.') - for line in product_produce.raw_workorder_line_ids.filtered(lambda x: x.lot_id): - self.assertEqual(line.lot_id, remaining_lot, 'Wrong lot proposed.') + # Check MO backorder + mo_backorder = mo.procurement_group_id.mrp_production_ids[-1] + + mo_form = Form(mo_backorder) + mo_form.qty_producing = 1 + mo_backorder = mo_form.save() + details_operation_form = Form(mo_backorder.move_raw_ids.filtered(lambda move: move.product_id == p1), view=self.env.ref('stock.view_stock_move_operations')) + self.assertEqual(len(details_operation_form.move_line_ids), 1) + with details_operation_form.move_line_ids.edit(0) as ml: + self.assertEqual(ml.lot_id, remaining_lot) def test_product_produce_3(self): """ Checks that, for a BOM where one of the components is tracked by lot and the other is not tracked, when creating a manufacturing order for 1 finished product and reserving, the - produce wizard proposes the corrects lines. Then, checks the generated move lines when over - consuming. + reserved lines are displayed. Then, over-consume by creating new line. """ - # FIXME: some asserts on the quants after overproducing would be nice self.stock_location = self.env.ref('stock.stock_location_stock') self.stock_shelf_1 = self.stock_location_components @@ -560,22 +494,31 @@ class TestMrpOrder(TestMrpCommon): self.env['stock.quant']._update_available_quantity(p2, self.stock_location, 5) mo.action_assign() - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - produce_form.qty_producing = 1.0 - for i in range(len(produce_form.raw_workorder_line_ids)): - with produce_form.raw_workorder_line_ids.edit(i) as line: - line.qty_done += 1 - product_produce = produce_form.save() - product_produce.finished_lot_id = final_product_lot.id - # product 1 lot 1 shelf1 - # product 1 lot 1 shelf2 - # product 1 lot 2 - self.assertEqual(len(product_produce.raw_workorder_line_ids), 4, 'You should have 4 produce lines. lot 1 shelf_1, lot 1 shelf_2, lot2 and for product which have tracking None') + mo_form = Form(mo) + mo_form.qty_producing = 1.0 + mo_form.lot_producing_id = final_product_lot + mo = mo_form.save() + # p2 + details_operation_form = Form(mo.move_raw_ids[0], view=self.env.ref('stock.view_stock_move_operations')) + with details_operation_form.move_line_ids.edit(0) as line: + line.qty_done = line.product_uom_qty + with details_operation_form.move_line_ids.new() as line: + line.qty_done = 1 + details_operation_form.save() - product_produce.do_produce() + # p1 + details_operation_form = Form(mo.move_raw_ids[1], view=self.env.ref('stock.view_stock_move_operations')) + for i in range(len(details_operation_form.move_line_ids)): + # reservation in shelf1: 3 lot1, shelf2: 3 lot1, stock: 4 lot2 + with details_operation_form.move_line_ids.edit(i) as line: + line.qty_done = line.product_uom_qty + with details_operation_form.move_line_ids.new() as line: + line.qty_done = 2 + line.lot_id = first_lot_for_p1 + with details_operation_form.move_line_ids.new() as line: + line.qty_done = 1 + line.lot_id = second_lot_for_p1 + details_operation_form.save() move_1 = mo.move_raw_ids.filtered(lambda m: m.product_id == p1) # qty_done/product_uom_qty lot @@ -616,18 +559,15 @@ class TestMrpOrder(TestMrpCommon): ml_p1[0].qty_done = 1.0 # Produce baby! - product_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - product_produce = product_form.save() - product_produce.do_produce() + mo_form = Form(mo) + mo_form.qty_producing = 1 + mo = mo_form.save() m_p1 = mo.move_raw_ids.filtered(lambda x: x.product_id == p1) ml_p1 = m_p1.mapped('move_line_ids') - self.assertEqual(len(ml_p1), 3) - self.assertEqual(sorted(ml_p1.mapped('qty_done')), [1.0, 2.0, 3.0], 'Quantity done should be 1.0, 2.0 or 3.0') - self.assertEqual(m_p1.quantity_done, 6.0, 'Total qty done should be 6.0') + self.assertEqual(len(ml_p1), 2) + self.assertEqual(sorted(ml_p1.mapped('qty_done')), [2.0, 3.0], 'Quantity done should be 1.0, 2.0 or 3.0') + self.assertEqual(m_p1.quantity_done, 5.0, 'Total qty done should be 6.0') self.assertEqual(sum(ml_p1.mapped('product_uom_qty')), 5.0, 'Total qty reserved should be 5.0') mo.button_mark_done() @@ -636,7 +576,7 @@ class TestMrpOrder(TestMrpCommon): def test_product_produce_6(self): """ Plan 5 finished products, reserve and produce 3. Post the current production. Simulate an unlock and edit and, on the opened moves, set the consumed quantity - to 3. Now, try to update the quantity to produce to 3. It should fail since there + to 3. Now, try to update the quantity to mo2 to 3. It should fail since there are consumed quantities. Unlock and edit, remove the consumed quantities and update the quantity to produce to 3.""" self.stock_location = self.env.ref('stock.stock_location_stock') @@ -648,13 +588,9 @@ class TestMrpOrder(TestMrpCommon): self.env['stock.quant']._update_available_quantity(p2, self.stock_location, 5) mo.action_assign() - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - produce_form.qty_producing = 3 - produce_wizard = produce_form.save() - produce_wizard.do_produce() + mo_form = Form(mo) + mo_form.qty_producing = 3 + mo = mo_form.save() mo.post_inventory() self.assertEqual(len(mo.move_raw_ids), 4) @@ -675,127 +611,11 @@ class TestMrpOrder(TestMrpCommon): self.assertTrue(all(s == 'done' for s in mo.move_raw_ids.mapped('state'))) self.assertEqual(sum(mo.move_raw_ids.mapped('move_line_ids.product_uom_qty')), 0) - def test_product_produce_7(self): - """ Add components in 2 different sub location. Do not reserve the MO - and checks that the move line created takes stock from location that - contains needed raw materials. - """ - mo, bom, p_final, p1, p2 = self.generate_mo(qty_final=2) - self.assertEqual(len(mo), 1, 'MO should have been created') - - self.stock_location = self.env.ref('stock.stock_location_stock') - self.stock_shelf_1 = self.stock_location_components - self.stock_shelf_2 = self.stock_location_14 - - self.env['stock.quant']._update_available_quantity(p1, self.stock_shelf_1, 3) - self.env['stock.quant']._update_available_quantity(p1, self.stock_location, 3) - self.env['stock.quant']._update_available_quantity(p1, self.stock_shelf_2, 2) - - self.env['stock.quant']._update_available_quantity(p2, self.stock_shelf_1, 1) - self.env['stock.quant']._update_available_quantity(p2, self.stock_shelf_2, 1) - - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - produce_form.qty_producing = 1 - produce_wizard = produce_form.save() - - self.assertEqual(len(produce_wizard.raw_workorder_line_ids), 2) - produce_wizard.do_produce() - - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - produce_form.qty_producing = 1 - - produce_wizard = produce_form.save() - - self.assertEqual(len(produce_wizard.raw_workorder_line_ids), 2) - produce_wizard.do_produce() - - mo.button_mark_done() - mo_move_line_p1 = mo.move_raw_ids[1].move_line_ids - self.assertEqual(sum(mo_move_line_p1.filtered(lambda ml: ml.location_id == self.stock_location).mapped('qty_done')), 3) - self.assertEqual(sum(mo_move_line_p1.filtered(lambda ml: ml.location_id == self.stock_shelf_1).mapped('qty_done')), 3) - self.assertEqual(sum(mo_move_line_p1.filtered(lambda ml: ml.location_id == self.stock_shelf_2).mapped('qty_done')), 2) - self.assertEqual(sum(mo.move_finished_ids.move_line_ids.mapped('qty_done')), 2) - - self.assertEqual(self.env['stock.quant']._gather(p1, self.stock_location, strict=True).quantity, 0) - self.assertEqual(self.env['stock.quant']._gather(p1, self.stock_shelf_1, strict=True).quantity, 0) - self.assertEqual(self.env['stock.quant']._gather(p1, self.stock_shelf_2, strict=True).quantity, 0) - - self.assertEqual(self.env['stock.quant']._gather(p2, self.stock_shelf_1, strict=True).quantity, 0) - self.assertEqual(self.env['stock.quant']._gather(p2, self.stock_shelf_2, strict=True).quantity, 0) - self.assertEqual(self.env['stock.quant']._gather(p_final, self.stock_location, strict=True).quantity, 2) - - def test_product_produce_8(self): - """ Produce more than reserved and planned. Check that produce wizard - only propose one line for product not reserved. - """ - mo, bom, p_final, p1, p2 = self.generate_mo(qty_final=2) - self.assertEqual(len(mo), 1, 'MO should have been created') - - self.stock_location = self.env.ref('stock.stock_location_stock') - - self.env['stock.quant']._update_available_quantity(p1, self.stock_location, 5) - self.env['stock.quant']._update_available_quantity(p2, self.stock_location, 2) - - mo.action_assign() - - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - produce_form.qty_producing = 1 - produce_wizard = produce_form.save() - self.assertEqual(len(produce_wizard.raw_workorder_line_ids), 2) - self.assertEqual(produce_wizard.raw_workorder_line_ids.filtered(lambda l: l.product_id == p1).qty_reserved, 4) - self.assertEqual(produce_wizard.raw_workorder_line_ids.filtered(lambda l: l.product_id == p2).qty_reserved, 1) - produce_wizard.do_produce() - - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - produce_form.qty_producing = 1 - produce_wizard = produce_form.save() - # p1 1 1 1 - # p1 3 0 3 - # p2 1 1 1 - self.assertEqual(len(produce_wizard.raw_workorder_line_ids), 3) - self.assertEqual(sum(produce_wizard.raw_workorder_line_ids.filtered(lambda l: l.product_id == p1).mapped('qty_reserved')), 1) - self.assertEqual(produce_wizard.raw_workorder_line_ids.filtered(lambda l: l.product_id == p1 and l.qty_reserved).qty_to_consume, 1) - self.assertEqual(produce_wizard.raw_workorder_line_ids.filtered(lambda l: l.product_id == p1 and not l.qty_reserved).qty_to_consume, 3) - self.assertEqual(produce_wizard.raw_workorder_line_ids.filtered(lambda l: l.product_id == p2).qty_reserved, 1) - - with Form(produce_wizard) as produce_form: - produce_form.qty_producing = 2 - # p1 1 1 1 - # p1 7 0 7 - # p2 1 1 1 - # p2 1 0 1 - self.assertEqual(len(produce_wizard.raw_workorder_line_ids), 4) - self.assertEqual(sum(produce_wizard.raw_workorder_line_ids.filtered(lambda l: l.product_id == p1).mapped('qty_reserved')), 1) - self.assertEqual(produce_wizard.raw_workorder_line_ids.filtered(lambda l: l.product_id == p1 and l.qty_reserved).qty_to_consume, 1) - self.assertEqual(produce_wizard.raw_workorder_line_ids.filtered(lambda l: l.product_id == p1 and not l.qty_reserved).qty_to_consume, 7) - self.assertEqual(sum(produce_wizard.raw_workorder_line_ids.filtered(lambda l: l.product_id == p2).mapped('qty_reserved')), 1) - - produce_wizard.do_produce() - - mo.button_mark_done() - - self.assertEqual(self.env['stock.quant']._gather(p1, self.stock_location, strict=True).quantity, -7) - self.assertEqual(self.env['stock.quant']._gather(p2, self.stock_location, strict=True).quantity, -1) - self.assertEqual(self.env['stock.quant']._gather(p_final, self.stock_location, strict=True).quantity, 3) - def test_product_produce_9(self): - """ Checks the constraints of a strict BOM without tracking when playing around in the - produce wizard. - """ + """ Checks the constraints of a strict BOM without tracking when playing around + quantities to consume.""" self.stock_location = self.env.ref('stock.stock_location_stock') - mo, bom, p_final, p1, p2 = self.generate_mo() + mo, bom, p_final, p1, p2 = self.generate_mo(consumption='strict') self.assertEqual(len(mo), 1, 'MO should have been created') self.env['stock.quant']._update_available_quantity(p1, self.stock_location, 100) @@ -803,52 +623,22 @@ class TestMrpOrder(TestMrpCommon): mo.action_assign() - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) + mo_form = Form(mo.with_context({'debug': True})) with self.assertRaises(UserError): # try adding another line for a bom product to increase the quantity - produce_form.qty_producing = 1 - with produce_form.raw_workorder_line_ids.new() as line: - line.product_id = p1 - line.qty_done = 1 - product_produce = produce_form.save() - product_produce.do_produce() + mo_form.qty_producing = 1 + with mo_form.move_raw_ids.new() as move: + move.product_id = p1 + move.quantity_done = 1 + mo = mo_form.save() + mo.button_mark_done() with self.assertRaises(UserError): # Try updating qty_done - product_produce = produce_form.save() - product_produce.raw_workorder_line_ids[0].qty_done += 1 - product_produce.do_produce() - - with self.assertRaises(UserError): - # try adding another product - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - produce_form.qty_producing = 1 - with produce_form.raw_workorder_line_ids.new() as line: - line.product_id = self.product_4 - line.qty_done = 1 - product_produce = produce_form.save() - product_produce.do_produce() - - # try adding another line for a bom product but the total quantity is good - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - produce_form.qty_producing = 1 - - with produce_form.raw_workorder_line_ids.new() as line: - line.product_id = p1 - line.qty_done = 1 - product_produce = produce_form.save() - product_produce.raw_workorder_line_ids[1].qty_done -= 1 - product_produce.do_produce() + mo = mo_form.save() + mo.move_raw_ids[0].move_line_ids[0].qty_done += 1 + mo.button_mark_done() def test_product_produce_10(self): """ Produce byproduct with serial, lot and not tracked. @@ -1027,43 +817,39 @@ class TestMrpOrder(TestMrpCommon): mo.bom_id.consumption = 'flexible' # Because we'll over-consume with a product not defined in the BOM mo.action_assign() - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - produce_form.qty_producing = 3 - self.assertEqual(len(produce_form.raw_workorder_line_ids._records), 4, 'Update the produce quantity should change the components quantity.') - self.assertEqual(sum([x['qty_done'] for x in produce_form.raw_workorder_line_ids._records]), 15, 'Update the produce quantity should change the components quantity.') - self.assertEqual(sum([x['qty_reserved'] for x in produce_form.raw_workorder_line_ids._records]), 5, 'Update the produce quantity should not change the components reserved quantity.') - produce_form.qty_producing = 4 - self.assertEqual(len(produce_form.raw_workorder_line_ids._records), 4, 'Update the produce quantity should change the components quantity.') - self.assertEqual(sum([x['qty_done'] for x in produce_form.raw_workorder_line_ids._records]), 20, 'Update the produce quantity should change the components quantity.') - self.assertEqual(sum([x['qty_reserved'] for x in produce_form.raw_workorder_line_ids._records]), 5, 'Update the produce quantity should not change the components reserved quantity.') - - produce_form.qty_producing = 1 - self.assertEqual(len(produce_form.raw_workorder_line_ids._records), 2, 'Update the produce quantity should change the components quantity.') - self.assertEqual(sum([x['qty_done'] for x in produce_form.raw_workorder_line_ids._records]), 5, 'Update the produce quantity should change the components quantity.') - self.assertEqual(sum([x['qty_reserved'] for x in produce_form.raw_workorder_line_ids._records]), 5, 'Update the produce quantity should not change the components reserved quantity.') + mo_form = Form(mo.with_context({'debug': True})) + mo_form.qty_producing = 3 + self.assertEqual(sum([x['quantity_done'] for x in mo_form.move_raw_ids._records]), 15, 'Update the produce quantity should change the components quantity.') + self.assertEqual(sum([x['reserved_availability'] for x in mo_form.move_raw_ids._records]), 5, 'Update the produce quantity should not change the components reserved quantity.') + mo_form.qty_producing = 4 + self.assertEqual(sum([x['quantity_done'] for x in mo_form.move_raw_ids._records]), 20, 'Update the produce quantity should change the components quantity.') + self.assertEqual(sum([x['reserved_availability'] for x in mo_form.move_raw_ids._records]), 5, 'Update the produce quantity should not change the components reserved quantity.') + mo_form.qty_producing = 1 + self.assertEqual(sum([x['quantity_done'] for x in mo_form.move_raw_ids._records]), 5, 'Update the produce quantity should change the components quantity.') + self.assertEqual(sum([x['reserved_availability'] for x in mo_form.move_raw_ids._records]), 5, 'Update the produce quantity should not change the components reserved quantity.') # try adding another product that doesn't belong to the BoM - with produce_form.raw_workorder_line_ids.new() as line: - line.product_id = self.product_4 - line.qty_done = 1 - produce_wizard = produce_form.save() - produce_wizard.do_produce() + with mo_form.move_raw_ids.new() as move: + move.product_id = self.product_4 + move.quantity_done = 10 + # Check that this new product is not updated by qty_producing + mo_form.qty_producing = 2 + for move in mo_form.move_raw_ids._records: + if move['product_id'] == self.product_4.id: + self.assertEqual(move['quantity_done'], 10) + break + mo = mo_form.save() + mo.button_mark_done() def test_product_produce_duplicate_1(self): """ produce a finished product tracked by serial number 2 times with the same SN. Check that an error is raised the second time""" mo1, bom, p_final, p1, p2 = self.generate_mo(tracking_final='serial', qty_final=1, qty_base_1=1,) - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo1.id, - 'active_ids': [mo1.id], - })) - product_produce = produce_form.save() - product_produce.action_generate_serial() - sn = product_produce.finished_lot_id - product_produce.do_produce() + mo_form = Form(mo1) + mo_form.qty_producing = 1 + mo1 = mo_form.save() + mo1.action_generate_serial() + sn = mo1.lot_producing_id mo1.button_mark_done() mo_form = Form(self.env['mrp.production']) @@ -1073,14 +859,11 @@ class TestMrpOrder(TestMrpCommon): mo2 = mo_form.save() mo2.action_confirm() - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo2.id, - 'active_ids': [mo2.id], - })) - produce_form.finished_lot_id = sn - product_produce = produce_form.save() + mo_form = Form(mo2) + mo_form.lot_producing_id = sn + mo2 = mo_form.save() with self.assertRaises(UserError): - product_produce.do_produce() + mo2.button_mark_done() def test_product_produce_duplicate_2(self): """ produce a finished product with component tracked by serial number 2 @@ -1091,14 +874,13 @@ class TestMrpOrder(TestMrpCommon): 'product_id': p2.id, 'company_id': self.env.company.id, }) - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo1.id, - 'active_ids': [mo1.id], - })) - with produce_form.raw_workorder_line_ids.edit(0) as line: - line.lot_id = sn - product_produce = produce_form.save() - product_produce.do_produce() + mo_form = Form(mo1) + mo_form.qty_producing = 1 + mo1 = mo_form.save() + details_operation_form = Form(mo1.move_raw_ids[0], view=self.env.ref('stock.view_stock_move_operations')) + with details_operation_form.move_line_ids.new() as ml: + ml.lot_id = sn + details_operation_form.save() mo1.button_mark_done() mo_form = Form(self.env['mrp.production']) @@ -1108,15 +890,15 @@ class TestMrpOrder(TestMrpCommon): mo2 = mo_form.save() mo2.action_confirm() - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo2.id, - 'active_ids': [mo2.id], - })) - with produce_form.raw_workorder_line_ids.edit(0) as line: - line.lot_id = sn - product_produce = produce_form.save() + mo_form = Form(mo2) + mo_form.qty_producing = 1 + mo2 = mo_form.save() + details_operation_form = Form(mo2.move_raw_ids[0], view=self.env.ref('stock.view_stock_move_operations')) + with details_operation_form.move_line_ids.new() as ml: + ml.lot_id = sn + details_operation_form.save() with self.assertRaises(UserError): - product_produce.do_produce() + mo2.button_mark_done() def test_product_produce_duplicate_3(self): """ produce a finished product with by-product tracked by serial number 2 @@ -1148,15 +930,15 @@ class TestMrpOrder(TestMrpCommon): 'product_id': byproduct.id, 'company_id': self.env.company.id, }) - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - with produce_form.finished_workorder_line_ids.edit(0) as line: - line.lot_id = sn - product_produce = produce_form.save() - product_produce.do_produce() + mo_form = Form(mo) + mo_form.qty_producing = 1 + mo = mo_form.save() + move_byproduct = mo.move_finished_ids.filtered(lambda m: m.product_id != mo.product_id) + details_operation_form = Form(move_byproduct, view=self.env.ref('stock.view_stock_move_operations')) + with details_operation_form.move_line_ids.new() as ml: + ml.lot_id = sn + details_operation_form.save() mo.button_mark_done() mo_form = Form(self.env['mrp.production']) @@ -1166,15 +948,16 @@ class TestMrpOrder(TestMrpCommon): mo2 = mo_form.save() mo2.action_confirm() - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo2.id, - 'active_ids': [mo2.id], - })) - with produce_form.finished_workorder_line_ids.edit(0) as line: - line.lot_id = sn - product_produce = produce_form.save() + mo_form = Form(mo2) + mo_form.qty_producing = 1 + mo2 = mo_form.save() + move_byproduct = mo2.move_finished_ids.filtered(lambda m: m.product_id != mo.product_id) + details_operation_form = Form(move_byproduct, view=self.env.ref('stock.view_stock_move_operations')) + with details_operation_form.move_line_ids.new() as ml: + ml.lot_id = sn + details_operation_form.save() with self.assertRaises(UserError): - product_produce.do_produce() + mo2.button_mark_done() def test_product_produce_duplicate_4(self): """ Consuming the same serial number two times should not give an error if @@ -1185,14 +968,13 @@ class TestMrpOrder(TestMrpCommon): 'product_id': p2.id, 'company_id': self.env.company.id, }) - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo1.id, - 'active_ids': [mo1.id], - })) - with produce_form.raw_workorder_line_ids.edit(0) as line: - line.lot_id = sn - product_produce = produce_form.save() - product_produce.do_produce() + mo_form = Form(mo1) + mo_form.qty_producing = 1 + mo1 = mo_form.save() + details_operation_form = Form(mo1.move_raw_ids[0], view=self.env.ref('stock.view_stock_move_operations')) + with details_operation_form.move_line_ids.new() as ml: + ml.lot_id = sn + details_operation_form.save() mo1.button_mark_done() unbuild_form = Form(self.env['mrp.unbuild']) @@ -1210,15 +992,15 @@ class TestMrpOrder(TestMrpCommon): mo2 = mo_form.save() mo2.action_confirm() - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo2.id, - 'active_ids': [mo2.id], - })) - with produce_form.raw_workorder_line_ids.edit(0) as line: - line.lot_id = sn - product_produce = produce_form.save() - product_produce.do_produce() - + mo_form = Form(mo2) + mo_form.qty_producing = 1 + mo2 = mo_form.save() + details_operation_form = Form(mo2.move_raw_ids[0], view=self.env.ref('stock.view_stock_move_operations')) + with details_operation_form.move_line_ids.new() as ml: + ml.lot_id = sn + details_operation_form.save() + mo2.button_mark_done() + def test_product_produce_uom(self): """ Produce a finished product tracked by serial number. Set another UoM on the bom. The produce wizard should keep the UoM of the product (unit) @@ -1268,86 +1050,20 @@ class TestMrpOrder(TestMrpCommon): self.assertEqual(mo.move_raw_ids.product_qty, 12, '12 units should be reserved.') # produce product - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - produce_form.finished_lot_id = final_product_lot - product_produce = produce_form.save() - self.assertEqual(product_produce.qty_producing, 1) - self.assertEqual(product_produce.product_uom_id, unit, 'Should be 1 unit since the tracking is serial.') - product_produce.finished_lot_id = final_product_lot.id + mo_form = Form(mo) + mo_form.qty_producing = 1/12.0 + mo_form.lot_producing_id = final_product_lot + mo = mo_form.save() - product_produce.do_produce() move_line_raw = mo.move_raw_ids.mapped('move_line_ids').filtered(lambda m: m.qty_done) self.assertEqual(move_line_raw.qty_done, 1) self.assertEqual(move_line_raw.product_uom_id, unit, 'Should be 1 unit since the tracking is serial.') + mo._post_inventory() move_line_finished = mo.move_finished_ids.mapped('move_line_ids').filtered(lambda m: m.qty_done) self.assertEqual(move_line_finished.qty_done, 1) self.assertEqual(move_line_finished.product_uom_id, unit, 'Should be 1 unit since the tracking is serial.') - def test_product_produce_uom_2(self): - """ Create a bom with a serial tracked component and a pair UoM (2 x unit). - The produce wizard should create 2 line with quantity = 1 and UoM = unit for - this component. """ - - unit = self.env.ref("uom.product_uom_unit") - categ_unit_id = self.env.ref('uom.product_uom_categ_unit') - paire = self.env['uom.uom'].create({ - 'name': 'Paire', - 'factor_inv': 2, - 'uom_type': 'bigger', - 'rounding': 0.001, - 'category_id': categ_unit_id.id - }) - binocular = self.env['product.product'].create({ - 'name': 'Binocular', - 'type': 'product', - 'uom_id': unit.id, - 'uom_po_id': unit.id - }) - nocular = self.env['product.product'].create({ - 'name': 'Nocular', - 'type': 'product', - 'tracking': 'serial', - 'uom_id': unit.id, - 'uom_po_id': unit.id - }) - bom_binocular = self.env['mrp.bom'].create({ - 'product_tmpl_id': binocular.product_tmpl_id.id, - 'product_qty': 1, - 'product_uom_id': unit.id, - 'bom_line_ids': [(0, 0, { - 'product_id': nocular.id, - 'product_qty': 1, - 'product_uom_id': paire.id - })] - }) - mo_form = Form(self.env['mrp.production']) - mo_form.product_id = binocular - mo_form.bom_id = bom_binocular - mo_form.product_uom_id = unit - mo_form.product_qty = 1 - mo = mo_form.save() - - mo.action_confirm() - self.assertEqual(mo.move_raw_ids.product_uom_qty, 1, 'Quantity should be 1.') - self.assertEqual(mo.move_raw_ids.product_uom, paire, 'Move UoM should be "Paire".') - - # produce product - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - product_produce = produce_form.save() - self.assertEqual(product_produce.qty_producing, 1) - self.assertEqual(len(product_produce.raw_workorder_line_ids), 2, 'Should be 2 lines since the component tracking is serial and quantity 2.') - self.assertEqual(product_produce.raw_workorder_line_ids[0].qty_to_consume, 1, 'Should be 1 unit since the tracking is serial and quantity 2.') - self.assertEqual(product_produce.raw_workorder_line_ids[0].product_uom_id, unit, 'Should be the product uom so "unit"') - self.assertEqual(product_produce.raw_workorder_line_ids[1].qty_to_consume, 1, 'Should be 1 unit since the tracking is serial and quantity 2.') - self.assertEqual(product_produce.raw_workorder_line_ids[1].product_uom_id, unit, 'should be the product uom so "unit"') - def test_product_type_service_1(self): # Create finished product finished_product = self.env['product.product'].create({ diff --git a/addons/mrp/tests/test_procurement.py b/addons/mrp/tests/test_procurement.py index 9e1d25e59ec..89be67074bd 100644 --- a/addons/mrp/tests/test_procurement.py +++ b/addons/mrp/tests/test_procurement.py @@ -39,7 +39,7 @@ class TestProcurement(TestMrpCommon): production_product_6.action_assign() # check production state is Confirmed - self.assertEqual(production_product_6.state, 'confirmed', 'Production order should be for Confirmed state') + self.assertEqual(production_product_6.state, 'confirmed') # Check procurement for product 4 created or not. # Check it created a purchase order @@ -69,14 +69,9 @@ class TestProcurement(TestMrpCommon): # produce product4 # --------------- - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': produce_product_4.id, - 'active_ids': [produce_product_4.id], - })) - produce_form.qty_producing = produce_product_4.product_qty - product_produce = produce_form.save() - product_produce.do_produce() - produce_product_4.post_inventory() + mo_form = Form(produce_product_4) + mo_form.qty_producing = produce_product_4.product_qty + produce_product_4 = mo_form.save() # Check procurement and Production state for product 4. produce_product_4.button_mark_done() self.assertEqual(produce_product_4.state, 'done', 'Production order should be in state done') @@ -95,14 +90,9 @@ class TestProcurement(TestMrpCommon): # ------------------------------------ self.assertEqual(production_product_6.reservation_state, 'assigned', "Consume material not available") - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': production_product_6.id, - 'active_ids': [production_product_6.id], - })) - produce_form.qty_producing = production_product_6.product_qty - product_produce = produce_form.save() - product_produce.do_produce() - production_product_6.post_inventory() + mo_form = Form(production_product_6) + mo_form.qty_producing = production_product_6.product_qty + production_product_6 = mo_form.save() # Check procurement and Production state for product 6. production_product_6.button_mark_done() self.assertEqual(production_product_6.state, 'done', 'Production order should be in state done') @@ -191,13 +181,9 @@ class TestProcurement(TestMrpCommon): self.assertEqual(picking_qc_to_stock.state, 'done') mo.action_assign() self.assertEqual(mo.move_raw_ids.reserved_availability, 3.0) - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) + produce_form = Form(mo) produce_form.qty_producing = 3.0 - produce_wizard = produce_form.save() - produce_wizard.do_produce() + mo = produce_form.save() self.assertEqual(mo.move_raw_ids.quantity_done, 3.0) picking_qc_to_stock.move_line_ids.qty_done = 5.0 self.assertEqual(mo.move_raw_ids.reserved_availability, 5.0) @@ -419,12 +405,9 @@ class TestProcurement(TestMrpCommon): self.env['stock.move'].create(move_values) production.action_confirm() - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': production.id, - 'active_ids': [production.id], - })) - product_produce = produce_form.save() - product_produce.do_produce() + produce_form = Form(production) + produce_form.qty_producing = production.product_qty + production = produce_form.save() production.button_mark_done() move_dest._action_assign() diff --git a/addons/mrp/tests/test_stock.py b/addons/mrp/tests/test_stock.py index 0d1097abbf3..9b51973f19d 100644 --- a/addons/mrp/tests/test_stock.py +++ b/addons/mrp/tests/test_stock.py @@ -207,14 +207,10 @@ class TestWarehouse(common.TestMrpCommon): mo_laptop = self.new_mo_laptop() serial = self.env['stock.production.lot'].create({'product_id': self.laptop.id, 'company_id': self.env.company.id}) - product_produce = self.env['mrp.product.produce'].with_context({ - 'active_id': mo_laptop.id, - 'active_ids': [mo_laptop.id], - }).create({ - "qty_producing": 1.0, - "finished_lot_id": serial.id, - }) - product_produce.do_produce() + mo_form = Form(mo_laptop) + mo_form.qty_producing = 1 + mo_form.lot_producing_id = serial + mo_laptop = mo_form.save() mo_laptop.button_mark_done() # We check if the laptop go in the depot and not in the stock diff --git a/addons/mrp/tests/test_traceability.py b/addons/mrp/tests/test_traceability.py index 2c05b2e70fe..a7f09bf6de1 100644 --- a/addons/mrp/tests/test_traceability.py +++ b/addons/mrp/tests/test_traceability.py @@ -63,19 +63,22 @@ class TestTraceability(TestMrpCommon): mo.action_assign() # Start MO production - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - - if finished_product.tracking != 'serial': - produce_form.qty_producing = 1 - + mo_form = Form(mo) + mo_form.qty_producing = 1 if finished_product.tracking != 'none': - produce_form.finished_lot_id = self.env['stock.production.lot'].create({'name': 'Serial or Lot finished', 'product_id': finished_product.id, 'company_id': self.env.company.id}) - produce_wizard = produce_form.save() + mo_form.lot_producing_id = self.env['stock.production.lot'].create({'name': 'Serial or Lot finished', 'product_id': finished_product.id, 'company_id': self.env.company.id}) + mo = mo_form.save() + + details_operation_form = Form(mo.move_raw_ids[1], view=self.env.ref('stock.view_stock_move_operations')) + with details_operation_form.move_line_ids.edit(0) as ml: + ml.qty_done = 1 + details_operation_form.save() + details_operation_form = Form(mo.move_raw_ids[2], view=self.env.ref('stock.view_stock_move_operations')) + with details_operation_form.move_line_ids.edit(0) as ml: + ml.qty_done = 1 + details_operation_form.save() + - produce_wizard.do_produce() mo.button_mark_done() self.assertEqual(mo.state, 'done', "Production order should be in done state.") @@ -160,41 +163,56 @@ class TestTraceability(TestMrpCommon): mo = mo_form.save() mo.action_confirm() - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - produce_form.finished_lot_id = self.env['stock.production.lot'].create({ + mo_form = Form(mo) + mo_form.lot_producing_id = self.env['stock.production.lot'].create({ 'product_id': product_final.id, 'name': 'Final_lot_1', 'company_id': self.env.company.id, }) - with produce_form.raw_workorder_line_ids.edit(0) as line: - line.lot_id = self.env['stock.production.lot'].create({ + mo = mo_form.save() + + details_operation_form = Form(mo.move_raw_ids[0], view=self.env.ref('stock.view_stock_move_operations')) + with details_operation_form.move_line_ids.new() as ml: + ml.lot_id = self.env['stock.production.lot'].create({ 'product_id': product_1.id, 'name': 'Raw_1_lot_1', 'company_id': self.env.company.id, }) - with produce_form.raw_workorder_line_ids.edit(1) as line: - line.lot_id = self.env['stock.production.lot'].create({ + ml.qty_done = 1 + details_operation_form.save() + details_operation_form = Form(mo.move_raw_ids[1], view=self.env.ref('stock.view_stock_move_operations')) + with details_operation_form.move_line_ids.new() as ml: + ml.lot_id = self.env['stock.production.lot'].create({ 'product_id': product_2.id, 'name': 'Raw_2_lot_1', 'company_id': self.env.company.id, }) - with produce_form.finished_workorder_line_ids.edit(0) as line: - line.lot_id = self.env['stock.production.lot'].create({ + ml.qty_done = 1 + details_operation_form.save() + details_operation_form = Form( + mo.move_finished_ids.filtered(lambda m: m.product_id == byproduct_1), + view=self.env.ref('stock.view_stock_move_operations') + ) + with details_operation_form.move_line_ids.new() as ml: + ml.lot_id = self.env['stock.production.lot'].create({ 'product_id': byproduct_1.id, 'name': 'Byproduct_1_lot_1', 'company_id': self.env.company.id, }) - with produce_form.finished_workorder_line_ids.edit(1) as line: - line.lot_id = self.env['stock.production.lot'].create({ + ml.qty_done = 1 + details_operation_form.save() + details_operation_form = Form( + mo.move_finished_ids.filtered(lambda m: m.product_id == byproduct_2), + view=self.env.ref('stock.view_stock_move_operations') + ) + with details_operation_form.move_line_ids.new() as ml: + ml.lot_id = self.env['stock.production.lot'].create({ 'product_id': byproduct_2.id, 'name': 'Byproduct_2_lot_1', 'company_id': self.env.company.id, }) - produce_wizard = produce_form.save() - produce_wizard.continue_production() + ml.qty_done = 1 + details_operation_form.save() action = mo.button_mark_done() backorder = Form(self.env['mrp.production.backorder'].with_context(**action['context'])) @@ -206,59 +224,84 @@ class TestTraceability(TestMrpCommon): 'name': 'Final_lot_2', 'company_id': self.env.company.id, }) - with produce_form.raw_workorder_line_ids.edit(0) as line: - line.lot_id = self.env['stock.production.lot'].create({ + mo_form.qty_producing = 1 + mo_backorder = mo_form.save() + + details_operation_form = Form( + mo_backorder.move_raw_ids.filtered(lambda m: m.product_id == product_1), + view=self.env.ref('stock.view_stock_move_operations') + ) + with details_operation_form.move_line_ids.new() as ml: + ml.lot_id = self.env['stock.production.lot'].create({ 'product_id': product_1.id, 'name': 'Raw_1_lot_2', 'company_id': self.env.company.id, }) - with produce_form.raw_workorder_line_ids.edit(1) as line: - line.lot_id = self.env['stock.production.lot'].create({ + ml.qty_done = 1 + details_operation_form.save() + details_operation_form = Form( + mo_backorder.move_raw_ids.filtered(lambda m: m.product_id == product_2), + view=self.env.ref('stock.view_stock_move_operations') + ) + with details_operation_form.move_line_ids.new() as ml: + ml.lot_id = self.env['stock.production.lot'].create({ 'product_id': product_2.id, 'name': 'Raw_2_lot_2', 'company_id': self.env.company.id, }) - with produce_form.finished_workorder_line_ids.edit(0) as line: - line.lot_id = self.env['stock.production.lot'].create({ + ml.qty_done = 1 + details_operation_form.save() + details_operation_form = Form( + mo_backorder.move_finished_ids.filtered(lambda m: m.product_id == byproduct_1), + view=self.env.ref('stock.view_stock_move_operations') + ) + with details_operation_form.move_line_ids.new() as ml: + ml.lot_id = self.env['stock.production.lot'].create({ 'product_id': byproduct_1.id, 'name': 'Byproduct_1_lot_2', 'company_id': self.env.company.id, }) - with produce_form.finished_workorder_line_ids.edit(1) as line: - line.lot_id = self.env['stock.production.lot'].create({ + ml.qty_done = 1 + details_operation_form.save() + details_operation_form = Form( + mo_backorder.move_finished_ids.filtered(lambda m: m.product_id == byproduct_2), + view=self.env.ref('stock.view_stock_move_operations') + ) + with details_operation_form.move_line_ids.new() as ml: + ml.lot_id = self.env['stock.production.lot'].create({ 'product_id': byproduct_2.id, 'name': 'Byproduct_2_lot_2', 'company_id': self.env.company.id, }) - produce_wizard = produce_form.save() - produce_wizard.do_produce() - mo.button_mark_done() + ml.qty_done = 1 + details_operation_form.save() - self.assertEqual(len(mo.move_raw_ids.mapped('move_line_ids')), 4) - self.assertEqual(len(mo.move_finished_ids.mapped('move_line_ids')), 6) + mo_backorder.button_mark_done() + # self.assertEqual(len(mo.move_raw_ids.mapped('move_line_ids')), 4) + # self.assertEqual(len(mo.move_finished_ids.mapped('move_line_ids')), 6) + + mo = mo | mo_backorder raw_move_lines = mo.move_raw_ids.mapped('move_line_ids') raw_line_raw_1_lot_1 = raw_move_lines.filtered(lambda ml: ml.lot_id.name == 'Raw_1_lot_1') - self.assertEqual(set(raw_line_raw_1_lot_1.lot_produced_ids.mapped('name')), set(['Final_lot_1', 'Byproduct_1_lot_1', 'Byproduct_2_lot_1'])) - raw_line_raw_1_lot_2 = raw_move_lines.filtered(lambda ml: ml.lot_id.name == 'Raw_1_lot_2') - self.assertEqual(set(raw_line_raw_1_lot_2.lot_produced_ids.mapped('name')), set(['Final_lot_2', 'Byproduct_1_lot_2', 'Byproduct_2_lot_2'])) + self.assertEqual(set(raw_line_raw_1_lot_1.produce_line_ids.lot_id.mapped('name')), set(['Final_lot_1', 'Byproduct_1_lot_1', 'Byproduct_2_lot_1'])) raw_line_raw_2_lot_1 = raw_move_lines.filtered(lambda ml: ml.lot_id.name == 'Raw_2_lot_1') - self.assertEqual(set(raw_line_raw_2_lot_1.lot_produced_ids.mapped('name')), set(['Final_lot_1', 'Byproduct_1_lot_1', 'Byproduct_2_lot_1'])) - raw_line_raw_2_lot_2 = raw_move_lines.filtered(lambda ml: ml.lot_id.name == 'Raw_2_lot_2') - self.assertEqual(set(raw_line_raw_2_lot_2.lot_produced_ids.mapped('name')), set(['Final_lot_2', 'Byproduct_1_lot_2', 'Byproduct_2_lot_2'])) + self.assertEqual(set(raw_line_raw_2_lot_1.produce_line_ids.lot_id.mapped('name')), set(['Final_lot_1', 'Byproduct_1_lot_1', 'Byproduct_2_lot_1'])) finished_move_lines = mo.move_finished_ids.mapped('move_line_ids') finished_move_line_lot_1 = finished_move_lines.filtered(lambda ml: ml.lot_id.name == 'Final_lot_1') - self.assertEqual(finished_move_line_lot_1.consume_line_ids, raw_line_raw_1_lot_1 | raw_line_raw_2_lot_1) + self.assertEqual(finished_move_line_lot_1.consume_line_ids.filtered(lambda l: l.qty_done), raw_line_raw_1_lot_1 | raw_line_raw_2_lot_1) finished_move_line_lot_2 = finished_move_lines.filtered(lambda ml: ml.lot_id.name == 'Final_lot_2') + raw_line_raw_1_lot_2 = raw_move_lines.filtered(lambda ml: ml.lot_id.name == 'Raw_1_lot_2') + raw_line_raw_2_lot_2 = raw_move_lines.filtered(lambda ml: ml.lot_id.name == 'Raw_2_lot_2') self.assertEqual(finished_move_line_lot_2.consume_line_ids, raw_line_raw_1_lot_2 | raw_line_raw_2_lot_2) byproduct_move_line_1_lot_1 = finished_move_lines.filtered(lambda ml: ml.lot_id.name == 'Byproduct_1_lot_1') - self.assertEqual(byproduct_move_line_1_lot_1.consume_line_ids, raw_line_raw_1_lot_1 | raw_line_raw_2_lot_1) + self.assertEqual(byproduct_move_line_1_lot_1.consume_line_ids.filtered(lambda l: l.qty_done), raw_line_raw_1_lot_1 | raw_line_raw_2_lot_1) byproduct_move_line_1_lot_2 = finished_move_lines.filtered(lambda ml: ml.lot_id.name == 'Byproduct_1_lot_2') self.assertEqual(byproduct_move_line_1_lot_2.consume_line_ids, raw_line_raw_1_lot_2 | raw_line_raw_2_lot_2) byproduct_move_line_2_lot_1 = finished_move_lines.filtered(lambda ml: ml.lot_id.name == 'Byproduct_2_lot_1') - self.assertEqual(byproduct_move_line_2_lot_1.consume_line_ids, raw_line_raw_1_lot_1 | raw_line_raw_2_lot_1) + self.assertEqual(byproduct_move_line_2_lot_1.consume_line_ids.filtered(lambda l: l.qty_done), raw_line_raw_1_lot_1 | raw_line_raw_2_lot_1) byproduct_move_line_2_lot_2 = finished_move_lines.filtered(lambda ml: ml.lot_id.name == 'Byproduct_2_lot_2') self.assertEqual(byproduct_move_line_2_lot_2.consume_line_ids, raw_line_raw_1_lot_2 | raw_line_raw_2_lot_2) diff --git a/addons/mrp/tests/test_unbuild.py b/addons/mrp/tests/test_unbuild.py index 3ceb071bf1b..159b4c3df3c 100644 --- a/addons/mrp/tests/test_unbuild.py +++ b/addons/mrp/tests/test_unbuild.py @@ -5,6 +5,7 @@ from odoo.tests import Form from odoo.addons.mrp.tests.common import TestMrpCommon from odoo.exceptions import UserError + class TestUnbuild(TestMrpCommon): def setUp(self): super(TestUnbuild, self).setUp() @@ -26,14 +27,9 @@ class TestUnbuild(TestMrpCommon): self.env['stock.quant']._update_available_quantity(p2, self.stock_location, 5) mo.action_assign() - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - produce_form.qty_producing = 5.0 - produce_wizard = produce_form.save() - produce_wizard.do_produce() - + mo_form = Form(mo) + mo_form.qty_producing = 5.0 + mo = mo_form.save() mo.button_mark_done() self.assertEqual(mo.state, 'done', "Production order should be in done state.") @@ -97,15 +93,10 @@ class TestUnbuild(TestMrpCommon): self.env['stock.quant']._update_available_quantity(p2, self.stock_location, 5) mo.action_assign() - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - produce_form.qty_producing = 5.0 - produce_form.finished_lot_id = lot - produce_wizard = produce_form.save() - - produce_wizard.do_produce() + mo_form = Form(mo) + mo_form.qty_producing = 5.0 + mo_form.lot_producing_id = lot + mo = mo_form.save() mo.button_mark_done() self.assertEqual(mo.state, 'done', "Production order should be in done state.") @@ -182,14 +173,15 @@ class TestUnbuild(TestMrpCommon): if ml.product_id.tracking != 'none': self.assertEqual(ml.lot_id, lot, 'Wrong reserved lot.') - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - produce_form.qty_producing = 5.0 - produce_wizard = produce_form.save() - - produce_wizard.do_produce() + # FIXME sle: behavior change + mo_form = Form(mo) + mo_form.qty_producing = 5.0 + mo = mo_form.save() + details_operation_form = Form(mo.move_raw_ids[1], view=self.env.ref('stock.view_stock_move_operations')) + with details_operation_form.move_line_ids.edit(0) as ml: + ml.lot_id = lot + ml.qty_done = 20 + details_operation_form.save() mo.button_mark_done() self.assertEqual(mo.state, 'done', "Production order should be in done state.") @@ -272,15 +264,19 @@ class TestUnbuild(TestMrpCommon): self.env['stock.quant']._update_available_quantity(p2, self.stock_location, 5, lot_id=lot_2) mo.action_assign() - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - produce_form.qty_producing = 5.0 - produce_form.finished_lot_id = lot_final - produce_wizard = produce_form.save() - - produce_wizard.do_produce() + # FIXME sle: behavior change + mo_form = Form(mo) + mo_form.qty_producing = 5.0 + mo_form.lot_producing_id = lot_final + mo = mo_form.save() + details_operation_form = Form(mo.move_raw_ids[0], view=self.env.ref('stock.view_stock_move_operations')) + with details_operation_form.move_line_ids.edit(0) as ml: + ml.qty_done = 5 + details_operation_form.save() + details_operation_form = Form(mo.move_raw_ids[1], view=self.env.ref('stock.view_stock_move_operations')) + with details_operation_form.move_line_ids.edit(0) as ml: + ml.qty_done = 20 + details_operation_form.save() mo.button_mark_done() self.assertEqual(mo.state, 'done', "Production order should be in done state.") @@ -326,7 +322,7 @@ class TestUnbuild(TestMrpCommon): x.save().action_unbuild() self.assertEqual(self.env['stock.quant']._get_available_quantity(p_final, self.stock_location, lot_id=lot_final), 2, 'You should have consumed 3 final product in stock') - self.assertEqual(self.env['stock.quant']._get_available_quantity(p1, self.stock_location, lot_id=lot_1), 92, 'You should have 80 products in stock') + self.assertEqual(self.env['stock.quant']._get_available_quantity(p1, self.stock_location, lot_id=lot_1), 92, 'You should have 92 products in stock') self.assertEqual(self.env['stock.quant']._get_available_quantity(p2, self.stock_location, lot_id=lot_2), 3, 'You should have consumed all the 5 product in stock') x = Form(self.env['mrp.unbuild']) @@ -381,14 +377,18 @@ class TestUnbuild(TestMrpCommon): self.env['stock.quant']._update_available_quantity(p2, self.stock_location, 2, lot_id=lot_3) mo.action_assign() - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - produce_form.qty_producing = 5.0 - produce_wizard = produce_form.save() + mo_form = Form(mo) + mo_form.qty_producing = 5.0 + mo = mo_form.save() + details_operation_form = Form(mo.move_raw_ids.filtered(lambda ml: ml.product_id == p2), view=self.env.ref('stock.view_stock_move_operations')) + with details_operation_form.move_line_ids.edit(0) as ml: + ml.qty_done = ml.product_uom_qty + with details_operation_form.move_line_ids.edit(1) as ml: + ml.qty_done = ml.product_uom_qty + with details_operation_form.move_line_ids.edit(2) as ml: + ml.qty_done = ml.product_uom_qty + details_operation_form.save() - produce_wizard.do_produce() mo.button_mark_done() self.assertEqual(mo.state, 'done', "Production order should be in done state.") # Check quantity in stock before unbuild. @@ -415,6 +415,9 @@ class TestUnbuild(TestMrpCommon): """ This test produces an MO in two times and checks that the move lines are linked in a correct way """ mo, bom, p_final, p1, p2 = self.generate_mo(tracking_final='lot', tracking_base_1='none', tracking_base_2='lot') + # Young Tom + # \ Botox - 4 - p1 + # \ Old Tom - 1 - p2 lot_1 = self.env['stock.production.lot'].create({ 'name': 'lot_1', 'product_id': p2.id, @@ -456,21 +459,26 @@ class TestUnbuild(TestMrpCommon): 'company_id': self.env.company.id, }) - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - produce_form.qty_producing = 2.0 - produce_form.finished_lot_id = lot_finished_2 + mo = mo.procurement_group_id.mrp_production_ids[1] + # FIXME sle: issue in backorder? + mo.move_raw_ids.move_line_ids.unlink() + self.assertEqual(mo.product_qty, 2) + mo_form = Form(mo) + mo_form.qty_producing = 2 + mo_form.lot_producing_id = lot_finished_2 + mo = mo_form.save() + details_operation_form = Form(mo.move_raw_ids[0], view=self.env.ref('stock.view_stock_move_operations')) + with details_operation_form.move_line_ids.new() as ml: + ml.qty_done = 2 + ml.lot_id = lot_2 + details_operation_form.save() + action = mo.button_mark_done() - produce_wizard = produce_form.save() - produce_wizard._workorder_line_ids()[0].lot_id = lot_2 - produce_wizard.do_produce() - mo.button_mark_done() - ml = mo.finished_move_line_ids[0].consume_line_ids.filtered(lambda m: m.product_id == p1 and lot_finished_1 in m.lot_produced_ids) - self.assertEqual(ml[0].qty_done, 12.0, 'Should have consumed 12 for the first lot') - ml = mo.finished_move_line_ids[1].consume_line_ids.filtered(lambda m: m.product_id == p1 and lot_finished_2 in m.lot_produced_ids) - self.assertEqual(ml[0].qty_done, 8.0, 'Should have consumed 8 for the second lot') + mo1 = mo.procurement_group_id.mrp_production_ids[0] + ml = mo1.finished_move_line_ids[0].consume_line_ids.filtered(lambda m: m.product_id == p1 and lot_finished_1 in m.produce_line_ids.lot_id) + self.assertEqual(sum(ml.mapped('qty_done')), 12.0, 'Should have consumed 12 for the first lot') + ml = mo.finished_move_line_ids[0].consume_line_ids.filtered(lambda m: m.product_id == p1 and lot_finished_2 in m.produce_line_ids.lot_id) + self.assertEqual(sum(ml.mapped('qty_done')), 8.0, 'Should have consumed 8 for the second lot') def test_unbuild_with_routes(self): """ This test creates a MO of a stockable product (Table). A new route for rule QC/Unbuild -> Stock @@ -544,13 +552,9 @@ class TestUnbuild(TestMrpCommon): mo.action_assign() # Produce the final product - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': mo.id, - 'active_ids': [mo.id], - })) - produce_form.qty_producing = 1.0 - produce_wizard = produce_form.save() - produce_wizard.do_produce() + mo_form = Form(mo) + mo_form.qty_producing = 1.0 + produce_wizard = mo_form.save() mo.button_mark_done() self.assertEqual(mo.state, 'done', "Production order should be in done state.") diff --git a/addons/mrp/tests/test_warehouse_multistep_manufacturing.py b/addons/mrp/tests/test_warehouse_multistep_manufacturing.py index a04f9078acc..408045ae274 100644 --- a/addons/mrp/tests/test_warehouse_multistep_manufacturing.py +++ b/addons/mrp/tests/test_warehouse_multistep_manufacturing.py @@ -184,13 +184,9 @@ class TestMultistepManufacturingWarehouse(TestMrpCommon): self.assertEqual(production_order.reservation_state, 'assigned') self.assertEqual(picking_stock_postprod.state, 'waiting') - produce_form = Form(self.env['mrp.product.produce'].with_context({ - 'active_id': production_order.id, - 'active_ids': [production_order.id], - })) + produce_form = Form(production_order) produce_form.qty_producing = production_order.product_qty - product_produce = produce_form.save() - product_produce.do_produce() + production_order = produce_form.save() production_order.button_mark_done() self.assertFalse(sum(self.env['stock.quant']._gather(self.raw_product, self.warehouse.pbm_loc_id).mapped('quantity'))) diff --git a/addons/mrp/tests/test_workorder_operation.py b/addons/mrp/tests/test_workorder_operation.py index 399c1d963c2..7327ed84c11 100644 --- a/addons/mrp/tests/test_workorder_operation.py +++ b/addons/mrp/tests/test_workorder_operation.py @@ -151,7 +151,6 @@ class TestWorkOrderProcess(TestWorkOrderProcessCommon): production_table_form.product_qty = 1.0 production_table_form.product_uom_id = dining_table.uom_id production_table = production_table_form.save() - production_table.action_confirm() # Set tracking lot on finish and consume products. dining_table.tracking = 'lot' @@ -159,6 +158,7 @@ class TestWorkOrderProcess(TestWorkOrderProcessCommon): product_table_leg.tracking = 'lot' product_bolt.tracking = "lot" + production_table.action_confirm() # Initial inventory of product sheet, lags and bolt lot_sheet = self.env['stock.production.lot'].create({'product_id': product_table_sheet.id, 'company_id': self.env.company.id}) lot_leg = self.env['stock.production.lot'].create({'product_id': product_table_leg.id, 'company_id': self.env.company.id}) @@ -626,9 +626,6 @@ class TestWorkOrderProcess(TestWorkOrderProcessCommon): # ----------------- # Produce 6 Unit of custom laptop will consume ( 12 Unit of keybord and 12 Unit of charger) - context = {"active_ids": [mo_custom_laptop.id], "active_id": mo_custom_laptop.id} - product_form = Form(self.env['mrp.product.produce'].with_context(context)) - product_form.qty_producing = 6.00 laptop_lot_001 = self.env['stock.production.lot'].create({'product_id': custom_laptop.id , 'company_id': self.env.company.id}) mo_form = Form(mo_custom_laptop) mo_form.qty_producing = 6 @@ -651,11 +648,8 @@ class TestWorkOrderProcess(TestWorkOrderProcessCommon): for move in mo_custom_laptop.move_raw_ids: self.assertEqual(move.quantity_done, 12, "Wrong produced quantity on raw material %s" % (move.product_id.name)) self.assertEqual(len(mo_custom_laptop.move_raw_ids), 2) - mo_custom_laptop.post_inventory() - self.assertEqual(len(mo_custom_laptop.move_raw_ids), 4) # Check done move and confirmed move quantity. - charger_done_move = mo_custom_laptop.move_raw_ids.filtered(lambda x: x.product_id.id == product_charger.id and x.state == 'done') keybord_done_move = mo_custom_laptop.move_raw_ids.filtered(lambda x: x.product_id.id == product_keybord.id and x.state == 'done') self.assertEqual(charger_done_move.product_uom_qty, 12) @@ -665,165 +659,26 @@ class TestWorkOrderProcess(TestWorkOrderProcessCommon): # ---------------------------- # Produce 4 Unit of custom laptop will consume ( 8 Unit of keybord and 8 Unit of charger). - context = {"active_ids": [mo_custom_laptop.id], "active_id": mo_custom_laptop.id} - produce_form = Form(self.env['mrp.product.produce'].with_context(context)) - produce_form.qty_producing = 4.00 laptop_lot_002 = self.env['stock.production.lot'].create({'product_id': custom_laptop.id, 'company_id': self.env.company.id}) - produce_form.finished_lot_id = laptop_lot_002 - product_consume = produce_form.save() - self.assertEqual(len(product_consume._workorder_line_ids()), 2) - product_consume._workorder_line_ids()[0].qty_done = 8 - product_consume.do_produce() + mo_custom_laptop = mo_custom_laptop.procurement_group_id.mrp_production_ids[1] + mo_form = Form(mo_custom_laptop) + mo_form.qty_producing = 4 + mo_form.lot_producing_id = laptop_lot_002 + mo_custom_laptop = mo_form.save() + details_operation_form = Form(mo_custom_laptop.move_raw_ids[0], view=self.env.ref('stock.view_stock_move_operations')) + with details_operation_form.move_line_ids.edit(0) as ml: + ml.qty_done = 8 + details_operation_form.save() + details_operation_form = Form(mo_custom_laptop.move_raw_ids[1], view=self.env.ref('stock.view_stock_move_operations')) + with details_operation_form.move_line_ids.edit(0) as ml: + ml.qty_done = 8 + details_operation_form.save() + charger_move = mo_custom_laptop.move_raw_ids.filtered(lambda x: x.product_id.id == product_charger.id and x.state != 'done') keybord_move = mo_custom_laptop.move_raw_ids.filtered(lambda x: x.product_id.id == product_keybord.id and x.state !='done') self.assertEqual(charger_move.quantity_done, 8, "Wrong consumed quantity of %s" % charger_move.product_id.name) self.assertEqual(keybord_move.quantity_done, 8, "Wrong consumed quantity of %s" % keybord_move.product_id.name) - # Post Inventory of production order. - mo_custom_laptop.post_inventory() - -# raw_moves_state = any(move.state != 'done' for move in mo_custom_laptop.move_raw_ids) -# finsh_moves_state = any(move.state != 'done' for move in mo_custom_laptop.move_finished_ids) -# self.assertFalse(raw_moves_state, "Wrong state in consumed moves of production order.") -# self.assertFalse(finsh_moves_state, "Wrong state in consumed moves of production order.") -# -# # Finished move quants of production order -# -# finshed_quant_lot_001 = mo_custom_laptop.move_finished_ids.filtered(lambda x: x.product_id.id == custom_laptop.id and x.product_uom_qty==6).mapped('quant_ids') -# finshed_quant_lot_002 = mo_custom_laptop.move_finished_ids.filtered(lambda x: x.product_id.id == custom_laptop.id and x.product_uom_qty==4).mapped('quant_ids') -# -# # Check total quantity consumed of charger, keybord -# # -------------------------------------------------- -# charger_quants = mo_custom_laptop.move_raw_ids.filtered(lambda x: x.product_id.id == product_charger.id and x.state == 'done').mapped('quant_ids') -# keybord_moves = mo_custom_laptop.move_raw_ids.filtered(lambda x: x.product_id.id == product_keybord.id and x.state == 'done').mapped('quant_ids') -# self.assertEqual(sum(charger_quants.mapped('qty')), 20) -# self.assertEqual(sum(keybord_moves.mapped('qty')), 20) - - def test_02_different_uom_on_bomlines(self): - """ Testing bill of material with different unit of measure.""" - route_manufacture = self.warehouse.manufacture_pull_id.route_id.id - route_mto = self.warehouse.mto_pull_id.route_id.id - unit = self.ref("uom.product_uom_unit") - dozen = self.ref("uom.product_uom_dozen") - kg = self.ref("uom.product_uom_kgm") - gm = self.ref("uom.product_uom_gram") - # Create Product A, B, C - product_A = self.env['product.product'].create({ - 'name': 'Product A', - 'type': 'product', - 'tracking': 'lot', - 'uom_id': dozen, - 'uom_po_id': dozen, - 'route_ids': [(6, 0, [route_manufacture, route_mto])]}) - product_B = self.env['product.product'].create({ - 'name': 'Product B', - 'type': 'product', - 'tracking': 'lot', - 'uom_id': dozen, - 'uom_po_id': dozen}) - product_C = self.env['product.product'].create({ - 'name': 'Product C', - 'type': 'product', - 'tracking': 'lot', - 'uom_id': kg, - 'uom_po_id': kg}) - - # Bill of materials - # ----------------- - - #=================================== - # Product A 1 Unit - # Product B 4 Unit - # Product C 600 gram - # ----------------------------------- - - bom_a = self.env['mrp.bom'].create({ - 'product_tmpl_id': product_A.product_tmpl_id.id, - 'product_qty': 2, - 'product_uom_id': unit, - 'bom_line_ids': [(0, 0, { - 'product_id': product_B.id, - 'product_qty': 4, - 'product_uom_id': unit - }), (0, 0, { - 'product_id': product_C.id, - 'product_qty': 600, - 'product_uom_id': gm - })] - }) - - # Create production order with product A 10 Unit. - # ----------------------------------------------- - - mo_custom_product_form = Form(self.env['mrp.production']) - mo_custom_product_form.product_id = product_A - mo_custom_product_form.bom_id = bom_a - mo_custom_product_form.product_qty = 10.0 - mo_custom_product_form.product_uom_id = self.env.ref("uom.product_uom_unit") - mo_custom_product = mo_custom_product_form.save() - - move_product_b = mo_custom_product.move_raw_ids.filtered(lambda x: x.product_id == product_B) - move_product_c = mo_custom_product.move_raw_ids.filtered(lambda x: x.product_id == product_C) - - # Check move correctly created or not. - self.assertEqual(move_product_b.product_uom_qty, 20) - self.assertEqual(move_product_b.product_uom.id, unit) - self.assertEqual(move_product_c.product_uom_qty, 3000) - self.assertEqual(move_product_c.product_uom.id, gm) - - # Lot create for product B and product C - # --------------------------------------- - lot_a = self.env['stock.production.lot'].create({'product_id': product_A.id, 'company_id': self.env.company.id}) - lot_b = self.env['stock.production.lot'].create({'product_id': product_B.id, 'company_id': self.env.company.id}) - lot_c = self.env['stock.production.lot'].create({'product_id': product_C.id, 'company_id': self.env.company.id}) - - # Inventory Update - # ---------------- - inventory = self.env['stock.inventory'].create({ - 'name': 'Inventory Product B and C', - 'line_ids': [(0, 0, { - 'product_id': product_B.id, - 'product_uom_id': product_B.uom_id.id, - 'product_qty': 3, - 'prod_lot_id': lot_b.id, - 'location_id': self.source_location_id - }), (0, 0, { - 'product_id': product_C.id, - 'product_uom_id': product_C.uom_id.id, - 'product_qty': 3, - 'prod_lot_id': lot_c.id, - 'location_id': self.source_location_id - })] - }) - inventory.action_start() - inventory.action_validate() - - # Start Production ... - # -------------------- - - mo_custom_product.action_confirm() - mo_custom_product.action_assign() - context = {"active_ids": [mo_custom_product.id], "active_id": mo_custom_product.id} - produce_form = Form(self.env['mrp.product.produce'].with_context(context)) - produce_form.qty_producing = 10.00 - produce_form.finished_lot_id = lot_a - product_consume = produce_form.save() - # laptop_lot_002 = self.env['stock.production.lot'].create({'product_id': custom_laptop.id}) - self.assertEqual(len(product_consume._workorder_line_ids()), 2) - product_consume._workorder_line_ids().filtered(lambda x: x.product_id == product_C).write({'qty_done': 3000}) - product_consume._workorder_line_ids().filtered(lambda x: x.product_id == product_B).write({'qty_done': 20}) - product_consume.do_produce() - mo_custom_product.post_inventory() - - # Check correct quant linked with move or not - # ------------------------------------------- - #TODO: check original quants qtys diminished -# self.assertEqual(len(move_product_b.quant_ids), 1) -# self.assertEqual(len(move_product_c.quant_ids), 1) -# self.assertEqual(move_product_b.quant_ids.qty, move_product_b.product_qty) -# self.assertEqual(move_product_c.quant_ids.qty, 3) -# self.assertEqual(move_product_c.quant_ids.product_uom_id.id, kg) - def test_03_test_serial_number_defaults(self): """ Test that the correct serial number is suggested on consecutive work orders. """ laptop = self.laptop @@ -1311,6 +1166,18 @@ class TestWorkOrderProcess(TestWorkOrderProcessCommon): the reservation slot in the calendar the be able to reserve the next production sooner """ self.env['mrp.workcenter'].search([]).write({'tz': 'UTC'}) # compute all date in UTC + mrp_workcenter_3 = self.env['mrp.workcenter'].create({ + 'name': 'assembly line 1', + 'resource_calendar_id': self.env.ref('resource.resource_calendar_std').id, + }) + self.planning_bom.operation_ids = False + self.planning_bom.write({ + 'operation_ids': [(0, 0, { + 'workcenter_id': mrp_workcenter_3.id, + 'name': 'Manual Assembly', + 'time_cycle': 60, + })] + }) mo_form = Form(self.env['mrp.production']) mo_form.product_id = self.product_4 mo_form.bom_id = self.planning_bom diff --git a/addons/mrp/views/mrp_production_views.xml b/addons/mrp/views/mrp_production_views.xml index 4fba0d6b30f..3b9159cd177 100644 --- a/addons/mrp/views/mrp_production_views.xml +++ b/addons/mrp/views/mrp_production_views.xml @@ -14,6 +14,7 @@ + @@ -52,8 +53,6 @@
+