Merge pull request #14039 from rohitwaghchaure/code_clanup_hr
Code cleaup
diff --git a/erpnext/hr/doctype/employee/employee.js b/erpnext/hr/doctype/employee/employee.js
index 6f6873a..7d153d4 100755
--- a/erpnext/hr/doctype/employee/employee.js
+++ b/erpnext/hr/doctype/employee/employee.js
@@ -37,6 +37,15 @@
});
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 1ef6f19..4097169 100644
--- a/erpnext/hr/doctype/leave_period/leave_period.py
+++ b/erpnext/hr/doctype/leave_period/leave_period.py
@@ -60,7 +60,6 @@
frappe.throw(_("Employee {0} already have Leave Allocation {1} for this period").format(employee, leave_alloc[0][0])\
+ """ <b><a href="#Form/Leave Allocation/{0}">{0}</a></b>""".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 @@
allocation.carry_forward = self.carry_forward_leaves
allocation.save(ignore_permissions = True)
allocation.submit()
+ frappe.msgprint(_("Leave Allocation {0} created").format(allocation.name))