nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 19:59:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
diptanilsaha
2025-12-02 20:56:54 +05:30
parent a444325bd1
commit 020db922b7
4 changed files with 0 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/setup/doctype/customer_group/customer_group.json
View File

@@ -139,11 +139,7 @@
"idx": 1, "idx": 1,
"is_tree": 1, "is_tree": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-06-02 13:40:34.435822",
=======
"modified": "2025-12-02 13:58:03.378607", "modified": "2025-12-02 13:58:03.378607",
>>>>>>> e08805128b (fix: exclude is_group records)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Customer Group", "name": "Customer Group",
@@ -217,11 +213,6 @@
"show_name_in_global_search": 1, "show_name_in_global_search": 1,
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
<<<<<<< HEAD
"states": []
}
=======
"states": [], "states": [],
"translated_doctype": 1 "translated_doctype": 1
} }
>>>>>>> e08805128b (fix: exclude is_group records)

9
erpnext/setup/doctype/item_group/item_group.json
View File

@@ -135,11 +135,7 @@
"is_tree": 1, "is_tree": 1,
"links": [], "links": [],
"max_attachments": 3, "max_attachments": 3,
<<<<<<< HEAD
"modified": "2024-01-30 14:08:38.485616",
=======
"modified": "2025-12-02 13:58:30.018021", "modified": "2025-12-02 13:58:30.018021",
>>>>>>> e08805128b (fix: exclude is_group records)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Item Group", "name": "Item Group",
@@ -211,11 +207,6 @@
"show_name_in_global_search": 1, "show_name_in_global_search": 1,
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
<<<<<<< HEAD
"states": []
}
=======
"states": [], "states": [],
"translated_doctype": 1 "translated_doctype": 1
} }
>>>>>>> e08805128b (fix: exclude is_group records)

9
erpnext/setup/doctype/supplier_group/supplier_group.json
View File

@@ -108,11 +108,7 @@
"idx": 1, "idx": 1,
"is_tree": 1, "is_tree": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2022-12-24 11:16:12.486719",
=======
"modified": "2025-12-02 13:57:57.814686", "modified": "2025-12-02 13:57:57.814686",
>>>>>>> e08805128b (fix: exclude is_group records)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Supplier Group", "name": "Supplier Group",
@@ -177,11 +173,6 @@
"show_name_in_global_search": 1, "show_name_in_global_search": 1,
"sort_field": "modified", "sort_field": "modified",
"sort_order": "ASC", "sort_order": "ASC",
<<<<<<< HEAD
"states": []
}
=======
"states": [], "states": [],
"translated_doctype": 1 "translated_doctype": 1
} }
>>>>>>> e08805128b (fix: exclude is_group records)

9
erpnext/setup/doctype/territory/territory.json
View File

@@ -124,11 +124,7 @@
"idx": 1, "idx": 1,
"is_tree": 1, "is_tree": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2022-12-24 11:16:39.964956",
=======
"modified": "2025-12-02 13:58:55.190485", "modified": "2025-12-02 13:58:55.190485",
>>>>>>> e08805128b (fix: exclude is_group records)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Territory", "name": "Territory",
@@ -196,11 +192,6 @@
"show_name_in_global_search": 1, "show_name_in_global_search": 1,
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
<<<<<<< HEAD
"states": []
}
=======
"states": [], "states": [],
"translated_doctype": 1 "translated_doctype": 1
} }
>>>>>>> e08805128b (fix: exclude is_group records)