Merge branch 'develop' into payment-reconc-party-validation-fix
diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py
index b97dc40..c3b78a4 100644
--- a/erpnext/accounts/party.py
+++ b/erpnext/accounts/party.py
@@ -286,6 +286,7 @@
.format(frappe.bold(party_type), frappe.bold(party), frappe.bold(existing_gle_currency), frappe.bold(company)), InvalidAccountCurrency)
def validate_party_accounts(doc):
+
companies = []
for account in doc.get("accounts"):
@@ -446,6 +447,10 @@
return template
def validate_party_frozen_disabled(party_type, party_name):
+
+ if frappe.flags.ignore_party_validation:
+ return
+
if party_type and party_name:
if party_type in ("Customer", "Supplier"):
party = frappe.get_cached_value(party_type, party_name, ["is_frozen", "disabled"], as_dict=True)
diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index 9272bc4..f5adc46 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -350,6 +350,7 @@
# cancel advance entry
doc = frappe.get_doc(d.voucher_type, d.voucher_no)
+ frappe.flags.ignore_party_validation = True
doc.make_gl_entries(cancel=1, adv_adj=1)
# update ref in advance entry
@@ -361,6 +362,7 @@
# re-submit advance entry
doc = frappe.get_doc(d.voucher_type, d.voucher_no)
doc.make_gl_entries(cancel = 0, adv_adj =1)
+ frappe.flags.ignore_party_validation = False
if d.voucher_type in ('Payment Entry', 'Journal Entry'):
doc.update_expense_claim()