From edef03ac226dde01463c3061bf9b3f979332d789 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Fri, 4 Jul 2025 12:49:45 +0530 Subject: [PATCH] chore: resolve conflict --- erpnext/stock/doctype/packed_item/packed_item.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/stock/doctype/packed_item/packed_item.py b/erpnext/stock/doctype/packed_item/packed_item.py index 6261d746e7f..85badeea5ff 100644 --- a/erpnext/stock/doctype/packed_item/packed_item.py +++ b/erpnext/stock/doctype/packed_item/packed_item.py @@ -341,12 +341,8 @@ def on_doctype_update(): @frappe.whitelist() def get_items_from_product_bundle(row): -<<<<<<< HEAD row, items = json.loads(row), [] -======= - row, items = ItemDetailsCtx(json.loads(row)), [] defaults = frappe.defaults.get_defaults() ->>>>>>> 45c7bac2d0 (fix: rate not being fetched for product bundles in material request) bundled_items = get_product_bundle_items(row["item_code"]) for item in bundled_items: