From 8e25189d7d2679f762952aa0f7cbe009c1f7b961 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Wed, 10 Jun 2026 10:14:23 +0530 Subject: [PATCH] chore: resolve conflicts --- .../stock/report/item_where_used/item_where_used.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/erpnext/stock/report/item_where_used/item_where_used.py b/erpnext/stock/report/item_where_used/item_where_used.py index 730091ed42e..a2b333bfb8f 100644 --- a/erpnext/stock/report/item_where_used/item_where_used.py +++ b/erpnext/stock/report/item_where_used/item_where_used.py @@ -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)) ) }