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

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

Browse Source
This commit is contained in:
Nabin Hait 2012-05-11 11:12:23 +05:30
commit a5b8ac4867
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/doctype/journal_voucher/listview.js
View File

@ -4,7 +4,8 @@ wn.doclistviews['Journal Voucher'] = wn.views.ListView.extend({
this.fields = this.fields.concat([
'`tabJournal Voucher`.voucher_type',
'`tabJournal Voucher`.remark',
'`tabJournal Voucher`.total_debit'
'`tabJournal Voucher`.total_debit',
'`tabJournal Voucher`.company',
]);
this.stats = this.stats.concat(['voucher_type']);
},
@ -25,7 +26,7 @@ wn.doclistviews['Journal Voucher'] = wn.views.ListView.extend({
{
width: '18%',
content: function(parent, data) {
$(parent).html(sys_defaults.currency + ' ' + fmt_money(data.total_debit))
$(parent).html(wn.boot.company[data.company].default_currency + ' ' + fmt_money(data.total_debit))
},
css: {'text-align':'right'}
},

7
erpnext/startup/event_handlers.py
View File

@ -88,6 +88,13 @@ def boot_session(bootinfo):
if hasattr(conf, 'max_users'): bootinfo['max_users'] = conf.max_users
if hasattr(conf, 'expires_on'): bootinfo['expires_on'] = conf.expires_on
company = webnotes.conn.sql("select name, default_currency from `tabCompany`", as_dict=1)
company_dict = {}
for c in company:
company_dict.setdefault(c['name'], {}).update(c)
bootinfo['company'] = company_dict
def get_letter_heads():
"""load letter heads with startup"""