nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-18 10:57:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fix] Updated 'Include Holiday' in existing and default leave type records

Browse Source
This commit is contained in:
Nabin Hait
2015-07-29 16:15:08 +05:30
parent a184fbfa66
commit b24d2efc4b
4 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -245,7 +245,7 @@ def get_total_leave_days(leave_app):
}
else:
ret = {
'total_leave_days' : flt(tot_days)
'total_leave_days' : flt(tot_days)
}
return ret

6
erpnext/hr/doctype/leave_type/test_records.json
View File

@@ -1,11 +1,13 @@
[
{
"doctype": "Leave Type",
"leave_type_name": "_Test Leave Type"
"leave_type_name": "_Test Leave Type",
"include_holiday": 1
},
{
"doctype": "Leave Type",
"is_lwp": 1,
"leave_type_name": "_Test Leave Type LWP"
"leave_type_name": "_Test Leave Type LWP",
"include_holiday": 1
}
]