commonified in_words function

2026-05-06 15:00:27 +00:00 · 2013-01-22 11:12:02 +05:30
parent d3b625035c 5a6bd199b8
commit 5b4c294b40
130 changed files with 2125 additions and 1833 deletions
--- a/setup/doctype/authorization_rule/authorization_rule.txt
+++ b/setup/doctype/authorization_rule/authorization_rule.txt
@@ -7,12 +7,12 @@
  "modified": "2012-12-17 17:59:54"
 }, 
 {
-  "autoname": "AR.####", 
+  "document_type": "Master", 
  "name": "__common__", 
-  "search_fields": "transaction,based_on,system_user,system_role,approving_user,approving_role", 
+  "autoname": "AR.####", 
  "module": "Setup", 
  "doctype": "DocType", 
-  "document_type": "Master"
+  "search_fields": "transaction,based_on,system_user,system_role,approving_user,approving_role"
 }, 
 {
  "name": "__common__", 
@@ -32,6 +32,7 @@
  "cancel": 1, 
  "parenttype": "DocType", 
  "role": "System Manager", 
+  "report": 1, 
  "permlevel": 0, 
  "parentfield": "permissions"
 }, 
--- a/setup/doctype/brand/brand.txt
+++ b/setup/doctype/brand/brand.txt
@@ -7,10 +7,10 @@
  "modified": "2012-12-25 13:20:51"
 }, 
 {
-  "autoname": "field:brand", 
  "name": "__common__", 
-  "doctype": "DocType", 
+  "autoname": "field:brand", 
  "module": "Setup", 
+  "doctype": "DocType", 
  "in_dialog": 1, 
  "document_type": "Master"
 }, 
@@ -29,6 +29,7 @@
  "read": 1, 
  "doctype": "DocPerm", 
  "parenttype": "DocType", 
+  "report": 1, 
  "permlevel": 0, 
  "parentfield": "permissions"
 }, 
--- a/setup/doctype/company/company.txt
+++ b/setup/doctype/company/company.txt
@@ -7,11 +7,11 @@
  "modified": "2012-12-03 11:26:05"
 }, 
 {
-  "autoname": "field:company_name", 
  "description": "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.", 
+  "autoname": "field:company_name", 
  "allow_rename": 1, 
-  "doctype": "DocType", 
  "module": "Setup", 
+  "doctype": "DocType", 
  "document_type": "Master", 
  "name": "__common__"
 }, 
@@ -85,11 +85,11 @@
 {
  "doctype": "DocField", 
  "label": "Default Currency", 
-  "options": "link:Currency", 
+  "permlevel": 0, 
  "fieldname": "default_currency", 
  "fieldtype": "Select", 
  "reqd": 1, 
-  "permlevel": 0
+  "options": "link:Currency"
 }, 
 {
  "no_copy": 1, 
@@ -97,12 +97,12 @@
  "doctype": "DocField", 
  "label": "Default Bank Account", 
  "oldfieldname": "default_bank_account", 
+  "permlevel": 0, 
  "trigger": "Client", 
  "fieldname": "default_bank_account", 
  "fieldtype": "Link", 
  "depends_on": "eval:!doc.__islocal", 
-  "options": "Account", 
-  "permlevel": 0
+  "options": "Account"
 }, 
 {
  "no_copy": 1, 
@@ -110,12 +110,12 @@
  "doctype": "DocField", 
  "label": "Receivables Group", 
  "oldfieldname": "receivables_group", 
+  "permlevel": 0, 
  "trigger": "Client", 
  "fieldname": "receivables_group", 
  "fieldtype": "Link", 
  "depends_on": "eval:!doc.__islocal", 
-  "options": "Account", 
-  "permlevel": 0
+  "options": "Account"
 }, 
 {
  "no_copy": 1, 
@@ -123,12 +123,12 @@
  "doctype": "DocField", 
  "label": "Payables Group", 
  "oldfieldname": "payables_group", 
+  "permlevel": 0, 
  "trigger": "Client", 
  "fieldname": "payables_group", 
  "fieldtype": "Link", 
  "depends_on": "eval:!doc.__islocal", 
-  "options": "Account", 
-  "permlevel": 0
+  "options": "Account"
 }, 
 {
  "oldfieldtype": "Column Break", 
@@ -164,22 +164,22 @@
  "doctype": "DocField", 
  "label": "If Yearly Budget Exceeded", 
  "oldfieldname": "yearly_bgt_flag", 
-  "options": "\nWarn\nIgnore\nStop", 
+  "permlevel": 0, 
  "fieldname": "yearly_bgt_flag", 
  "fieldtype": "Select", 
  "depends_on": "eval:!doc.__islocal", 
-  "permlevel": 0
+  "options": "\nWarn\nIgnore\nStop"
 }, 
 {
  "oldfieldtype": "Select", 
  "doctype": "DocField", 
  "label": "If Monthly Budget Exceeded", 
  "oldfieldname": "monthly_bgt_flag", 
-  "options": "\nWarn\nIgnore\nStop", 
+  "permlevel": 0, 
  "fieldname": "monthly_bgt_flag", 
  "fieldtype": "Select", 
  "depends_on": "eval:!doc.__islocal", 
-  "permlevel": 0
+  "options": "\nWarn\nIgnore\nStop"
 }, 
 {
  "description": "For reference only.", 
@@ -212,30 +212,30 @@
  "doctype": "DocField", 
  "label": "Phone No", 
  "oldfieldname": "phone_no", 
-  "options": "Phone", 
+  "permlevel": 0, 
  "fieldname": "phone_no", 
  "fieldtype": "Data", 
-  "permlevel": 0
+  "options": "Phone"
 }, 
 {
  "oldfieldtype": "Data", 
  "doctype": "DocField", 
  "label": "Fax", 
  "oldfieldname": "fax", 
-  "options": "Phone", 
+  "permlevel": 0, 
  "fieldname": "fax", 
  "fieldtype": "Data", 
-  "permlevel": 0
+  "options": "Phone"
 }, 
 {
  "oldfieldtype": "Data", 
  "doctype": "DocField", 
  "label": "Email", 
  "oldfieldname": "email", 
-  "options": "Email", 
+  "permlevel": 0, 
  "fieldname": "email", 
  "fieldtype": "Data", 
-  "permlevel": 0
+  "options": "Email"
 }, 
 {
  "oldfieldtype": "Data", 
@@ -284,6 +284,7 @@
  "doctype": "DocPerm", 
  "submit": 0, 
  "write": 1, 
+  "report": 1, 
  "role": "System Manager", 
  "cancel": 1, 
  "permlevel": 0
@@ -294,14 +295,15 @@
  "doctype": "DocPerm", 
  "submit": 0, 
  "write": 1, 
+  "report": 1, 
  "role": "System Manager", 
  "cancel": 1, 
  "permlevel": 0
 }, 
 {
-  "doctype": "DocPerm", 
-  "role": "All", 
  "cancel": 0, 
-  "permlevel": 1
+  "role": "All", 
+  "permlevel": 1, 
+  "doctype": "DocPerm"
 }
 ]
