| commit | eadc14447773503facd4c8bdb01a3fbc230e6afa | [log] [tgz] |
|---|---|---|
| author | karthikeyan5 <skarthikeyan1410@gmail.com> | Wed Jun 19 08:53:04 2019 +0530 |
| committer | karthikeyan5 <skarthikeyan1410@gmail.com> | Mon Jun 24 15:15:38 2019 +0530 |
| tree | 2038ea19a37bd50d39a308f8e8affef9571f59e7 | |
| parent | 82256bc58b5673a6ffaf9d67f313f91c145553bc [diff] |
fix(HR): fixing bug introduced during merge conflict resolution. > while merging with https://github.com/frappe/erpnext/pull/17837
diff --git a/erpnext/hr/doctype/shift_type/shift_type_dashboard.py b/erpnext/hr/doctype/shift_type/shift_type_dashboard.py index 0a49dda..aedd190 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 @@ 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']