Merge branch 'feature/payroll' into feature/america

client/src/translations/fr/common.json

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