diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py index 42f48c0aef..af5a5e249d 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.py +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py @@ -1176,7 +1176,6 @@ def validate_inclusive_tax(tax, doc): @frappe.whitelist() def get_outstanding_reference_documents(args): - if isinstance(args, str): args = json.loads(args) diff --git a/erpnext/setup/doctype/employee/employee.py b/erpnext/setup/doctype/employee/employee.py index 3399b1a5a3..13a6f20db2 100755 --- a/erpnext/setup/doctype/employee/employee.py +++ b/erpnext/setup/doctype/employee/employee.py @@ -284,7 +284,7 @@ def get_holiday_list_for_employee(employee, raise_exception=True): holiday_list, company = frappe.db.get_value("Employee", employee, ["holiday_list", "company"]) else: holiday_list = "" - company = frappe.db.get_value("Global Defaults", None, "default_company") + company = frappe.db.get_single_value("Global Defaults", "default_company") if not holiday_list: holiday_list = frappe.get_cached_value("Company", company, "default_holiday_list")