nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 08:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove comments

Browse Source
This commit is contained in:
sonali
2023-01-09 20:07:24 +05:30
parent 12822f7c36
commit 917b2190aa
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js
View File

@@ -25,16 +25,16 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
frappe.require("bank-reconciliation-tool.bundle.js", () => frappe.require("bank-reconciliation-tool.bundle.js", () =>
frm.trigger("make_reconciliation_tool") frm.trigger("make_reconciliation_tool")
); );
frm.add_custom_button(__('Auto Reconcile'), function(){ frm.add_custom_button(__('Auto Reconcile'), function() {
frappe.call({ 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: { args: {
bank_account:frm.doc.bank_account, bank_account: frm.doc.bank_account,
from_date: frm.doc.bank_statement_from_date, from_date: frm.doc.bank_statement_from_date,
to_date: frm.doc.bank_statement_to_date, to_date: frm.doc.bank_statement_to_date,
filtered_by_reference_date:frm.doc.filtered_by_reference_date, filtered_by_reference_date: frm.doc.filtered_by_reference_date,
from_reference_date:frm.doc.from_reference_date, from_reference_date: frm.doc.from_reference_date,
to_reference_date:frm.doc.to_reference_date, to_reference_date: frm.doc.to_reference_date,
}, },
callback: function (r) { callback: function (r) {
} }
@@ -178,9 +178,9 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
).$wrapper, ).$wrapper,
bank_statement_from_date: frm.doc.bank_statement_from_date, bank_statement_from_date: frm.doc.bank_statement_from_date,
bank_statement_to_date: frm.doc.bank_statement_to_date, bank_statement_to_date: frm.doc.bank_statement_to_date,
filtered_by_reference_date:frm.doc.filtered_by_reference_date, filtered_by_reference_date: frm.doc.filtered_by_reference_date,
from_reference_date:frm.doc.from_reference_date, from_reference_date: frm.doc.from_reference_date,
to_reference_date:frm.doc.to_reference_date, to_reference_date: frm.doc.to_reference_date,
bank_statement_closing_balance: bank_statement_closing_balance:
frm.doc.bank_statement_closing_balance, frm.doc.bank_statement_closing_balance,
cards_manager: frm.cards_manager, cards_manager: frm.cards_manager,

4
erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
View File

@@ -298,8 +298,6 @@ def auto_reconcile_vouchers(
"amount": r[4], "amount": r[4],
} }
) )
# vouchers = frappe.as_json(voucherss)
# vouchers = json.loads(voucherss)
transaction = frappe.get_doc("Bank Transaction", transaction.name) transaction = frappe.get_doc("Bank Transaction", transaction.name)
account = frappe.db.get_value("Bank Account", transaction.bank_account, "account") account = frappe.db.get_value("Bank Account", transaction.bank_account, "account")
matched_trans = 0 matched_trans = 0
@@ -331,7 +329,7 @@ def auto_reconcile_vouchers(
transaction.update_allocations() transaction.update_allocations()
matched_transaction_len = len(set(matched_transaction)) matched_transaction_len = len(set(matched_transaction))
if matched_transaction_len == 0: 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: elif matched_transaction_len == 1:
frappe.msgprint(_("{0} transaction is reconcilied").format(matched_transaction_len)) frappe.msgprint(_("{0} transaction is reconcilied").format(matched_transaction_len))
else: else:

4
erpnext/public/js/bank_reconciliation_tool/data_table_manager.js
View File

@@ -22,8 +22,8 @@ erpnext.accounts.bank_reconciliation.DataTableManager = class DataTableManager {
"erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_bank_transactions", "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_bank_transactions",
args: { args: {
bank_account: this.bank_account, bank_account: this.bank_account,
from_date:this.bank_statement_from_date, from_date: this.bank_statement_from_date,
to_date:this.bank_statement_to_date to_date: this.bank_statement_to_date
}, },
callback: function (response) { callback: function (response) {
me.format_data(response.message); me.format_data(response.message);