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

chore: rebase with v15 branch

Browse Source
This commit is contained in:
khushi8112
2026-01-13 16:23:00 +05:30
parent 11d23e1a4a
commit 3365bc3ba3
2 changed files with 10 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/accounts/doctype/journal_entry/journal_entry.py
View File

@@ -227,14 +227,6 @@ class JournalEntry(AccountsController):
"Advance Payment Ledger Entry", "Advance Payment Ledger Entry",
) )
self.make_gl_entries(1) self.make_gl_entries(1)
<<<<<<< HEAD
=======
JournalTaxWithholding(self).on_cancel()
<<<<<<< HEAD
self.has_asset_adjustment_entry()
>>>>>>> 73b038084b (fix: prevent manual cancellation of the linked Revaluation Journal Entry)
=======
>>>>>>> d65cd605a1 (fix: move validation to before_cancel)
self.unlink_advance_entry_reference() self.unlink_advance_entry_reference()
self.unlink_asset_reference() self.unlink_asset_reference()
self.unlink_inter_company_jv() self.unlink_inter_company_jv()

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

@@ -159,6 +159,16 @@ class AssetValueAdjustment(Document):
self.db_set("journal_entry", je.name) self.db_set("journal_entry", je.name)
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.flags.ignore_permissions = True
revaluation_entry.flags.via_asset_value_adjustment = True
revaluation_entry.cancel()
def update_asset(self, asset_value=None): def update_asset(self, asset_value=None):
difference_amount = self.difference_amount if self.docstatus == 1 else -1 * self.difference_amount difference_amount = self.difference_amount if self.docstatus == 1 else -1 * self.difference_amount
asset = self.update_asset_value_after_depreciation(difference_amount) asset = self.update_asset_value_after_depreciation(difference_amount)
@@ -180,7 +190,6 @@ class AssetValueAdjustment(Document):
get_link_to_form(self.get("doctype"), self.get("name")), get_link_to_form(self.get("doctype"), self.get("name")),
) )
<<<<<<< HEAD
make_new_active_asset_depr_schedules_and_cancel_current_ones( make_new_active_asset_depr_schedules_and_cancel_current_ones(
asset, asset,
notes, notes,
@@ -190,36 +199,6 @@ class AssetValueAdjustment(Document):
) )
asset.flags.ignore_validate_update_after_submit = True asset.flags.ignore_validate_update_after_submit = True
asset.save() 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:
# 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()
reschedule_depreciation(asset, note)
>>>>>>> b1704ccef1 (fix(asset value adjustment): skip cancelling revaluation journal entry if already cancelled)
asset.set_status() asset.set_status()
def update_asset_value_after_depreciation(self, difference_amount): def update_asset_value_after_depreciation(self, difference_amount):