--- a/setup/doctype/country/country.txt
+++ b/setup/doctype/country/country.txt
@@ -1,81 +1,82 @@
 [
 {
-  "owner": "Administrator", 
+  "creation": "2013-01-19 10:23:30", 
  "docstatus": 0, 
-  "creation": "2013-01-17 17:02:24", 
+  "modified": "2013-01-21 15:56:50", 
  "modified_by": "Administrator", 
-  "modified": "2013-01-17 17:04:08"
+  "owner": "Administrator"
 }, 
 {
-  "read_only": 0, 
  "autoname": "field:country_name", 
-  "in_create": 0, 
  "doctype": "DocType", 
-  "module": "Setup", 
  "document_type": "Master", 
-  "name": "__common__"
+  "in_create": 0, 
+  "module": "Setup", 
+  "name": "__common__", 
+  "read_only": 0
 }, 
 {
-  "name": "__common__", 
-  "parent": "Country", 
  "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "parentfield": "fields"
- }, 
- {
  "name": "__common__", 
  "parent": "Country", 
-  "read": 1, 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
  "create": 1, 
  "doctype": "DocPerm", 
-  "write": 1, 
+  "name": "__common__", 
+  "parent": "Country", 
+  "parentfield": "permissions", 
  "parenttype": "DocType", 
  "permlevel": 0, 
-  "parentfield": "permissions"
+  "read": 1, 
+  "report": 1, 
+  "submit": 0, 
+  "write": 1
 }, 
 {
-  "name": "Country", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Country"
 }, 
 {
-  "oldfieldtype": "Data", 
  "doctype": "DocField", 
-  "label": "Country Name", 
-  "oldfieldname": "country_name", 
  "fieldname": "country_name", 
  "fieldtype": "Data", 
+  "label": "Country Name", 
+  "oldfieldname": "country_name", 
+  "oldfieldtype": "Data", 
  "reqd": 1
 }, 
 {
  "doctype": "DocField", 
-  "label": "Date Format", 
  "fieldname": "date_format", 
-  "fieldtype": "Data"
+  "fieldtype": "Data", 
+  "label": "Date Format"
 }, 
 {
  "doctype": "DocField", 
-  "label": "Time Zones", 
  "fieldname": "time_zones", 
-  "fieldtype": "Text"
+  "fieldtype": "Text", 
+  "label": "Time Zones"
 }, 
 {
  "amend": 0, 
+  "cancel": 0, 
  "doctype": "DocPerm", 
-  "submit": 0, 
-  "role": "Sales Master Manager", 
-  "cancel": 0
+  "role": "Sales Master Manager"
 }, 
 {
-  "role": "Purchase Master Manager", 
-  "doctype": "DocPerm"
+  "doctype": "DocPerm", 
+  "role": "Purchase Master Manager"
 }, 
 {
-  "role": "HR User", 
-  "doctype": "DocPerm"
+  "doctype": "DocPerm", 
+  "role": "HR User"
 }, 
 {
-  "role": "HR Manager", 
-  "doctype": "DocPerm"
+  "doctype": "DocPerm", 
+  "role": "HR Manager"
 }
 ]
--- a/setup/doctype/currency/currency.js
+++ b/setup/doctype/currency/currency.js
@@ -1,3 +1,2 @@
 cur_frm.cscript.refresh = function(doc) {
-	cur_frm.set_intro(doc.__islocal ? "" : "There is nothing to edit.")
 }
--- a/setup/doctype/currency/currency.txt
+++ b/setup/doctype/currency/currency.txt
@@ -2,9 +2,9 @@
 {
  "owner": "Administrator", 
  "docstatus": 0, 
-  "creation": "2013-01-17 12:30:28", 
+  "creation": "2013-01-19 10:23:31", 
  "modified_by": "Administrator", 
-  "modified": "2013-01-17 16:24:59"
+  "modified": "2013-01-19 11:10:45"
 }, 
 {
  "read_only": 0, 
@@ -27,8 +27,12 @@
  "name": "__common__", 
  "parent": "Currency", 
  "read": 1, 
+  "create": 1, 
+  "submit": 0, 
  "doctype": "DocPerm", 
+  "write": 1, 
  "parenttype": "DocType", 
+  "report": 1, 
  "permlevel": 0, 
  "parentfield": "permissions"
 }, 
@@ -63,18 +67,27 @@
  "fieldname": "symbol", 
  "fieldtype": "Data"
 }, 
+ {
+  "doctype": "DocField", 
+  "label": "Number Format", 
+  "fieldname": "number_format", 
+  "fieldtype": "Data"
+ }, 
+ {
+  "cancel": 1, 
+  "role": "Accounts Manager", 
+  "doctype": "DocPerm"
+ }, 
 {
  "amend": 0, 
-  "create": 1, 
  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 1, 
-  "report": 1, 
-  "role": "System Manager", 
+  "role": "Sales Master Manager", 
  "cancel": 1
 }, 
 {
-  "role": "All", 
-  "doctype": "DocPerm"
+  "amend": 0, 
+  "doctype": "DocPerm", 
+  "role": "Purchase Master Manager", 
+  "cancel": 0
 }
 ]
--- a/setup/doctype/customer_group/customer_group.txt
+++ b/setup/doctype/customer_group/customer_group.txt
@@ -7,15 +7,15 @@
  "modified": "2012-12-06 10:28:54"
 }, 
 {
-  "in_create": 1, 
-  "search_fields": "name,parent_customer_group", 
-  "module": "Setup", 
-  "document_type": "Master", 
  "read_only": 1, 
+  "document_type": "Master", 
+  "in_create": 1, 
  "autoname": "field:customer_group_name", 
-  "name": "__common__", 
  "allow_rename": 1, 
-  "doctype": "DocType"
+  "module": "Setup", 
+  "doctype": "DocType", 
+  "search_fields": "name,parent_customer_group", 
+  "name": "__common__"
 }, 
 {
  "name": "__common__", 
@@ -64,12 +64,12 @@
  "doctype": "DocField", 
  "label": "Parent Customer Group", 
  "oldfieldname": "parent_customer_group", 
+  "permlevel": 0, 
  "trigger": "Client", 
  "fieldname": "parent_customer_group", 
  "fieldtype": "Link", 
  "reqd": 1, 
-  "options": "Customer Group", 
-  "permlevel": 0
+  "options": "Customer Group"
 }, 
 {
  "description": "Only leaf nodes are allowed in transaction", 
@@ -78,11 +78,11 @@
  "doctype": "DocField", 
  "label": "Has Child Node", 
  "oldfieldname": "is_group", 
-  "options": "\nYes\nNo", 
+  "permlevel": 0, 
  "fieldname": "is_group", 
  "fieldtype": "Select", 
  "reqd": 1, 
-  "permlevel": 0
+  "options": "\nYes\nNo"
 }, 
 {
  "doctype": "DocField", 
@@ -95,10 +95,10 @@
  "colour": "White:FFF", 
  "doctype": "DocField", 
  "label": "Default Price List", 
-  "options": "Price List", 
+  "permlevel": 0, 
  "fieldname": "default_price_list", 
  "fieldtype": "Link", 
-  "permlevel": 0
+  "options": "Price List"
 }, 
 {
  "print_hide": 1, 
@@ -135,11 +135,11 @@
  "doctype": "DocField", 
  "label": "old_parent", 
  "oldfieldname": "old_parent", 
-  "permlevel": 0, 
+  "options": "Customer Group", 
  "fieldname": "old_parent", 
  "fieldtype": "Link", 
  "hidden": 1, 
-  "options": "Customer Group", 
+  "permlevel": 0, 
  "report_hide": 1
 }, 
 {
@@ -154,6 +154,7 @@
  "create": 0, 
  "doctype": "DocPerm", 
  "write": 0, 
+  "report": 1, 
  "role": "Sales Manager", 
  "cancel": 0, 
  "permlevel": 0
@@ -178,6 +179,7 @@
  "create": 0, 
  "doctype": "DocPerm", 
  "write": 0, 
+  "report": 1, 
  "role": "Sales User", 
  "cancel": 0, 
  "permlevel": 0
@@ -186,6 +188,7 @@
  "create": 1, 
  "doctype": "DocPerm", 
  "write": 1, 
+  "report": 1, 
  "role": "Sales Master Manager", 
  "cancel": 1, 
  "permlevel": 0
--- a/setup/doctype/email_digest/email_digest.txt
+++ b/setup/doctype/email_digest/email_digest.txt
@@ -11,11 +11,11 @@
  "description": "Send regular summary reports via Email.", 
  "module": "Setup", 
  "doctype": "DocType", 
-  "autoname": "Prompt", 
  "document_type": "System", 
+  "_last_update": "1324556758", 
+  "autoname": "Prompt", 
  "name": "__common__", 
  "colour": "White:FFF", 
-  "_last_update": "1324556758", 
  "show_in_menu": 0, 
  "version": 1
 }, 
@@ -62,21 +62,21 @@
 {
  "doctype": "DocField", 
  "label": "For Company", 
-  "options": "link:Company", 
+  "permlevel": 0, 
  "fieldname": "company", 
  "fieldtype": "Select", 
  "reqd": 1, 
-  "permlevel": 0
+  "options": "link:Company"
 }, 
 {
  "allow_on_submit": 0, 
  "doctype": "DocField", 
  "label": "How frequently?", 
-  "permlevel": 0, 
+  "options": "Daily\nWeekly\nMonthly", 
  "fieldname": "frequency", 
  "fieldtype": "Select", 
  "reqd": 1, 
-  "options": "Daily\nWeekly\nMonthly"
+  "permlevel": 0
 }, 
 {
  "depends_on": "eval:doc.enabled", 
@@ -284,6 +284,7 @@
  "doctype": "DocPerm", 
  "write": 1, 
  "cancel": 1, 
+  "report": 1, 
  "permlevel": 0
 }, 
 {
--- a/setup/doctype/global_defaults/global_defaults.py
+++ b/setup/doctype/global_defaults/global_defaults.py
@@ -21,20 +21,21 @@ from webnotes.utils import cint

 keydict = {
 	"fiscal_year": "current_fiscal_year",
-    'company': 'default_company',
-    'currency': 'default_currency',
-    'price_list_name': 'default_price_list',
+	'company': 'default_company',
+	'currency': 'default_currency',
+	'price_list_name': 'default_price_list',
 	'price_list_currency': 'default_price_list_currency',
-    'item_group': 'default_item_group',
-    'customer_group': 'default_customer_group',
-    'cust_master_name': 'cust_master_name', 
-    'supplier_type': 'default_supplier_type',
-    'supp_master_name': 'supp_master_name', 
-    'territory': 'default_territory',
-    'stock_uom': 'default_stock_uom',
-    'fraction_currency': 'default_currency_fraction',
-    'valuation_method': 'default_valuation_method',
+	'item_group': 'default_item_group',
+	'customer_group': 'default_customer_group',
+	'cust_master_name': 'cust_master_name', 
+	'supplier_type': 'default_supplier_type',
+	'supp_master_name': 'supp_master_name', 
+	'territory': 'default_territory',
+	'stock_uom': 'default_stock_uom',
+	'fraction_currency': 'default_currency_fraction',
+	'valuation_method': 'default_valuation_method',
 	'date_format': 'date_format',
+	'number_format': 'number_format',
 	'currency_format':'default_currency_format',
 	'account_url':'account_url',
 	'allow_negative_stock' : 'allow_negative_stock',
--- a/setup/doctype/global_defaults/global_defaults.txt
+++ b/setup/doctype/global_defaults/global_defaults.txt
@@ -1,228 +1,237 @@
 [
 {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:23", 
  "docstatus": 0, 
-  "creation": "2012-10-26 16:49:40", 
+  "modified": "2013-01-21 16:32:30", 
  "modified_by": "Administrator", 
-  "modified": "2012-12-12 14:13:31"
+  "owner": "Administrator"
 }, 
 {
-  "in_create": 1, 
-  "allow_print": 1, 
-  "module": "Setup", 
-  "read_only": 1, 
+  "allow_copy": 1, 
  "allow_email": 1, 
-  "issingle": 1, 
-  "name": "__common__", 
+  "allow_print": 1, 
  "doctype": "DocType", 
  "hide_toolbar": 0, 
-  "allow_copy": 1
+  "in_create": 1, 
+  "issingle": 1, 
+  "module": "Setup", 
+  "name": "__common__", 
+  "read_only": 1
 }, 
 {
-  "name": "__common__", 
-  "parent": "Global Defaults", 
  "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "parentfield": "fields"
- }, 
- {
  "name": "__common__", 
  "parent": "Global Defaults", 
-  "read": 1, 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Global Defaults", 
+  "parentfield": "permissions", 
  "parenttype": "DocType", 
-  "parentfield": "permissions"
+  "read": 1, 
+  "report": 0, 
+  "submit": 0
 }, 
 {
-  "name": "Global Defaults", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Global Defaults"
 }, 
 {
  "doctype": "DocField", 
-  "label": "General", 
  "fieldname": "general", 
-  "fieldtype": "Section Break"
+  "fieldtype": "Section Break", 
+  "label": "General"
 }, 
 {
  "description": "Session Expiry in Hours e.g. 06:00", 
  "doctype": "DocField", 
-  "label": "Session Expiry", 
  "fieldname": "session_expiry", 
-  "fieldtype": "Data"
+  "fieldtype": "Data", 
+  "label": "Session Expiry"
 }, 
 {
  "doctype": "DocField", 
-  "label": "Company", 
  "fieldname": "company", 
-  "fieldtype": "Section Break"
+  "fieldtype": "Section Break", 
+  "label": "Company"
 }, 
 {
  "doctype": "DocField", 
-  "label": "Default Company", 
  "fieldname": "default_company", 
  "fieldtype": "Link", 
-  "reqd": 0, 
-  "options": "Company"
+  "label": "Default Company", 
+  "options": "Company", 
+  "reqd": 0
 }, 
 {
  "doctype": "DocField", 
-  "label": "Current Fiscal Year", 
  "fieldname": "current_fiscal_year", 
  "fieldtype": "Link", 
-  "reqd": 1, 
-  "options": "Fiscal Year"
+  "label": "Current Fiscal Year", 
+  "options": "Fiscal Year", 
+  "reqd": 1
 }, 
 {
  "doctype": "DocField", 
-  "label": "Date Format", 
  "fieldname": "date_format", 
  "fieldtype": "Select", 
+  "label": "Date Format", 
  "options": "yyyy-mm-dd\ndd-mm-yyyy\ndd/mm/yyyy\nmm/dd/yyyy\nmm-dd-yyyy"
 }, 
 {
  "doctype": "DocField", 
-  "width": "50%", 
+  "fieldname": "number_format", 
+  "fieldtype": "Select", 
+  "label": "Number Format", 
+  "options": "\n#,###.##\n#.###,##\n# ###.##\n#,##,###.##\n######"
+ }, 
+ {
+  "doctype": "DocField", 
  "fieldname": "column_break1", 
-  "fieldtype": "Column Break"
+  "fieldtype": "Column Break", 
+  "width": "50%"
 }, 
 {
  "default": "INR", 
  "doctype": "DocField", 
-  "label": "Default Currency", 
  "fieldname": "default_currency", 
  "fieldtype": "Select", 
-  "reqd": 1, 
-  "options": "link:Currency"
+  "label": "Default Currency", 
+  "options": "link:Currency", 
+  "reqd": 1
 }, 
 {
  "doctype": "DocField", 
-  "label": "Default Currency Format", 
  "fieldname": "default_currency_format", 
  "fieldtype": "Select", 
+  "label": "Default Currency Format", 
  "options": "Lacs\nMillions"
 }, 
 {
  "doctype": "DocField", 
-  "label": "Default Currency Fraction", 
  "fieldname": "default_currency_fraction", 
-  "fieldtype": "Data"
+  "fieldtype": "Data", 
+  "label": "Default Currency Fraction"
 }, 
 {
  "doctype": "DocField", 
-  "label": "Stock", 
  "fieldname": "stock", 
-  "fieldtype": "Section Break"
+  "fieldtype": "Section Break", 
+  "label": "Stock"
 }, 
 {
  "doctype": "DocField", 
-  "width": "50%", 
  "fieldname": "column_break2", 
-  "fieldtype": "Column Break"
+  "fieldtype": "Column Break", 
+  "width": "50%"
 }, 
 {
  "doctype": "DocField", 
-  "label": "Default Item Group", 
  "fieldname": "default_item_group", 
  "fieldtype": "Link", 
+  "label": "Default Item Group", 
  "options": "Item Group"
 }, 
 {
  "doctype": "DocField", 
-  "label": "IGHelp", 
  "fieldname": "ighelp", 
  "fieldtype": "HTML", 
+  "label": "IGHelp", 
  "options": "<a href=\"#!Sales Browser/Item Group\">To manage Item Groups, click here</a>"
 }, 
 {
  "doctype": "DocField", 
-  "label": "Default Stock UOM", 
  "fieldname": "default_stock_uom", 
  "fieldtype": "Link", 
+  "label": "Default Stock UOM", 
  "options": "UOM"
 }, 
 {
  "doctype": "DocField", 
-  "label": "Default Valuation Method", 
  "fieldname": "default_valuation_method", 
  "fieldtype": "Select", 
+  "label": "Default Valuation Method", 
  "options": "FIFO\nMoving Average"
 }, 
 {
  "description": "Applicable only if valuation method is moving average", 
  "doctype": "DocField", 
-  "label": "Allow Negative Stock", 
  "fieldname": "allow_negative_stock", 
-  "fieldtype": "Check"
+  "fieldtype": "Check", 
+  "label": "Allow Negative Stock"
 }, 
 {
  "doctype": "DocField", 
-  "label": "Default Warehouse Type", 
  "fieldname": "default_warehouse_type", 
  "fieldtype": "Link", 
+  "label": "Default Warehouse Type", 
  "options": "Warehouse Type"
 }, 
 {
  "doctype": "DocField", 
-  "label": "Raise Purchase Request when stock reaches re-order level", 
  "fieldname": "auto_indent", 
-  "fieldtype": "Check"
+  "fieldtype": "Check", 
+  "label": "Raise Purchase Request when stock reaches re-order level"
 }, 
 {
  "default": "1", 
  "doctype": "DocField", 
-  "width": "50%", 
  "fieldname": "column_break3", 
-  "fieldtype": "Column Break"
+  "fieldtype": "Column Break", 
+  "width": "50%"
 }, 
 {
  "description": "Percentage you are allowed to receive or deliver more against the quantity ordered. <p>For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units</p>", 
  "doctype": "DocField", 
-  "label": "Allowance Percent", 
  "fieldname": "tolerance", 
-  "fieldtype": "Currency"
+  "fieldtype": "Currency", 
+  "label": "Allowance Percent"
 }, 
 {
  "description": "Stock level frozen up to this date, nobody can do / modify entry except authorized person", 
  "doctype": "DocField", 
-  "label": "Stock Frozen Upto", 
  "fieldname": "stock_frozen_upto", 
-  "fieldtype": "Date"
+  "fieldtype": "Date", 
+  "label": "Stock Frozen Upto"
 }, 
 {
  "description": "Users with this role are allowed to do / modify stock entry before frozen date", 
  "doctype": "DocField", 
-  "label": "Authorized Role (Frozen Entry)", 
  "fieldname": "stock_auth_role", 
  "fieldtype": "Link", 
+  "label": "Authorized Role (Frozen Entry)", 
  "options": "Role"
 }, 
 {
  "doctype": "DocField", 
-  "label": "Accounts", 
  "fieldname": "accounts", 
-  "fieldtype": "Section Break"
+  "fieldtype": "Section Break", 
+  "label": "Accounts"
 }, 
 {
  "description": "Accounting entry frozen up to this date, nobody can do / modify entry except authorized person", 
  "doctype": "DocField", 
-  "label": "Accounts Frozen Upto", 
  "fieldname": "acc_frozen_upto", 
-  "fieldtype": "Date"
+  "fieldtype": "Date", 
+  "label": "Accounts Frozen Upto"
 }, 
 {
  "description": "Users with this role are allowed to do / modify accounting entry before frozen date", 
  "doctype": "DocField", 
-  "label": "Authourized Role (Frozen Entry)", 
  "fieldname": "bde_auth_role", 
  "fieldtype": "Link", 
+  "label": "Authourized Role (Frozen Entry)", 
  "options": "Role"
 }, 
 {
  "doctype": "DocField", 
-  "label": "Credit Controller", 
  "fieldname": "credit_controller", 
  "fieldtype": "Link", 
+  "label": "Credit Controller", 
  "options": "Role"
 }, 
 {
@@ -232,197 +241,187 @@
 }, 
 {
  "doctype": "DocField", 
-  "label": "Account Info", 
  "fieldname": "account_info", 
  "fieldtype": "HTML", 
+  "label": "Account Info", 
  "options": "<div class=\"help-box\">For more accounting defaults, Open <a href=\"#!List/Company\">Company</a></div>"
 }, 
 {
  "doctype": "DocField", 
-  "label": "Selling", 
  "fieldname": "selling", 
-  "fieldtype": "Section Break"
+  "fieldtype": "Section Break", 
+  "label": "Selling"
 }, 
 {
  "default": "Customer Name", 
  "doctype": "DocField", 
-  "label": "Customer Master created by ", 
  "fieldname": "cust_master_name", 
  "fieldtype": "Select", 
+  "label": "Customer Master created by ", 
  "options": "Customer Name\nNaming Series"
 }, 
 {
  "doctype": "DocField", 
-  "label": "Default Customer Group", 
  "fieldname": "default_customer_group", 
  "fieldtype": "Link", 
+  "label": "Default Customer Group", 
  "options": "Customer Group"
 }, 
 {
  "doctype": "DocField", 
-  "label": "CGHelp", 
  "fieldname": "cghelp", 
  "fieldtype": "HTML", 
+  "label": "CGHelp", 
  "options": "<a href=\"#!Sales Browser/Customer Group\">To manage Customer Groups, click here</a>"
 }, 
 {
  "doctype": "DocField", 
-  "label": "Default Territory", 
  "fieldname": "default_territory", 
  "fieldtype": "Link", 
+  "label": "Default Territory", 
  "options": "Territory"
 }, 
 {
  "doctype": "DocField", 
-  "label": "TerritoryHelp", 
  "fieldname": "territoryhelp", 
  "fieldtype": "HTML", 
+  "label": "TerritoryHelp", 
  "options": "<a href=\"#!Sales Browser/Territory\">To manage Territory, click here</a>"
 }, 
 {
  "doctype": "DocField", 
-  "width": "50%", 
  "fieldname": "column_break5", 
-  "fieldtype": "Column Break"
+  "fieldtype": "Column Break", 
+  "width": "50%"
 }, 
 {
  "doctype": "DocField", 
-  "label": "Default Price List", 
  "fieldname": "default_price_list", 
  "fieldtype": "Link", 
+  "label": "Default Price List", 
  "options": "Price List"
 }, 
 {
  "doctype": "DocField", 
-  "label": "Default Price List Currency", 
  "fieldname": "default_price_list_currency", 
  "fieldtype": "Link", 
+  "label": "Default Price List Currency", 
  "options": "Currency"
 }, 
 {
  "default": "No", 
  "doctype": "DocField", 
-  "label": "Sales Order Required", 
  "fieldname": "so_required", 
  "fieldtype": "Select", 
+  "label": "Sales Order Required", 
  "options": "No\nYes"
 }, 
 {
  "default": "No", 
  "doctype": "DocField", 
-  "label": "Delivery Note Required", 
  "fieldname": "dn_required", 
  "fieldtype": "Select", 
+  "label": "Delivery Note Required", 
  "options": "No\nYes"
 }, 
 {
  "doctype": "DocField", 
-  "label": "Buying", 
  "fieldname": "buying", 
-  "fieldtype": "Section Break"
+  "fieldtype": "Section Break", 
+  "label": "Buying"
 }, 
 {
  "doctype": "DocField", 
-  "label": "Default Supplier Type", 
  "fieldname": "default_supplier_type", 
  "fieldtype": "Link", 
+  "label": "Default Supplier Type", 
  "options": "Supplier Type"
 }, 
 {
  "default": "Supplier Name", 
  "doctype": "DocField", 
-  "label": "Supplier Master created by ", 
  "fieldname": "supp_master_name", 
  "fieldtype": "Select", 
+  "label": "Supplier Master created by ", 
  "options": "Supplier Name\nNaming Series"
 }, 
 {
  "doctype": "DocField", 
-  "width": "50%", 
  "fieldname": "column_break6", 
-  "fieldtype": "Column Break"
+  "fieldtype": "Column Break", 
+  "width": "50%"
 }, 
 {
  "default": "No", 
  "doctype": "DocField", 
-  "label": "Purchase Order Required", 
  "fieldname": "po_required", 
  "fieldtype": "Select", 
+  "label": "Purchase Order Required", 
  "options": "No\nYes"
 }, 
 {
  "default": "No", 
  "doctype": "DocField", 
-  "label": "Purchase Receipt Required", 
  "fieldname": "pr_required", 
  "fieldtype": "Select", 
+  "label": "Purchase Receipt Required", 
  "options": "No\nYes"
 }, 
 {
  "doctype": "DocField", 
-  "label": "Maintain same rate throughout purchase cycle", 
  "fieldname": "maintain_same_rate", 
-  "fieldtype": "Check"
+  "fieldtype": "Check", 
+  "label": "Maintain same rate throughout purchase cycle"
 }, 
 {
  "doctype": "DocField", 
-  "label": "HR", 
  "fieldname": "hr", 
  "fieldtype": "Section Break", 
+  "label": "HR", 
  "options": "<div style=\"padding-top: 8px;\" class=\"columnHeading\">HR</div>"
 }, 
 {
  "description": "Employee record is created using selected field. ", 
  "doctype": "DocField", 
-  "label": "Employee Records to be created by ", 
  "fieldname": "emp_created_by", 
  "fieldtype": "Select", 
+  "label": "Employee Records to be created by ", 
  "options": "\nNaming Series\nEmployee Number"
 }, 
 {
  "doctype": "DocField", 
-  "label": "System", 
  "fieldname": "system", 
-  "fieldtype": "Section Break"
+  "fieldtype": "Section Break", 
+  "label": "System"
 }, 
 {
  "doctype": "DocField", 
-  "label": "SMS Sender Name", 
  "fieldname": "sms_sender_name", 
-  "fieldtype": "Data"
- }, 
- {
-  "amend": 0, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 1, 
-  "role": "System Manager", 
-  "cancel": 0, 
-  "permlevel": 0
+  "fieldtype": "Data", 
+  "label": "SMS Sender Name"
 }, 
 {
  "create": 1, 
  "doctype": "DocPerm", 
-  "write": 1, 
+  "permlevel": 0, 
  "role": "System Manager", 
-  "permlevel": 0
+  "write": 1
 }, 
 {
  "doctype": "DocPerm", 
-  "write": 1, 
+  "permlevel": 1, 
  "role": "System Manager", 
-  "permlevel": 1
+  "write": 1
 }, 
 {
  "doctype": "DocPerm", 
-  "role": "All", 
-  "permlevel": 1
+  "permlevel": 1, 
+  "role": "All"
 }, 
 {
  "doctype": "DocPerm", 
-  "write": 1, 
+  "permlevel": 2, 
  "role": "System Manager", 
-  "permlevel": 2
+  "write": 1
 }
 ]
--- a/setup/doctype/item_group/item_group.txt
+++ b/setup/doctype/item_group/item_group.txt
@@ -7,18 +7,18 @@
  "modified": "2012-12-27 18:50:20"
 }, 
 {
-  "in_create": 1, 
+  "allow_attach": 1, 
  "search_fields": "parent_item_group", 
  "module": "Setup", 
+  "doctype": "DocType", 
  "autoname": "field:item_group_name", 
  "document_type": "Master", 
-  "allow_attach": 1, 
+  "description": "Item Classification", 
  "issingle": 0, 
  "name": "__common__", 
  "allow_rename": 1, 
-  "description": "Item Classification", 
-  "doctype": "DocType", 
-  "max_attachments": 3
+  "max_attachments": 3, 
+  "in_create": 1
 }, 
 {
  "name": "__common__", 
@@ -59,9 +59,9 @@
  "fieldtype": "Data"
 }, 
 {
-  "doctype": "DocField", 
  "fieldname": "cb0", 
-  "fieldtype": "Column Break"
+  "fieldtype": "Column Break", 
+  "doctype": "DocField"
 }, 
 {
  "no_copy": 0, 
@@ -90,9 +90,9 @@
 }, 
 {
  "doctype": "DocField", 
-  "label": "Website Settings", 
  "fieldname": "sb9", 
-  "fieldtype": "Section Break"
+  "fieldtype": "Section Break", 
+  "label": "Website Settings"
 }, 
 {
  "description": "Check this if you want to show in website", 
@@ -177,8 +177,8 @@
  "doctype": "DocPerm", 
  "submit": 0, 
  "write": 0, 
-  "cancel": 0, 
  "role": "Material Manager", 
+  "cancel": 0, 
  "permlevel": 1
 }, 
 {
@@ -187,8 +187,9 @@
  "doctype": "DocPerm", 
  "submit": 0, 
  "write": 0, 
-  "cancel": 0, 
+  "report": 1, 
  "role": "Material Manager", 
+  "cancel": 0, 
  "permlevel": 0
 }, 
 {
@@ -197,8 +198,8 @@
  "doctype": "DocPerm", 
  "submit": 0, 
  "write": 0, 
-  "cancel": 0, 
  "role": "Material User", 
+  "cancel": 0, 
  "permlevel": 1
 }, 
 {
@@ -207,24 +208,27 @@
  "doctype": "DocPerm", 
  "submit": 0, 
  "write": 0, 
-  "cancel": 0, 
+  "report": 1, 
  "role": "Material User", 
+  "cancel": 0, 
  "permlevel": 0
 }, 
 {
  "create": 1, 
  "doctype": "DocPerm", 
  "write": 1, 
+  "cancel": 1, 
  "role": "System Manager", 
-  "cancel": 1, 
+  "report": 1, 
  "permlevel": 0
 }, 
 {
  "create": 1, 
  "doctype": "DocPerm", 
  "write": 1, 
-  "role": "Material Master Manager", 
  "cancel": 1, 
+  "role": "Material Master Manager", 
+  "report": 1, 
  "permlevel": 0
 }
 ]
--- a/setup/doctype/naming_series_options/naming_series_options.txt
+++ b/setup/doctype/naming_series_options/naming_series_options.txt
@@ -11,12 +11,12 @@
  "in_create": 1, 
  "module": "Setup", 
  "doctype": "DocType", 
-  "autoname": "__NSO.#####", 
-  "show_in_menu": 0, 
  "read_only": 0, 
+  "autoname": "__NSO.#####", 
  "name": "__common__", 
  "colour": "White:FFF", 
  "server_code_error": " ", 
+  "show_in_menu": 0, 
  "version": 5
 }, 
 {
@@ -32,6 +32,7 @@
  "read": 1, 
  "name": "__common__", 
  "doctype": "DocPerm", 
+  "report": 1, 
  "parenttype": "DocType", 
  "role": "System Manager", 
  "permlevel": 0, 
--- a/setup/doctype/price_list/price_list.txt
+++ b/setup/doctype/price_list/price_list.txt
@@ -8,16 +8,16 @@
 }, 
 {
  "section_style": "Simple", 
+  "doctype": "DocType", 
  "allow_attach": 0, 
  "allow_print": 1, 
  "module": "Setup", 
-  "doctype": "DocType", 
-  "allow_trash": 1, 
  "server_code_error": " ", 
+  "allow_trash": 1, 
+  "autoname": "field:price_list_name", 
  "document_type": "Master", 
  "description": "Price List Master", 
  "allow_email": 1, 
-  "autoname": "field:price_list_name", 
  "name": "__common__", 
  "colour": "White:FFF", 
  "_last_update": "1303100817", 
@@ -38,8 +38,8 @@
  "name": "__common__", 
  "parent": "Price List", 
  "amend": 0, 
-  "doctype": "DocPerm", 
  "submit": 0, 
+  "doctype": "DocPerm", 
  "read": 1, 
  "parenttype": "DocType", 
  "parentfield": "permissions"
@@ -84,6 +84,7 @@
  "create": 0, 
  "doctype": "DocPerm", 
  "write": 0, 
+  "report": 1, 
  "role": "Sales Manager", 
  "cancel": 0, 
  "permlevel": 0
@@ -100,6 +101,7 @@
  "create": 0, 
  "doctype": "DocPerm", 
  "write": 0, 
+  "report": 1, 
  "role": "Sales User", 
  "cancel": 0, 
  "permlevel": 0
@@ -108,6 +110,7 @@
  "create": 1, 
  "doctype": "DocPerm", 
  "write": 1, 
+  "report": 1, 
  "role": "Sales Master Manager", 
  "cancel": 1, 
  "permlevel": 0
--- a/setup/doctype/print_heading/print_heading.txt
+++ b/setup/doctype/print_heading/print_heading.txt
@@ -10,13 +10,13 @@
  "section_style": "Simple", 
  "search_fields": "print_heading", 
  "module": "Setup", 
-  "doctype": "DocType", 
  "allow_trash": 1, 
-  "document_type": "Master", 
  "autoname": "field:print_heading", 
+  "document_type": "Master", 
+  "_last_update": "1294312215", 
  "name": "__common__", 
  "colour": "White:FFF", 
-  "_last_update": "1294312215", 
+  "doctype": "DocType", 
  "server_code_error": " ", 
  "version": 27
 }, 
