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

Merge pull request #51666 from aerele/fix-asset-value-adjustment-cancel

Browse Source 
fix(asset value adjustment): skip cancelling revaluation journal entry if already cancelled
This commit is contained in:
Khushi Rawat
2026-01-13 12:38:44 +05:30
committed by GitHub
parent 6ec41fa47e d65cd605a1
commit d3cd887f5e
2 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.py
View File

@@ -74,7 +74,7 @@ class AssetValueAdjustment(Document):
)
def on_cancel(self):
frappe.get_doc("Journal Entry", self.journal_entry).cancel()
self.cancel_asset_revaluation_entry()
self.update_asset()
add_asset_activity(
self.asset,
@@ -167,6 +167,17 @@ class AssetValueAdjustment(Document):
if dimension.get("mandatory_for_pl"):
debit_entry.update({dimension["fieldname"]: dimension_value})
def cancel_asset_revaluation_entry(self):
if not self.journal_entry:
return
revaluation_entry = frappe.get_doc("Journal Entry", self.journal_entry)
if revaluation_entry.docstatus == 1:
# Ignore permissions to match Journal Entry submission behavior
revaluation_entry.flags.ignore_permissions = True
revaluation_entry.flags.via_asset_value_adjustment = True
revaluation_entry.cancel()
def update_asset(self):
asset = self.update_asset_value_after_depreciation()
note = self.get_adjustment_note()