From 4ca6cdca7621e40093abe43d016124798ede25ea Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Sun, 15 May 2022 21:10:52 +0530 Subject: [PATCH] fix: Remove validation from Journal Entry (cherry picked from commit 5b8726405d54c2a0601d379dbc78482e19858cda) # Conflicts: # erpnext/accounts/doctype/journal_entry/journal_entry.py --- erpnext/accounts/doctype/journal_entry/journal_entry.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index a7c52dd24d0..7bd978561ba 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -56,7 +56,6 @@ class JournalEntry(AccountsController): self.clearance_date = None self.validate_party() - self.validate_party_account_currency() self.validate_entries_for_advance() self.validate_multi_currency() self.set_amounts_in_company_currency() @@ -341,6 +340,7 @@ class JournalEntry(AccountsController): d.idx, d.account ) ) +<<<<<<< HEAD ======= frappe.throw(_("Row {0}: Party Type and Party is required for Receivable / Payable account {1}").format(d.idx, d.account)) @@ -354,6 +354,8 @@ class JournalEntry(AccountsController): if not party_gle_currency and (party_account_currency != party_currency): frappe.throw(_("Party Account {0} currency and default party currency should be same").format(frappe.bold(d.account))) >>>>>>> 417d6abcf4 (fix: Party account validation in JV) +======= +>>>>>>> 5b8726405d (fix: Remove validation from Journal Entry) def check_credit_limit(self): customers = list(