- Merge in test-AIO

Signed-off-by: Dave Richer <dave@imexsystems.ca>

client/src/translations/en_us/common.json

@@ -116,7 +116,8 @@
         "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}}.",
-        "jobconverted": "Job converted and assigned number {{ro_number}}.",
+        "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": "",
         "jobfieldchanged": "Job field $t(jobs.fields.{{field}}) changed to {{value}}.",
@@ -1984,7 +1985,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?",
@@ -2012,7 +2013,7 @@
         },
         "ppc": "This line contains a part price change.",
         "ppdnotexported": "PPDs not Exported",
-        "profileadjustments": "Profile Disc./Mkup",
+        "profileadjustments": "Profile Disc./Mkup","profitbypassrequired": "Minimum gross profit requirements have not been met.",
         "profits": "Job Profits",
         "prt_dsmk_total": "Line Item Adjustment",
         "rates": "Rates",
@@ -2034,12 +2035,13 @@
         "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 marginsenforced.",
           "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,7 +116,8 @@
         "jobassignmentchange": "",
         "jobassignmentremoved": "",
         "jobchecklist": "",
-        "jobconverted": "",
+        "jobclosedwithbypass": "",
+				"jobconverted": "",
         "jobdelivery": "",
         "jobexported": "",
         "jobfieldchanged": "",
@@ -2012,7 +2013,8 @@
         "ppc": "",
         "ppdnotexported": "",
         "profileadjustments": "",
-        "profits": "",
+        "profitbypassrequired": "",
+				"profits": "",
         "prt_dsmk_total": "",
         "rates": "Tarifas",
         "rates_subtotal": "",
@@ -2033,12 +2035,11 @@
         "remove_from_ar": "",
         "returntotals": "",
         "ro_guard": {
-          "eforce_profit": "",
           "enforce_ar": "",
           "enforce_bills": "",
           "enforce_cm": "",
           "enforce_labor": "",
-          "enforce_ppd": "",
+          "enforce_ppd": "","enforce_profit": "",
           "enforce_sublet": "",
           "enforce_validation": "",
           "enforced": ""

client/src/translations/fr/common.json

@@ -116,7 +116,8 @@
         "jobassignmentchange": "",
         "jobassignmentremoved": "",
         "jobchecklist": "",
-        "jobconverted": "",
+        "jobclosedwithbypass": "",
+				"jobconverted": "",
         "jobdelivery": "",
         "jobexported": "",
         "jobfieldchanged": "",
@@ -2012,7 +2013,8 @@
         "ppc": "",
         "ppdnotexported": "",
         "profileadjustments": "",
-        "profits": "",
+        "profitbypassrequired": "",
+				"profits": "",
         "prt_dsmk_total": "",
         "rates": "Les taux",
         "rates_subtotal": "",
@@ -2033,12 +2035,11 @@
         "remove_from_ar": "",
         "returntotals": "",
         "ro_guard": {
-          "eforce_profit": "",
           "enforce_ar": "",
           "enforce_bills": "",
           "enforce_cm": "",
           "enforce_labor": "",
-          "enforce_ppd": "",
+          "enforce_ppd": "","enforce_profit": "",
           "enforce_sublet": "",
           "enforce_validation": "",
           "enforced": ""