mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-08 23:52:57 +00:00
fix: sidebar items for accounts (#51418)
(cherry picked from commit b93f920592)
# Conflicts:
# erpnext/desktop_icon/accounting.json
# erpnext/desktop_icon/financial_reports.json
# erpnext/desktop_icon/taxes.json
# erpnext/workspace_sidebar/accounting.json
# erpnext/workspace_sidebar/assets.json
# erpnext/workspace_sidebar/taxes.json
This commit is contained in:
@@ -9,13 +9,21 @@
|
|||||||
"idx": 1,
|
"idx": 1,
|
||||||
"label": "Accounting",
|
"label": "Accounting",
|
||||||
"link_to": "Accounting",
|
"link_to": "Accounting",
|
||||||
|
<<<<<<< HEAD
|
||||||
"link_type": "Workspace Sidebar",
|
"link_type": "Workspace Sidebar",
|
||||||
"modified": "2026-01-01 20:07:01.203651",
|
"modified": "2026-01-01 20:07:01.203651",
|
||||||
|
=======
|
||||||
|
"link_type": "Workspace",
|
||||||
|
"modified": "2025-12-31 16:06:04.678577",
|
||||||
|
>>>>>>> b93f920592 (fix: sidebar items for accounts (#51418))
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"name": "Accounting",
|
"name": "Accounting",
|
||||||
"owner": "Administrator",
|
"owner": "Administrator",
|
||||||
"parent_icon": "Accounts",
|
"parent_icon": "Accounts",
|
||||||
|
<<<<<<< HEAD
|
||||||
"restrict_removal": 0,
|
"restrict_removal": 0,
|
||||||
|
=======
|
||||||
|
>>>>>>> b93f920592 (fix: sidebar items for accounts (#51418))
|
||||||
"roles": [],
|
"roles": [],
|
||||||
"standard": 1
|
"standard": 1
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,13 +9,21 @@
|
|||||||
"idx": 0,
|
"idx": 0,
|
||||||
"label": "Financial Reports",
|
"label": "Financial Reports",
|
||||||
"link_to": "Financial Reports",
|
"link_to": "Financial Reports",
|
||||||
|
<<<<<<< HEAD
|
||||||
"link_type": "Workspace Sidebar",
|
"link_type": "Workspace Sidebar",
|
||||||
"modified": "2026-01-01 20:07:01.253367",
|
"modified": "2026-01-01 20:07:01.253367",
|
||||||
|
=======
|
||||||
|
"link_type": "Workspace",
|
||||||
|
"modified": "2025-12-31 16:07:27.060176",
|
||||||
|
>>>>>>> b93f920592 (fix: sidebar items for accounts (#51418))
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"name": "Financial Reports",
|
"name": "Financial Reports",
|
||||||
"owner": "Administrator",
|
"owner": "Administrator",
|
||||||
"parent_icon": "Accounts",
|
"parent_icon": "Accounts",
|
||||||
|
<<<<<<< HEAD
|
||||||
"restrict_removal": 0,
|
"restrict_removal": 0,
|
||||||
|
=======
|
||||||
|
>>>>>>> b93f920592 (fix: sidebar items for accounts (#51418))
|
||||||
"roles": [],
|
"roles": [],
|
||||||
"sidebar": "",
|
"sidebar": "",
|
||||||
"standard": 1
|
"standard": 1
|
||||||
|
|||||||
@@ -8,9 +8,15 @@
|
|||||||
"icon_type": "Link",
|
"icon_type": "Link",
|
||||||
"idx": 3,
|
"idx": 3,
|
||||||
"label": "Taxes",
|
"label": "Taxes",
|
||||||
|
<<<<<<< HEAD
|
||||||
"link_to": "Taxes",
|
"link_to": "Taxes",
|
||||||
"link_type": "Workspace Sidebar",
|
"link_type": "Workspace Sidebar",
|
||||||
"modified": "2026-01-01 20:07:01.356333",
|
"modified": "2026-01-01 20:07:01.356333",
|
||||||
|
=======
|
||||||
|
"link_to": "Sales Taxes and Charges Template",
|
||||||
|
"link_type": "DocType",
|
||||||
|
"modified": "2025-12-31 16:59:14.978584",
|
||||||
|
>>>>>>> b93f920592 (fix: sidebar items for accounts (#51418))
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"name": "Taxes",
|
"name": "Taxes",
|
||||||
"owner": "Administrator",
|
"owner": "Administrator",
|
||||||
|
|||||||
@@ -67,7 +67,11 @@
|
|||||||
{
|
{
|
||||||
"child": 1,
|
"child": 1,
|
||||||
"collapsible": 1,
|
"collapsible": 1,
|
||||||
|
<<<<<<< HEAD
|
||||||
"filters": "[[\"Sales Invoice\",\"is_return\",\"=\",1]]",
|
"filters": "[[\"Sales Invoice\",\"is_return\",\"=\",1]]",
|
||||||
|
=======
|
||||||
|
"filters": "",
|
||||||
|
>>>>>>> b93f920592 (fix: sidebar items for accounts (#51418))
|
||||||
"icon": "",
|
"icon": "",
|
||||||
"indent": 0,
|
"indent": 0,
|
||||||
"keep_closed": 0,
|
"keep_closed": 0,
|
||||||
@@ -542,7 +546,7 @@
|
|||||||
"icon": "",
|
"icon": "",
|
||||||
"indent": 0,
|
"indent": 0,
|
||||||
"keep_closed": 0,
|
"keep_closed": 0,
|
||||||
"label": "Accounts Settings",
|
"label": "Settings",
|
||||||
"link_to": "Accounts Settings",
|
"link_to": "Accounts Settings",
|
||||||
"link_type": "DocType",
|
"link_type": "DocType",
|
||||||
"show_arrow": 0,
|
"show_arrow": 0,
|
||||||
@@ -571,7 +575,11 @@
|
|||||||
"type": "Link"
|
"type": "Link"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
<<<<<<< HEAD
|
||||||
"modified": "2026-01-10 00:06:13.234927",
|
"modified": "2026-01-10 00:06:13.234927",
|
||||||
|
=======
|
||||||
|
"modified": "2025-12-31 16:54:07.693056",
|
||||||
|
>>>>>>> b93f920592 (fix: sidebar items for accounts (#51418))
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Accounts",
|
"module": "Accounts",
|
||||||
"name": "Accounting",
|
"name": "Accounting",
|
||||||
|
|||||||
@@ -258,7 +258,11 @@
|
|||||||
"url": ""
|
"url": ""
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
<<<<<<< HEAD
|
||||||
"modified": "2026-01-10 00:06:13.218453",
|
"modified": "2026-01-10 00:06:13.218453",
|
||||||
|
=======
|
||||||
|
"modified": "2025-12-31 16:27:44.936562",
|
||||||
|
>>>>>>> b93f920592 (fix: sidebar items for accounts (#51418))
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Assets",
|
"module": "Assets",
|
||||||
"name": "Assets",
|
"name": "Assets",
|
||||||
|
|||||||
@@ -13,7 +13,11 @@
|
|||||||
"indent": 0,
|
"indent": 0,
|
||||||
"keep_closed": 0,
|
"keep_closed": 0,
|
||||||
"label": "Sales Tax Template",
|
"label": "Sales Tax Template",
|
||||||
|
<<<<<<< HEAD
|
||||||
"link_to": "Item Tax Template",
|
"link_to": "Item Tax Template",
|
||||||
|
=======
|
||||||
|
"link_to": "Sales Taxes and Charges",
|
||||||
|
>>>>>>> b93f920592 (fix: sidebar items for accounts (#51418))
|
||||||
"link_type": "DocType",
|
"link_type": "DocType",
|
||||||
"navigate_to_tab": "",
|
"navigate_to_tab": "",
|
||||||
"show_arrow": 0,
|
"show_arrow": 0,
|
||||||
@@ -46,6 +50,7 @@
|
|||||||
{
|
{
|
||||||
"child": 0,
|
"child": 0,
|
||||||
"collapsible": 1,
|
"collapsible": 1,
|
||||||
|
<<<<<<< HEAD
|
||||||
"icon": "database",
|
"icon": "database",
|
||||||
"indent": 1,
|
"indent": 1,
|
||||||
"keep_closed": 1,
|
"keep_closed": 1,
|
||||||
@@ -57,6 +62,8 @@
|
|||||||
{
|
{
|
||||||
"child": 1,
|
"child": 1,
|
||||||
"collapsible": 1,
|
"collapsible": 1,
|
||||||
|
=======
|
||||||
|
>>>>>>> b93f920592 (fix: sidebar items for accounts (#51418))
|
||||||
"icon": "triangle",
|
"icon": "triangle",
|
||||||
"indent": 0,
|
"indent": 0,
|
||||||
"keep_closed": 0,
|
"keep_closed": 0,
|
||||||
@@ -67,7 +74,11 @@
|
|||||||
"type": "Link"
|
"type": "Link"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
<<<<<<< HEAD
|
||||||
"child": 1,
|
"child": 1,
|
||||||
|
=======
|
||||||
|
"child": 0,
|
||||||
|
>>>>>>> b93f920592 (fix: sidebar items for accounts (#51418))
|
||||||
"collapsible": 1,
|
"collapsible": 1,
|
||||||
"icon": "book-open-text",
|
"icon": "book-open-text",
|
||||||
"indent": 0,
|
"indent": 0,
|
||||||
@@ -79,7 +90,11 @@
|
|||||||
"type": "Link"
|
"type": "Link"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
<<<<<<< HEAD
|
||||||
"child": 1,
|
"child": 1,
|
||||||
|
=======
|
||||||
|
"child": 0,
|
||||||
|
>>>>>>> b93f920592 (fix: sidebar items for accounts (#51418))
|
||||||
"collapsible": 1,
|
"collapsible": 1,
|
||||||
"icon": "book-text",
|
"icon": "book-text",
|
||||||
"indent": 0,
|
"indent": 0,
|
||||||
@@ -148,7 +163,11 @@
|
|||||||
"type": "Link"
|
"type": "Link"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
<<<<<<< HEAD
|
||||||
"modified": "2026-01-10 00:06:13.005238",
|
"modified": "2026-01-10 00:06:13.005238",
|
||||||
|
=======
|
||||||
|
"modified": "2025-12-31 16:55:52.262432",
|
||||||
|
>>>>>>> b93f920592 (fix: sidebar items for accounts (#51418))
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Accounts",
|
"module": "Accounts",
|
||||||
"name": "Taxes",
|
"name": "Taxes",
|
||||||
|
|||||||
Reference in New Issue
Block a user