nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 16:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: add expected_value_after_useful_life in depr schedule

Browse Source
This commit is contained in:
anandbaburajan
2022-11-14 14:36:10 +05:30
parent ca3581d055
commit ffd41703de
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
View File

@@ -14,9 +14,10 @@
"depreciation_details_section", "depreciation_details_section",
"depreciation_method", "depreciation_method",
"total_number_of_depreciations", "total_number_of_depreciations",
"rate_of_depreciation",
"column_break_8", "column_break_8",
"frequency_of_depreciation", "frequency_of_depreciation",
"rate_of_depreciation", "expected_value_after_useful_life",
"depreciation_schedule_section", "depreciation_schedule_section",
"depreciation_schedule", "depreciation_schedule",
"details_section", "details_section",
@@ -133,13 +134,21 @@
"fieldtype": "Int", "fieldtype": "Int",
"label": "Frequency of Depreciation (Months)", "label": "Frequency of Depreciation (Months)",
"read_only": 1 "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, "in_create": 1,
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2022-11-01 17:23:33.873283", "modified": "2022-11-14 14:33:53.360643",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Assets", "module": "Assets",
"name": "Asset Depreciation Schedule", "name": "Asset Depreciation Schedule",

1
erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py
View File

@@ -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.total_number_of_depreciations = row.total_number_of_depreciations
asset_depr_schedule.frequency_of_depreciation = row.frequency_of_depreciation asset_depr_schedule.frequency_of_depreciation = row.frequency_of_depreciation
asset_depr_schedule.rate_of_depreciation = row.rate_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" asset_depr_schedule.status = "Draft"