From e3d734c8907aab06e54e93356d50311d192e3937 Mon Sep 17 00:00:00 2001 From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> Date: Mon, 18 Nov 2024 14:40:32 +0530 Subject: [PATCH 1/3] style: added progressive disclosure to assets --- erpnext/assets/doctype/asset/asset.json | 69 +++++++++++-------------- erpnext/assets/doctype/asset/asset.py | 18 +------ 2 files changed, 33 insertions(+), 54 deletions(-) diff --git a/erpnext/assets/doctype/asset/asset.json b/erpnext/assets/doctype/asset/asset.json index 92537e0e3cc..859a9e7a094 100644 --- a/erpnext/assets/doctype/asset/asset.json +++ b/erpnext/assets/doctype/asset/asset.json @@ -27,10 +27,6 @@ "split_from", "custodian", "department", - "disposal_date", - "accounting_dimensions_section", - "cost_center", - "dimension_col_break", "purchase_details_section", "purchase_receipt", "purchase_receipt_item", @@ -38,6 +34,7 @@ "purchase_invoice_item", "purchase_date", "available_for_use_date", + "disposal_date", "column_break_23", "gross_purchase_amount", "asset_quantity", @@ -60,7 +57,9 @@ "next_depreciation_date", "depreciation_schedule_sb", "depreciation_schedule_view", - "insurance_details", + "accounting_dimensions_tab", + "cost_center", + "insurance_details_tab", "policy_number", "insurer", "insured_value", @@ -68,16 +67,16 @@ "insurance_start_date", "insurance_end_date", "comprehensive_insurance", - "section_break_31", - "maintenance_required", - "other_details", - "status", + "other_info_tab", "booked_fixed_asset", + "maintenance_required", "column_break_51", + "status", "purchase_amount", "default_finance_book", "depr_entry_posting_status", - "amended_from" + "amended_from", + "connections_tab" ], "fields": [ { @@ -310,12 +309,6 @@ "label": "Next Depreciation Date", "no_copy": 1 }, - { - "collapsible": 1, - "fieldname": "insurance_details", - "fieldtype": "Section Break", - "label": "Insurance details" - }, { "fieldname": "policy_number", "fieldtype": "Data", @@ -350,11 +343,6 @@ "fieldtype": "Data", "label": "Comprehensive Insurance" }, - { - "fieldname": "section_break_31", - "fieldtype": "Section Break", - "label": "Maintenance" - }, { "allow_on_submit": 1, "default": "0", @@ -363,12 +351,6 @@ "fieldtype": "Check", "label": "Maintenance Required" }, - { - "collapsible": 1, - "fieldname": "other_details", - "fieldtype": "Section Break", - "label": "Other Details" - }, { "allow_on_submit": 1, "default": "Draft", @@ -428,16 +410,6 @@ "print_hide": 1, "read_only": 1 }, - { - "collapsible": 1, - "fieldname": "accounting_dimensions_section", - "fieldtype": "Section Break", - "label": "Accounting Dimensions" - }, - { - "fieldname": "dimension_col_break", - "fieldtype": "Column Break" - }, { "collapsible": 1, "collapsible_depends_on": "is_existing_asset", @@ -552,6 +524,27 @@ "hidden": 1, "label": "Purchase Invoice Item", "options": "Purchase Invoice Item" + }, + { + "fieldname": "accounting_dimensions_tab", + "fieldtype": "Tab Break", + "label": "Accounting Dimensions" + }, + { + "fieldname": "insurance_details_tab", + "fieldtype": "Tab Break", + "label": "Insurance Details" + }, + { + "fieldname": "other_info_tab", + "fieldtype": "Tab Break", + "label": "Other Info" + }, + { + "fieldname": "connections_tab", + "fieldtype": "Tab Break", + "label": "Connections", + "show_dashboard": 1 } ], "idx": 72, @@ -595,7 +588,7 @@ "link_fieldname": "target_asset" } ], - "modified": "2024-08-26 23:28:29.095139", + "modified": "2024-11-18 12:51:49.862757", "modified_by": "Administrator", "module": "Assets", "name": "Asset", diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py index 205880ca9d5..f446b22d1d4 100644 --- a/erpnext/assets/doctype/asset/asset.py +++ b/erpnext/assets/doctype/asset/asset.py @@ -46,9 +46,8 @@ class Asset(AccountsController): from typing import TYPE_CHECKING if TYPE_CHECKING: - from frappe.types import DF - from erpnext.assets.doctype.asset_finance_book.asset_finance_book import AssetFinanceBook + from frappe.types import DF additional_asset_cost: DF.Currency amended_from: DF.Link | None @@ -98,20 +97,7 @@ class Asset(AccountsController): purchase_receipt: DF.Link | None purchase_receipt_item: DF.Link | None split_from: DF.Link | None - status: DF.Literal[ - "Draft", - "Submitted", - "Partially Depreciated", - "Fully Depreciated", - "Sold", - "Scrapped", - "In Maintenance", - "Out of Order", - "Issue", - "Receipt", - "Capitalized", - "Decapitalized", - ] + status: DF.Literal["Draft", "Submitted", "Partially Depreciated", "Fully Depreciated", "Sold", "Scrapped", "In Maintenance", "Out of Order", "Issue", "Receipt", "Capitalized", "Decapitalized"] supplier: DF.Link | None total_asset_cost: DF.Currency total_number_of_depreciations: DF.Int From 87065d0387b76d45165d3d0953105e15405b3ce5 Mon Sep 17 00:00:00 2001 From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> Date: Mon, 18 Nov 2024 14:45:02 +0530 Subject: [PATCH 2/3] chore: pre-commit check --- erpnext/assets/doctype/asset/asset.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py index f446b22d1d4..205880ca9d5 100644 --- a/erpnext/assets/doctype/asset/asset.py +++ b/erpnext/assets/doctype/asset/asset.py @@ -46,9 +46,10 @@ class Asset(AccountsController): from typing import TYPE_CHECKING if TYPE_CHECKING: - from erpnext.assets.doctype.asset_finance_book.asset_finance_book import AssetFinanceBook from frappe.types import DF + from erpnext.assets.doctype.asset_finance_book.asset_finance_book import AssetFinanceBook + additional_asset_cost: DF.Currency amended_from: DF.Link | None asset_category: DF.Link | None @@ -97,7 +98,20 @@ class Asset(AccountsController): purchase_receipt: DF.Link | None purchase_receipt_item: DF.Link | None split_from: DF.Link | None - status: DF.Literal["Draft", "Submitted", "Partially Depreciated", "Fully Depreciated", "Sold", "Scrapped", "In Maintenance", "Out of Order", "Issue", "Receipt", "Capitalized", "Decapitalized"] + status: DF.Literal[ + "Draft", + "Submitted", + "Partially Depreciated", + "Fully Depreciated", + "Sold", + "Scrapped", + "In Maintenance", + "Out of Order", + "Issue", + "Receipt", + "Capitalized", + "Decapitalized", + ] supplier: DF.Link | None total_asset_cost: DF.Currency total_number_of_depreciations: DF.Int From 4bdc6a00215b2c751a621c0c936502a557ed69bc Mon Sep 17 00:00:00 2001 From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> Date: Wed, 20 Nov 2024 11:56:34 +0530 Subject: [PATCH 3/3] style: move depreciation details to a new tab --- erpnext/assets/doctype/asset/asset.json | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/erpnext/assets/doctype/asset/asset.json b/erpnext/assets/doctype/asset/asset.json index 859a9e7a094..ad0ae85d447 100644 --- a/erpnext/assets/doctype/asset/asset.json +++ b/erpnext/assets/doctype/asset/asset.json @@ -40,7 +40,7 @@ "asset_quantity", "additional_asset_cost", "total_asset_cost", - "section_break_23", + "depreciation_tab", "calculate_depreciation", "column_break_33", "opening_accumulated_depreciation", @@ -256,13 +256,6 @@ "label": "Opening Accumulated Depreciation", "options": "Company:company:default_currency" }, - { - "collapsible": 1, - "collapsible_depends_on": "eval:doc.calculate_depreciation || doc.is_existing_asset", - "fieldname": "section_break_23", - "fieldtype": "Section Break", - "label": "Depreciation" - }, { "columns": 10, "fieldname": "finance_books", @@ -545,6 +538,11 @@ "fieldtype": "Tab Break", "label": "Connections", "show_dashboard": 1 + }, + { + "fieldname": "depreciation_tab", + "fieldtype": "Tab Break", + "label": "Depreciation Details" } ], "idx": 72, @@ -588,7 +586,7 @@ "link_fieldname": "target_asset" } ], - "modified": "2024-11-18 12:51:49.862757", + "modified": "2024-11-20 11:52:06.332683", "modified_by": "Administrator", "module": "Assets", "name": "Asset",