fixes in test runner and add role for profile
diff --git a/hr/doctype/employee/employee.py b/hr/doctype/employee/employee.py
index e357ff4..cef6fdc 100644
--- a/hr/doctype/employee/employee.py
+++ b/hr/doctype/employee/employee.py
@@ -76,7 +76,7 @@
# add employee role if missing
if not "Employee" in webnotes.conn.sql_list("""select role from tabUserRole
where parent=%s""", self.doc.user_id):
- from core.doctype.profile.profile import add_role
+ from webnotes.profile import add_role
add_role(self.doc.user_id, "HR User")
profile_wrapper = webnotes.model_wrapper("Profile", self.doc.user_id)
diff --git a/hr/doctype/leave_application/leave_application.py b/hr/doctype/leave_application/leave_application.py
index 2045147..bc685df 100755
--- a/hr/doctype/leave_application/leave_application.py
+++ b/hr/doctype/leave_application/leave_application.py
@@ -78,7 +78,9 @@
if block_date > from_date and block_date < to_date:
webnotes.msgprint(_("You cannot apply for a leave on the following date because it is blocked")
+ ": " + formatdate(d.block_date) + _(" Reason: ") + d.reason)
- raise LeaveDayBlockedError
+ if self.doc.docstatus == 1:
+ # throw exception only when submitting
+ raise LeaveDayBlockedError
def is_user_in_allow_list(self, block_list):
return webnotes.session.user in webnotes.conn.sql_list("""select allow_user
diff --git a/hr/doctype/leave_application/test_leave_application.py b/hr/doctype/leave_application/test_leave_application.py
index ead0d0c..8fe11d6 100644
--- a/hr/doctype/leave_application/test_leave_application.py
+++ b/hr/doctype/leave_application/test_leave_application.py
@@ -20,7 +20,7 @@
webnotes.session.user = "test1@erpnext.com"
- from core.doctype.profile.profile import add_role
+ from webnotes.profile import add_role
add_role("test1@erpnext.com", "HR User")
self.assertTrue(application.insert())