nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 02:01:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: handle change in opening_accumulated_depreciation properly

Browse Source
This commit is contained in:
anandbaburajan
2023-02-24 20:34:36 +05:30
parent e0ad1a305e
commit b0d670a51d
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/assets/doctype/asset/asset.js
View File

@@ -302,10 +302,6 @@ frappe.ui.form.on('Asset', {
// frm.toggle_reqd("next_depreciation_date", (!frm.doc.is_existing_asset && frm.doc.calculate_depreciation)); // frm.toggle_reqd("next_depreciation_date", (!frm.doc.is_existing_asset && frm.doc.calculate_depreciation));
}, },
opening_accumulated_depreciation: function(frm) {
erpnext.asset.set_accumulated_depreciation(frm);
},
make_schedules_editable: function(frm) { make_schedules_editable: function(frm) {
if (frm.doc.finance_books) { if (frm.doc.finance_books) {
var is_editable = frm.doc.finance_books.filter(d => d.depreciation_method == "Manual").length > 0 var is_editable = frm.doc.finance_books.filter(d => d.depreciation_method == "Manual").length > 0

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

@@ -85,7 +85,10 @@ class Asset(AccountsController):
self.value_after_depreciation = 0 self.value_after_depreciation = 0
self.set_depreciation_rate() self.set_depreciation_rate()
if not ( if not (
self.get("schedules") and "Manual" in [d.depreciation_method for d in self.finance_books] self.get("schedules")
and "Manual" in [d.depreciation_method for d in self.finance_books]
and self.get_doc_before_save().opening_accumulated_depreciation
== self.opening_accumulated_depreciation
): ):
self.make_depreciation_schedule(date_of_disposal) self.make_depreciation_schedule(date_of_disposal)
self.set_accumulated_depreciation(date_of_disposal, date_of_return) self.set_accumulated_depreciation(date_of_disposal, date_of_return)