Merge branch 'feature/payroll' into feature/america

This commit is contained in:
Patrick Fic
2023-05-17 07:51:57 -07:00
15 changed files with 470 additions and 32 deletions

View File

@@ -227,6 +227,7 @@
},
"bodyshop": {
"actions": {
"add_task_preset": "Add Task Preset",
"addapptcolor": "Add Appointment Color",
"addbucket": "Add Definition",
"addpartslocation": "Add Parts Location",
@@ -339,6 +340,12 @@
},
"md_payment_types": "Payment Types",
"md_referral_sources": "Referral Sources",
"md_tasks_presets": {
"hourstype": "Hour Types",
"memo": "Time Ticket Memo",
"name": "Preset Name",
"percent": "Percent"
},
"messaginglabel": "Messaging Preset Label",
"messagingtext": "Messaging Preset Text",
"noteslabel": "Note Label",
@@ -594,6 +601,7 @@
"jobstatuses": "Job Statuses",
"laborrates": "Labor Rates",
"licensing": "Licensing",
"md_tasks_presets": "Tasks Presets",
"md_to_emails": "Preset To Emails",
"md_to_emails_emails": "Emails",
"messagingpresets": "Messaging Presets",
@@ -620,6 +628,7 @@
"speedprint": "Speed Print Configuration",
"ssbuckets": "Job Size Definitions",
"systemsettings": "System Settings",
"task-presets": "Task Presets",
"workingdays": "Working Days"
},
"successes": {
@@ -921,11 +930,14 @@
},
"employee_teams": {
"actions": {
"new": "New Team"
"new": "New Team",
"newmember": "New Team Member"
},
"fields": {
"active": "Active",
"name": "Team Name"
"employeeid": "Employee",
"name": "Team Name",
"percentage": "Percent"
}
},
"employees": {

View File

@@ -227,6 +227,7 @@
},
"bodyshop": {
"actions": {
"add_task_preset": "",
"addapptcolor": "",
"addbucket": "",
"addpartslocation": "",
@@ -339,6 +340,12 @@
},
"md_payment_types": "",
"md_referral_sources": "",
"md_tasks_presets": {
"hourstype": "",
"memo": "",
"name": "",
"percent": ""
},
"messaginglabel": "",
"messagingtext": "",
"noteslabel": "",
@@ -593,6 +600,7 @@
"jobstatuses": "",
"laborrates": "",
"licensing": "",
"md_tasks_presets": "",
"md_to_emails": "",
"md_to_emails_emails": "",
"messagingpresets": "",
@@ -619,6 +627,7 @@
"speedprint": "",
"ssbuckets": "",
"systemsettings": "",
"task-presets": "",
"workingdays": ""
},
"successes": {
@@ -920,11 +929,14 @@
},
"employee_teams": {
"actions": {
"new": ""
"new": "",
"newmember": ""
},
"fields": {
"active": "",
"name": ""
"employeeid": "",
"name": "",
"percentage": ""
}
},
"employees": {

View File

@@ -227,6 +227,7 @@
},
"bodyshop": {
"actions": {
"add_task_preset": "",
"addapptcolor": "",
"addbucket": "",
"addpartslocation": "",
@@ -339,6 +340,12 @@
},
"md_payment_types": "",
"md_referral_sources": "",
"md_tasks_presets": {
"hourstype": "",
"memo": "",
"name": "",
"percent": ""
},
"messaginglabel": "",
"messagingtext": "",
"noteslabel": "",
@@ -593,6 +600,7 @@
"jobstatuses": "",
"laborrates": "",
"licensing": "",
"md_tasks_presets": "",
"md_to_emails": "",
"md_to_emails_emails": "",
"messagingpresets": "",
@@ -619,6 +627,7 @@
"speedprint": "",
"ssbuckets": "",
"systemsettings": "",
"task-presets": "",
"workingdays": ""
},
"successes": {
@@ -920,11 +929,14 @@
},
"employee_teams": {
"actions": {
"new": ""
"new": "",
"newmember": ""
},
"fields": {
"active": "",
"name": ""
"employeeid": "",
"name": "",
"percentage": ""
}
},
"employees": {