From ee5a1d91ff2961919ad996e9e5b9f2ec152426e0 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Thu, 17 Aug 2023 20:45:53 +0530 Subject: [PATCH] chore: resolve conflicts --- .../js/bank_reconciliation_tool/dialog_manager.js | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/erpnext/public/js/bank_reconciliation_tool/dialog_manager.js b/erpnext/public/js/bank_reconciliation_tool/dialog_manager.js index 4e2de8b0ff8..ddc10530581 100644 --- a/erpnext/public/js/bank_reconciliation_tool/dialog_manager.js +++ b/erpnext/public/js/bank_reconciliation_tool/dialog_manager.js @@ -144,20 +144,6 @@ erpnext.accounts.bank_reconciliation.DialogManager = class DialogManager { ]; } -<<<<<<< HEAD -======= - format_row(row) { - return [ - row[1], // Document Type - row[2], // Document Name - row[5] || row[8], // Reference Date - format_currency(row[3], row[9]), // Remaining - row[4], // Reference Number - row[6], // Party - ]; - } - ->>>>>>> 7ab55b1bb2 (fix: Document Name link validation in Bank Reconciliation Tool (#36495)) get_datatable(proposals_wrapper) { if (!this.datatable) { const datatable_options = {