From ffd41703dee89032d065dad9e10e03ae2506480e Mon Sep 17 00:00:00 2001 From: anandbaburajan Date: Mon, 14 Nov 2022 14:36:10 +0530 Subject: [PATCH] chore: add expected_value_after_useful_life in depr schedule --- .../asset_depreciation_schedule.json | 13 +++++++++++-- .../asset_depreciation_schedule.py | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json index 49bd2e7faa..83ed089de8 100644 --- a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json +++ b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json @@ -14,9 +14,10 @@ "depreciation_details_section", "depreciation_method", "total_number_of_depreciations", + "rate_of_depreciation", "column_break_8", "frequency_of_depreciation", - "rate_of_depreciation", + "expected_value_after_useful_life", "depreciation_schedule_section", "depreciation_schedule", "details_section", @@ -133,13 +134,21 @@ "fieldtype": "Int", "label": "Frequency of Depreciation (Months)", "read_only": 1 + }, + { + "default": "0", + "fieldname": "expected_value_after_useful_life", + "fieldtype": "Currency", + "label": "Expected Value After Useful Life", + "options": "Company:company:default_currency", + "read_only": 1 } ], "in_create": 1, "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2022-11-01 17:23:33.873283", + "modified": "2022-11-14 14:33:53.360643", "modified_by": "Administrator", "module": "Assets", "name": "Asset Depreciation Schedule", diff --git a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py index 7bb8b0e01d..f04a9fdd24 100644 --- a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py +++ b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py @@ -56,6 +56,7 @@ def set_draft_asset_depreciation_schedule_details(asset_depr_schedule, asset_nam asset_depr_schedule.total_number_of_depreciations = row.total_number_of_depreciations asset_depr_schedule.frequency_of_depreciation = row.frequency_of_depreciation asset_depr_schedule.rate_of_depreciation = row.rate_of_depreciation + asset_depr_schedule.expected_value_after_useful_life = row.expected_value_after_useful_life asset_depr_schedule.status = "Draft"