nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-19 11:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fixes] Leave Application and Toggle Rounded Totals

Browse Source
This commit is contained in:
Anand Doshi
2014-07-30 17:00:05 +05:30
parent 5a5b405a18
commit 35cc320e21
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -252,7 +252,7 @@ def get_events(start, end):
if "Employee" in frappe.get_roles():
add_department_leaves(events, start, end, employee, company)
add_leaves(events, start, end, employee, company, match_conditions)
add_leaves(events, start, end, match_conditions)
add_block_dates(events, start, end, employee, company)
add_holidays(events, start, end, employee, company)
@@ -270,9 +270,9 @@ def add_department_leaves(events, start, end, employee, company):
and company=%s""", (department, company))
match_conditions = "employee in (\"%s\")" % '", "'.join(department_employees)
add_leaves(events, start, end, employee, company, match_conditions=match_conditions)
add_leaves(events, start, end, match_conditions=match_conditions)
def add_leaves(events, start, end, employee, company, match_conditions=None):
def add_leaves(events, start, end, match_conditions=None):
query = """select name, from_date, to_date, employee_name, half_day,
status, employee, docstatus
from `tabLeave Application` where