From 2f8ad5e5c1781db7dab62d701575d357a349c5bb Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 25 Mar 2013 15:48:57 +0530 Subject: [PATCH] [accounts] [feature] added default_cash_account in company and gets set in Journal Voucher --- accounts/doctype/journal_voucher/journal_voucher.js | 3 ++- accounts/doctype/journal_voucher/journal_voucher.py | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/accounts/doctype/journal_voucher/journal_voucher.js b/accounts/doctype/journal_voucher/journal_voucher.js index 811bc50b80d..4edbed56cd6 100644 --- a/accounts/doctype/journal_voucher/journal_voucher.js +++ b/accounts/doctype/journal_voucher/journal_voucher.js @@ -153,7 +153,8 @@ cur_frm.cscript.voucher_type = function(doc, cdt, cdn) { callback: function(r) { if(r.message) { var jvdetail = wn.model.add_child(doc, "Journal Voucher Detail", "entries"); - jvdetail.account = r.message || ""; + jvdetail.account = r.message.account; + jvdetail.balance = r.message.balance; refresh_field("entries"); } } diff --git a/accounts/doctype/journal_voucher/journal_voucher.py b/accounts/doctype/journal_voucher/journal_voucher.py index 4078701ff9a..812ab7d0be5 100644 --- a/accounts/doctype/journal_voucher/journal_voucher.py +++ b/accounts/doctype/journal_voucher/journal_voucher.py @@ -351,8 +351,14 @@ class DocType(AccountsController): @webnotes.whitelist() def get_default_bank_cash_account(company, voucher_type): - return webnotes.conn.get_value("Company", company, + from accounts.utils import get_balance_on + account = webnotes.conn.get_value("Company", company, voucher_type=="Bank Voucher" and "default_bank_account" or "default_cash_account") + if account: + return { + "account": account, + "balance": get_balance_on(account) + } def get_against_purchase_invoice(doctype, txt, searchfield, start, page_len, filters): return webnotes.conn.sql("""select name, credit_to, outstanding_amount, bill_no, bill_date