mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-27 08:54:45 +00:00
fix(asset value adjustment): skip cancelling revaluation journal entry if already cancelled
This commit is contained in:
@@ -74,7 +74,7 @@ class AssetValueAdjustment(Document):
|
|||||||
)
|
)
|
||||||
|
|
||||||
def on_cancel(self):
|
def on_cancel(self):
|
||||||
frappe.get_doc("Journal Entry", self.journal_entry).cancel()
|
self.cancel_asset_revaluation_entry()
|
||||||
self.update_asset()
|
self.update_asset()
|
||||||
add_asset_activity(
|
add_asset_activity(
|
||||||
self.asset,
|
self.asset,
|
||||||
@@ -167,6 +167,14 @@ class AssetValueAdjustment(Document):
|
|||||||
if dimension.get("mandatory_for_pl"):
|
if dimension.get("mandatory_for_pl"):
|
||||||
debit_entry.update({dimension["fieldname"]: dimension_value})
|
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:
|
||||||
|
revaluation_entry.cancel()
|
||||||
|
|
||||||
def update_asset(self):
|
def update_asset(self):
|
||||||
asset = self.update_asset_value_after_depreciation()
|
asset = self.update_asset_value_after_depreciation()
|
||||||
note = self.get_adjustment_note()
|
note = self.get_adjustment_note()
|
||||||
|
|||||||
Reference in New Issue
Block a user