CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-13 09:43:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(asset value adjustment): skip cancelling revaluation journal entry if already cancelled

Browse Source 
(cherry picked from commit b1704ccef1)

# Conflicts:
#	erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.py
This commit is contained in:
Navin-S-R
2026-01-11 19:20:01 +05:30
committed by Mergify
parent f5cae2d60b
commit dae6adfe13
1 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,7 +57,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,
@@ -180,6 +180,7 @@ class AssetValueAdjustment(Document):
get_link_to_form(self.get("doctype"), self.get("name")),
)
<<<<<<< HEAD
make_new_active_asset_depr_schedules_and_cancel_current_ones(
asset,
notes,
@@ -189,6 +190,33 @@ class AssetValueAdjustment(Document):
)
asset.flags.ignore_validate_update_after_submit = True
asset.save()
=======
return credit_entry, debit_entry
def update_accounting_dimensions(self, credit_entry, debit_entry):
accounting_dimensions = get_checks_for_pl_and_bs_accounts()
for dimension in accounting_dimensions:
dimension_value = self.get(dimension["fieldname"]) or dimension.get("default_dimension")
if dimension.get("mandatory_for_bs"):
credit_entry.update({dimension["fieldname"]: dimension_value})
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:
revaluation_entry.cancel()
def update_asset(self):
asset = self.update_asset_value_after_depreciation()
note = self.get_adjustment_note()
reschedule_depreciation(asset, note)
>>>>>>> b1704ccef1 (fix(asset value adjustment): skip cancelling revaluation journal entry if already cancelled)
asset.set_status()
def update_asset_value_after_depreciation(self, difference_amount):