diff --git a/erpnext/accounts/doctype/bank_transaction/bank_transaction.py b/erpnext/accounts/doctype/bank_transaction/bank_transaction.py index 2ea38fd8ceff4f15027ce7542c7a688c3a61ccd2..4deb4373e8403f02d96b4676d870e4acfbcabfb6 100644 --- a/erpnext/accounts/doctype/bank_transaction/bank_transaction.py +++ b/erpnext/accounts/doctype/bank_transaction/bank_transaction.py @@ -112,8 +112,8 @@ class BankTransaction(StatusUpdater): self.check_reconciliation_amounts() def before_submit(self): - self.set_allocation_in_linked_docs() self.check_reconciliation_amounts() + self.set_allocation_in_linked_docs() self.set_allocation_in_bank_transaction() if frappe.db.get_single_value("Accounts Settings", "enable_party_matching"): @@ -128,8 +128,8 @@ class BankTransaction(StatusUpdater): self.check_payment_types() self.calculate_totals() - self.set_allocation_in_linked_docs() self.check_reconciliation_amounts() + self.set_allocation_in_linked_docs() self.set_allocation_in_bank_transaction() def on_update_after_submit(self): diff --git a/erpnext/accounts/page/bank_reconciliation/auto_bank_reconciliation.py b/erpnext/accounts/page/bank_reconciliation/auto_bank_reconciliation.py index 09b672da60b71341cb0d7ea172d77e2396c38bfd..e5bb72c799390e5035358db4bd40a4ae078a0289 100644 --- a/erpnext/accounts/page/bank_reconciliation/auto_bank_reconciliation.py +++ b/erpnext/accounts/page/bank_reconciliation/auto_bank_reconciliation.py @@ -31,12 +31,11 @@ def _reconcile_transactions(bank_transactions): if not bank_transaction.get("amount"): continue - if frappe.get_hooks("auto_reconciliation_methods"): - for hook in frappe.get_hooks("auto_reconciliation_methods"): - frappe.get_attr(hook)(bank_transaction) - else: - bank_reconciliation = AutoBankReconciliation(bank_transaction) - bank_reconciliation.reconcile() + for hook in frappe.get_hooks("auto_reconciliation_methods"): + frappe.get_attr(hook)(bank_transaction) + + bank_reconciliation = AutoBankReconciliation(bank_transaction) + bank_reconciliation.reconcile() reconcile_stripe_payouts(bank_transactions) reconcile_gocardless_payouts(bank_transactions)