Merge branch 'feature/payroll' into feature/america
This commit is contained in:
@@ -343,10 +343,12 @@
|
||||
"md_payment_types": "",
|
||||
"md_referral_sources": "",
|
||||
"md_tasks_presets": {
|
||||
"enable_tasks": "",
|
||||
"hourstype": "",
|
||||
"memo": "",
|
||||
"name": "",
|
||||
"percent": ""
|
||||
"percent": "",
|
||||
"use_approvals": ""
|
||||
},
|
||||
"messaginglabel": "",
|
||||
"messagingtext": "",
|
||||
@@ -2692,8 +2694,11 @@
|
||||
"claimtasks": "",
|
||||
"clockin": "",
|
||||
"clockout": "",
|
||||
"commit": "",
|
||||
"commitone": "",
|
||||
"enter": "",
|
||||
"printemployee": ""
|
||||
"printemployee": "",
|
||||
"uncommit": ""
|
||||
},
|
||||
"errors": {
|
||||
"clockingin": "",
|
||||
@@ -2745,6 +2750,7 @@
|
||||
"successes": {
|
||||
"clockedin": "",
|
||||
"clockedout": "",
|
||||
"committed": "",
|
||||
"created": "",
|
||||
"deleted": ""
|
||||
},
|
||||
@@ -2855,6 +2861,10 @@
|
||||
"tt_approvals": {
|
||||
"actions": {
|
||||
"approveselected": ""
|
||||
},
|
||||
"labels": {
|
||||
"approval_queue_in_use": "",
|
||||
"calculate": ""
|
||||
}
|
||||
},
|
||||
"user": {
|
||||
|
||||
Reference in New Issue
Block a user