audrius/manufacture
1
0
Fork 0
mirror of https://github.com/OCA/manufacture.git synced 2025-01-28 16:37:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

[REF] mrp_multi_level: location management

Browse Source 
Small refactoring adding a _get_locations method on product.mrp.area
which by defaults delegates the computation to the related mrp.area.

This enables extending a few things related to locations at the
product.mrp.area level.

Change the way `_get_locations()` work: don't return the list of child
locations, only the top-most locations, and then use the `child_of`
operator in the code that looks for locations.
This commit is contained in:
Alexandre Fayolle
2023-12-04 11:59:32 +01:00
committed by Lois Rilo
parent 384ef2468b
commit ef0da31762
3 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mrp_multi_level/models/mrp_area.py
View File

@@ -39,6 +39,4 @@ class MrpArea(models.Model):
def _get_locations(self): def _get_locations(self):
self.ensure_one() self.ensure_one()
return self.env["stock.location"].search( return self.location_id
[("id", "child_of", self.location_id.id)]
)

24
mrp_multi_level/models/product_mrp_area.py
View File

@@ -172,16 +172,16 @@ class ProductMRPArea(models.Model):
def _compute_qty_available(self): def _compute_qty_available(self):
for rec in self: for rec in self:
rec.qty_available = rec.product_id.with_context( rec.qty_available = rec.product_id.with_context(
{"location": rec.mrp_area_id.location_id.id} location=rec._get_locations().ids
).qty_available ).qty_available
def _compute_supply_method(self): def _compute_supply_method(self):
group_obj = self.env["procurement.group"] group_obj = self.env["procurement.group"]
for rec in self: for rec in self:
proc_loc = rec.location_proc_id or rec.mrp_area_id.location_id proc_loc = rec.location_proc_id or rec.location_id
values = { values = {
"warehouse_id": rec.mrp_area_id.warehouse_id, "warehouse_id": rec.mrp_area_id.warehouse_id,
"company_id": rec.mrp_area_id.company_id, "company_id": rec.company_id,
} }
rule = group_obj._get_rule(rec.product_id, proc_loc, values) rule = group_obj._get_rule(rec.product_id, proc_loc, values)
if not rule: if not rule:
@@ -255,24 +255,26 @@ class ProductMRPArea(models.Model):
def _in_stock_moves_domain(self): def _in_stock_moves_domain(self):
self.ensure_one() self.ensure_one()
locations = self.mrp_area_id._get_locations() locations = self._get_locations()
return [ return [
("product_id", "=", self.product_id.id), ("product_id", "=", self.product_id.id),
("state", "not in", ["done", "cancel"]), ("state", "not in", ["done", "cancel"]),
("product_qty", ">", 0.00), ("product_qty", ">", 0.00),
("location_id", "not in", locations.ids), "!",
("location_dest_id", "in", locations.ids), ("location_id", "child_of", locations.ids),
("location_dest_id", "child_of", locations.ids),
] ]
def _out_stock_moves_domain(self): def _out_stock_moves_domain(self):
self.ensure_one() self.ensure_one()
locations = self.mrp_area_id._get_locations() locations = self._get_locations()
return [ return [
("product_id", "=", self.product_id.id), ("product_id", "=", self.product_id.id),
("state", "not in", ["done", "cancel"]), ("state", "not in", ["done", "cancel"]),
("product_qty", ">", 0.00), ("product_qty", ">", 0.00),
("location_id", "in", locations.ids), ("location_id", "child_of", locations.ids),
("location_dest_id", "not in", locations.ids), "!",
("location_dest_id", "child_of", locations.ids),
] ]
def action_view_stock_moves(self, domain): def action_view_stock_moves(self, domain):
@@ -292,3 +294,7 @@ class ProductMRPArea(models.Model):
def _to_be_exploded(self): def _to_be_exploded(self):
self.ensure_one() self.ensure_one()
return self.supply_method in ["manufacture", "phantom"] return self.supply_method in ["manufacture", "phantom"]
def _get_locations(self):
self.ensure_one()
return self.mrp_area_id._get_locations()

8
mrp_multi_level/wizards/mrp_multi_level.py
View File

@@ -27,7 +27,7 @@ class MultiLevelMrp(models.TransientModel):
def _prepare_product_mrp_area_data(self, product_mrp_area): def _prepare_product_mrp_area_data(self, product_mrp_area):
qty_available = 0.0 qty_available = 0.0
product_obj = self.env["product.product"] product_obj = self.env["product.product"]
location_ids = product_mrp_area.mrp_area_id._get_locations() location_ids = product_mrp_area._get_locations()
for location in location_ids: for location in location_ids:
product_l = product_obj.with_context({"location": location.id}).browse( product_l = product_obj.with_context({"location": location.id}).browse(
product_mrp_area.product_id.id product_mrp_area.product_id.id
@@ -462,9 +462,9 @@ class MultiLevelMrp(models.TransientModel):
@api.model @api.model
def _init_mrp_move_from_purchase_order(self, product_mrp_area): def _init_mrp_move_from_purchase_order(self, product_mrp_area):
location_ids = product_mrp_area.mrp_area_id._get_locations() location_ids = product_mrp_area._get_locations()
picking_types = self.env["stock.picking.type"].search( picking_types = self.env["stock.picking.type"].search(
[("default_location_dest_id", "in", location_ids.ids)] [("default_location_dest_id", "child_of", location_ids.ids)]
) )
picking_type_ids = [ptype.id for ptype in picking_types] picking_type_ids = [ptype.id for ptype in picking_types]
orders = self.env["purchase.order"].search( orders = self.env["purchase.order"].search(
@@ -781,7 +781,7 @@ class MultiLevelMrp(models.TransientModel):
).mapped("due_date") ).mapped("due_date")
mrp_dates = set(moves_dates + action_dates) mrp_dates = set(moves_dates + action_dates)
on_hand_qty = product_mrp_area.product_id.with_context( on_hand_qty = product_mrp_area.product_id.with_context(
location=product_mrp_area.mrp_area_id.location_id.id location=product_mrp_area._get_locations().ids
)._product_available()[product_mrp_area.product_id.id]["qty_available"] )._product_available()[product_mrp_area.product_id.id]["qty_available"]
running_availability = on_hand_qty running_availability = on_hand_qty
mrp_inventory_vals = [] mrp_inventory_vals = []