schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into e-commerce-refactor

Browse Source
This commit is contained in:
marination
2021-06-28 16:50:08 +05:30
parent d6a32ea832 c1853ddf73
commit db792c307f
701 changed files with 9390 additions and 13054 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/utilities/product.py
View File

@@ -141,6 +141,6 @@ def get_non_stock_item_status(item_code, item_warehouse_field):
if frappe.db.exists("Product Bundle", item_code):
items = frappe.get_doc("Product Bundle", item_code).get_all_children()
bundle_warehouse = frappe.db.get_value('Item', item_code, item_warehouse_field)
return all([get_web_item_qty_in_stock(d.item_code, item_warehouse_field, bundle_warehouse).in_stock for d in items])
return all(get_web_item_qty_in_stock(d.item_code, item_warehouse_field, bundle_warehouse).in_stock for d in items)
else:
return 1