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

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Rushabh Mehta
2013-03-26 17:16:15 +05:30
parent e9ef6be57f 808b085057
commit f9d2ff067e
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
accounts/doctype/purchase_invoice/purchase_invoice.js
View File

@@ -177,10 +177,15 @@ cur_frm.cscript.allocated_amount = function(doc,cdt,cdn) {
cur_frm.cscript.make_bank_voucher = function() { cur_frm.cscript.make_bank_voucher = function() {
$c('accounts.get_default_bank_account', { company: cur_frm.doc.company }, function(r, rt) { wn.call({
if(!r.exc) { method: "accounts.doctype.journal_voucher.journal_voucher.get_default_bank_cash_account",
args: {
"company": cur_frm.doc.company,
"voucher_type": "Bank Voucher"
},
callback: function(r) {
cur_frm.cscript.make_jv(cur_frm.doc, null, null, r.message); cur_frm.cscript.make_jv(cur_frm.doc, null, null, r.message);
} }
}); });
} }
@@ -289,8 +294,9 @@ cur_frm.cscript.make_jv = function(doc, dt, dn, bank_account) {
// credit to bank // credit to bank
var d1 = wn.model.add_child(jv, 'Journal Voucher Detail', 'entries'); var d1 = wn.model.add_child(jv, 'Journal Voucher Detail', 'entries');
d1.account = bank_account; d1.account = bank_account.account;
d1.credit = doc.outstanding_amount; d1.credit = doc.outstanding_amount;
d1.balance = bank_account.balance;
loaddoc('Journal Voucher', jv.name); loaddoc('Journal Voucher', jv.name);
} }