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

Conflicts:
	public/js/all-app.js
	public/js/all-web.js
This commit is contained in:
Anand Doshi
2012-09-26 12:24:28 +05:30
11 changed files with 441 additions and 315 deletions

View File

@@ -31,8 +31,8 @@ data_map = {
# Accounts
"Account": {
"columns": ["name", "parent_account", "lft", "rgt", "debit_or_credit", "is_pl_account",
"company"],
"columns": ["name", "parent_account", "lft", "rgt", "debit_or_credit",
"is_pl_account", "company"],
"order_by": "lft"
},
"Cost Center": {