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

Merge PR #1402 into 15.0

Browse Source 
Signed-off-by LoisRForgeFlow
This commit is contained in:
OCA-git-bot
2024-11-26 15:09:05 +00:00
parent b423d5be07 01f3e9287c
commit ffcfda8aad
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mrp_multi_level/models/product_mrp_area.py
View File

@@ -213,18 +213,19 @@ class ProductMRPArea(models.Model):
boms_by_product = self.env["mrp.bom"]._bom_find(self.mapped("product_id")) boms_by_product = self.env["mrp.bom"]._bom_find(self.mapped("product_id"))
for rec in self: for rec in self:
rule = rec._get_rule() rule = rec._get_rule()
if not rule: bom = boms_by_product.get(rec.product_id, self.env["mrp.bom"])
if bom.type == "phantom":
rec.supply_method = "phantom"
rec.supply_bom_id = bom
elif not rule:
rec.supply_method = "none" rec.supply_method = "none"
rec.supply_bom_id = False rec.supply_bom_id = False
continue elif rule.action == "manufacture":
# Determine the supply method based on the final rule. rec.supply_method = rule.action
bom = boms_by_product.get(rec.product_id, self.env["mrp.bom"]) rec.supply_bom_id = bom
rec.supply_method = ( else:
"phantom" rec.supply_method = rule.action
if rule.action == "manufacture" and bom.type == "phantom" rec.supply_bom_id = False
else rule.action
)
rec.supply_bom_id = bom
@api.depends( @api.depends(
"mrp_area_id", "supply_method", "product_id.route_ids", "product_id.seller_ids" "mrp_area_id", "supply_method", "product_id.route_ids", "product_id.seller_ids"

10
mrp_multi_level/tests/test_mrp_multi_level.py
View File

@@ -451,6 +451,16 @@ class TestMrpMultiLevel(TestMrpMultiLevelCommon):
] ]
product_mrp_area._compute_supply_method() product_mrp_area._compute_supply_method()
self.assertEqual(product_mrp_area.supply_method, "buy") self.assertEqual(product_mrp_area.supply_method, "buy")
kit_bom = self.mrp_bom_obj.create(
{
"product_tmpl_id": self.fp_4.product_tmpl_id.id,
"product_id": self.fp_4.id,
"type": "phantom",
}
)
product_mrp_area._compute_supply_method()
self.assertEqual(product_mrp_area.supply_method, "phantom")
self.assertEqual(product_mrp_area.supply_bom_id, kit_bom)
def test_18_priorize_safety_stock(self): def test_18_priorize_safety_stock(self):
now = datetime.now() now = datetime.now()