Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rushabh Mehta 2013-03-13 14:51:03 +05:30
commit 4f20f693c4
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
accounts/page/accounts_browser/accounts_browser.js
View File

@ -109,11 +109,11 @@ erpnext.AccountsChart = Class.extend({
}, },
onrender: function(treenode) { onrender: function(treenode) {
if (ctype == 'Account') { if (ctype == 'Account' && treenode.data) {
var bal = treenode.data && treenode.data.balance.split(' ') || ['','']; if(treenode.data.balance) {
if (bal && flt(bal[1])) {
treenode.parent.append('<span class="balance-area">' treenode.parent.append('<span class="balance-area">'
+ format_currency(bal[1], bal[0]) + '</span>'); + format_currency(treenode.data.balance, treenode.data.currency)
+ '</span>');
} }
} }
} }

5
accounts/page/accounts_browser/accounts_browser.py
View File

@ -1,7 +1,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import webnotes import webnotes
import webnotes.defaults import webnotes.defaults
from webnotes.utils import flt
from accounts.utils import get_balance_on from accounts.utils import get_balance_on
@webnotes.whitelist() @webnotes.whitelist()
@ -53,6 +53,7 @@ def get_children():
currency = webnotes.conn.sql("select default_currency from `tabCompany` where name = %s", company)[0][0] currency = webnotes.conn.sql("select default_currency from `tabCompany` where name = %s", company)[0][0]
for each in acc: for each in acc:
bal = get_balance_on(each.get("value")) bal = get_balance_on(each.get("value"))
each['balance'] = currency + ' ' + str(bal or 0) each["currency"] = currency
each["balance"] = flt(bal)
return acc return acc