nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 10:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
Mihir Kandoi
2025-07-04 12:49:45 +05:30
committed by GitHub
parent cfedaf5dc1
commit edef03ac22
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -341,12 +341,8 @@ def on_doctype_update():
@frappe.whitelist() @frappe.whitelist()
def get_items_from_product_bundle(row): def get_items_from_product_bundle(row):
<<<<<<< HEAD
row, items = json.loads(row), [] row, items = json.loads(row), []
=======
row, items = ItemDetailsCtx(json.loads(row)), []
defaults = frappe.defaults.get_defaults() 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"]) bundled_items = get_product_bundle_items(row["item_code"])
for item in bundled_items: for item in bundled_items: