Merge branch 'release/2023-04-28' into feature/america

client/src/translations/en_us/common.json

@@ -548,6 +548,7 @@
 				"tt_allow_post_to_invoiced": "Allow Time Tickets to be posted to Invoiced & Exported Jobs",
 				"tt_enforce_hours_for_tech_console": "Restrict Claimable hours from Tech Console",
 				"use_fippa": "Use FIPPA for Names on Generated Documents?",
+				"use_paint_scale_data": "Use Paint Scale Data for Job Costing?",
 				"uselocalmediaserver": "Use Local Media Server?",
 				"website": "Website",
 				"zip_post": "Zip/Postal Code"
@@ -1030,6 +1031,7 @@
 				"created_at": "Created At",
 				"email": "Email",
 				"errors": "Errors",
+				"excel": "Excel",
 				"exceptiontitle": "An error has occurred.",
 				"friday": "Friday",
 				"globalsearch": "Global Search",
@@ -1977,7 +1979,8 @@
 				"actions": "Actions",
 				"deletenote": "Delete Note",
 				"edit": "Edit Note",
-				"new": "New Note"
+				"new": "New Note",
+				"savetojobnotes": "Save to Job Notes"
 			},
 			"errors": {
 				"inserting": "Error inserting note.  {{error}}"
@@ -2243,6 +2246,7 @@
 				"csi_invitation": "CSI Invitation",
 				"csi_invitation_action": "CSI Invite",
 				"diagnostic_authorization": "Diagnostic Authorization",
+				"dms_posting_sheet": "DMS Posting Sheet",
 				"envelope_return_address": "#10 Envelope Return Address Label",
 				"estimate": "Estimate Only",
 				"estimate_detail": "Estimate Details",
@@ -2461,6 +2465,8 @@
 				"export_payables": "Export Log - Payables",
 				"export_payments": "Export Log - Payments",
 				"export_receivables": "Export Log - Receivables",
+				"exported_gsr_by_ro": "Exported Gross Sales - Excel",
+				"exported_gsr_by_ro_labor": "Exported Gross Sales (Labor) - Excel",
 				"gsr_by_atp": "",
 				"gsr_by_ats": "Gross Sales by ATS",
 				"gsr_by_category": "Gross Sales by Category",