mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-29 09:54:47 +00:00
Fixed merge conflict
This commit is contained in:
@@ -1,25 +1,26 @@
|
||||
from frappe import _
|
||||
|
||||
data = {
|
||||
'heatmap': True,
|
||||
'heatmap_message': _('This is based on the attendance of this Employee'),
|
||||
'fieldname': 'employee',
|
||||
'transactions': [
|
||||
{
|
||||
'label': _('Leave and Attendance'),
|
||||
'items': ['Attendance', 'Leave Application', 'Leave Allocation']
|
||||
},
|
||||
{
|
||||
'label': _('Payroll'),
|
||||
'items': ['Salary Structure', 'Salary Slip', 'Timesheet']
|
||||
},
|
||||
{
|
||||
'label': _('Expense'),
|
||||
'items': ['Expense Claim']
|
||||
},
|
||||
{
|
||||
'label': _('Evaluation'),
|
||||
'items': ['Appraisal']
|
||||
}
|
||||
]
|
||||
}
|
||||
def get_data():
|
||||
return {
|
||||
'heatmap': True,
|
||||
'heatmap_message': _('This is based on the attendance of this Employee'),
|
||||
'fieldname': 'employee',
|
||||
'transactions': [
|
||||
{
|
||||
'label': _('Leave and Attendance'),
|
||||
'items': ['Attendance', 'Leave Application', 'Leave Allocation']
|
||||
},
|
||||
{
|
||||
'label': _('Payroll'),
|
||||
'items': ['Salary Structure', 'Salary Slip', 'Timesheet']
|
||||
},
|
||||
{
|
||||
'label': _('Expense'),
|
||||
'items': ['Expense Claim']
|
||||
},
|
||||
{
|
||||
'label': _('Evaluation'),
|
||||
'items': ['Appraisal']
|
||||
}
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user