CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-07 20:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: move validation to before_cancel

Browse Source 
(cherry picked from commit d65cd605a1)

# Conflicts:
#	erpnext/accounts/doctype/journal_entry/journal_entry.py
This commit is contained in:
Navin-S-R
2026-01-13 12:16:52 +05:30
committed by Mergify
parent 07de3f4391
commit 11d23e1a4a
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -178,7 +178,7 @@ class JournalEntry(AccountsController):
return self._submit() return self._submit()
def before_cancel(self): def before_cancel(self):
pass self.has_asset_adjustment_entry()
def cancel(self): def cancel(self):
if len(self.accounts) > 100: if len(self.accounts) > 100:
@@ -230,8 +230,11 @@ class JournalEntry(AccountsController):
<<<<<<< HEAD <<<<<<< HEAD
======= =======
JournalTaxWithholding(self).on_cancel() JournalTaxWithholding(self).on_cancel()
<<<<<<< HEAD
self.has_asset_adjustment_entry() self.has_asset_adjustment_entry()
>>>>>>> 73b038084b (fix: prevent manual cancellation of the linked Revaluation Journal 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()