Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/accounts/doctype/journal_voucher/journal_voucher.js b/accounts/doctype/journal_voucher/journal_voucher.js
index ff520f6..2e89a67 100644
--- a/accounts/doctype/journal_voucher/journal_voucher.js
+++ b/accounts/doctype/journal_voucher/journal_voucher.js
@@ -163,7 +163,7 @@
method: "accounts.utils.get_balance_on",
args: {account: d.account, date: doc.posting_date},
callback: function(r) {
- d.balance = format_currency(r.message, erpnext.get_currency(doc.company));
+ d.balance = r.message;
refresh_field('balance', d.name, 'entries');
}
});
diff --git a/accounts/utils.py b/accounts/utils.py
index 3de445c..77665ea 100644
--- a/accounts/utils.py
+++ b/accounts/utils.py
@@ -119,7 +119,7 @@
bal = -bal
# if bal is None, return 0
- return bal or 0
+ return flt(bal)
@webnotes.whitelist()
def add_ac(args=None):
diff --git a/patches/march_2013/p08_create_aii_accounts.py b/patches/march_2013/p08_create_aii_accounts.py
index 0156a17..e4260d3 100644
--- a/patches/march_2013/p08_create_aii_accounts.py
+++ b/patches/march_2013/p08_create_aii_accounts.py
@@ -1,6 +1,7 @@
import webnotes
def execute():
webnotes.reload_doc("setup", "doctype", "company")
+ webnotes.reload_doc("accounts", "doctype", "cost_center")
create_chart_of_accounts_if_not_exists()
add_group_accounts()
add_ledger_accounts()