feature/IO-3083-i18-Translation-Shop-Info-Warning

resolve conflicts

client/src/translations/fr/common.json

@@ -256,15 +256,6 @@
       }
     },
     "bodyshop": {
-      "operations": {
-        "starts_with": "",
-        "contains": "",
-        "ends_with": "",
-        "equals": "",
-        "not_equals": "",
-        "greater_than": "",
-        "less_than": ""
-      },
       "actions": {
         "add_task_preset": "",
         "addapptcolor": "",
@@ -388,10 +379,12 @@
         "md_lost_sale_reasons": "",
         "md_parts_order_comment": "",
         "md_parts_scan": {
-          "field": "",
-          "operation": "",
-          "value": "",
-          "caseInsensitive": ""
+          "caseInsensitive": "",
+					"expression": "",
+					"field": "",
+          "flags": "",
+					"operation": "",
+					"value": ""
         },
         "md_payment_types": "",
         "md_referral_sources": "",
@@ -721,7 +714,16 @@
         "task-presets": "",
         "workingdays": ""
       },
-      "successes": {
+      "operations": {
+				"contains": "",
+				"ends_with": "",
+				"equals": "",
+				"greater_than": "",
+				"less_than": "",
+				"not_equals": "",
+				"starts_with": ""
+			},
+			"successes": {
         "areyousure": "",
         "defaultviewcreated": "",
         "save": "",
@@ -1434,12 +1436,14 @@
         "act_price_before_ppc": "",
         "adjustment": "",
         "ah_detail_line": "",
-        "amount": "",
+        "alt_partno": "",
+				"amount": "",
         "assigned_team": "",
         "assigned_team_name": "",
         "create_ppc": "",
         "db_price": "Prix de la base de données",
-        "lbr_types": {
+        "include_in_part_cnt": "",
+				"lbr_types": {
           "LA1": "",
           "LA2": "",
           "LA3": "",
@@ -1463,7 +1467,6 @@
         "mod_lbr_ty": "Type de travail",
         "notes": "",
         "oem_partno": "Pièce OEM #",
-        "alt_partno": "",
         "op_code_desc": "",
         "part_qty": "",
         "part_type": "Type de pièce",
@@ -3079,6 +3082,7 @@
         "purchase_return_ratio_grouped_by_vendor_summary": "",
         "purchases_by_cost_center_detail": "",
         "purchases_by_cost_center_summary": "",
+				"purchases_by_date_excel": "",
         "purchases_by_date_range_detail": "",
         "purchases_by_date_range_summary": "",
         "purchases_by_ro_detail_date": "",