diff --git a/erpnext/hr/doctype/leave_application/leave_application.py b/erpnext/hr/doctype/leave_application/leave_application.py index 45fcde03760..b33bd5444e3 100755 --- a/erpnext/hr/doctype/leave_application/leave_application.py +++ b/erpnext/hr/doctype/leave_application/leave_application.py @@ -9,8 +9,6 @@ from frappe.utils import cint, cstr, date_diff, flt, formatdate, getdate, get_li from erpnext.hr.utils import set_employee_name from erpnext.hr.doctype.leave_block_list.leave_block_list import get_applicable_block_dates from erpnext.hr.doctype.employee.employee import get_holiday_list_for_employee -from erpnext.hr.doctype.employee_leave_approver.employee_leave_approver import get_approver_list - class LeaveDayBlockedError(frappe.ValidationError): pass class OverlapError(frappe.ValidationError): pass diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 95335dfe75e..9ec52837830 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -517,7 +517,7 @@ erpnext.patches.v10_0.update_project_in_sle erpnext.patches.v10_0.fix_reserved_qty_for_sub_contract erpnext.patches.v11_0.add_index_on_nestedset_doctypes erpnext.patches.v11_0.remove_modules_setup_page -erpnext.patches.v11_0.update_department_lft_rgt erpnext.patches.v11_0.move_leave_approvers_from_employee +erpnext.patches.v11_0.update_department_lft_rgt erpnext.patches.v11_0.add_default_email_template_for_leave erpnext.patches.v11_0.set_default_email_template_in_hr diff --git a/erpnext/patches/v11_0/move_leave_approvers_from_employee.py b/erpnext/patches/v11_0/move_leave_approvers_from_employee.py index 2a7afdc89fc..d9127528214 100644 --- a/erpnext/patches/v11_0/move_leave_approvers_from_employee.py +++ b/erpnext/patches/v11_0/move_leave_approvers_from_employee.py @@ -2,9 +2,9 @@ import frappe from frappe import _ def execute(): + frappe.reload_doc("hr", "doctype", "department_approver") frappe.reload_doc("hr", "doctype", "employee") frappe.reload_doc("hr", "doctype", "department") - frappe.reload_doc("hr", "doctype", "employee_leave_approver") approvers = frappe.db.sql("""select distinct app.leave_approver, emp.department from `tabEmployee Leave Approver` app, `tabEmployee` emp