From 917b2190aa25fff735ea3442cee797112147ccb1 Mon Sep 17 00:00:00 2001 From: sonali Date: Mon, 9 Jan 2023 20:07:24 +0530 Subject: [PATCH] fix: remove comments --- .../bank_reconciliation_tool.js | 18 +++++++++--------- .../bank_reconciliation_tool.py | 4 +--- .../data_table_manager.js | 4 ++-- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js index f142549810..8e4214f202 100644 --- a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js +++ b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js @@ -25,16 +25,16 @@ frappe.ui.form.on("Bank Reconciliation Tool", { frappe.require("bank-reconciliation-tool.bundle.js", () => frm.trigger("make_reconciliation_tool") ); - frm.add_custom_button(__('Auto Reconcile'), function(){ + frm.add_custom_button(__('Auto Reconcile'), function() { frappe.call({ - method:"erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.auto_reconcile_vouchers", + method: "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.auto_reconcile_vouchers", args: { - bank_account:frm.doc.bank_account, + bank_account: frm.doc.bank_account, from_date: frm.doc.bank_statement_from_date, to_date: frm.doc.bank_statement_to_date, - filtered_by_reference_date:frm.doc.filtered_by_reference_date, - from_reference_date:frm.doc.from_reference_date, - to_reference_date:frm.doc.to_reference_date, + filtered_by_reference_date: frm.doc.filtered_by_reference_date, + from_reference_date: frm.doc.from_reference_date, + to_reference_date: frm.doc.to_reference_date, }, callback: function (r) { } @@ -178,9 +178,9 @@ frappe.ui.form.on("Bank Reconciliation Tool", { ).$wrapper, bank_statement_from_date: frm.doc.bank_statement_from_date, bank_statement_to_date: frm.doc.bank_statement_to_date, - filtered_by_reference_date:frm.doc.filtered_by_reference_date, - from_reference_date:frm.doc.from_reference_date, - to_reference_date:frm.doc.to_reference_date, + filtered_by_reference_date: frm.doc.filtered_by_reference_date, + from_reference_date: frm.doc.from_reference_date, + to_reference_date: frm.doc.to_reference_date, bank_statement_closing_balance: frm.doc.bank_statement_closing_balance, cards_manager: frm.cards_manager, diff --git a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py index f71855a872..053641d310 100644 --- a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py +++ b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py @@ -298,8 +298,6 @@ def auto_reconcile_vouchers( "amount": r[4], } ) - # vouchers = frappe.as_json(voucherss) - # vouchers = json.loads(voucherss) transaction = frappe.get_doc("Bank Transaction", transaction.name) account = frappe.db.get_value("Bank Account", transaction.bank_account, "account") matched_trans = 0 @@ -331,7 +329,7 @@ def auto_reconcile_vouchers( transaction.update_allocations() matched_transaction_len = len(set(matched_transaction)) if matched_transaction_len == 0: - frappe.msgprint(_("There is no any matched reference number for reconciliation")) + frappe.msgprint(_("No matching references found for auto reconciliation")) elif matched_transaction_len == 1: frappe.msgprint(_("{0} transaction is reconcilied").format(matched_transaction_len)) else: diff --git a/erpnext/public/js/bank_reconciliation_tool/data_table_manager.js b/erpnext/public/js/bank_reconciliation_tool/data_table_manager.js index e1914b4819..532f6a9f50 100644 --- a/erpnext/public/js/bank_reconciliation_tool/data_table_manager.js +++ b/erpnext/public/js/bank_reconciliation_tool/data_table_manager.js @@ -22,8 +22,8 @@ erpnext.accounts.bank_reconciliation.DataTableManager = class DataTableManager { "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_bank_transactions", args: { bank_account: this.bank_account, - from_date:this.bank_statement_from_date, - to_date:this.bank_statement_to_date + from_date: this.bank_statement_from_date, + to_date: this.bank_statement_to_date }, callback: function (response) { me.format_data(response.message);