nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 10:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: set depreciation rate before return

Browse Source
This commit is contained in:
Khushi Rawat
2025-01-23 12:59:04 +05:30
parent fe52e802ce
commit 48311ee5c5
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/assets/doctype/asset/asset.json
View File

@@ -405,7 +405,6 @@
"read_only": 1 "read_only": 1
}, },
{ {
"collapsible": 1,
"collapsible_depends_on": "is_existing_asset", "collapsible_depends_on": "is_existing_asset",
"fieldname": "purchase_details_section", "fieldname": "purchase_details_section",
"fieldtype": "Section Break", "fieldtype": "Section Break",

8
erpnext/assets/doctype/asset/asset.py
View File

@@ -132,11 +132,11 @@ class Asset(AccountsController):
self.status = self.get_status() self.status = self.get_status()
def create_asset_depreciation_schedule(self): def create_asset_depreciation_schedule(self):
self.set_depr_rate_and_value_after_depreciation()
if self.split_from or not self.calculate_depreciation: if self.split_from or not self.calculate_depreciation:
return return
self.set_depr_rate_and_value_after_depreciation()
schedules = [] schedules = []
for row in self.get("finance_books"): for row in self.get("finance_books"):
self.validate_asset_finance_books(row) self.validate_asset_finance_books(row)
@@ -1242,7 +1242,7 @@ def update_existing_asset(asset, remaining_qty, new_asset_name):
current_asset_depr_schedule_doc = get_asset_depr_schedule_doc(asset.name, "Active", row.finance_book) current_asset_depr_schedule_doc = get_asset_depr_schedule_doc(asset.name, "Active", row.finance_book)
new_asset_depr_schedule_doc = frappe.copy_doc(current_asset_depr_schedule_doc) new_asset_depr_schedule_doc = frappe.copy_doc(current_asset_depr_schedule_doc)
new_asset_depr_schedule_doc.fetch_asset_details(asset, row) new_asset_depr_schedule_doc.fetch_asset_details()
accumulated_depreciation = 0 accumulated_depreciation = 0
@@ -1299,7 +1299,7 @@ def create_new_asset_after_split(asset, split_qty):
continue continue
new_asset_depr_schedule_doc = frappe.copy_doc(current_asset_depr_schedule_doc) new_asset_depr_schedule_doc = frappe.copy_doc(current_asset_depr_schedule_doc)
new_asset_depr_schedule_doc.fetch_asset_details(new_asset, row) new_asset_depr_schedule_doc.fetch_asset_details()
accumulated_depreciation = 0 accumulated_depreciation = 0