Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2039 from anandpdoshi/anand-august-8

Browse Source 
[fix] Show Employee Name in Employee Birthday report
This commit is contained in:
Nabin Hait 2014-08-08 13:21:36 +05:30
commit 688a7a7329
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/hr/report/employee_birthday/employee_birthday.py
View File

@ -15,14 +15,15 @@ def execute(filters=None):
def get_columns(): def get_columns():
return [ return [
"Employee:Link/Employee:120", "Date of Birth:Date:100", "Branch:Link/Branch:120", "Employee:Link/Employee:120", "Name:Data:200", "Date of Birth:Date:100",
"Department:Link/Department:120", "Designation:Link/Designation:120", "Gender::60", "Branch:Link/Branch:120", "Department:Link/Department:120",
"Company:Link/Company:120" "Designation:Link/Designation:120", "Gender::60", "Company:Link/Company:120"
] ]
def get_employees(filters): def get_employees(filters):
conditions = get_conditions(filters) conditions = get_conditions(filters)
return frappe.db.sql("""select name, date_of_birth, branch, department, designation, return frappe.db.sql("""select name, employee_name, date_of_birth,
branch, department, designation,
gender, company from tabEmployee where status = 'Active' %s""" % conditions, as_list=1) gender, company from tabEmployee where status = 'Active' %s""" % conditions, as_list=1)
def get_conditions(filters): def get_conditions(filters):