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:
Nabin Hait 2013-07-19 16:17:25 +05:30
commit 9f8edda6a2
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accounts/doctype/journal_voucher/journal_voucher.js
View File

@ -163,7 +163,7 @@ cur_frm.cscript.account = function(doc,dt,dn) {
method: "accounts.utils.get_balance_on", method: "accounts.utils.get_balance_on",
args: {account: d.account, date: doc.posting_date}, args: {account: d.account, date: doc.posting_date},
callback: function(r) { callback: function(r) {
d.balance = format_currency(r.message, erpnext.get_currency(doc.company)); d.balance = r.message;
refresh_field('balance', d.name, 'entries'); refresh_field('balance', d.name, 'entries');
} }
}); });

2
accounts/utils.py
View File

@ -119,7 +119,7 @@ def get_balance_on(account=None, date=None):
bal = -bal bal = -bal
# if bal is None, return 0 # if bal is None, return 0
return bal or 0 return flt(bal)
@webnotes.whitelist() @webnotes.whitelist()
def add_ac(args=None): def add_ac(args=None):

1
patches/march_2013/p08_create_aii_accounts.py
View File

@ -1,6 +1,7 @@
import webnotes import webnotes
def execute(): def execute():
webnotes.reload_doc("setup", "doctype", "company") webnotes.reload_doc("setup", "doctype", "company")
webnotes.reload_doc("accounts", "doctype", "cost_center")
create_chart_of_accounts_if_not_exists() create_chart_of_accounts_if_not_exists()
add_group_accounts() add_group_accounts()
add_ledger_accounts() add_ledger_accounts()