mirror of
https://github.com/frappe/erpnext.git
synced 2026-03-26 06:31:13 +01:00
fix(accounts): update payment mode account retrieval to use namespaced function
(cherry picked from commit 0af74aef00)
# Conflicts:
# erpnext/public/js/controllers/accounts.js
This commit is contained in:
@@ -237,10 +237,17 @@ 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){
|
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)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
=======
|
||||||
|
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)
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user