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

Fixed merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2016-10-17 16:42:49 +05:30
parent 9cb69ca0e3 b40c0a917d
commit 395d757c5a
21 changed files with 738 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,6 +81,14 @@ frappe.ui.form.on('Payment Entry', {
}
})
frappe.ui.form.on('Salary Structure', {
mode_of_payment: function(frm) {
get_payment_mode_account(frm, frm.doc.mode_of_payment, function(account){
frm.set_value("payment_account", account);
})
}
})
get_payment_mode_account = function(frm, mode_of_payment, callback){
return frappe.call({
method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.get_bank_cash_account",