diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.json b/erpnext/assets/doctype/asset_repair/asset_repair.json index 8195c56b431..b74292a093e 100644 --- a/erpnext/assets/doctype/asset_repair/asset_repair.json +++ b/erpnext/assets/doctype/asset_repair/asset_repair.json @@ -7,40 +7,42 @@ "editable_grid": 1, "engine": "InnoDB", "field_order": [ + "naming_series", "asset", + "asset_name", "company", "column_break_2", - "asset_name", - "naming_series", - "section_break_5", - "failure_date", "repair_status", - "column_break_6", + "failure_date", "completion_date", - "accounting_dimensions_section", - "cost_center", - "column_break_14", - "project", - "accounting_details", - "invoices", - "section_break_y7cc", - "capitalize_repair_cost", - "stock_consumption", - "column_break_8", - "repair_cost", - "stock_consumption_details_section", - "stock_items", - "total_repair_cost", - "asset_depreciation_details_section", - "increase_in_asset_life", + "downtime", + "amended_from", "section_break_9", "description", "column_break_9", "actions_performed", - "section_break_23", - "downtime", - "column_break_19", - "amended_from" + "accounting_details", + "invoices", + "section_break_muyc", + "column_break_ajbh", + "column_break_hkem", + "repair_cost", + "asset_depreciation_details_section", + "cost_center", + "column_break_14", + "project", + "stock_consumption_details_section", + "stock_items", + "section_break_ltbb", + "column_break_ewor", + "column_break_ceuc", + "consumed_items_cost", + "capitalizations_section", + "column_break_spre", + "capitalize_repair_cost", + "increase_in_asset_life", + "column_break_xebe", + "total_repair_cost" ], "fields": [ { @@ -54,11 +56,6 @@ "fieldname": "column_break_2", "fieldtype": "Column Break" }, - { - "fieldname": "section_break_5", - "fieldtype": "Section Break", - "label": "Repair Details" - }, { "columns": 1, "fieldname": "failure_date", @@ -67,11 +64,7 @@ "reqd": 1 }, { - "fieldname": "column_break_6", - "fieldtype": "Column Break" - }, - { - "depends_on": "eval:!doc.__islocal", + "depends_on": "eval:doc.repair_status==\"Completed\"", "fieldname": "completion_date", "fieldtype": "Datetime", "label": "Completion Date", @@ -79,7 +72,6 @@ }, { "default": "Pending", - "depends_on": "eval:!doc.__islocal", "fieldname": "repair_status", "fieldtype": "Select", "label": "Repair Status", @@ -113,10 +105,6 @@ "label": "Downtime", "read_only": 1 }, - { - "fieldname": "column_break_19", - "fieldtype": "Column Break" - }, { "default": "0", "fieldname": "repair_cost", @@ -148,10 +136,6 @@ "fieldtype": "Read Only", "label": "Asset Name" }, - { - "fieldname": "column_break_8", - "fieldtype": "Column Break" - }, { "default": "0", "depends_on": "eval:!doc.__islocal", @@ -162,7 +146,8 @@ { "fieldname": "accounting_details", "fieldtype": "Section Break", - "label": "Accounting Details" + "hide_border": 1, + "label": "Repair Purchase Invoices" }, { "fieldname": "stock_items", @@ -171,16 +156,6 @@ "mandatory_depends_on": "stock_consumption", "options": "Asset Repair Consumed Item" }, - { - "fieldname": "section_break_23", - "fieldtype": "Section Break" - }, - { - "collapsible": 1, - "fieldname": "accounting_dimensions_section", - "fieldtype": "Section Break", - "label": "Accounting Dimensions" - }, { "fieldname": "cost_center", "fieldtype": "Link", @@ -198,21 +173,13 @@ "fieldtype": "Column Break" }, { - "default": "0", - "depends_on": "eval:!doc.__islocal", - "fieldname": "stock_consumption", - "fieldtype": "Check", - "label": "Stock Consumed During Repair" - }, - { - "depends_on": "stock_consumption", + "collapsible_depends_on": "stock_items", "fieldname": "stock_consumption_details_section", "fieldtype": "Section Break", - "label": "Stock Consumption Details" + "hide_border": 1, + "label": "Consumed Stock Items" }, { - "depends_on": "eval: doc.stock_consumption && doc.total_repair_cost > 0", - "description": "Sum of Repair Cost and Value of Consumed Stock Items.", "fieldname": "total_repair_cost", "fieldtype": "Currency", "label": "Total Repair Cost", @@ -225,6 +192,7 @@ "label": "Asset Depreciation Details" }, { + "depends_on": "capitalize_repair_cost", "fieldname": "increase_in_asset_life", "fieldtype": "Int", "label": "Increase In Asset Life(Months)", @@ -240,20 +208,57 @@ { "fieldname": "invoices", "fieldtype": "Table", - "label": "Asset Repair Purchase Invoices", "mandatory_depends_on": "eval: doc.repair_status == 'Completed' && doc.repair_cost > 0;", "no_copy": 1, "options": "Asset Repair Purchase Invoice" }, { - "fieldname": "section_break_y7cc", + "fieldname": "section_break_muyc", "fieldtype": "Section Break" + }, + { + "fieldname": "column_break_hkem", + "fieldtype": "Column Break" + }, + { + "fieldname": "capitalizations_section", + "fieldtype": "Section Break", + "label": "Totals" + }, + { + "fieldname": "column_break_spre", + "fieldtype": "Column Break" + }, + { + "fieldname": "column_break_ajbh", + "fieldtype": "Column Break" + }, + { + "fieldname": "section_break_ltbb", + "fieldtype": "Section Break" + }, + { + "fieldname": "column_break_ewor", + "fieldtype": "Column Break" + }, + { + "fieldname": "column_break_ceuc", + "fieldtype": "Column Break" + }, + { + "fieldname": "consumed_items_cost", + "fieldtype": "Currency", + "label": "Consumed Items Cost" + }, + { + "fieldname": "column_break_xebe", + "fieldtype": "Column Break" } ], "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2024-09-30 13:02:06.931188", + "modified": "2024-12-20 13:10:31.540666", "modified_by": "Administrator", "module": "Assets", "name": "Asset Repair",