Skip to content

Commit

Permalink
fix: condition in other bundle utils
Browse files Browse the repository at this point in the history
(cherry picked from commit 8bdb61c)
  • Loading branch information
GursheenK authored and mergify[bot] committed Nov 24, 2023
1 parent c0de9c0 commit e4d9ef1
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion erpnext/accounts/doctype/pos_invoice/pos_invoice.py
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ def get_stock_availability(item_code, warehouse):
return bin_qty - pos_sales_qty, is_stock_item
else:
is_stock_item = True
if frappe.db.exists("Product Bundle", item_code):
if frappe.db.exists("Product Bundle", {"name": item_code, "disabled": 0}):
return get_bundle_availability(item_code, warehouse), is_stock_item
else:
is_stock_item = False
Expand Down
8 changes: 5 additions & 3 deletions erpnext/selling/doctype/sales_order/sales_order.py
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,9 @@ def update_item(source, target, source_parent):
"Sales Order Item": {
"doctype": "Material Request Item",
"field_map": {"name": "sales_order_item", "parent": "sales_order"},
"condition": lambda item: not frappe.db.exists("Product Bundle", item.item_code)
"condition": lambda item: not frappe.db.exists(
"Product Bundle", {"name": item.item_code, "disabled": 0}
)
and get_remaining_qty(item) > 0,
"postprocess": update_item,
},
Expand Down Expand Up @@ -1309,7 +1311,7 @@ def set_delivery_date(items, sales_order):


def is_product_bundle(item_code):
return frappe.db.exists("Product Bundle", item_code)
return frappe.db.exists("Product Bundle", {"name": item_code, "disabled": 0})


@frappe.whitelist()
Expand Down Expand Up @@ -1521,7 +1523,7 @@ def get_work_order_items(sales_order, for_raw_material_request=0):
product_bundle_parents = [
pb.new_item_code
for pb in frappe.get_all(
"Product Bundle", {"new_item_code": ["in", item_codes]}, ["new_item_code"]
"Product Bundle", {"new_item_code": ["in", item_codes], "disabled": 0}, ["new_item_code"]
)
]

Expand Down
2 changes: 1 addition & 1 deletion erpnext/stock/get_item_details.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ def remove_standard_fields(details):


def set_valuation_rate(out, args):
if frappe.db.exists("Product Bundle", args.item_code, cache=True):
if frappe.db.exists("Product Bundle", {"name": args.item_code, "disabled": 0}, cache=True):
valuation_rate = 0.0
bundled_items = frappe.get_doc("Product Bundle", args.item_code)

Expand Down

0 comments on commit e4d9ef1

Please sign in to comment.