fetch docstatus in leave application for calendar view; fix in leave application test
diff --git a/hr/doctype/leave_application/leave_application.py b/hr/doctype/leave_application/leave_application.py
index f268704..4ad1c23 100755
--- a/hr/doctype/leave_application/leave_application.py
+++ b/hr/doctype/leave_application/leave_application.py
@@ -237,7 +237,7 @@
department)
for d in webnotes.conn.sql("""select name, from_date, to_date, employee_name, half_day,
- status, employee
+ status, employee, docstatus
from `tabLeave Application` where
(from_date between %s and %s or to_date between %s and %s)
and docstatus < 2
@@ -251,7 +251,8 @@
"to_date": d.to_date,
"status": d.status,
"title": _("Leave by") + " " + cstr(d.employee_name) + \
- (d.half_day and _(" (Half Day)") or "")
+ (d.half_day and _(" (Half Day)") or ""),
+ "docstatus": d.docstatus
})
diff --git a/hr/doctype/leave_application/test_leave_application.py b/hr/doctype/leave_application/test_leave_application.py
index 584549a..ff515b2 100644
--- a/hr/doctype/leave_application/test_leave_application.py
+++ b/hr/doctype/leave_application/test_leave_application.py
@@ -17,6 +17,7 @@
application = self.get_application(test_records[1])
application.insert()
+ application.doc.status = "Approved"
self.assertRaises(LeaveDayBlockedError, application.submit)
webnotes.session.user = "test1@example.com"