- Merge in test-AIO

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

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": ""