nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 23:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into edge

Browse Source
This commit is contained in:
Anand Doshi
2013-03-01 14:13:08 +05:30
parent 5ec043c920 57f83ed36b
commit f8a01cfb93
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hr/report/employee_leave_balance/employee_leave_balance.py
View File

@@ -33,6 +33,7 @@ def execute(filters=None):
for leave_type in leave_types: for leave_type in leave_types:
columns.append(leave_type + " Allocated:Float") columns.append(leave_type + " Allocated:Float")
columns.append(leave_type + " Taken:Float") columns.append(leave_type + " Taken:Float")
columns.append(leave_type + " Balance:Float")
data = {} data = {}
for d in allocations: for d in allocations:
@@ -52,5 +53,6 @@ def execute(filters=None):
tmp = data.get((fiscal_year, employee.name, leave_type), webnotes._dict()) tmp = data.get((fiscal_year, employee.name, leave_type), webnotes._dict())
row.append(tmp.allocation or 0) row.append(tmp.allocation or 0)
row.append(tmp.leaves or 0) row.append(tmp.leaves or 0)
row.append((tmp.allocation or 0) - (tmp.leaves or 0))
return columns, result return columns, result