nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-23 06:59:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: nullish check and table name

Browse Source
This commit is contained in:
Ankush Menat
2022-04-24 19:26:15 +05:30
parent 0fdfc1e76e
commit 7d2587c0a9
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/manufacturing/doctype/bom/bom.py
View File

@@ -753,7 +753,7 @@ class BOM(WebsiteGenerator):
bom_item.include_item_in_manufacturing, bom_item.include_item_in_manufacturing,
bom_item.sourced_by_supplier, bom_item.sourced_by_supplier,
bom_item.stock_qty / ifnull(bom.quantity, 1) AS qty_consumed_per_unit bom_item.stock_qty / ifnull(bom.quantity, 1) AS qty_consumed_per_unit
FROM `tabBOM Explosion Item` bom_item, tabBOM bom FROM `tabBOM Explosion Item` bom_item, `tabBOM` bom
WHERE WHERE
bom_item.parent = bom.name bom_item.parent = bom.name
AND bom.name = %s AND bom.name = %s

2
erpnext/stock/doctype/item_price/item_price.py
View File

@@ -64,7 +64,7 @@ class ItemPrice(Document):
if self.get(field): if self.get(field):
conditions += " and {0} = %({0})s ".format(field) conditions += " and {0} = %({0})s ".format(field)
else: else:
conditions += "and (isnull({0}) or {0} = '')".format(field) conditions += "and ({0} is null or {0} = '')".format(field)
price_list_rate = frappe.db.sql( price_list_rate = frappe.db.sql(
""" """