admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/payroll' into feature/america

Browse Source
This commit is contained in:
Patrick Fic
2023-06-02 09:32:00 -07:00
parent ce0fd42995 3d03de193e
commit dbf3226f97
19 changed files with 751 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
client/src/translations/en_us/common.json
View File

@@ -343,10 +343,12 @@
"md_payment_types": "Payment Types",
"md_referral_sources": "Referral Sources",
"md_tasks_presets": {
"enable_tasks": "Enable Task Claiming",
"hourstype": "Hour Types",
"memo": "Time Ticket Memo",
"name": "Preset Name",
"percent": "Percent"
"percent": "Percent",
"use_approvals": "Use Time Ticket Approval Queue"
},
"messaginglabel": "Messaging Preset Label",
"messagingtext": "Messaging Preset Text",
@@ -2696,8 +2698,11 @@
"claimtasks": "Claim Tasks",
"clockin": "Clock In",
"clockout": "Clock Out",
"commit": "Commit Tickets ({{count}})",
"commitone": "Commit",
"enter": "Enter New Time Ticket",
"printemployee": "Print Time Tickets"
"printemployee": "Print Time Tickets",
"uncommit": "Uncommit"
},
"errors": {
"clockingin": "Error while clocking in. {{message}}",
@@ -2749,6 +2754,7 @@
"successes": {
"clockedin": "Clocked in successfully.",
"clockedout": "Clocked out successfully.",
"committed": "Time Tickets Committed Successfully",
"created": "Time ticket entered successfully.",
"deleted": "Time ticket deleted successfully."
},
@@ -2859,6 +2865,10 @@
"tt_approvals": {
"actions": {
"approveselected": "Approve Selected"
},
"labels": {
"approval_queue_in_use": "Time tickets will be added to the approval queue.",
"calculate": "Calculate"
}
},
"user": {

14
client/src/translations/es/common.json
View File

@@ -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": {

14
client/src/translations/fr/common.json
View File

@@ -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": {