From eadc14447773503facd4c8bdb01a3fbc230e6afa Mon Sep 17 00:00:00 2001 From: karthikeyan5 Date: Wed, 19 Jun 2019 08:53:04 +0530 Subject: [PATCH] fix(HR): fixing bug introduced during merge conflict resolution. > while merging with https://github.com/frappe/erpnext/pull/17837 --- erpnext/hr/doctype/shift_type/shift_type_dashboard.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erpnext/hr/doctype/shift_type/shift_type_dashboard.py b/erpnext/hr/doctype/shift_type/shift_type_dashboard.py index 0a49ddaa9a..aedd190bcb 100644 --- a/erpnext/hr/doctype/shift_type/shift_type_dashboard.py +++ b/erpnext/hr/doctype/shift_type/shift_type_dashboard.py @@ -4,6 +4,10 @@ from frappe import _ def get_data(): return { 'fieldname': 'shift', + 'non_standard_fieldnames': { + 'Shift Request': 'shift_type', + 'Shift Assignment': 'shift_type' + }, 'transactions': [ { 'items': ['Attendance', 'Employee Checkin', 'Shift Request', 'Shift Assignment']