mirror of
https://github.com/frappe/erpnext.git
synced 2026-04-11 19:05:08 +00:00
fix: Append existing ignored doctypes in Journal Entry on_cancel instead of overwriting
(cherry picked from commit 39e10c4ab0)
This commit is contained in:
@@ -214,6 +214,8 @@ class JournalEntry(AccountsController):
|
|||||||
def on_cancel(self):
|
def on_cancel(self):
|
||||||
# References for this Journal are removed on the `on_cancel` event in accounts_controller
|
# References for this Journal are removed on the `on_cancel` event in accounts_controller
|
||||||
super().on_cancel()
|
super().on_cancel()
|
||||||
|
|
||||||
|
from_doc_events = getattr(self, "ignore_linked_doctypes", ())
|
||||||
self.ignore_linked_doctypes = (
|
self.ignore_linked_doctypes = (
|
||||||
"GL Entry",
|
"GL Entry",
|
||||||
"Stock Ledger Entry",
|
"Stock Ledger Entry",
|
||||||
@@ -226,6 +228,10 @@ class JournalEntry(AccountsController):
|
|||||||
"Unreconcile Payment Entries",
|
"Unreconcile Payment Entries",
|
||||||
"Advance Payment Ledger Entry",
|
"Advance Payment Ledger Entry",
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if from_doc_events and from_doc_events != self.ignore_linked_doctypes:
|
||||||
|
self.ignore_linked_doctypes = self.ignore_linked_doctypes + from_doc_events
|
||||||
|
|
||||||
self.make_gl_entries(1)
|
self.make_gl_entries(1)
|
||||||
self.unlink_advance_entry_reference()
|
self.unlink_advance_entry_reference()
|
||||||
self.unlink_asset_reference()
|
self.unlink_asset_reference()
|
||||||
|
|||||||
Reference in New Issue
Block a user