[minor] added webnotes.get_list, fixed webnotes/erpnext#663
diff --git a/accounts/page/accounts_browser/accounts_browser.py b/accounts/page/accounts_browser/accounts_browser.py
index e3ca889..61f4bfc 100644
--- a/accounts/page/accounts_browser/accounts_browser.py
+++ b/accounts/page/accounts_browser/accounts_browser.py
@@ -10,21 +10,8 @@
@webnotes.whitelist()
def get_companies():
"""get a list of companies based on permission"""
-
- # check if match permission exists
- res = webnotes.conn.sql("""select role, `match` from `tabDocPerm`
- where parent='Account' and permlevel=0 and `read`=1""", as_dict=1)
-
- roles = webnotes.user.get_roles()
- match = any((r["match"] for r in res
- if r["role"] in roles and r["match"]=="company"))
-
- # if match == company is specified and companies are specified in user defaults
- if match:
- return webnotes.defaults.get_user_default_as_list("company")
- else:
- return [r[0] for r in webnotes.conn.sql("""select name from tabCompany
- where docstatus!=2""")]
+ return [d.name for d in webnotes.get_list("Company", fields=["name"],
+ order_by="name")]
@webnotes.whitelist()
def get_children():
diff --git a/setup/doctype/company/company.txt b/setup/doctype/company/company.txt
index 6ca3668..768c7b1 100644
--- a/setup/doctype/company/company.txt
+++ b/setup/doctype/company/company.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-04-10 08:35:39",
"docstatus": 0,
- "modified": "2013-07-23 11:58:36",
+ "modified": "2013-08-05 15:39:36",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -157,15 +157,7 @@
"width": "50%"
},
{
- "depends_on": "eval:!doc.__islocal",
- "doctype": "DocField",
- "fieldname": "cost_center",
- "fieldtype": "Link",
- "label": "Cost Center",
- "no_copy": 1,
- "options": "Cost Center"
- },
- {
+ "description": "To enable more currencies go to Setup > Currency",
"doctype": "DocField",
"fieldname": "default_currency",
"fieldtype": "Link",
@@ -177,6 +169,15 @@
{
"depends_on": "eval:!doc.__islocal",
"doctype": "DocField",
+ "fieldname": "cost_center",
+ "fieldtype": "Link",
+ "label": "Cost Center",
+ "no_copy": 1,
+ "options": "Cost Center"
+ },
+ {
+ "depends_on": "eval:!doc.__islocal",
+ "doctype": "DocField",
"fieldname": "credit_days",
"fieldtype": "Int",
"label": "Credit Days",