nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/meatechsupport/erpnext into meatechsupport-develop

Browse Source
This commit is contained in:
Nabin Hait
2015-07-29 16:05:47 +05:30
parent 763821d57d e102332f08
commit a184fbfa66
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -238,10 +238,15 @@ def get_total_leave_days(leave_app):
ret = {'total_leave_days' : 0.5} ret = {'total_leave_days' : 0.5}
if not leave_app.half_day: if not leave_app.half_day:
tot_days = date_diff(leave_app.to_date, leave_app.from_date) + 1 tot_days = date_diff(leave_app.to_date, leave_app.from_date) + 1
holidays = leave_app.get_holidays() if frappe.db.get_value("Leave Type", self.leave_type, "include_holiday"):
ret = { holidays = leave_app.get_holidays()
'total_leave_days' : flt(tot_days)-flt(holidays) ret = {
} 'total_leave_days' : flt(tot_days)-flt(holidays)
}
else:
ret = {
'total_leave_days' : flt(tot_days)
}
return ret return ret
@frappe.whitelist() @frappe.whitelist()

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

@@ -246,4 +246,4 @@ class TestLeaveApplication(unittest.TestCase):
frappe.db.sql("""delete from `tabEmployee Leave Approver` where parent=%s""", frappe.db.sql("""delete from `tabEmployee Leave Approver` where parent=%s""",
"_T-Employee-0001") "_T-Employee-0001")
frappe.db.set_value("Employee", "_T-Employee-0001", "department", original_department) frappe.db.set_value("Employee", "_T-Employee-0001", "department", original_department)

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

@@ -59,6 +59,12 @@
"fieldtype": "Check", "fieldtype": "Check",
"label": "Allow Negative Balance", "label": "Allow Negative Balance",
"permlevel": 0 "permlevel": 0
},
{
"fieldname": "include_holiday",
"fieldtype": "Check",
"label": "Include holidays within leaves as leaves",
"permlevel": 0
} }
], ],
"icon": "icon-flag", "icon": "icon-flag",