Tiffany Chang (tic)
c7f53f770c
Currently stock moves are auto-assigned (i.e. reserve free stock) both when the scheduler is run and when a corresponding stock move that can assign a move is completed. This strictness was causing issues for prioritization of moves to assign, for example a picking with a scheduled_date far in the future could automatically reserve all stock if it was created before another picking that an immediate scheduled_date. To ease this, an extra setting has been added to stock.picking.type to let users choose how reservations should occur for moves assigned to that picking_type (or picking with that picking_type): 1. 'at_confirm' = automatically when: - stock is available when the move's associated picking/MO is confirmed, - when new stock becomes available, - when the scheduler is triggered (+ stock available). 2. 'manual' = user must always manually click "Check Availability" button (scheduler will no longer reserve). 3. 'by_date' = automatically when within the move's reservation_date and: - stock is available when the move's associated picking/MO is confirmed, - new stock becomes available when move is already confirmed, or - the scheduler is run (+ stock is available). 'by_date' has an extra option of # days before the move's scheduled date that affects the move.reservation_date. Task: 2359317 Upgrade PR: odoo/upgrade#1868 ENT PR: odoo/enterprise#15050
311 lines
15 KiB
Python
311 lines
15 KiB
Python
# -*- coding: utf-8 -*-
|
|
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
|
|
|
from odoo.tests import Form
|
|
from odoo.addons.mrp.tests.common import TestMrpCommon
|
|
|
|
|
|
class TestMultistepManufacturingWarehouse(TestMrpCommon):
|
|
|
|
def setUp(self):
|
|
super(TestMultistepManufacturingWarehouse, self).setUp()
|
|
# Create warehouse
|
|
self.customer_location = self.env['ir.model.data'].xmlid_to_res_id('stock.stock_location_customers')
|
|
warehouse_form = Form(self.env['stock.warehouse'])
|
|
warehouse_form.name = 'Test Warehouse'
|
|
warehouse_form.code = 'TWH'
|
|
self.warehouse = warehouse_form.save()
|
|
|
|
self.uom_unit = self.env.ref('uom.product_uom_unit')
|
|
|
|
# Create manufactured product
|
|
product_form = Form(self.env['product.product'])
|
|
product_form.name = 'Stick'
|
|
product_form.uom_id = self.uom_unit
|
|
product_form.uom_po_id = self.uom_unit
|
|
product_form.type = 'product'
|
|
product_form.route_ids.clear()
|
|
product_form.route_ids.add(self.warehouse.manufacture_pull_id.route_id)
|
|
product_form.route_ids.add(self.warehouse.mto_pull_id.route_id)
|
|
self.finished_product = product_form.save()
|
|
|
|
# Create raw product for manufactured product
|
|
product_form = Form(self.env['product.product'])
|
|
product_form.name = 'Raw Stick'
|
|
product_form.type = 'product'
|
|
product_form.uom_id = self.uom_unit
|
|
product_form.uom_po_id = self.uom_unit
|
|
self.raw_product = product_form.save()
|
|
|
|
# Create bom for manufactured product
|
|
bom_product_form = Form(self.env['mrp.bom'])
|
|
bom_product_form.product_id = self.finished_product
|
|
bom_product_form.product_tmpl_id = self.finished_product.product_tmpl_id
|
|
bom_product_form.product_qty = 1.0
|
|
bom_product_form.type = 'normal'
|
|
with bom_product_form.bom_line_ids.new() as bom_line:
|
|
bom_line.product_id = self.raw_product
|
|
bom_line.product_qty = 2.0
|
|
|
|
self.bom = bom_product_form.save()
|
|
|
|
def _check_location_and_routes(self):
|
|
# Check manufacturing pull rule.
|
|
self.assertTrue(self.warehouse.manufacture_pull_id)
|
|
self.assertTrue(self.warehouse.manufacture_pull_id.active, self.warehouse.manufacture_to_resupply)
|
|
self.assertTrue(self.warehouse.manufacture_pull_id.route_id)
|
|
# Check new routes created or not.
|
|
self.assertTrue(self.warehouse.pbm_route_id)
|
|
# Check location should be created and linked to warehouse.
|
|
self.assertTrue(self.warehouse.pbm_loc_id)
|
|
self.assertEqual(self.warehouse.pbm_loc_id.active, self.warehouse.manufacture_steps != 'mrp_one_step', "Input location must be de-active for single step only.")
|
|
self.assertTrue(self.warehouse.manu_type_id.active)
|
|
|
|
def test_00_create_warehouse(self):
|
|
""" Warehouse testing for direct manufacturing """
|
|
with Form(self.warehouse) as warehouse:
|
|
warehouse.manufacture_steps = 'mrp_one_step'
|
|
self._check_location_and_routes()
|
|
# Check locations of existing pull rule
|
|
self.assertFalse(self.warehouse.pbm_route_id.rule_ids, 'only the update of global manufacture route should happen.')
|
|
self.assertEqual(self.warehouse.manufacture_pull_id.location_id.id, self.warehouse.lot_stock_id.id)
|
|
|
|
def test_01_warehouse_twostep_manufacturing(self):
|
|
""" Warehouse testing for picking before manufacturing """
|
|
with Form(self.warehouse) as warehouse:
|
|
warehouse.manufacture_steps = 'pbm'
|
|
self._check_location_and_routes()
|
|
self.assertEqual(len(self.warehouse.pbm_route_id.rule_ids), 2)
|
|
self.assertEqual(self.warehouse.manufacture_pull_id.location_id.id, self.warehouse.lot_stock_id.id)
|
|
|
|
def test_02_warehouse_twostep_manufacturing(self):
|
|
""" Warehouse testing for picking ans store after manufacturing """
|
|
with Form(self.warehouse) as warehouse:
|
|
warehouse.manufacture_steps = 'pbm_sam'
|
|
self._check_location_and_routes()
|
|
self.assertEqual(len(self.warehouse.pbm_route_id.rule_ids), 3)
|
|
self.assertEqual(self.warehouse.manufacture_pull_id.location_id.id, self.warehouse.sam_loc_id.id)
|
|
|
|
def test_manufacturing_3_steps(self):
|
|
""" Test MO/picking before manufacturing/picking after manufacturing
|
|
components and move_orig/move_dest. Ensure that everything is created
|
|
correctly.
|
|
"""
|
|
with Form(self.warehouse) as warehouse:
|
|
warehouse.manufacture_steps = 'pbm_sam'
|
|
|
|
production_form = Form(self.env['mrp.production'])
|
|
production_form.product_id = self.finished_product
|
|
production_form.picking_type_id = self.warehouse.manu_type_id
|
|
production = production_form.save()
|
|
production.action_confirm()
|
|
|
|
move_raw_ids = production.move_raw_ids
|
|
self.assertEqual(len(move_raw_ids), 1)
|
|
self.assertEqual(move_raw_ids.product_id, self.raw_product)
|
|
self.assertEqual(move_raw_ids.picking_type_id, self.warehouse.manu_type_id)
|
|
pbm_move = move_raw_ids.move_orig_ids
|
|
self.assertEqual(len(pbm_move), 1)
|
|
self.assertEqual(pbm_move.location_id, self.warehouse.lot_stock_id)
|
|
self.assertEqual(pbm_move.location_dest_id, self.warehouse.pbm_loc_id)
|
|
self.assertEqual(pbm_move.picking_type_id, self.warehouse.pbm_type_id)
|
|
self.assertFalse(pbm_move.move_orig_ids)
|
|
|
|
move_finished_ids = production.move_finished_ids
|
|
self.assertEqual(len(move_finished_ids), 1)
|
|
self.assertEqual(move_finished_ids.product_id, self.finished_product)
|
|
self.assertEqual(move_finished_ids.picking_type_id, self.warehouse.manu_type_id)
|
|
sam_move = move_finished_ids.move_dest_ids
|
|
self.assertEqual(len(sam_move), 1)
|
|
self.assertEqual(sam_move.location_id, self.warehouse.sam_loc_id)
|
|
self.assertEqual(sam_move.location_dest_id, self.warehouse.lot_stock_id)
|
|
self.assertEqual(sam_move.picking_type_id, self.warehouse.sam_type_id)
|
|
self.assertFalse(sam_move.move_dest_ids)
|
|
|
|
def test_manufacturing_flow(self):
|
|
""" Simulate a pick pack ship delivery combined with a picking before
|
|
manufacturing and store after manufacturing. Also ensure that the MO and
|
|
the moves to stock are created with the generic pull rules.
|
|
In order to trigger the rule we create a picking to the customer with
|
|
the 'make to order' procure method
|
|
"""
|
|
with Form(self.warehouse) as warehouse:
|
|
warehouse.manufacture_steps = 'pbm_sam'
|
|
warehouse.delivery_steps = 'pick_pack_ship'
|
|
self.warehouse.flush()
|
|
self.env.ref('stock.route_warehouse0_mto').active = True
|
|
self.env['stock.quant']._update_available_quantity(self.raw_product, self.warehouse.lot_stock_id, 4.0)
|
|
picking_customer = self.env['stock.picking'].create({
|
|
'location_id': self.warehouse.wh_output_stock_loc_id.id,
|
|
'location_dest_id': self.customer_location,
|
|
'partner_id': self.env['ir.model.data'].xmlid_to_res_id('base.res_partner_4'),
|
|
'picking_type_id': self.warehouse.out_type_id.id,
|
|
})
|
|
self.env['stock.move'].create({
|
|
'name': self.finished_product.name,
|
|
'product_id': self.finished_product.id,
|
|
'product_uom_qty': 2,
|
|
'product_uom': self.uom_unit.id,
|
|
'picking_id': picking_customer.id,
|
|
'location_id': self.warehouse.wh_output_stock_loc_id.id,
|
|
'location_dest_id': self.customer_location,
|
|
'procure_method': 'make_to_order',
|
|
'origin': 'SOURCEDOCUMENT',
|
|
'state': 'draft',
|
|
})
|
|
picking_customer.action_confirm()
|
|
production_order = self.env['mrp.production'].search([('product_id', '=', self.finished_product.id)])
|
|
self.assertTrue(production_order)
|
|
self.assertEqual(production_order.origin, 'SOURCEDOCUMENT', 'The MO origin should be the SO name')
|
|
self.assertNotEqual(production_order.name, 'SOURCEDOCUMENT', 'The MO name should not be the origin of the move')
|
|
|
|
picking_stock_preprod = self.env['stock.move'].search([
|
|
('product_id', '=', self.raw_product.id),
|
|
('location_id', '=', self.warehouse.lot_stock_id.id),
|
|
('location_dest_id', '=', self.warehouse.pbm_loc_id.id),
|
|
('picking_type_id', '=', self.warehouse.pbm_type_id.id)
|
|
]).picking_id
|
|
picking_stock_postprod = self.env['stock.move'].search([
|
|
('product_id', '=', self.finished_product.id),
|
|
('location_id', '=', self.warehouse.sam_loc_id.id),
|
|
('location_dest_id', '=', self.warehouse.lot_stock_id.id),
|
|
('picking_type_id', '=', self.warehouse.sam_type_id.id)
|
|
]).picking_id
|
|
|
|
self.assertTrue(picking_stock_preprod)
|
|
self.assertTrue(picking_stock_postprod)
|
|
self.assertEqual(picking_stock_preprod.state, 'assigned')
|
|
self.assertEqual(picking_stock_postprod.state, 'waiting')
|
|
self.assertEqual(picking_stock_preprod.origin, production_order.name, 'The pre-prod origin should be the MO name')
|
|
self.assertEqual(picking_stock_postprod.origin, 'SOURCEDOCUMENT', 'The post-prod origin should be the SO name')
|
|
|
|
picking_stock_preprod.action_assign()
|
|
picking_stock_preprod.move_line_ids.qty_done = 4
|
|
picking_stock_preprod._action_done()
|
|
|
|
self.assertFalse(sum(self.env['stock.quant']._gather(self.raw_product, self.warehouse.lot_stock_id).mapped('quantity')))
|
|
self.assertTrue(self.env['stock.quant']._gather(self.raw_product, self.warehouse.pbm_loc_id))
|
|
|
|
production_order.action_assign()
|
|
self.assertEqual(production_order.reservation_state, 'assigned')
|
|
self.assertEqual(picking_stock_postprod.state, 'waiting')
|
|
|
|
produce_form = Form(production_order)
|
|
produce_form.qty_producing = production_order.product_qty
|
|
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')))
|
|
|
|
self.assertEqual(picking_stock_postprod.state, 'assigned')
|
|
|
|
picking_stock_pick = self.env['stock.move'].search([
|
|
('product_id', '=', self.finished_product.id),
|
|
('location_id', '=', self.warehouse.lot_stock_id.id),
|
|
('location_dest_id', '=', self.warehouse.wh_pack_stock_loc_id.id),
|
|
('picking_type_id', '=', self.warehouse.pick_type_id.id)
|
|
]).picking_id
|
|
self.assertEqual(picking_stock_pick.move_lines.move_orig_ids.picking_id, picking_stock_postprod)
|
|
|
|
def test_cancel_propagation(self):
|
|
""" Test cancelling moves in a 'picking before
|
|
manufacturing' and 'store after manufacturing' process. The propagation of
|
|
cancel depends on the default values on each rule of the chain.
|
|
"""
|
|
self.warehouse.manufacture_steps = 'pbm_sam'
|
|
self.warehouse.flush()
|
|
self.env['stock.quant']._update_available_quantity(self.raw_product, self.warehouse.lot_stock_id, 4.0)
|
|
picking_customer = self.env['stock.picking'].create({
|
|
'location_id': self.warehouse.lot_stock_id.id,
|
|
'location_dest_id': self.customer_location,
|
|
'partner_id': self.env['ir.model.data'].xmlid_to_res_id('base.res_partner_4'),
|
|
'picking_type_id': self.warehouse.out_type_id.id,
|
|
})
|
|
self.env['stock.move'].create({
|
|
'name': self.finished_product.name,
|
|
'product_id': self.finished_product.id,
|
|
'product_uom_qty': 2,
|
|
'picking_id': picking_customer.id,
|
|
'product_uom': self.uom_unit.id,
|
|
'location_id': self.warehouse.lot_stock_id.id,
|
|
'location_dest_id': self.customer_location,
|
|
'procure_method': 'make_to_order',
|
|
})
|
|
picking_customer.action_confirm()
|
|
production_order = self.env['mrp.production'].search([('product_id', '=', self.finished_product.id)])
|
|
self.assertTrue(production_order)
|
|
|
|
move_stock_preprod = self.env['stock.move'].search([
|
|
('product_id', '=', self.raw_product.id),
|
|
('location_id', '=', self.warehouse.lot_stock_id.id),
|
|
('location_dest_id', '=', self.warehouse.pbm_loc_id.id),
|
|
('picking_type_id', '=', self.warehouse.pbm_type_id.id)
|
|
])
|
|
move_stock_postprod = self.env['stock.move'].search([
|
|
('product_id', '=', self.finished_product.id),
|
|
('location_id', '=', self.warehouse.sam_loc_id.id),
|
|
('location_dest_id', '=', self.warehouse.lot_stock_id.id),
|
|
('picking_type_id', '=', self.warehouse.sam_type_id.id)
|
|
])
|
|
|
|
self.assertTrue(move_stock_preprod)
|
|
self.assertTrue(move_stock_postprod)
|
|
self.assertEqual(move_stock_preprod.state, 'assigned')
|
|
self.assertEqual(move_stock_postprod.state, 'waiting')
|
|
|
|
move_stock_preprod._action_cancel()
|
|
self.assertEqual(production_order.state, 'confirmed')
|
|
production_order.action_cancel()
|
|
self.assertTrue(move_stock_postprod.state, 'cancel')
|
|
|
|
def test_no_initial_demand(self):
|
|
""" Test MO/picking before manufacturing/picking after manufacturing
|
|
components and move_orig/move_dest. Ensure that everything is created
|
|
correctly.
|
|
"""
|
|
with Form(self.warehouse) as warehouse:
|
|
warehouse.manufacture_steps = 'pbm_sam'
|
|
production_form = Form(self.env['mrp.production'])
|
|
production_form.product_id = self.finished_product
|
|
production_form.picking_type_id = self.warehouse.manu_type_id
|
|
production = production_form.save()
|
|
production.move_raw_ids.product_uom_qty = 0
|
|
production.action_confirm()
|
|
production.action_assign()
|
|
self.assertFalse(production.move_raw_ids.move_orig_ids)
|
|
self.assertEqual(production.state, 'confirmed')
|
|
self.assertEqual(production.reservation_state, 'assigned')
|
|
|
|
def test_manufacturing_3_steps_flexible(self):
|
|
""" Test MO/picking before manufacturing/picking after manufacturing
|
|
components and move_orig/move_dest. Ensure that additional moves are put
|
|
in picking before manufacturing too.
|
|
"""
|
|
with Form(self.warehouse) as warehouse:
|
|
warehouse.manufacture_steps = 'pbm_sam'
|
|
bom = self.env['mrp.bom'].search([
|
|
('product_id', '=', self.finished_product.id)
|
|
])
|
|
new_product = self.env['product.product'].create({
|
|
'name': 'New product',
|
|
'type': 'product',
|
|
})
|
|
bom.consumption = 'flexible'
|
|
production_form = Form(self.env['mrp.production'])
|
|
production_form.product_id = self.finished_product
|
|
production_form.picking_type_id = self.warehouse.manu_type_id
|
|
production = production_form.save()
|
|
|
|
production.action_confirm()
|
|
|
|
production_form = Form(production)
|
|
with production_form.move_raw_ids.new() as move:
|
|
move.product_id = new_product
|
|
move.product_uom_qty = 2
|
|
production = production_form.save()
|
|
move_raw_ids = production.move_raw_ids
|
|
self.assertEqual(len(move_raw_ids), 2)
|
|
pbm_move = move_raw_ids.move_orig_ids
|
|
self.assertEqual(len(pbm_move), 2)
|
|
self.assertTrue(new_product in pbm_move.product_id)
|