From a5776d16b4da69892b0552d1437672448c8bd4f7 Mon Sep 17 00:00:00 2001 From: Mitchy25 <42224026+Mitchy25@users.noreply.github.com> Date: Thu, 7 Nov 2019 02:34:54 +1300 Subject: [PATCH] fix: Version 12 Bank Reconciliation fix (#19182) * Fix Bank Reconciliation Change fixes Bank Rec upload as well as the duplicatation of bank_account and company filters * Update bank_reconciliation.js Removing incorrect fix to filters. Filters are loaded from Bank Transaction List. * Update bank_reconciliation.js --- .../bank_reconciliation/bank_reconciliation.js | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.js b/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.js index 6eafa0d231..854b973bea 100644 --- a/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.js +++ b/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.js @@ -139,15 +139,11 @@ erpnext.accounts.bankTransactionUpload = class bankTransactionUpload { } make() { - const me = this; - frappe.upload.make({ - args: { - method: 'erpnext.accounts.doctype.bank_transaction.bank_transaction_upload.upload_bank_statement', - allow_multiple: 0 - }, - no_socketio: true, - sample_url: "e.g. http://example.com/somefile.csv", - callback: function(attachment, r) { + const me = this; + new frappe.ui.FileUploader({ + method: 'erpnext.accounts.doctype.bank_transaction.bank_transaction_upload.upload_bank_statement', + allow_multiple: 0, + on_success: function(attachment, r) { if (!r.exc && r.message) { me.data = r.message; me.setup_transactions_dom(); @@ -575,4 +571,4 @@ erpnext.accounts.ReconciliationRow = class ReconciliationRow { } } -} \ No newline at end of file +}