From 36983c97cb54f926e04be353868ca897d2657289 Mon Sep 17 00:00:00 2001 From: Diptanil Saha Date: Tue, 28 Oct 2025 08:06:10 +0530 Subject: [PATCH] chore: resolve conflict --- erpnext/public/js/controllers/accounts.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/erpnext/public/js/controllers/accounts.js b/erpnext/public/js/controllers/accounts.js index fb85092c2a0..dec0f1c024d 100644 --- a/erpnext/public/js/controllers/accounts.js +++ b/erpnext/public/js/controllers/accounts.js @@ -237,17 +237,10 @@ erpnext.accounts.pos = { frappe.ui.form.on(doctype, { mode_of_payment: function(frm, cdt, cdn) { var d = locals[cdt][cdn]; -<<<<<<< HEAD - get_payment_mode_account(frm, d.mode_of_payment, function(account){ - frappe.model.set_value(cdt, cdn, 'account', account) - }) - } -======= erpnext.accounts.pos.get_payment_mode_account(frm, d.mode_of_payment, function (account) { frappe.model.set_value(cdt, cdn, "account", account); }); }, ->>>>>>> 0af74aef00 (fix(accounts): update payment mode account retrieval to use namespaced function) }); },