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 #1111 into 13.0

Browse Source 
Signed-off-by LoisRForgeFlow
This commit is contained in:
OCA-git-bot
2023-11-29 12:34:36 +00:00
parent ce91767f93 30d2c59c34
commit 280b035bf5
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
mrp_multi_level/wizards/mrp_multi_level.py
View File

@@ -418,20 +418,22 @@ class MultiLevelMrp(models.TransientModel):
in_moves = move_obj.search(in_domain) in_moves = move_obj.search(in_domain)
out_domain = product_mrp_area._out_stock_moves_domain() out_domain = product_mrp_area._out_stock_moves_domain()
out_moves = move_obj.search(out_domain) out_moves = move_obj.search(out_domain)
move_vals = []
if in_moves: if in_moves:
for move in in_moves: for move in in_moves:
move_data = self._prepare_mrp_move_data_from_stock_move( move_data = self._prepare_mrp_move_data_from_stock_move(
product_mrp_area, move, direction="in" product_mrp_area, move, direction="in"
) )
if move_data: if move_data:
mrp_move_obj.create(move_data) move_vals.append(move_data)
if out_moves: if out_moves:
for move in out_moves: for move in out_moves:
move_data = self._prepare_mrp_move_data_from_stock_move( move_data = self._prepare_mrp_move_data_from_stock_move(
product_mrp_area, move, direction="out" product_mrp_area, move, direction="out"
) )
if move_data: if move_data:
mrp_move_obj.create(move_data) move_vals.append(move_data)
mrp_move_obj.create(move_vals)
return True return True
@api.model @api.model
@@ -479,11 +481,14 @@ class MultiLevelMrp(models.TransientModel):
] ]
) )
mrp_move_vals = []
for line in po_lines: for line in po_lines:
mrp_move_data = self._prepare_mrp_move_data_from_purchase_order( mrp_move_data = self._prepare_mrp_move_data_from_purchase_order(
line, product_mrp_area line, product_mrp_area
) )
self.env["mrp.move"].create(mrp_move_data) mrp_move_vals.append(mrp_move_data)
if mrp_move_vals:
self.env["mrp.move"].create(mrp_move_vals)
@api.model @api.model
def _get_product_mrp_area_from_product_and_area(self, product, mrp_area): def _get_product_mrp_area_from_product_and_area(self, product, mrp_area):
@@ -778,6 +783,7 @@ class MultiLevelMrp(models.TransientModel):
location=product_mrp_area.mrp_area_id.location_id.id location=product_mrp_area.mrp_area_id.location_id.id
)._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 = []
for mdt in sorted(mrp_dates): for mdt in sorted(mrp_dates):
( (
mrp_inventory_data, mrp_inventory_data,
@@ -792,14 +798,17 @@ class MultiLevelMrp(models.TransientModel):
supply_qty_by_date, supply_qty_by_date,
planned_qty_by_date, planned_qty_by_date,
) )
inv_id = self.env["mrp.inventory"].create(mrp_inventory_data) mrp_inventory_vals.append(mrp_inventory_data)
if mrp_inventory_vals:
mrp_invs = self.env["mrp.inventory"].create(mrp_inventory_vals)
planned_orders = planned_order_obj.search(
[("product_mrp_area_id", "=", product_mrp_area.id)]
)
# attach planned orders to inventory # attach planned orders to inventory
planned_order_obj.search( for po in planned_orders:
[ invs = mrp_invs.filtered(lambda i: i.date == po.due_date)
("due_date", "=", mdt), if invs:
("product_mrp_area_id", "=", product_mrp_area.id), po.mrp_inventory_id = invs[0]
]
).write({"mrp_inventory_id": inv_id.id})
@api.model @api.model
def _mrp_final_process(self, mrp_areas): def _mrp_final_process(self, mrp_areas):