From 63de576be61ec2ec30c79cec055b4c8afa2dfd07 Mon Sep 17 00:00:00 2001 From: vishakhdesai Date: Tue, 26 Nov 2024 14:26:02 +0530 Subject: [PATCH 1/2] fix: move validate_total_debit_and_credit from validate to on_submit in Journal Entry (cherry picked from commit 8b5d4c023654157d58b40fce81ab6787d95bc734) --- erpnext/accounts/doctype/journal_entry/journal_entry.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index aeaadae0b30..34a4d14fbbf 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -127,9 +127,6 @@ class JournalEntry(AccountsController): self.set_amounts_in_company_currency() self.validate_debit_credit_amount() self.set_total_debit_credit() - # Do not validate while importing via data import - if not frappe.flags.in_import: - self.validate_total_debit_and_credit() if not frappe.flags.is_reverse_depr_entry: self.validate_against_jv() @@ -185,6 +182,10 @@ class JournalEntry(AccountsController): return self._cancel() def on_submit(self): + # Do not validate while importing via data import + if not frappe.flags.in_import: + self.validate_total_debit_and_credit() + self.validate_cheque_info() self.check_credit_limit() self.make_gl_entries() From 16d0d42afe2f1282c5291cfcb88495348910c015 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 3 Dec 2024 17:42:11 +0530 Subject: [PATCH 2/2] refactor: validate debit and credit on before_submit (cherry picked from commit c3ace82db83dcf2dbb2afabeda2a82aa37d9e5ab) --- erpnext/accounts/doctype/journal_entry/journal_entry.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index 34a4d14fbbf..ef2388a7eaa 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -181,11 +181,12 @@ class JournalEntry(AccountsController): else: return self._cancel() - def on_submit(self): + def before_submit(self): # Do not validate while importing via data import if not frappe.flags.in_import: self.validate_total_debit_and_credit() + def on_submit(self): self.validate_cheque_info() self.check_credit_limit() self.make_gl_entries()