nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 04:09:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2025-07-14 17:22:00 +05:30
committed by GitHub
parent d8212d98ca
commit c39993a3ba
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/stock/doctype/packed_item/packed_item.py
View File

@@ -340,13 +340,8 @@ def on_doctype_update():
@frappe.whitelist() @frappe.whitelist()
<<<<<<< HEAD
def get_items_from_product_bundle(row, price_list):
row, items = json.loads(row), []
=======
def get_items_from_product_bundle(row): def get_items_from_product_bundle(row):
row, items = ItemDetailsCtx(json.loads(row)), [] row, items = json.loads(row), []
>>>>>>> adb9a6bc15 (fix: field name of price_list in material request)
bundled_items = get_product_bundle_items(row["item_code"]) bundled_items = get_product_bundle_items(row["item_code"])
for item in bundled_items: for item in bundled_items: