Merge branch 'feature/payroll' into feature/america

client/src/translations/en_us/common.json

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