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 #826 into 14.0

Browse Source 
Signed-off-by LoisRForgeFlow
This commit is contained in:
OCA-git-bot
2022-07-13 15:34:12 +00:00
parent d9efd514af 23f7596dc4
commit fd4718f3c3
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mrp_multi_level_estimate/tests/test_mrp_multi_level_estimate.py
View File

@@ -189,6 +189,27 @@ class TestMrpMultiLevelEstimate(TestMrpMultiLevelCommon):
self.assertEqual(moves_from_estimates[0].mrp_qty, -120)
self.assertEqual(moves_from_estimates[1].mrp_qty, -280)
self.assertEqual(moves_from_estimates[2].mrp_qty, -350)
# Test group_estimate_days smaller than date range, it should not
# generate greater demand.
self.test_mrp_parameter.group_estimate_days = 5
self.mrp_multi_level_wiz.create({}).run_mrp_multi_level()
moves = self.mrp_move_obj.search(
[
("product_id", "=", self.prod_test.id),
("mrp_area_id", "=", self.estimate_area.id),
]
)
moves_from_estimates = moves.filtered(lambda m: m.mrp_type == "d")
self.assertEqual(len(moves_from_estimates), 5)
# Week 1 partially consumed, so only 4 remaining days considered.
# 30 daily x 4 days = 120
self.assertEqual(moves_from_estimates[0].mrp_qty, -120)
# Week 2 divided in 2 (40 daily) -> 5 days = 200, 2 days = 80
self.assertEqual(moves_from_estimates[1].mrp_qty, -200)
self.assertEqual(moves_from_estimates[2].mrp_qty, -80)
# Week 3 divided in 2, (50 daily) -> 5 days = 250, 2 days = 100
self.assertEqual(moves_from_estimates[3].mrp_qty, -250)
self.assertEqual(moves_from_estimates[4].mrp_qty, -100)
def test_04_group_demand_estimates_rounding(self):
"""Test demand grouping functionality, `group_estimate_days` and rounding."""

5
mrp_multi_level_estimate/wizards/mrp_multi_level.py
View File

@@ -24,12 +24,11 @@ class MultiLevelMrp(models.TransientModel):
precision_rounding=product_mrp_area.product_id.uom_id.rounding,
rounding_method="HALF-UP",
)
today = fields.Date.today()
days_consumed = 0
if product_mrp_area.group_estimate_days > 1:
start = estimate.date_from
if start < today:
days_consumed = (today - start).days
if start < date:
days_consumed = (date - start).days
group_estimate_days = min(
product_mrp_area.group_estimate_days, estimate.duration - days_consumed
)