diff --git a/erpnext/demo/user/hr.py b/erpnext/demo/user/hr.py index 6c6a7d4e937..b8016869cf1 100644 --- a/erpnext/demo/user/hr.py +++ b/erpnext/demo/user/hr.py @@ -105,10 +105,9 @@ def get_timesheet_based_salary_slip_employee(): and docstatus != 2""") if sal_struct: employees = frappe.db.sql(""" - select employee from `tabSalary Structure Employee` - where parent IN %(sal_struct)s""", {"sal_struct": sal_struct}, as_dict=True) + select employee from `tabSalary Structure Assignment` + where salary_structure IN %(sal_struct)s""", {"sal_struct": sal_struct}, as_dict=True) return employees - else: return [] diff --git a/erpnext/hr/doctype/employee/employee_dashboard.py b/erpnext/hr/doctype/employee/employee_dashboard.py index be92074da10..0f950203066 100644 --- a/erpnext/hr/doctype/employee/employee_dashboard.py +++ b/erpnext/hr/doctype/employee/employee_dashboard.py @@ -12,7 +12,7 @@ def get_data(): }, { 'label': _('Payroll'), - 'items': ['Salary Structure', 'Salary Slip', 'Timesheet'] + 'items': ['Salary Slip', 'Timesheet'] }, { 'label': _('Training Events/Results'),