Skip to content

Commit

Permalink
Merge pull request #44187 from khushi8112/progressive-disclosure-assets
Browse files Browse the repository at this point in the history
style: added progressive disclosure to assets
  • Loading branch information
khushi8112 authored Nov 27, 2024
2 parents f6776c7 + 4bdc6a0 commit 9a5d68f
Showing 1 changed file with 37 additions and 46 deletions.
83 changes: 37 additions & 46 deletions erpnext/assets/doctype/asset/asset.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,23 +27,20 @@
"split_from",
"custodian",
"department",
"disposal_date",
"accounting_dimensions_section",
"cost_center",
"dimension_col_break",
"purchase_details_section",
"purchase_receipt",
"purchase_receipt_item",
"purchase_invoice",
"purchase_invoice_item",
"purchase_date",
"available_for_use_date",
"disposal_date",
"column_break_23",
"gross_purchase_amount",
"asset_quantity",
"additional_asset_cost",
"total_asset_cost",
"section_break_23",
"depreciation_tab",
"calculate_depreciation",
"column_break_33",
"opening_accumulated_depreciation",
Expand All @@ -60,24 +57,26 @@
"next_depreciation_date",
"depreciation_schedule_sb",
"depreciation_schedule_view",
"insurance_details",
"accounting_dimensions_tab",
"cost_center",
"insurance_details_tab",
"policy_number",
"insurer",
"insured_value",
"column_break_48",
"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": [
{
Expand Down Expand Up @@ -257,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",
Expand Down Expand Up @@ -310,12 +302,6 @@
"label": "Next Depreciation Date",
"no_copy": 1
},
{
"collapsible": 1,
"fieldname": "insurance_details",
"fieldtype": "Section Break",
"label": "Insurance details"
},
{
"fieldname": "policy_number",
"fieldtype": "Data",
Expand Down Expand Up @@ -350,11 +336,6 @@
"fieldtype": "Data",
"label": "Comprehensive Insurance"
},
{
"fieldname": "section_break_31",
"fieldtype": "Section Break",
"label": "Maintenance"
},
{
"allow_on_submit": 1,
"default": "0",
Expand All @@ -363,12 +344,6 @@
"fieldtype": "Check",
"label": "Maintenance Required"
},
{
"collapsible": 1,
"fieldname": "other_details",
"fieldtype": "Section Break",
"label": "Other Details"
},
{
"allow_on_submit": 1,
"default": "Draft",
Expand Down Expand Up @@ -428,16 +403,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",
Expand Down Expand Up @@ -552,6 +517,32 @@
"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
},
{
"fieldname": "depreciation_tab",
"fieldtype": "Tab Break",
"label": "Depreciation Details"
}
],
"idx": 72,
Expand Down Expand Up @@ -595,7 +586,7 @@
"link_fieldname": "target_asset"
}
],
"modified": "2024-08-26 23:28:29.095139",
"modified": "2024-11-20 11:52:06.332683",
"modified_by": "Administrator",
"module": "Assets",
"name": "Asset",
Expand Down

0 comments on commit 9a5d68f

Please sign in to comment.