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

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

Browse Source 
Conflicts:
	erpnext/setup/doctype/company/company.txt
This commit is contained in:
Anand Doshi 2012-08-10 12:58:48 +05:30
commit 241437995f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/accounts/page/accounts_browser/accounts_browser.py
View File

@ -36,7 +36,8 @@ 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 = webnotes.conn.sql("select balance from `tabAccount Balance` \ bal = webnotes.conn.sql("select balance from `tabAccount Balance` \
where account = %s and period = %s", (each.get('value'), get_defaults('fiscal_year')))[0][0] where account = %s and period = %s", (each.get('value'), get_defaults('fiscal_year')))
bal = bal and bal[0][0] or 0
each['balance'] = currency + ' ' + cstr(bal) each['balance'] = currency + ' ' + cstr(bal)
return acc return acc

5
erpnext/setup/doctype/company/company.txt
View File

@ -3,9 +3,9 @@
# These values are common in all dictionaries # These values are common in all dictionaries
{ {
'creation': '2012-07-03 13:30:55', 'creation': '2012-05-15 12:15:00',
'docstatus': 0, 'docstatus': 0,
'modified': '2012-07-11 14:43:55', 'modified': '2012-08-10 12:15:45',
'modified_by': u'Administrator', 'modified_by': u'Administrator',
'owner': u'Administrator' 'owner': u'Administrator'
}, },
@ -133,7 +133,6 @@
# DocField # DocField
{ {
'depends_on': u'eval:!doc.__islocal',
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'default_settings', 'fieldname': u'default_settings',
'fieldtype': u'Section Break', 'fieldtype': u'Section Break',