From 4a126947f507ccb198e710f6d005263866c36651 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Tue, 15 May 2018 12:43:21 +0530 Subject: [PATCH] Code cleaup --- erpnext/hr/doctype/employee/employee.js | 9 +++++++++ erpnext/hr/doctype/leave_period/leave_period.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/erpnext/hr/doctype/employee/employee.js b/erpnext/hr/doctype/employee/employee.js index 6f6873ac1d1..7d153d432c5 100755 --- a/erpnext/hr/doctype/employee/employee.js +++ b/erpnext/hr/doctype/employee/employee.js @@ -37,6 +37,15 @@ erpnext.hr.EmployeeController = frappe.ui.form.Controller.extend({ }); frappe.ui.form.on('Employee',{ + setup: function(frm) { + frm.set_query("leave_policy", function() { + return { + "filters": { + "docstatus": 1 + } + }; + }); + }, onload:function(frm) { frm.set_query("department", function() { return { diff --git a/erpnext/hr/doctype/leave_period/leave_period.py b/erpnext/hr/doctype/leave_period/leave_period.py index 1ef6f196d43..4097169ad82 100644 --- a/erpnext/hr/doctype/leave_period/leave_period.py +++ b/erpnext/hr/doctype/leave_period/leave_period.py @@ -60,7 +60,6 @@ class LeavePeriod(Document): frappe.throw(_("Employee {0} already have Leave Allocation {1} for this period").format(employee, leave_alloc[0][0])\ + """ {0}""".format(leave_alloc[0][0])) - def validate_dates(self): if getdate(self.from_date) >= getdate(self.to_date): frappe.throw(_("To date can not be equal or less than from date")) @@ -79,3 +78,4 @@ class LeavePeriod(Document): allocation.carry_forward = self.carry_forward_leaves allocation.save(ignore_permissions = True) allocation.submit() + frappe.msgprint(_("Leave Allocation {0} created").format(allocation.name))