mirror of
https://github.com/frappe/erpnext.git
synced 2026-08-13 06:31:48 +00:00
fix: show inactive product bundles in item where used (#55769)
(cherry picked from commit 6201fefdfb)
# Conflicts:
# erpnext/stock/report/item_where_used/item_where_used.py
This commit is contained in:
@@ -294,8 +294,13 @@ def get_product_bundle_component_rows(item):
|
|||||||
def get_product_bundle_parent_rows(item):
|
def get_product_bundle_parent_rows(item):
|
||||||
rows = frappe.get_all(
|
rows = frappe.get_all(
|
||||||
"Product Bundle",
|
"Product Bundle",
|
||||||
|
<<<<<<< HEAD
|
||||||
filters={"new_item_code": item, "disabled": 0, "docstatus": 0},
|
filters={"new_item_code": item, "disabled": 0, "docstatus": 0},
|
||||||
fields=["name", "new_item_code", "disabled"],
|
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",
|
order_by="name asc",
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -463,8 +468,13 @@ def get_product_bundle_map(bundle_names):
|
|||||||
row.name: row
|
row.name: row
|
||||||
for row in frappe.get_all(
|
for row in frappe.get_all(
|
||||||
"Product Bundle",
|
"Product Bundle",
|
||||||
|
<<<<<<< HEAD
|
||||||
filters={"name": ["in", bundle_names], "disabled": 0, "docstatus": 0},
|
filters={"name": ["in", bundle_names], "disabled": 0, "docstatus": 0},
|
||||||
fields=["name", "new_item_code", "disabled"],
|
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))
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user