Merge conflict

smart_service/phase_2/doctype/feature_finder/feature_finder.json

@@ -1,6 +1,4 @@
 {
- "_comments": "[]",
- "_liked_by": "[\"Administrator\"]",
  "actions": [],
  "allow_rename": 1,
  "autoname": "format:{variant}-{features_names}-{language}",
@@ -72,6 +70,7 @@
    "fieldname": "feature_name",
    "fieldtype": "Link",
    "hidden": 1,
+   "in_list_view": 1,
    "label": "Feature Name1",
    "options": "Feature Finder Master",
    "read_only": 1,
@@ -141,9 +140,6 @@
    "depends_on": "eval:doc.variant",
    "fieldname": "features_names",
    "fieldtype": "Select",
-   "in_global_search": 1,
-   "in_list_view": 1,
-   "in_standard_filter": 1,
    "label": "Feature Name",
    "reqd": 1,
    "set_only_once": 1
@@ -194,7 +190,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-08-16 11:07:09.586411",
+ "modified": "2023-08-14 18:42:42.356900",
  "modified_by": "Administrator",
  "module": "Phase-2",
  "name": "Feature Finder",

smart_service/phase_2/doctype/feature_finder_master/feature_finder_master.json

@@ -1,6 +1,4 @@
 {
- "_comments": "[]",
- "_liked_by": "[]",
  "actions": [],
  "allow_rename": 1,
  "autoname": "format:{vehicle}-{feature_name}-{language}",
@@ -9,14 +7,14 @@
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
+  "vehicle",
+  "language",
   "feature_name",
   "feature_category",
   "column_break_5ksna",
   "feature_pdf",
   "section_break_lyzco",
-  "feature_finder_disclaimer",
-  "vehicle",
-  "language"
+  "feature_finder_disclaimer"
  ],
  "fields": [
   {
@@ -52,6 +50,7 @@
    "fieldname": "vehicle",
    "fieldtype": "Link",
    "in_list_view": 1,
+   "in_standard_filter": 1,
    "label": "Vehicle",
    "options": "Vehicle",
    "reqd": 1
@@ -60,6 +59,7 @@
    "fieldname": "language",
    "fieldtype": "Link",
    "in_list_view": 1,
+   "in_standard_filter": 1,
    "label": "Language",
    "options": "Custom Languages",
    "reqd": 1
@@ -68,12 +68,14 @@
    "fetch_from": "feature_name.feature_category",
    "fieldname": "feature_category",
    "fieldtype": "Data",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
    "label": "Feature Category"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-08-09 12:10:38.658905",
+ "modified": "2023-08-14 18:38:57.870551",
  "modified_by": "Administrator",
  "module": "Phase-2",
  "name": "Feature Finder Master",

smart_service/phase_2/doctype/feature_finder_specification_master/feature_finder_specification_master.json

@@ -1,5 +1,4 @@
 {
- "_liked_by": "[\"Administrator\"]",
  "actions": [],
  "allow_rename": 1,
  "autoname": "format:{specification}",
@@ -38,7 +37,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-08-14 17:46:12.062394",
+ "modified": "2023-08-14 18:37:46.123574",
  "modified_by": "Administrator",
  "module": "Phase-2",
  "name": "Feature Finder Specification Master",

smart_service/phase_2/doctype/repair_service_master/repair_service_master.json

@@ -1,6 +1,4 @@
 {
- "_comments": "[]",
- "_liked_by": "[\"Administrator\"]",
  "actions": [],
  "autoname": "format:{repairservicename}",
  "creation": "2023-07-20 17:52:46.159091",
@@ -52,7 +50,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-08-14 17:47:39.860103",
+ "modified": "2023-08-14 18:39:29.097473",
  "modified_by": "Administrator",
  "module": "Phase-2",
  "name": "Repair Service Master",