Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch fixes (#13754)

Browse Source 
* reload doc

* remove unused code
This commit is contained in:
Shreya Shah 2018-04-23 13:21:35 +05:30 committed by Nabin Hait
parent d4991cc49f
commit 828f5ab29e
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/hr/doctype/leave_application/leave_application.py
View File

@ -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.utils import set_employee_name
from erpnext.hr.doctype.leave_block_list.leave_block_list import get_applicable_block_dates 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.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 LeaveDayBlockedError(frappe.ValidationError): pass
class OverlapError(frappe.ValidationError): pass class OverlapError(frappe.ValidationError): pass

2
erpnext/patches.txt
View File

@ -517,7 +517,7 @@ erpnext.patches.v10_0.update_project_in_sle
erpnext.patches.v10_0.fix_reserved_qty_for_sub_contract erpnext.patches.v10_0.fix_reserved_qty_for_sub_contract
erpnext.patches.v11_0.add_index_on_nestedset_doctypes erpnext.patches.v11_0.add_index_on_nestedset_doctypes
erpnext.patches.v11_0.remove_modules_setup_page 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.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.add_default_email_template_for_leave
erpnext.patches.v11_0.set_default_email_template_in_hr erpnext.patches.v11_0.set_default_email_template_in_hr

2
erpnext/patches/v11_0/move_leave_approvers_from_employee.py
View File

@ -2,9 +2,9 @@ import frappe
from frappe import _ from frappe import _
def execute(): def execute():
frappe.reload_doc("hr", "doctype", "department_approver")
frappe.reload_doc("hr", "doctype", "employee") frappe.reload_doc("hr", "doctype", "employee")
frappe.reload_doc("hr", "doctype", "department") 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 approvers = frappe.db.sql("""select distinct app.leave_approver, emp.department from
`tabEmployee Leave Approver` app, `tabEmployee` emp `tabEmployee Leave Approver` app, `tabEmployee` emp