@@ -30,10 +30,11 @@
 {
  "parent": "Print Heading", 
  "read": 1, 
-  "doctype": "DocPerm", 
+  "report": 1, 
  "cancel": 1, 
  "name": "__common__", 
  "create": 1, 
+  "doctype": "DocPerm", 
  "write": 1, 
  "parenttype": "DocType", 
  "role": "All", 
--- a/setup/doctype/quotation_lost_reason/quotation_lost_reason.txt
+++ b/setup/doctype/quotation_lost_reason/quotation_lost_reason.txt
@@ -9,13 +9,13 @@
 {
  "section_style": "Simple", 
  "module": "Setup", 
-  "server_code_error": " ", 
-  "allow_trash": 1, 
  "doctype": "DocType", 
-  "autoname": "field:order_lost_reason", 
+  "allow_trash": 1, 
  "document_type": "Master", 
+  "autoname": "field:order_lost_reason", 
  "name": "__common__", 
  "colour": "White:FFF", 
+  "server_code_error": " ", 
  "show_in_menu": 0, 
  "version": 4
 }, 
@@ -35,6 +35,7 @@
  "write": 1, 
  "cancel": 1, 
  "parenttype": "DocType", 
+  "report": 1, 
  "permlevel": 0, 
  "parentfield": "permissions"
 }, 
