Merge branch 'master' into feature/america

client/src/translations/en_us/common.json

@@ -269,6 +269,8 @@
 					"templates": "Delivery Templates"
 				},
 				"dms": {
+					"apcontrol": "AP Control Number",
+					"appostingaccount": "AP Posting Account",
 					"cashierid": "Cashier ID",
 					"default_journal": "Default Journal",
 					"disablebillwip": "Disable bill WIP for A/P Posting",
@@ -1454,8 +1456,8 @@
 					"cost_dms_acctnumber": "Cost DMS Acct #",
 					"dms_make": "DMS Make",
 					"dms_model": "DMS Model",
-					"dms_wip_acctnumber": "Cost WIP DMS Acct #",
 					"dms_unsold": "New, Unsold Vehicle",
+					"dms_wip_acctnumber": "Cost WIP DMS Acct #",
 					"id": "DMS ID",
 					"inservicedate": "In Service Date",
 					"journal": "Journal #",
@@ -2220,17 +2222,17 @@
 				"external": "External",
 				"findermodal": "ICBC Payment Finder",
 				"insurance": "Insurance",
+				"markexported": "Mark Exported",
+				"markforreexport": "Mark for Re-export",
 				"new": "New Payment",
 				"signup": "Please contact support to sign up for electronic payments.",
 				"title": "Payments",
-				"totalpayments": "Total Payments",
-				"markexported": "Mark Exported",
-				"markforreexport": "Mark for Re-export"
+				"totalpayments": "Total Payments"
 			},
 			"successes": {
 				"exported": "Payment(s) exported successfully.",
-				"markreexported": "Payment marked for re-export successfully",
 				"markexported": "Payment(s) marked exported.",
+				"markreexported": "Payment marked for re-export successfully",
 				"payment": "Payment created successfully. ",
 				"stripe": "Credit card transaction charged successfully."
 			}
@@ -2572,8 +2574,8 @@
 				"job_costing_ro_ins_co": "Job Costing by RO Source",
 				"jobs_completed_not_invoiced": "Jobs Completed not Invoiced",
 				"jobs_invoiced_not_exported": "Jobs Invoiced not Exported",
-				"jobs_scheduled_completion": "Jobs Scheduled Completion",
 				"jobs_reconcile": "Parts/Sublet/Labor Reconciliation",
+				"jobs_scheduled_completion": "Jobs Scheduled Completion",
 				"lag_time": "Lag Time",
 				"open_orders": "Open Orders by Date",
 				"open_orders_csr": "Open Orders by CSR",
@@ -2630,8 +2632,8 @@
 			"labels": {
 				"atssummary": "ATS Summary",
 				"employeevacation": "Employee Vacations",
-				"ins_co_nm_filter": "Filter by Insurance Company",
 				"estimators": "Filter by Writer/Customer Rep.",
+				"ins_co_nm_filter": "Filter by Insurance Company",
 				"intake": "Intake Events",
 				"manual": "Manual Events",
 				"manualevent": "Add Manual Event"