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

minor fix

Browse Source
This commit is contained in:
Nabin Hait
2018-04-26 16:32:17 +05:30
parent 25ccd1acbb
commit 2f82bce387
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/demo/user/hr.py
View File

@@ -105,10 +105,9 @@ def get_timesheet_based_salary_slip_employee():
and docstatus != 2""") and docstatus != 2""")
if sal_struct: if sal_struct:
employees = frappe.db.sql(""" employees = frappe.db.sql("""
select employee from `tabSalary Structure Employee` select employee from `tabSalary Structure Assignment`
where parent IN %(sal_struct)s""", {"sal_struct": sal_struct}, as_dict=True) where salary_structure IN %(sal_struct)s""", {"sal_struct": sal_struct}, as_dict=True)
return employees return employees
else: else:
return [] return []

2
erpnext/hr/doctype/employee/employee_dashboard.py
View File

@@ -12,7 +12,7 @@ def get_data():
}, },
{ {
'label': _('Payroll'), 'label': _('Payroll'),
'items': ['Salary Structure', 'Salary Slip', 'Timesheet'] 'items': ['Salary Slip', 'Timesheet']
}, },
{ {
'label': _('Training Events/Results'), 'label': _('Training Events/Results'),