Merge branch 'master' into feature/america

2023-05-29 14:49:13 -07:00
parent 6b2d10d589 de62e994bd
commit e85203e429
32 changed files with 634 additions and 167 deletions
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -2333,6 +2333,7 @@
 				"mpi_animal_checklist": "",
 				"mpi_eglass_auth": "",
 				"mpi_final_acct_sheet": "",
+				"mpi_final_repair_acct_sheet": "",
 				"paint_grid": "",
 				"parts_invoice_label_single": "",
 				"parts_label_multiple": "",
@@ -2394,6 +2395,7 @@
 			},
 			"subjects": {
 				"jobs": {
+					"individual_job_note": "",
 					"parts_order": "",
 					"sublet_order": ""
 				}