Merge branch 'edge' of github.com:webnotes/erpnext into edge

This commit is contained in:
Nabin Hait
2013-01-22 11:22:53 +05:30
2 changed files with 14 additions and 3 deletions

View File

@@ -52,6 +52,6 @@ def get_children():
currency = webnotes.conn.sql("select default_currency from `tabCompany` where name = %s", company)[0][0]
for each in acc:
bal = get_balance_on(each.get("value"))
each['balance'] = currency + ' ' + fmt_money(bal)
each['balance'] = currency + ' ' + str(bal or 0)
return acc