From 366cd6171c6537720edba083e9f4e0a31f15c8b0 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Tue, 3 May 2022 12:21:06 +0530 Subject: [PATCH] chore: resolve conflicts --- .../payment_reconciliation/payment_reconciliation.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js index 17ac5d959f7..c0b8fa57011 100644 --- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js @@ -38,10 +38,7 @@ erpnext.accounts.PaymentReconciliationController = frappe.ui.form.Controller.ext ] }; }); -<<<<<<< HEAD - }, -======= - + this.frm.set_query("cost_center", () => { return { "filters": { @@ -50,8 +47,7 @@ erpnext.accounts.PaymentReconciliationController = frappe.ui.form.Controller.ext } } }); - } ->>>>>>> ab94b73e93 (fix: Cost center filter on payment reconciliation) + }, refresh: function() { this.frm.disable_save();