CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-06 03:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: set default view as tree-view (#45365)

Browse Source 
feat: set default view as treeview
(cherry picked from commit 5207917993)

# Conflicts:
#	erpnext/assets/doctype/location/location.json
#	erpnext/setup/doctype/customer_group/customer_group.json
#	erpnext/setup/doctype/item_group/item_group.json
#	erpnext/setup/doctype/supplier_group/supplier_group.json
This commit is contained in:
Ejaaz Khan
2025-01-22 16:18:31 +05:30
committed by Mergify
parent 7848f1146b
commit 79a8766aa5
8 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/accounts/doctype/account/account.json
View File

@@ -3,6 +3,7 @@
"allow_copy": 1,
"allow_import": 1,
"creation": "2013-01-30 12:49:46",
"default_view": "Tree",
"description": "Heads (or groups) against which Accounting Entries are made and balances are maintained.",
"doctype": "DocType",
"document_type": "Setup",
@@ -191,7 +192,7 @@
"idx": 1,
"is_tree": 1,
"links": [],
"modified": "2024-08-19 15:19:11.095045",
"modified": "2025-01-22 10:40:35.766017",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Account",

3
erpnext/accounts/doctype/cost_center/cost_center.json
View File

@@ -3,6 +3,7 @@
"allow_copy": 1,
"allow_import": 1,
"creation": "2013-01-23 19:57:17",
"default_view": "Tree",
"description": "Track separate Income and Expense for product verticals or divisions.",
"doctype": "DocType",
"document_type": "Setup",
@@ -125,7 +126,7 @@
"idx": 1,
"is_tree": 1,
"links": [],
"modified": "2024-04-24 10:55:54.083042",
"modified": "2025-01-22 10:46:42.904001",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Cost Center",

5
erpnext/assets/doctype/location/location.json
View File

@@ -4,6 +4,7 @@
"allow_rename": 1,
"autoname": "field:location_name",
"creation": "2018-05-07 12:49:22.595974",
"default_view": "Tree",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
@@ -142,7 +143,11 @@
],
"is_tree": 1,
"links": [],
<<<<<<< HEAD
"modified": "2023-08-29 12:49:33.290527",
=======
"modified": "2025-01-22 10:47:32.581537",
>>>>>>> 5207917993 (feat: set default view as tree-view (#45365))
"modified_by": "Administrator",
"module": "Assets",
"name": "Location",

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

@@ -4,6 +4,7 @@
"allow_rename": 1,
"autoname": "field:customer_group_name",
"creation": "2013-01-10 16:34:23",
"default_view": "Tree",
"doctype": "DocType",
"document_type": "Setup",
"engine": "InnoDB",
@@ -139,7 +140,11 @@
"idx": 1,
"is_tree": 1,
"links": [],
<<<<<<< HEAD
"modified": "2023-06-02 13:40:34.435822",
=======
"modified": "2025-01-22 10:48:10.186637",
>>>>>>> 5207917993 (feat: set default view as tree-view (#45365))
"modified_by": "Administrator",
"module": "Setup",
"name": "Customer Group",

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

@@ -4,6 +4,7 @@
"allow_rename": 1,
"autoname": "field:item_group_name",
"creation": "2013-03-28 10:35:29",
"default_view": "Tree",
"description": "An Item Group is a way to classify items based on types.",
"doctype": "DocType",
"document_type": "Setup",
@@ -135,7 +136,11 @@
"is_tree": 1,
"links": [],
"max_attachments": 3,
<<<<<<< HEAD
"modified": "2024-01-30 14:08:38.485616",
=======
"modified": "2025-01-22 10:46:09.450137",
>>>>>>> 5207917993 (feat: set default view as tree-view (#45365))
"modified_by": "Administrator",
"module": "Setup",
"name": "Item Group",

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

@@ -4,6 +4,7 @@
"allow_rename": 1,
"autoname": "field:supplier_group_name",
"creation": "2013-01-10 16:34:24",
"default_view": "Tree",
"doctype": "DocType",
"document_type": "Setup",
"engine": "InnoDB",
@@ -107,7 +108,11 @@
"idx": 1,
"is_tree": 1,
"links": [],
<<<<<<< HEAD
"modified": "2022-12-24 11:16:12.486719",
=======
"modified": "2025-01-22 10:49:27.066443",
>>>>>>> 5207917993 (feat: set default view as tree-view (#45365))
"modified_by": "Administrator",
"module": "Setup",
"name": "Supplier Group",

5
erpnext/stock/doctype/warehouse/warehouse.json
View File

@@ -2,6 +2,7 @@
"actions": [],
"allow_import": 1,
"creation": "2023-05-29 13:02:17.121296",
"default_view": "Tree",
"description": "A logical Warehouse against which stock entries are made.",
"doctype": "DocType",
"document_type": "Setup",
@@ -263,7 +264,7 @@
"idx": 1,
"is_tree": 1,
"links": [],
"modified": "2024-08-14 16:08:15.733597",
"modified": "2025-01-22 10:47:00.674163",
"modified_by": "Administrator",
"module": "Stock",
"name": "Warehouse",
@@ -321,4 +322,4 @@
"sort_order": "DESC",
"states": [],
"track_changes": 1
}
}

1
erpnext/stock/doctype/warehouse/warehouse.py
View File

@@ -29,6 +29,7 @@ class Warehouse(NestedSet):
disabled: DF.Check
email_id: DF.Data | None
is_group: DF.Check
is_rejected_warehouse: DF.Check
lft: DF.Int
mobile_no: DF.Data | None
old_parent: DF.Link | None