From adc03ed054f2248265a2a80abbb47df75cf8287e Mon Sep 17 00:00:00 2001 From: Ahmed Khalaf Date: Fri, 5 May 2023 09:51:26 +0000 Subject: [PATCH] [FIX] purchase_mrp: traceback merging 2 step MO A traceback occurs when merging two MOs when 2 step manufacturing is enabled. The issue was introduced in odoo/odoo#106411 closes odoo/odoo#120707 Taskid: 3299549 X-original-commit: 242f0f224d8941bca689e20e37c5bca3bba51afe Signed-off-by: Tiffany Chang --- addons/purchase_mrp/models/mrp_production.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/purchase_mrp/models/mrp_production.py b/addons/purchase_mrp/models/mrp_production.py index ed9dd1878f3..29cbfac9295 100644 --- a/addons/purchase_mrp/models/mrp_production.py +++ b/addons/purchase_mrp/models/mrp_production.py @@ -47,7 +47,7 @@ class MrpProduction(models.Model): def _prepare_merge_orig_links(self): origs = super()._prepare_merge_orig_links() for move in self.move_raw_ids: - if not move.move_orig_ids: + if not move.move_orig_ids or not move.created_purchase_line_ids: continue origs[move.bom_line_id.id].setdefault('created_purchase_line_ids', set()).update(move.created_purchase_line_ids.ids) for vals in origs.values():