nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 11:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
Diptanil Saha
2025-10-28 08:06:10 +05:30
committed by GitHub
parent 23006601b2
commit 36983c97cb
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/public/js/controllers/accounts.js
View File

@@ -237,17 +237,10 @@ erpnext.accounts.pos = {
frappe.ui.form.on(doctype, { frappe.ui.form.on(doctype, {
mode_of_payment: function(frm, cdt, cdn) { mode_of_payment: function(frm, cdt, cdn) {
var d = locals[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) { erpnext.accounts.pos.get_payment_mode_account(frm, d.mode_of_payment, function (account) {
frappe.model.set_value(cdt, cdn, "account", account); frappe.model.set_value(cdt, cdn, "account", account);
}); });
}, },
>>>>>>> 0af74aef00 (fix(accounts): update payment mode account retrieval to use namespaced function)
}); });
}, },