chore: asset form reorder (#22833)
Co-authored-by: Marica <maricadsouza221197@gmail.com>
diff --git a/erpnext/assets/doctype/asset/asset.json b/erpnext/assets/doctype/asset/asset.json
index 97165a3..a3152ab 100644
--- a/erpnext/assets/doctype/asset/asset.json
+++ b/erpnext/assets/doctype/asset/asset.json
@@ -1,4 +1,5 @@
{
+ "actions": [],
"allow_import": 1,
"allow_rename": 1,
"autoname": "naming_series:",
@@ -7,8 +8,9 @@
"document_type": "Document",
"engine": "InnoDB",
"field_order": [
+ "is_existing_asset",
+ "section_break_2",
"naming_series",
- "asset_name",
"item_code",
"item_name",
"asset_category",
@@ -17,29 +19,31 @@
"supplier",
"customer",
"image",
- "purchase_invoice",
+ "journal_entry_for_scrap",
"column_break_3",
"company",
+ "asset_name",
"location",
"custodian",
"department",
- "purchase_date",
"disposal_date",
- "journal_entry_for_scrap",
- "purchase_receipt",
"accounting_dimensions_section",
"cost_center",
"dimension_col_break",
- "section_break_5",
- "gross_purchase_amount",
+ "purchase_details_section",
+ "purchase_receipt",
+ "purchase_invoice",
"available_for_use_date",
- "column_break_18",
+ "column_break_23",
+ "gross_purchase_amount",
+ "purchase_date",
+ "section_break_23",
"calculate_depreciation",
"allow_monthly_depreciation",
- "is_existing_asset",
+ "column_break_33",
"opening_accumulated_depreciation",
"number_of_depreciations_booked",
- "section_break_23",
+ "section_break_36",
"finance_books",
"section_break_33",
"depreciation_method",
@@ -64,7 +68,6 @@
"status",
"booked_fixed_asset",
"column_break_51",
-
"purchase_receipt_amount",
"default_finance_book",
"amended_from"
@@ -187,6 +190,8 @@
"fieldname": "purchase_date",
"fieldtype": "Date",
"label": "Purchase Date",
+ "read_only": 1,
+ "read_only_depends_on": "eval:!doc.is_existing_asset",
"reqd": 1
},
{
@@ -205,24 +210,19 @@
"read_only": 1
},
{
- "fieldname": "section_break_5",
- "fieldtype": "Section Break"
- },
- {
"fieldname": "gross_purchase_amount",
"fieldtype": "Currency",
"label": "Gross Purchase Amount",
"options": "Company:company:default_currency",
+ "read_only": 1,
+ "read_only_depends_on": "eval:!doc.is_existing_asset",
"reqd": 1
},
{
"fieldname": "available_for_use_date",
"fieldtype": "Date",
- "label": "Available-for-use Date"
- },
- {
- "fieldname": "column_break_18",
- "fieldtype": "Column Break"
+ "label": "Available-for-use Date",
+ "reqd": 1
},
{
"default": "0",
@@ -252,12 +252,14 @@
"no_copy": 1
},
{
- "depends_on": "calculate_depreciation",
+ "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",
"fieldtype": "Table",
"label": "Finance Books",
@@ -305,8 +307,7 @@
{
"depends_on": "calculate_depreciation",
"fieldname": "section_break_14",
- "fieldtype": "Section Break",
- "label": "Depreciation Schedule"
+ "fieldtype": "Section Break"
},
{
"fieldname": "schedules",
@@ -456,12 +457,37 @@
"fieldname": "allow_monthly_depreciation",
"fieldtype": "Check",
"label": "Allow Monthly Depreciation"
+ },
+ {
+ "fieldname": "section_break_2",
+ "fieldtype": "Section Break"
+ },
+ {
+ "collapsible": 1,
+ "collapsible_depends_on": "is_existing_asset",
+ "fieldname": "purchase_details_section",
+ "fieldtype": "Section Break",
+ "label": "Purchase Details"
+ },
+ {
+ "fieldname": "column_break_23",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "column_break_33",
+ "fieldtype": "Column Break"
+ },
+ {
+ "depends_on": "calculate_depreciation",
+ "fieldname": "section_break_36",
+ "fieldtype": "Section Break"
}
],
"idx": 72,
"image_field": "image",
"is_submittable": 1,
- "modified": "2019-10-22 15:47:36.050828",
+ "links": [],
+ "modified": "2020-07-28 15:04:44.452224",
"modified_by": "Administrator",
"module": "Assets",
"name": "Asset",