diff --git a/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py b/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py index f6783abfbe5..2cd286edb7b 100644 --- a/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py +++ b/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py @@ -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()) diff --git a/erpnext/setup/doctype/employee/employee.py b/erpnext/setup/doctype/employee/employee.py index 77f7e9bd43a..ca13ae74b92 100755 --- a/erpnext/setup/doctype/employee/employee.py +++ b/erpnext/setup/doctype/employee/employee.py @@ -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)