mirror of
https://github.com/frappe/erpnext.git
synced 2026-04-18 22:35:10 +00:00
fix(UI): reposition fields for better UX
(cherry picked from commit 4e7794bfc3)
This commit is contained in:
@@ -10,16 +10,16 @@
|
|||||||
"field_order": [
|
"field_order": [
|
||||||
"naming_series",
|
"naming_series",
|
||||||
"item_code",
|
"item_code",
|
||||||
"item_name",
|
|
||||||
"asset_name",
|
"asset_name",
|
||||||
"asset_category",
|
"asset_category",
|
||||||
"location",
|
"location",
|
||||||
"image",
|
"image",
|
||||||
"column_break_3",
|
"column_break_3",
|
||||||
"status",
|
|
||||||
"company",
|
"company",
|
||||||
"asset_owner",
|
"asset_owner",
|
||||||
"asset_owner_company",
|
"asset_owner_company",
|
||||||
|
"customer",
|
||||||
|
"supplier",
|
||||||
"is_existing_asset",
|
"is_existing_asset",
|
||||||
"is_composite_asset",
|
"is_composite_asset",
|
||||||
"is_composite_component",
|
"is_composite_component",
|
||||||
@@ -30,13 +30,13 @@
|
|||||||
"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",
|
||||||
"net_purchase_amount",
|
"net_purchase_amount",
|
||||||
"purchase_amount",
|
"purchase_amount",
|
||||||
"asset_quantity",
|
"asset_quantity",
|
||||||
"additional_asset_cost",
|
"additional_asset_cost",
|
||||||
"total_asset_cost",
|
"total_asset_cost",
|
||||||
"disposal_date",
|
|
||||||
"depreciation_tab",
|
"depreciation_tab",
|
||||||
"calculate_depreciation",
|
"calculate_depreciation",
|
||||||
"column_break_33",
|
"column_break_33",
|
||||||
@@ -66,12 +66,11 @@
|
|||||||
"accounting_dimensions_section",
|
"accounting_dimensions_section",
|
||||||
"cost_center",
|
"cost_center",
|
||||||
"section_break_jtou",
|
"section_break_jtou",
|
||||||
|
"status",
|
||||||
"custodian",
|
"custodian",
|
||||||
"default_finance_book",
|
"default_finance_book",
|
||||||
"depr_entry_posting_status",
|
"depr_entry_posting_status",
|
||||||
"booked_fixed_asset",
|
"booked_fixed_asset",
|
||||||
"customer",
|
|
||||||
"supplier",
|
|
||||||
"column_break_51",
|
"column_break_51",
|
||||||
"department",
|
"department",
|
||||||
"split_from",
|
"split_from",
|
||||||
@@ -106,13 +105,6 @@
|
|||||||
"options": "Item",
|
"options": "Item",
|
||||||
"reqd": 1
|
"reqd": 1
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"depends_on": "item_code",
|
|
||||||
"fetch_from": "item_code.item_name",
|
|
||||||
"fieldname": "item_name",
|
|
||||||
"fieldtype": "Read Only",
|
|
||||||
"label": "Item Name"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"depends_on": "item_code",
|
"depends_on": "item_code",
|
||||||
"fetch_from": "item_code.asset_category",
|
"fetch_from": "item_code.asset_category",
|
||||||
@@ -229,7 +221,7 @@
|
|||||||
{
|
{
|
||||||
"fieldname": "available_for_use_date",
|
"fieldname": "available_for_use_date",
|
||||||
"fieldtype": "Date",
|
"fieldtype": "Date",
|
||||||
"label": "Available-for-use Date",
|
"label": "Available for Use Date",
|
||||||
"mandatory_depends_on": "eval:(!(doc.is_composite_component || doc.is_composite_asset) || doc.docstatus==1)"
|
"mandatory_depends_on": "eval:(!(doc.is_composite_component || doc.is_composite_asset) || doc.docstatus==1)"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -257,6 +249,7 @@
|
|||||||
"columns": 10,
|
"columns": 10,
|
||||||
"fieldname": "finance_books",
|
"fieldname": "finance_books",
|
||||||
"fieldtype": "Table",
|
"fieldtype": "Table",
|
||||||
|
"label": "Finance Books",
|
||||||
"options": "Asset Finance Book"
|
"options": "Asset Finance Book"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -415,8 +408,7 @@
|
|||||||
{
|
{
|
||||||
"depends_on": "calculate_depreciation",
|
"depends_on": "calculate_depreciation",
|
||||||
"fieldname": "section_break_36",
|
"fieldname": "section_break_36",
|
||||||
"fieldtype": "Section Break",
|
"fieldtype": "Section Break"
|
||||||
"label": "Finance Books"
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "split_from",
|
"fieldname": "split_from",
|
||||||
@@ -601,7 +593,7 @@
|
|||||||
"link_fieldname": "target_asset"
|
"link_fieldname": "target_asset"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"modified": "2025-12-18 16:36:40.904246",
|
"modified": "2026-02-03 15:29:21.504376",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Assets",
|
"module": "Assets",
|
||||||
"name": "Asset",
|
"name": "Asset",
|
||||||
|
|||||||
@@ -81,7 +81,6 @@ class Asset(AccountsController):
|
|||||||
is_existing_asset: DF.Check
|
is_existing_asset: DF.Check
|
||||||
is_fully_depreciated: DF.Check
|
is_fully_depreciated: DF.Check
|
||||||
item_code: DF.Link
|
item_code: DF.Link
|
||||||
item_name: DF.ReadOnly | None
|
|
||||||
journal_entry_for_scrap: DF.Link | None
|
journal_entry_for_scrap: DF.Link | None
|
||||||
location: DF.Link
|
location: DF.Link
|
||||||
maintenance_required: DF.Check
|
maintenance_required: DF.Check
|
||||||
|
|||||||
Reference in New Issue
Block a user