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

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2026-06-10 10:14:23 +05:30
committed by GitHub
parent 2bea9ae2a5
commit 8e25189d7d
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/stock/report/item_where_used/item_where_used.py
View File

@@ -294,13 +294,8 @@ def get_product_bundle_component_rows(item):
def get_product_bundle_parent_rows(item):
rows = frappe.get_all(
"Product Bundle",
<<<<<<< HEAD
filters={"new_item_code": item, "disabled": 0, "docstatus": 0},
fields=["name", "new_item_code", "disabled"],
=======
filters={"new_item_code": item, "docstatus": 1},
fields=["name", "new_item_code", "is_active", "disabled"],
>>>>>>> 6201fefdfb (fix: show inactive product bundles in item where used (#55769))
order_by="name asc",
)
@@ -468,13 +463,8 @@ def get_product_bundle_map(bundle_names):
row.name: row
for row in frappe.get_all(
"Product Bundle",
<<<<<<< HEAD
filters={"name": ["in", bundle_names], "disabled": 0, "docstatus": 0},
fields=["name", "new_item_code", "disabled"],
=======
filters={"name": ["in", bundle_names], "docstatus": 1},
fields=["name", "new_item_code", "is_active", "disabled"],
>>>>>>> 6201fefdfb (fix: show inactive product bundles in item where used (#55769))
)
}