nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-29 19:48:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2023-08-17 20:45:53 +05:30
committed by GitHub
parent 83cbc1bef6
commit ee5a1d91ff
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/public/js/bank_reconciliation_tool/dialog_manager.js
View File

@@ -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 = {