Merged in feature/IO-2458-RO-Closer (pull request #1406)

Feature/IO-2458 RO Closer

client/src/translations/en_us/common.json

@@ -116,6 +116,7 @@
 				"jobassignmentchange": "Employee {{name}} assigned to {{operation}}",
 				"jobassignmentremoved": "Employee assignment removed for {{operation}}",
 				"jobchecklist": "Checklist type \"{{type}}\" completed.  In production set to {{inproduction}}.  Status set to {{status}}.",
+				"jobclosedwithbypass": "Job was invoiced using the master bypass password. ",
 				"jobconverted": "Job converted and assigned number {{ro_number}}.",
 				"jobdelivery": "Job intake completed. Status set to {{status}}. Actual completion is {{actual_completion}}.",
 				"jobexported": "",
@@ -1975,7 +1976,7 @@
 				"outstanding_ar": "A balance is outstanding on this RO. Payments can still be entered when the job is closed. ",
 				"outstanding_credit_memos": "Outstanding credit memos have not been entered against this job. Credit Memos may still be posted once the job is closed.",
 				"outstanding_ppd": "There are outstanding PPDs that may not have been synced back to the estimate.",
-				"outstanding_reconciliation_discrep": "At least one discrepancy is not 0. This may indicate that this job is not properly reconciled and should not be closed.",
+				"outstanding_reconciliation_discrep": "At least one discrepancy is not $0. This may indicate that this job is not properly reconciled and should not be closed.",
 				"outstanding_sublets": "There are sublet lines on the job which have not been marked as completed. ",
 				"outstandinghours": "There are outstanding hours on the job that have not been paid or have been overpaid.",
 				"override_header": "Override estimate header on import?",
@@ -2026,12 +2027,12 @@
 				"remove_from_ar": "Remove from AR",
 				"returntotals": "Return Totals",
 				"ro_guard": {
-					"eforce_profit": "Profit margins enforced.",
 					"enforce_ar": "AR collection enforced.",
 					"enforce_bills": "Bill discrepancy enforced.",
 					"enforce_cm": "Credit memo entry enforced.",
 					"enforce_labor": "Labor allocations enforced.",
 					"enforce_ppd": "PPD sync enforced.",
+					"enforce_profit": "Profit margins enforced.",
 					"enforce_sublet": "Sublet completion enforced.",
 					"enforce_validation": "Master Bypass Required: {{message}}",
 					"enforced": "This check has been enforced by your shop manager. Enter the master bypass password to close the Job."

client/src/translations/es/common.json

@@ -116,6 +116,7 @@
 				"jobassignmentchange": "",
 				"jobassignmentremoved": "",
 				"jobchecklist": "",
+				"jobclosedwithbypass": "",
 				"jobconverted": "",
 				"jobdelivery": "",
 				"jobexported": "",
@@ -2025,12 +2026,12 @@
 				"remove_from_ar": "",
 				"returntotals": "",
 				"ro_guard": {
-					"eforce_profit": "",
 					"enforce_ar": "",
 					"enforce_bills": "",
 					"enforce_cm": "",
 					"enforce_labor": "",
 					"enforce_ppd": "",
+					"enforce_profit": "",
 					"enforce_sublet": "",
 					"enforce_validation": "",
 					"enforced": ""

client/src/translations/fr/common.json

@@ -116,6 +116,7 @@
 				"jobassignmentchange": "",
 				"jobassignmentremoved": "",
 				"jobchecklist": "",
+				"jobclosedwithbypass": "",
 				"jobconverted": "",
 				"jobdelivery": "",
 				"jobexported": "",
@@ -2025,12 +2026,12 @@
 				"remove_from_ar": "",
 				"returntotals": "",
 				"ro_guard": {
-					"eforce_profit": "",
 					"enforce_ar": "",
 					"enforce_bills": "",
 					"enforce_cm": "",
 					"enforce_labor": "",
 					"enforce_ppd": "",
+					"enforce_profit": "",
 					"enforce_sublet": "",
 					"enforce_validation": "",
 					"enforced": ""