--- a/setup/doctype/sales_partner/sales_partner.txt
+++ b/setup/doctype/sales_partner/sales_partner.txt
@@ -8,11 +8,11 @@
 }, 
 {
  "read_only": 0, 
-  "autoname": "field:partner_name", 
  "in_create": 0, 
+  "autoname": "field:partner_name", 
  "name": "__common__", 
-  "doctype": "DocType", 
  "module": "Setup", 
+  "doctype": "DocType", 
  "document_type": "Master", 
  "description": "A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission."
 }, 
@@ -61,11 +61,11 @@
  "doctype": "DocField", 
  "label": "Partner Type", 
  "oldfieldname": "partner_type", 
-  "options": "\nChannel Partner\nDistributor\nDealer\nAgent\nRetailer\nImplementation Partner\nReseller", 
+  "permlevel": 0, 
  "fieldname": "partner_type", 
  "fieldtype": "Select", 
  "search_index": 0, 
-  "permlevel": 0, 
+  "options": "\nChannel Partner\nDistributor\nDealer\nAgent\nRetailer\nImplementation Partner\nReseller", 
  "in_filter": 1
 }, 
 {
@@ -89,11 +89,11 @@
 {
  "doctype": "DocField", 
  "label": "Territory", 
-  "options": "Territory", 
+  "permlevel": 0, 
  "fieldname": "territory", 
  "fieldtype": "Link", 
  "reqd": 1, 
-  "permlevel": 0
+  "options": "Territory"
 }, 
 {
  "doctype": "DocField", 
@@ -106,10 +106,10 @@
  "depends_on": "eval:doc.__islocal", 
  "doctype": "DocField", 
  "label": "Address Desc", 
-  "options": "<em>Addresses will appear only when you save the customer</em>", 
+  "permlevel": 0, 
  "fieldname": "address_desc", 
  "fieldtype": "HTML", 
-  "permlevel": 0
+  "options": "<em>Addresses will appear only when you save the customer</em>"
 }, 
 {
  "doctype": "DocField", 
@@ -128,10 +128,10 @@
  "depends_on": "eval:doc.__islocal", 
  "doctype": "DocField", 
  "label": "Contact Desc", 
-  "options": "<em>Contact Details will appear only when you save the customer</em>", 
+  "permlevel": 0, 
  "fieldname": "contact_desc", 
  "fieldtype": "HTML", 
-  "permlevel": 0
+  "options": "<em>Contact Details will appear only when you save the customer</em>"
 }, 
 {
  "doctype": "DocField", 
@@ -153,11 +153,11 @@
  "doctype": "DocField", 
  "label": "Partner Target Detail", 
  "oldfieldname": "partner_target_details", 
-  "options": "Target Detail", 
+  "permlevel": 0, 
  "fieldname": "partner_target_details", 
  "fieldtype": "Table", 
  "reqd": 0, 
-  "permlevel": 0
+  "options": "Target Detail"
 }, 
 {
  "description": "Select Budget Distribution to unevenly distribute targets across months.", 
@@ -165,10 +165,10 @@
  "doctype": "DocField", 
  "label": "Target Distribution", 
  "oldfieldname": "distribution_id", 
-  "options": "Budget Distribution", 
+  "permlevel": 0, 
  "fieldname": "distribution_id", 
  "fieldtype": "Link", 
-  "permlevel": 0
+  "options": "Budget Distribution"
 }, 
 {
  "amend": 0, 
@@ -186,6 +186,7 @@
  "doctype": "DocPerm", 
  "submit": 0, 
  "write": 0, 
+  "report": 1, 
  "role": "Sales Manager", 
  "cancel": 0, 
  "permlevel": 0
@@ -206,6 +207,7 @@
  "doctype": "DocPerm", 
  "submit": 0, 
  "write": 0, 
+  "report": 1, 
  "role": "Sales User", 
  "cancel": 0, 
  "permlevel": 0
@@ -216,6 +218,7 @@
  "doctype": "DocPerm", 
  "submit": 0, 
  "write": 1, 
+  "report": 1, 
  "role": "Sales Master Manager", 
  "cancel": 1, 
  "permlevel": 0
@@ -234,8 +237,9 @@
  "create": 1, 
  "doctype": "DocPerm", 
  "write": 1, 
+  "cancel": 1, 
  "role": "System Manager", 
-  "cancel": 1, 
+  "report": 1, 
  "permlevel": 0
 }, 
 {
--- a/setup/doctype/sales_person/sales_person.txt
+++ b/setup/doctype/sales_person/sales_person.txt
@@ -7,14 +7,14 @@
  "modified": "2012-12-06 10:30:15"
 }, 
 {
-  "autoname": "field:sales_person_name", 
+  "document_type": "Master", 
  "in_create": 1, 
-  "name": "__common__", 
+  "autoname": "field:sales_person_name", 
  "allow_rename": 1, 
-  "search_fields": "name,parent_sales_person", 
+  "name": "__common__", 
  "module": "Setup", 
  "doctype": "DocType", 
-  "document_type": "Master", 
+  "search_fields": "name,parent_sales_person", 
  "description": "All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets."
 }, 
 {
@@ -66,23 +66,23 @@
  "doctype": "DocField", 
  "label": "Parent Sales Person", 
  "oldfieldname": "parent_sales_person", 
-  "permlevel": 0, 
  "trigger": "Client", 
  "fieldname": "parent_sales_person", 
  "fieldtype": "Link", 
  "reqd": 1, 
-  "options": "Sales Person"
+  "options": "Sales Person", 
+  "permlevel": 0
 }, 
 {
  "oldfieldtype": "Select", 
  "doctype": "DocField", 
  "label": "Has Child Node", 
  "oldfieldname": "is_group", 
-  "options": "\nYes\nNo", 
+  "permlevel": 0, 
  "fieldname": "is_group", 
  "fieldtype": "Select", 
  "reqd": 1, 
-  "permlevel": 0
+  "options": "\nYes\nNo"
 }, 
 {
  "doctype": "DocField", 
@@ -92,10 +92,10 @@
 }, 
 {
  "doctype": "DocField", 
-  "label": "Employee", 
  "options": "Employee", 
  "fieldname": "employee", 
  "fieldtype": "Link", 
+  "label": "Employee", 
  "permlevel": 0
 }, 
 {
@@ -153,10 +153,10 @@
  "doctype": "DocField", 
  "label": "Target Details1", 
  "oldfieldname": "target_details", 
-  "options": "Target Detail", 
+  "permlevel": 0, 
  "fieldname": "target_details", 
  "fieldtype": "Table", 
-  "permlevel": 0
+  "options": "Target Detail"
 }, 
 {
  "description": "Select Budget Distribution to unevenly distribute targets across months.", 
@@ -165,11 +165,11 @@
  "doctype": "DocField", 
  "label": "Target Distribution", 
  "oldfieldname": "distribution_id", 
-  "options": "Budget Distribution", 
+  "permlevel": 0, 
  "fieldname": "distribution_id", 
  "fieldtype": "Link", 
  "search_index": 0, 
-  "permlevel": 0
+  "options": "Budget Distribution"
 }, 
 {
  "create": 0, 
@@ -183,6 +183,7 @@
  "create": 0, 
  "doctype": "DocPerm", 
  "write": 0, 
+  "report": 1, 
  "role": "Sales Manager", 
  "cancel": 0, 
  "permlevel": 0
@@ -199,6 +200,7 @@
  "create": 0, 
  "doctype": "DocPerm", 
  "write": 0, 
+  "report": 1, 
  "role": "Sales User", 
  "cancel": 0, 
  "permlevel": 0
@@ -207,6 +209,7 @@
  "create": 1, 
  "doctype": "DocPerm", 
  "write": 1, 
+  "report": 1, 
  "role": "Sales Master Manager", 
  "cancel": 1, 
  "permlevel": 0
--- a/setup/doctype/setup_control/setup_control.py
+++ b/setup/doctype/setup_control/setup_control.py
@@ -236,7 +236,7 @@ class DocType:
 				on duplicate key update `password`=password(%s)""", 
 				(user_email, pwd, pwd))
 				
-		self.add_all_roles_to(pr.name)
+		add_all_roles_to(pr.name)
 				
 def add_all_roles_to(name):
 	profile = webnotes.doc("Profile", name)
--- a/setup/doctype/state/state.txt
+++ b/setup/doctype/state/state.txt
@@ -7,25 +7,25 @@
  "modified": "2012-03-27 14:36:25"
 }, 
 {
+  "show_in_menu": 0, 
  "section_style": "Simple", 
  "in_create": 0, 
  "module": "Setup", 
-  "server_code_error": " ", 
+  "autoname": "field:state_name", 
  "document_type": "Master", 
  "read_only": 0, 
-  "autoname": "field:state_name", 
  "name": "__common__", 
  "colour": "White:FFF", 
  "doctype": "DocType", 
-  "show_in_menu": 0, 
+  "server_code_error": " ", 
  "version": 14
 }, 
 {
  "name": "__common__", 
  "parent": "State", 
  "doctype": "DocField", 
-  "reqd": 1, 
  "parenttype": "DocType", 
+  "reqd": 1, 
  "permlevel": 0, 
  "parentfield": "fields"
 }, 
@@ -36,6 +36,7 @@
  "create": 1, 
  "doctype": "DocPerm", 
  "write": 1, 
+  "report": 1, 
  "parenttype": "DocType", 
  "permlevel": 0, 
  "parentfield": "permissions"
--- a/setup/doctype/supplier_type/supplier_type.txt
+++ b/setup/doctype/supplier_type/supplier_type.txt
@@ -7,11 +7,11 @@
  "modified": "2012-12-06 10:29:04"
 }, 
 {
-  "autoname": "field:supplier_type", 
  "name": "__common__", 
+  "autoname": "field:supplier_type", 
  "allow_rename": 1, 
-  "doctype": "DocType", 
  "module": "Setup", 
+  "doctype": "DocType", 
  "document_type": "Master"
 }, 
 {
@@ -25,8 +25,8 @@
  "name": "__common__", 
  "parent": "Supplier Type", 
  "amend": 0, 
-  "doctype": "DocPerm", 
  "submit": 0, 
+  "doctype": "DocPerm", 
  "read": 1, 
  "parenttype": "DocType", 
  "parentfield": "permissions"
@@ -66,6 +66,7 @@
  "create": 0, 
  "doctype": "DocPerm", 
  "write": 0, 
+  "report": 1, 
  "role": "Purchase Manager", 
  "cancel": 0, 
  "permlevel": 0
@@ -82,6 +83,7 @@
  "create": 0, 
  "doctype": "DocPerm", 
  "write": 0, 
+  "report": 1, 
  "role": "Purchase User", 
  "cancel": 0, 
  "permlevel": 0
@@ -90,6 +92,7 @@
  "create": 1, 
  "doctype": "DocPerm", 
  "write": 1, 
+  "report": 1, 
  "role": "Purchase Master Manager", 
  "cancel": 1, 
  "permlevel": 0
--- a/setup/doctype/terms_and_conditions/terms_and_conditions.txt
+++ b/setup/doctype/terms_and_conditions/terms_and_conditions.txt
@@ -10,14 +10,14 @@
  "section_style": "Simple", 
  "description": "Standard Terms and Conditions that can be added to Sales and Purchases.\n\nExamples:\n\n1. Validity of the offer.\n1. Payment Terms (In Advance, On Credit, part advance etc).\n1. What is extra (or payable by the Customer).\n1. Safety / usage warning.\n1. Warranty if any.\n1. Returns Policy.\n1. Terms of shipping, if applicable.\n1. Ways of addressing disputes, indemnity, liability, etc.\n1. Address and Contact of your Company.", 
  "module": "Setup", 
-  "doctype": "DocType", 
-  "allow_trash": 1, 
  "server_code_error": " ", 
-  "document_type": "Master", 
+  "allow_trash": 1, 
  "autoname": "field:title", 
+  "document_type": "Master", 
+  "_last_update": "1322549700", 
  "name": "__common__", 
  "colour": "White:FFF", 
-  "_last_update": "1322549700", 
+  "doctype": "DocType", 
  "show_in_menu": 0, 
  "version": 1
 }, 
@@ -56,6 +56,7 @@
  "doctype": "DocPerm", 
  "submit": 0, 
  "write": 1, 
+  "report": 1, 
  "role": "Sales Master Manager", 
  "cancel": 1, 
  "permlevel": 0
@@ -76,6 +77,7 @@
  "doctype": "DocPerm", 
  "submit": 0, 
  "write": 0, 
+  "report": 1, 
  "role": "Sales User", 
  "cancel": 0, 
  "permlevel": 0
@@ -89,16 +91,18 @@
  "create": 1, 
  "doctype": "DocPerm", 
  "write": 1, 
-  "role": "System Manager", 
  "cancel": 1, 
+  "role": "System Manager", 
+  "report": 1, 
  "permlevel": 0
 }, 
 {
  "create": 1, 
  "doctype": "DocPerm", 
  "write": 1, 
-  "role": "Accounts User", 
  "cancel": 1, 
+  "role": "Accounts User", 
+  "report": 1, 
  "permlevel": 0
 }, 
 {
--- a/setup/doctype/territory/territory.txt
+++ b/setup/doctype/territory/territory.txt
@@ -7,11 +7,11 @@
  "modified": "2012-12-06 10:29:39"
 }, 
 {
-  "in_create": 1, 
+  "description": "Classification of Customers by region", 
  "search_fields": "name,parent_territory,territory_manager", 
  "module": "Setup", 
  "document_type": "Master", 
-  "description": "Classification of Customers by region", 
+  "in_create": 1, 
  "read_only": 1, 
  "autoname": "field:territory_name", 
  "name": "__common__", 
@@ -65,12 +65,12 @@
  "doctype": "DocField", 
  "label": "Parent Territory", 
  "oldfieldname": "parent_territory", 
+  "permlevel": 0, 
  "trigger": "Client", 
  "fieldname": "parent_territory", 
  "fieldtype": "Link", 
  "reqd": 1, 
-  "options": "Territory", 
-  "permlevel": 0
+  "options": "Territory"
 }, 
 {
  "description": "Only leaf nodes are allowed in transaction", 
@@ -79,11 +79,11 @@
  "doctype": "DocField", 
  "label": "Has Child Node", 
  "oldfieldname": "is_group", 
-  "options": "\nYes\nNo", 
+  "permlevel": 0, 
  "fieldname": "is_group", 
  "fieldtype": "Select", 
  "reqd": 1, 
-  "permlevel": 0
+  "options": "\nYes\nNo"
 }, 
 {
  "doctype": "DocField", 
@@ -98,12 +98,12 @@
  "doctype": "DocField", 
  "label": "Territory Manager", 
  "oldfieldname": "territory_manager", 
-  "permlevel": 0, 
+  "options": "Sales Person", 
  "fieldname": "territory_manager", 
  "fieldtype": "Link", 
  "search_index": 1, 
-  "in_filter": 1, 
-  "options": "Sales Person"
+  "permlevel": 0, 
+  "in_filter": 1
 }, 
 {
  "print_hide": 1, 
@@ -142,11 +142,11 @@
  "doctype": "DocField", 
  "label": "old_parent", 
  "oldfieldname": "old_parent", 
-  "permlevel": 0, 
+  "options": "Territory", 
  "fieldname": "old_parent", 
  "fieldtype": "Link", 
  "hidden": 1, 
-  "options": "Territory", 
+  "permlevel": 0, 
  "report_hide": 1
 }, 
 {
@@ -164,10 +164,10 @@
  "doctype": "DocField", 
  "label": "Target Details", 
  "oldfieldname": "target_details", 
-  "options": "Target Detail", 
+  "permlevel": 0, 
  "fieldname": "target_details", 
  "fieldtype": "Table", 
-  "permlevel": 0
+  "options": "Target Detail"
 }, 
 {
  "description": "Select Budget Distribution to unevenly distribute targets across months.", 
@@ -176,57 +176,60 @@
  "doctype": "DocField", 
  "label": "Target Distribution", 
  "oldfieldname": "distribution_id", 
-  "options": "Budget Distribution", 
+  "permlevel": 0, 
  "fieldname": "distribution_id", 
  "fieldtype": "Link", 
-  "permlevel": 0
+  "options": "Budget Distribution"
 }, 
 {
  "create": 0, 
  "doctype": "DocPerm", 
  "write": 0, 
-  "cancel": 0, 
  "role": "Sales Manager", 
+  "cancel": 0, 
  "permlevel": 1
 }, 
 {
  "create": 0, 
  "doctype": "DocPerm", 
  "write": 0, 
-  "cancel": 0, 
+  "report": 1, 
  "role": "Sales Manager", 
+  "cancel": 0, 
  "permlevel": 0
 }, 
 {
  "create": 0, 
  "doctype": "DocPerm", 
  "write": 0, 
-  "cancel": 0, 
  "role": "Sales Master Manager", 
+  "cancel": 0, 
  "permlevel": 1
 }, 
 {
  "create": 0, 
  "doctype": "DocPerm", 
  "write": 0, 
-  "cancel": 0, 
  "role": "Sales User", 
+  "cancel": 0, 
  "permlevel": 1
 }, 
 {
  "create": 0, 
  "doctype": "DocPerm", 
  "write": 0, 
-  "cancel": 0, 
+  "report": 1, 
  "role": "Sales User", 
+  "cancel": 0, 
  "permlevel": 0
 }, 
 {
  "create": 1, 
  "doctype": "DocPerm", 
  "write": 1, 
-  "cancel": 1, 
+  "report": 1, 
  "role": "Sales Master Manager", 
+  "cancel": 1, 
  "permlevel": 0
 }
 ]
--- a/setup/doctype/uom/uom.txt
+++ b/setup/doctype/uom/uom.txt
@@ -9,14 +9,14 @@
 {
  "section_style": "Tabbed", 
  "module": "Setup", 
-  "doctype": "DocType", 
-  "allow_trash": 1, 
  "server_code_error": " ", 
-  "document_type": "Master", 
+  "allow_trash": 1, 
  "autoname": "field:uom_name", 
+  "document_type": "Master", 
+  "_last_update": "1307707462", 
  "name": "__common__", 
  "colour": "White:FFF", 
-  "_last_update": "1307707462", 
+  "doctype": "DocType", 
  "show_in_menu": 0, 
  "version": 5
 }, 
@@ -31,8 +31,8 @@
  "name": "__common__", 
  "parent": "UOM", 
  "read": 1, 
-  "doctype": "DocPerm", 
  "submit": 0, 
+  "doctype": "DocPerm", 
  "amend": 0, 
  "parenttype": "DocType", 
  "parentfield": "permissions"
@@ -45,6 +45,7 @@
  "create": 1, 
  "doctype": "DocPerm", 
  "write": 1, 
+  "report": 1, 
  "role": "Material Master Manager", 
  "cancel": 1, 
  "permlevel": 0
@@ -61,6 +62,7 @@
  "create": 0, 
  "doctype": "DocPerm", 
  "write": 0, 
+  "report": 1, 
  "role": "Material Manager", 
  "cancel": 0, 
  "permlevel": 0
@@ -77,6 +79,7 @@
  "create": 0, 
  "doctype": "DocPerm", 
  "write": 0, 
+  "report": 1, 
  "role": "Material User", 
  "cancel": 0, 
  "permlevel": 0
--- a/setup/doctype/warehouse_type/warehouse_type.txt
+++ b/setup/doctype/warehouse_type/warehouse_type.txt
@@ -13,10 +13,10 @@
  "doctype": "DocType", 
  "allow_trash": 1, 
  "autoname": "field:warehouse_type", 
-  "show_in_menu": 0, 
  "name": "__common__", 
  "colour": "White:FFF", 
  "server_code_error": " ", 
+  "show_in_menu": 0, 
  "version": 6
 }, 
 {
@@ -30,8 +30,8 @@
  "name": "__common__", 
  "parent": "Warehouse Type", 
  "read": 1, 
-  "doctype": "DocPerm", 
  "submit": 0, 
+  "doctype": "DocPerm", 
  "amend": 0, 
  "parenttype": "DocType", 
  "parentfield": "permissions"
@@ -44,6 +44,7 @@
  "create": 1, 
  "doctype": "DocPerm", 
  "write": 1, 
+  "report": 1, 
  "role": "Material Master Manager", 
  "cancel": 1, 
  "permlevel": 0
@@ -60,6 +61,7 @@
  "create": 0, 
  "doctype": "DocPerm", 
  "write": 0, 
+  "report": 1, 
  "role": "Material Manager", 
  "cancel": 0, 
  "permlevel": 0
@@ -76,6 +78,7 @@
  "create": 0, 
  "doctype": "DocPerm", 
  "write": 0, 
+  "report": 1, 
  "role": "Material User", 
  "cancel": 0, 
  "permlevel": 0
--- a/setup/doctype/workflow_rule/workflow_rule.txt
+++ b/setup/doctype/workflow_rule/workflow_rule.txt
@@ -10,12 +10,12 @@
  "section_style": "Tray", 
  "search_fields": "select_form,rule_status", 
  "module": "Setup", 
-  "server_code_error": " ", 
  "doctype": "DocType", 
-  "autoname": "field:rule_name", 
  "document_type": "Master", 
+  "autoname": "field:rule_name", 
  "name": "__common__", 
  "colour": "White:FFF", 
+  "server_code_error": " ", 
  "show_in_menu": 0, 
  "version": 31
 }, 
@@ -30,6 +30,7 @@
 {
  "parent": "Workflow Rule", 
  "read": 1, 
+  "report": 1, 
  "name": "__common__", 
  "create": 1, 
  "doctype": "DocPerm", 
--- a/setup/utils.py
+++ b/setup/utils.py
@@ -46,10 +46,4 @@ def get_price_list_currency(args):
 	if result and len(result)==1:
 		return {"price_list_currency": result[0][0]}
 	else:
-		return {}
-
-@webnotes.whitelist()
-def get_total_in_words(amount, currency):
-	from webnotes.utils import money_in_words
-	fraction = webnotes.conn.get_value("Currency", currency, "fraction")
-	return money_in_words(amount, currency, fraction)
+		return {}