mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-03 04:09:11 +00:00
style: added progressive disclosure to assets
This commit is contained in:
@@ -27,10 +27,6 @@
|
|||||||
"split_from",
|
"split_from",
|
||||||
"custodian",
|
"custodian",
|
||||||
"department",
|
"department",
|
||||||
"disposal_date",
|
|
||||||
"accounting_dimensions_section",
|
|
||||||
"cost_center",
|
|
||||||
"dimension_col_break",
|
|
||||||
"purchase_details_section",
|
"purchase_details_section",
|
||||||
"purchase_receipt",
|
"purchase_receipt",
|
||||||
"purchase_receipt_item",
|
"purchase_receipt_item",
|
||||||
@@ -38,6 +34,7 @@
|
|||||||
"purchase_invoice_item",
|
"purchase_invoice_item",
|
||||||
"purchase_date",
|
"purchase_date",
|
||||||
"available_for_use_date",
|
"available_for_use_date",
|
||||||
|
"disposal_date",
|
||||||
"column_break_23",
|
"column_break_23",
|
||||||
"gross_purchase_amount",
|
"gross_purchase_amount",
|
||||||
"asset_quantity",
|
"asset_quantity",
|
||||||
@@ -60,7 +57,9 @@
|
|||||||
"next_depreciation_date",
|
"next_depreciation_date",
|
||||||
"depreciation_schedule_sb",
|
"depreciation_schedule_sb",
|
||||||
"depreciation_schedule_view",
|
"depreciation_schedule_view",
|
||||||
"insurance_details",
|
"accounting_dimensions_tab",
|
||||||
|
"cost_center",
|
||||||
|
"insurance_details_tab",
|
||||||
"policy_number",
|
"policy_number",
|
||||||
"insurer",
|
"insurer",
|
||||||
"insured_value",
|
"insured_value",
|
||||||
@@ -68,16 +67,16 @@
|
|||||||
"insurance_start_date",
|
"insurance_start_date",
|
||||||
"insurance_end_date",
|
"insurance_end_date",
|
||||||
"comprehensive_insurance",
|
"comprehensive_insurance",
|
||||||
"section_break_31",
|
"other_info_tab",
|
||||||
"maintenance_required",
|
|
||||||
"other_details",
|
|
||||||
"status",
|
|
||||||
"booked_fixed_asset",
|
"booked_fixed_asset",
|
||||||
|
"maintenance_required",
|
||||||
"column_break_51",
|
"column_break_51",
|
||||||
|
"status",
|
||||||
"purchase_amount",
|
"purchase_amount",
|
||||||
"default_finance_book",
|
"default_finance_book",
|
||||||
"depr_entry_posting_status",
|
"depr_entry_posting_status",
|
||||||
"amended_from"
|
"amended_from",
|
||||||
|
"connections_tab"
|
||||||
],
|
],
|
||||||
"fields": [
|
"fields": [
|
||||||
{
|
{
|
||||||
@@ -310,12 +309,6 @@
|
|||||||
"label": "Next Depreciation Date",
|
"label": "Next Depreciation Date",
|
||||||
"no_copy": 1
|
"no_copy": 1
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"collapsible": 1,
|
|
||||||
"fieldname": "insurance_details",
|
|
||||||
"fieldtype": "Section Break",
|
|
||||||
"label": "Insurance details"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"fieldname": "policy_number",
|
"fieldname": "policy_number",
|
||||||
"fieldtype": "Data",
|
"fieldtype": "Data",
|
||||||
@@ -350,11 +343,6 @@
|
|||||||
"fieldtype": "Data",
|
"fieldtype": "Data",
|
||||||
"label": "Comprehensive Insurance"
|
"label": "Comprehensive Insurance"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"fieldname": "section_break_31",
|
|
||||||
"fieldtype": "Section Break",
|
|
||||||
"label": "Maintenance"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"allow_on_submit": 1,
|
"allow_on_submit": 1,
|
||||||
"default": "0",
|
"default": "0",
|
||||||
@@ -363,12 +351,6 @@
|
|||||||
"fieldtype": "Check",
|
"fieldtype": "Check",
|
||||||
"label": "Maintenance Required"
|
"label": "Maintenance Required"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"collapsible": 1,
|
|
||||||
"fieldname": "other_details",
|
|
||||||
"fieldtype": "Section Break",
|
|
||||||
"label": "Other Details"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"allow_on_submit": 1,
|
"allow_on_submit": 1,
|
||||||
"default": "Draft",
|
"default": "Draft",
|
||||||
@@ -428,16 +410,6 @@
|
|||||||
"print_hide": 1,
|
"print_hide": 1,
|
||||||
"read_only": 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": 1,
|
||||||
"collapsible_depends_on": "is_existing_asset",
|
"collapsible_depends_on": "is_existing_asset",
|
||||||
@@ -552,6 +524,27 @@
|
|||||||
"hidden": 1,
|
"hidden": 1,
|
||||||
"label": "Purchase Invoice Item",
|
"label": "Purchase Invoice Item",
|
||||||
"options": "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,
|
"idx": 72,
|
||||||
@@ -595,7 +588,7 @@
|
|||||||
"link_fieldname": "target_asset"
|
"link_fieldname": "target_asset"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"modified": "2024-08-26 23:28:29.095139",
|
"modified": "2024-11-18 12:51:49.862757",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Assets",
|
"module": "Assets",
|
||||||
"name": "Asset",
|
"name": "Asset",
|
||||||
|
|||||||
@@ -46,9 +46,8 @@ class Asset(AccountsController):
|
|||||||
from typing import TYPE_CHECKING
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from frappe.types import DF
|
|
||||||
|
|
||||||
from erpnext.assets.doctype.asset_finance_book.asset_finance_book import AssetFinanceBook
|
from erpnext.assets.doctype.asset_finance_book.asset_finance_book import AssetFinanceBook
|
||||||
|
from frappe.types import DF
|
||||||
|
|
||||||
additional_asset_cost: DF.Currency
|
additional_asset_cost: DF.Currency
|
||||||
amended_from: DF.Link | None
|
amended_from: DF.Link | None
|
||||||
@@ -98,20 +97,7 @@ class Asset(AccountsController):
|
|||||||
purchase_receipt: DF.Link | None
|
purchase_receipt: DF.Link | None
|
||||||
purchase_receipt_item: DF.Link | None
|
purchase_receipt_item: DF.Link | None
|
||||||
split_from: DF.Link | None
|
split_from: DF.Link | None
|
||||||
status: DF.Literal[
|
status: DF.Literal["Draft", "Submitted", "Partially Depreciated", "Fully Depreciated", "Sold", "Scrapped", "In Maintenance", "Out of Order", "Issue", "Receipt", "Capitalized", "Decapitalized"]
|
||||||
"Draft",
|
|
||||||
"Submitted",
|
|
||||||
"Partially Depreciated",
|
|
||||||
"Fully Depreciated",
|
|
||||||
"Sold",
|
|
||||||
"Scrapped",
|
|
||||||
"In Maintenance",
|
|
||||||
"Out of Order",
|
|
||||||
"Issue",
|
|
||||||
"Receipt",
|
|
||||||
"Capitalized",
|
|
||||||
"Decapitalized",
|
|
||||||
]
|
|
||||||
supplier: DF.Link | None
|
supplier: DF.Link | None
|
||||||
total_asset_cost: DF.Currency
|
total_asset_cost: DF.Currency
|
||||||
total_number_of_depreciations: DF.Int
|
total_number_of_depreciations: DF.Int
|
||||||
|
|||||||
Reference in New Issue
Block a user