nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-22 02:40:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #56370 from mihir-kandoi/pg-report-bool-and-fieldcase

Browse Source 
fix: two Postgres hard errors — Check-vs-bool and capital-cased fieldname
This commit is contained in:
Mihir Kandoi
2026-06-23 19:04:35 +05:30
committed by GitHub
parent 3b1b315bf4 abe9e8becc
commit 247d574283
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py
View File

@@ -62,7 +62,7 @@ def fetch_item_prices(
or_conditions = []
if items:
and_conditions.append(ip.item_code.isin([x.item_code for x in items]))
and_conditions.append(ip.selling.eq(True))
and_conditions.append(ip.selling.eq(1))
or_conditions.append(ip.customer.isnull())
or_conditions.append(ip.price_list.isnull())

2
erpnext/setup/doctype/employee/employee.py
View File

@@ -427,7 +427,7 @@ def is_holiday(employee, date=None, raise_exception=True, only_non_weekly=False,
def deactivate_sales_person(status: str, employee: str):
frappe.has_permission("Employee", doc=employee, ptype="write", throw=True)
if status == "Left":
sales_person = frappe.db.get_value("Sales Person", {"Employee": employee})
sales_person = frappe.db.get_value("Sales Person", {"employee": employee})
if sales_person:
frappe.db.set_value("Sales Person", sales_person, "enabled", 0)