diff --git a/erpnext/accounts/doctype/account/account.json b/erpnext/accounts/doctype/account/account.json
index dc83351..ccb0d24 100644
--- a/erpnext/accounts/doctype/account/account.json
+++ b/erpnext/accounts/doctype/account/account.json
@@ -1,332 +1,332 @@
 {
- "allow_copy": 1, 
- "allow_import": 1, 
- "allow_rename": 1, 
- "creation": "2013-01-30 12:49:46", 
- "description": "Heads (or groups) against which Accounting Entries are made and balances are maintained.", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Master", 
+ "allow_copy": 1,
+ "allow_import": 1,
+ "allow_rename": 1,
+ "creation": "2013-01-30 12:49:46",
+ "description": "Heads (or groups) against which Accounting Entries are made and balances are maintained.",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Master",
  "fields": [
   {
-   "fieldname": "properties", 
-   "fieldtype": "Section Break", 
-   "in_list_view": 0, 
-   "label": "Account Details", 
-   "oldfieldtype": "Section Break", 
+   "fieldname": "properties",
+   "fieldtype": "Section Break",
+   "in_list_view": 0,
+   "label": "Account Details",
+   "oldfieldtype": "Section Break",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "column_break0", 
-   "fieldtype": "Column Break", 
-   "in_list_view": 0, 
-   "permlevel": 0, 
+   "fieldname": "column_break0",
+   "fieldtype": "Column Break",
+   "in_list_view": 0,
+   "permlevel": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "fieldname": "account_name", 
-   "fieldtype": "Data", 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "label": "Account Name", 
-   "no_copy": 1, 
-   "oldfieldname": "account_name", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "read_only": 1, 
-   "reqd": 1, 
+   "fieldname": "account_name",
+   "fieldtype": "Data",
+   "in_filter": 1,
+   "in_list_view": 1,
+   "label": "Account Name",
+   "no_copy": 1,
+   "oldfieldname": "account_name",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "read_only": 1,
+   "reqd": 1,
    "search_index": 1
-  }, 
+  },
   {
-   "default": "Ledger", 
-   "fieldname": "group_or_ledger", 
-   "fieldtype": "Select", 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "label": "Group or Ledger", 
-   "oldfieldname": "group_or_ledger", 
-   "oldfieldtype": "Select", 
-   "options": "\nLedger\nGroup", 
-   "permlevel": 0, 
-   "read_only": 1, 
-   "reqd": 1, 
+   "default": "Ledger",
+   "fieldname": "group_or_ledger",
+   "fieldtype": "Select",
+   "in_filter": 1,
+   "in_list_view": 1,
+   "label": "Group or Ledger",
+   "oldfieldname": "group_or_ledger",
+   "oldfieldtype": "Select",
+   "options": "\nLedger\nGroup",
+   "permlevel": 0,
+   "read_only": 1,
+   "reqd": 1,
    "search_index": 1
-  }, 
+  },
   {
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "in_filter": 1, 
-   "label": "Company", 
-   "oldfieldname": "company", 
-   "oldfieldtype": "Link", 
-   "options": "Company", 
-   "permlevel": 0, 
-   "read_only": 1, 
-   "reqd": 1, 
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "in_filter": 1,
+   "label": "Company",
+   "oldfieldname": "company",
+   "oldfieldtype": "Link",
+   "options": "Company",
+   "permlevel": 0,
+   "read_only": 1,
+   "reqd": 1,
    "search_index": 1
-  }, 
+  },
   {
-   "fieldname": "column_break1", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0, 
+   "fieldname": "column_break1",
+   "fieldtype": "Column Break",
+   "permlevel": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "fieldname": "parent_account", 
-   "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
-   "label": "Parent Account", 
-   "oldfieldname": "parent_account", 
-   "oldfieldtype": "Link", 
-   "options": "Account", 
-   "permlevel": 0, 
-   "reqd": 1, 
+   "fieldname": "parent_account",
+   "fieldtype": "Link",
+   "ignore_user_permissions": 1,
+   "label": "Parent Account",
+   "oldfieldname": "parent_account",
+   "oldfieldtype": "Link",
+   "options": "Account",
+   "permlevel": 0,
+   "reqd": 1,
    "search_index": 1
-  }, 
+  },
   {
-   "description": "Setting Account Type helps in selecting this Account in transactions.", 
-   "fieldname": "account_type", 
-   "fieldtype": "Select", 
-   "in_filter": 1, 
-   "label": "Account Type", 
-   "oldfieldname": "account_type", 
-   "oldfieldtype": "Select", 
-   "options": "\nBank\nCash\nTax\nChargeable\nWarehouse\nReceivable\nPayable\nEquity\nFixed Asset\nCost of Goods Sold\nExpense Account\nIncome Account\nStock Received But Not Billed\nExpenses Included In Valuation\nStock Adjustment", 
-   "permlevel": 0, 
+   "description": "Setting Account Type helps in selecting this Account in transactions.",
+   "fieldname": "account_type",
+   "fieldtype": "Select",
+   "in_filter": 1,
+   "label": "Account Type",
+   "oldfieldname": "account_type",
+   "oldfieldtype": "Select",
+   "options": "\nBank\nCash\nTax\nChargeable\nWarehouse\nReceivable\nPayable\nEquity\nFixed Asset\nCost of Goods Sold\nExpense Account\nIncome Account\nStock Received But Not Billed\nExpenses Included In Valuation\nStock Adjustment",
+   "permlevel": 0,
    "search_index": 0
-  }, 
+  },
   {
-   "description": "Rate at which this tax is applied", 
-   "fieldname": "tax_rate", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "label": "Rate", 
-   "oldfieldname": "tax_rate", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
+   "description": "Rate at which this tax is applied",
+   "fieldname": "tax_rate",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "label": "Rate",
+   "oldfieldname": "tax_rate",
+   "oldfieldtype": "Currency",
+   "permlevel": 0,
    "reqd": 0
-  }, 
+  },
   {
-   "description": "If the account is frozen, entries are allowed to restricted users.", 
-   "fieldname": "freeze_account", 
-   "fieldtype": "Select", 
-   "label": "Frozen", 
-   "oldfieldname": "freeze_account", 
-   "oldfieldtype": "Select", 
-   "options": "No\nYes", 
+   "description": "If the account is frozen, entries are allowed to restricted users.",
+   "fieldname": "freeze_account",
+   "fieldtype": "Select",
+   "label": "Frozen",
+   "oldfieldname": "freeze_account",
+   "oldfieldtype": "Select",
+   "options": "No\nYes",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "credit_days", 
-   "fieldtype": "Int", 
-   "hidden": 1, 
-   "label": "Credit Days", 
-   "oldfieldname": "credit_days", 
-   "oldfieldtype": "Int", 
-   "permlevel": 0, 
+   "fieldname": "credit_days",
+   "fieldtype": "Int",
+   "hidden": 1,
+   "label": "Credit Days",
+   "oldfieldname": "credit_days",
+   "oldfieldtype": "Int",
+   "permlevel": 0,
    "print_hide": 1
-  }, 
+  },
   {
-   "fieldname": "credit_limit", 
-   "fieldtype": "Currency", 
-   "hidden": 1, 
-   "label": "Credit Limit", 
-   "oldfieldname": "credit_limit", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
+   "fieldname": "credit_limit",
+   "fieldtype": "Currency",
+   "hidden": 1,
+   "label": "Credit Limit",
+   "oldfieldname": "credit_limit",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "permlevel": 0,
    "print_hide": 1
-  }, 
+  },
   {
-   "description": "If this Account represents a Customer, Supplier or Employee, set it here.", 
-   "fieldname": "master_type", 
-   "fieldtype": "Select", 
-   "label": "Master Type", 
-   "oldfieldname": "master_type", 
-   "oldfieldtype": "Select", 
-   "options": "\nSupplier\nCustomer\nEmployee", 
+   "description": "If this Account represents a Customer, Supplier or Employee, set it here.",
+   "fieldname": "master_type",
+   "fieldtype": "Select",
+   "label": "Master Type",
+   "oldfieldname": "master_type",
+   "oldfieldtype": "Select",
+   "options": "\nSupplier\nCustomer\nEmployee",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "master_name", 
-   "fieldtype": "Link", 
-   "label": "Master Name", 
-   "oldfieldname": "master_name", 
-   "oldfieldtype": "Link", 
-   "options": "[Select]", 
+   "fieldname": "master_name",
+   "fieldtype": "Link",
+   "label": "Master Name",
+   "oldfieldname": "master_name",
+   "oldfieldtype": "Link",
+   "options": "[Select]",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "balance_must_be", 
-   "fieldtype": "Select", 
-   "label": "Balance must be", 
-   "options": "\nDebit\nCredit", 
+   "fieldname": "balance_must_be",
+   "fieldtype": "Select",
+   "label": "Balance must be",
+   "options": "\nDebit\nCredit",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "root_type", 
-   "fieldtype": "Select", 
-   "label": "Root Type", 
-   "options": "\nAsset\nLiability\nIncome\nExpense\nEquity", 
-   "permlevel": 0, 
+   "fieldname": "root_type",
+   "fieldtype": "Select",
+   "label": "Root Type",
+   "options": "\nAsset\nLiability\nIncome\nExpense\nEquity",
+   "permlevel": 0,
    "read_only": 1
-  }, 
+  },
   {
-   "fieldname": "report_type", 
-   "fieldtype": "Select", 
-   "label": "Report Type", 
-   "options": "\nBalance Sheet\nProfit and Loss", 
-   "permlevel": 0, 
+   "fieldname": "report_type",
+   "fieldtype": "Select",
+   "label": "Report Type",
+   "options": "\nBalance Sheet\nProfit and Loss",
+   "permlevel": 0,
    "read_only": 1
-  }, 
+  },
   {
-   "fieldname": "lft", 
-   "fieldtype": "Int", 
-   "hidden": 1, 
-   "label": "Lft", 
-   "permlevel": 0, 
-   "print_hide": 1, 
+   "fieldname": "lft",
+   "fieldtype": "Int",
+   "hidden": 1,
+   "label": "Lft",
+   "permlevel": 0,
+   "print_hide": 1,
    "read_only": 1
-  }, 
+  },
   {
-   "fieldname": "rgt", 
-   "fieldtype": "Int", 
-   "hidden": 1, 
-   "label": "Rgt", 
-   "permlevel": 0, 
-   "print_hide": 1, 
+   "fieldname": "rgt",
+   "fieldtype": "Int",
+   "hidden": 1,
+   "label": "Rgt",
+   "permlevel": 0,
+   "print_hide": 1,
    "read_only": 1
-  }, 
+  },
   {
-   "fieldname": "old_parent", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "label": "Old Parent", 
-   "permlevel": 0, 
-   "print_hide": 1, 
+   "fieldname": "old_parent",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "label": "Old Parent",
+   "permlevel": 0,
+   "print_hide": 1,
    "read_only": 1
   }
- ], 
- "icon": "icon-money", 
- "idx": 1, 
- "in_create": 1, 
- "modified": "2014-06-03 18:27:58.109303", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Account", 
- "owner": "Administrator", 
+ ],
+ "icon": "icon-money",
+ "idx": 1,
+ "in_create": 1,
+ "modified": "2014-06-03 18:27:58.109303",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Account",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "import": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts User", 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "import": 1,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Accounts User",
+   "submit": 0,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Auditor", 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "email": 1,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Auditor",
+   "submit": 0,
    "write": 0
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Sales User", 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "email": 1,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Sales User",
+   "submit": 0,
    "write": 0
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Purchase User", 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "email": 1,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Purchase User",
+   "submit": 0,
    "write": 0
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "permlevel": 2, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Auditor", 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "permlevel": 2,
+   "read": 1,
+   "report": 1,
+   "role": "Auditor",
+   "submit": 0,
    "write": 0
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "import": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "restrict": 1, 
-   "role": "Accounts Manager", 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "import": 1,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "set_user_permissions": 1,
+   "role": "Accounts Manager",
+   "submit": 0,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "permlevel": 2, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts Manager", 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "permlevel": 2,
+   "read": 1,
+   "report": 1,
+   "role": "Accounts Manager",
+   "submit": 0,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "permlevel": 2, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts User", 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "permlevel": 2,
+   "read": 1,
+   "report": 1,
+   "role": "Accounts User",
+   "submit": 0,
    "write": 0
   }
- ], 
+ ],
  "search_fields": "group_or_ledger"
-}
\ No newline at end of file
+}
diff --git a/erpnext/accounts/doctype/c_form/c_form.json b/erpnext/accounts/doctype/c_form/c_form.json
index 87d2922..6ba4578 100644
--- a/erpnext/accounts/doctype/c_form/c_form.json
+++ b/erpnext/accounts/doctype/c_form/c_form.json
@@ -126,7 +126,7 @@
   {
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Amended From", 
    "no_copy": 1, 
    "options": "C-Form", 
@@ -139,7 +139,7 @@
  "idx": 1, 
  "is_submittable": 1, 
  "max_attachments": 3, 
- "modified": "2014-05-09 02:18:00.162685", 
+ "modified": "2014-05-26 03:05:47.144265", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "C-Form", 
diff --git a/erpnext/accounts/doctype/cost_center/cost_center.json b/erpnext/accounts/doctype/cost_center/cost_center.json
index d497974..2e3efc1 100644
--- a/erpnext/accounts/doctype/cost_center/cost_center.json
+++ b/erpnext/accounts/doctype/cost_center/cost_center.json
@@ -31,7 +31,7 @@
   {
    "fieldname": "parent_cost_center", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "in_list_view": 1, 
    "label": "Parent Cost Center", 
    "oldfieldname": "parent_cost_center", 
@@ -131,7 +131,7 @@
    "fieldname": "old_parent", 
    "fieldtype": "Link", 
    "hidden": 1, 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "old_parent", 
    "no_copy": 1, 
    "oldfieldname": "old_parent", 
@@ -145,7 +145,7 @@
  "icon": "icon-money", 
  "idx": 1, 
  "in_create": 1, 
- "modified": "2014-05-07 06:37:48.038993", 
+ "modified": "2014-05-26 03:05:47.474366", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Cost Center", 
diff --git a/erpnext/accounts/doctype/journal_voucher/journal_voucher.json b/erpnext/accounts/doctype/journal_voucher/journal_voucher.json
index c214f98..bafc6df 100644
--- a/erpnext/accounts/doctype/journal_voucher/journal_voucher.json
+++ b/erpnext/accounts/doctype/journal_voucher/journal_voucher.json
@@ -426,7 +426,7 @@
   {
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Amended From", 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
@@ -440,7 +440,7 @@
  "icon": "icon-file-text", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2014-05-09 02:16:47.686703", 
+ "modified": "2014-05-26 03:05:49.482476", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Journal Voucher", 
diff --git a/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
index ef50882..decdc0a 100644
--- a/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
+++ b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
@@ -31,7 +31,7 @@
    "description": "Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.", 
    "fieldname": "default_account", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "in_list_view": 1, 
    "label": "Default Account", 
    "options": "Account", 
@@ -41,7 +41,7 @@
  ], 
  "icon": "icon-credit-card", 
  "idx": 1, 
- "modified": "2014-05-07 05:06:13.702313", 
+ "modified": "2014-05-26 03:05:50.299354", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Mode of Payment", 
diff --git a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json
index aaa8c8a..e1aa66f 100644
--- a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json
+++ b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json
@@ -44,7 +44,7 @@
   {
    "fieldname": "amended_from", 
    "fieldtype": "Data", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "in_list_view": 1, 
    "label": "Amended From", 
    "no_copy": 1, 
@@ -101,7 +101,7 @@
  "icon": "icon-file-text", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2014-05-09 02:16:36.920034", 
+ "modified": "2014-05-26 03:05:50.722547", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Period Closing Voucher", 
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
index e023dd0..b20563f 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
@@ -1,288 +1,288 @@
 {
- "allow_import": 1, 
- "autoname": "PRULE.#####", 
- "creation": "2014-02-21 15:02:51", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Master", 
+ "allow_import": 1,
+ "autoname": "PRULE.#####",
+ "creation": "2014-02-21 15:02:51",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Master",
  "fields": [
   {
-   "fieldname": "applicability_section", 
-   "fieldtype": "Section Break", 
-   "in_list_view": 0, 
-   "label": "Applicability", 
+   "fieldname": "applicability_section",
+   "fieldtype": "Section Break",
+   "in_list_view": 0,
+   "label": "Applicability",
    "permlevel": 0
-  }, 
+  },
   {
-   "default": "Item Code", 
-   "fieldname": "apply_on", 
-   "fieldtype": "Select", 
-   "in_list_view": 1, 
-   "label": "Apply On", 
-   "options": "\nItem Code\nItem Group\nBrand", 
-   "permlevel": 0, 
+   "default": "Item Code",
+   "fieldname": "apply_on",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "Apply On",
+   "options": "\nItem Code\nItem Group\nBrand",
+   "permlevel": 0,
    "reqd": 1
-  }, 
+  },
   {
-   "depends_on": "eval:doc.apply_on==\"Item Code\"", 
-   "fieldname": "item_code", 
-   "fieldtype": "Link", 
-   "in_list_view": 1, 
-   "label": "Item Code", 
-   "options": "Item", 
-   "permlevel": 0, 
+   "depends_on": "eval:doc.apply_on==\"Item Code\"",
+   "fieldname": "item_code",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Item Code",
+   "options": "Item",
+   "permlevel": 0,
    "reqd": 0
-  }, 
+  },
   {
-   "depends_on": "eval:doc.apply_on==\"Item Group\"", 
-   "fieldname": "item_group", 
-   "fieldtype": "Link", 
-   "in_list_view": 1, 
-   "label": "Item Group", 
-   "options": "Item Group", 
+   "depends_on": "eval:doc.apply_on==\"Item Group\"",
+   "fieldname": "item_group",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Item Group",
+   "options": "Item Group",
    "permlevel": 0
-  }, 
+  },
   {
-   "depends_on": "eval:doc.apply_on==\"Brand\"", 
-   "fieldname": "brand", 
-   "fieldtype": "Link", 
-   "in_list_view": 1, 
-   "label": "Brand", 
-   "options": "Brand", 
+   "depends_on": "eval:doc.apply_on==\"Brand\"",
+   "fieldname": "brand",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Brand",
+   "options": "Brand",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "applicable_for", 
-   "fieldtype": "Select", 
-   "label": "Applicable For", 
-   "options": "\nCustomer\nCustomer Group\nTerritory\nSales Partner\nCampaign\nSupplier\nSupplier Type", 
+   "fieldname": "applicable_for",
+   "fieldtype": "Select",
+   "label": "Applicable For",
+   "options": "\nCustomer\nCustomer Group\nTerritory\nSales Partner\nCampaign\nSupplier\nSupplier Type",
    "permlevel": 0
-  }, 
+  },
   {
-   "depends_on": "eval:doc.applicable_for==\"Customer\"", 
-   "fieldname": "customer", 
-   "fieldtype": "Link", 
-   "label": "Customer", 
-   "options": "Customer", 
+   "depends_on": "eval:doc.applicable_for==\"Customer\"",
+   "fieldname": "customer",
+   "fieldtype": "Link",
+   "label": "Customer",
+   "options": "Customer",
    "permlevel": 0
-  }, 
+  },
   {
-   "depends_on": "eval:doc.applicable_for==\"Customer Group\"", 
-   "fieldname": "customer_group", 
-   "fieldtype": "Link", 
-   "label": "Customer Group", 
-   "options": "Customer Group", 
+   "depends_on": "eval:doc.applicable_for==\"Customer Group\"",
+   "fieldname": "customer_group",
+   "fieldtype": "Link",
+   "label": "Customer Group",
+   "options": "Customer Group",
    "permlevel": 0
-  }, 
+  },
   {
-   "depends_on": "eval:doc.applicable_for==\"Territory\"", 
-   "fieldname": "territory", 
-   "fieldtype": "Link", 
-   "label": "Territory", 
-   "options": "Territory", 
+   "depends_on": "eval:doc.applicable_for==\"Territory\"",
+   "fieldname": "territory",
+   "fieldtype": "Link",
+   "label": "Territory",
+   "options": "Territory",
    "permlevel": 0
-  }, 
+  },
   {
-   "depends_on": "eval:doc.applicable_for==\"Sales Partner\"", 
-   "fieldname": "sales_partner", 
-   "fieldtype": "Link", 
-   "label": "Sales Partner", 
-   "options": "Sales Partner", 
+   "depends_on": "eval:doc.applicable_for==\"Sales Partner\"",
+   "fieldname": "sales_partner",
+   "fieldtype": "Link",
+   "label": "Sales Partner",
+   "options": "Sales Partner",
    "permlevel": 0
-  }, 
+  },
   {
-   "depends_on": "eval:doc.applicable_for==\"Campaign\"", 
-   "fieldname": "campaign", 
-   "fieldtype": "Link", 
-   "label": "Campaign", 
-   "options": "Campaign", 
+   "depends_on": "eval:doc.applicable_for==\"Campaign\"",
+   "fieldname": "campaign",
+   "fieldtype": "Link",
+   "label": "Campaign",
+   "options": "Campaign",
    "permlevel": 0
-  }, 
+  },
   {
-   "depends_on": "eval:doc.applicable_for==\"Supplier\"", 
-   "fieldname": "supplier", 
-   "fieldtype": "Link", 
-   "label": "Supplier", 
-   "options": "Supplier", 
+   "depends_on": "eval:doc.applicable_for==\"Supplier\"",
+   "fieldname": "supplier",
+   "fieldtype": "Link",
+   "label": "Supplier",
+   "options": "Supplier",
    "permlevel": 0
-  }, 
+  },
   {
-   "depends_on": "eval:doc.applicable_for==\"Supplier Type\"", 
-   "fieldname": "supplier_type", 
-   "fieldtype": "Link", 
-   "label": "Supplier Type", 
-   "options": "Supplier Type", 
+   "depends_on": "eval:doc.applicable_for==\"Supplier Type\"",
+   "fieldname": "supplier_type",
+   "fieldtype": "Link",
+   "label": "Supplier Type",
+   "options": "Supplier Type",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "min_qty", 
-   "fieldtype": "Float", 
-   "label": "Min Qty", 
+   "fieldname": "min_qty",
+   "fieldtype": "Float",
+   "label": "Min Qty",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "max_qty", 
-   "fieldtype": "Float", 
-   "label": "Max Qty", 
+   "fieldname": "max_qty",
+   "fieldtype": "Float",
+   "label": "Max Qty",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "col_break1", 
-   "fieldtype": "Column Break", 
+   "fieldname": "col_break1",
+   "fieldtype": "Column Break",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "label": "Company", 
-   "options": "Company", 
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "label": "Company",
+   "options": "Company",
    "permlevel": 0
-  }, 
+  },
   {
-   "default": "Today", 
-   "fieldname": "valid_from", 
-   "fieldtype": "Date", 
-   "label": "Valid From", 
+   "default": "Today",
+   "fieldname": "valid_from",
+   "fieldtype": "Date",
+   "label": "Valid From",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "valid_upto", 
-   "fieldtype": "Date", 
-   "label": "Valid Upto", 
+   "fieldname": "valid_upto",
+   "fieldtype": "Date",
+   "label": "Valid Upto",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "priority", 
-   "fieldtype": "Select", 
-   "label": "Priority", 
-   "options": "\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20", 
+   "fieldname": "priority",
+   "fieldtype": "Select",
+   "label": "Priority",
+   "options": "\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "disable", 
-   "fieldtype": "Check", 
-   "label": "Disable", 
+   "fieldname": "disable",
+   "fieldtype": "Check",
+   "label": "Disable",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "price_discount_section", 
-   "fieldtype": "Section Break", 
-   "label": "Price / Discount", 
+   "fieldname": "price_discount_section",
+   "fieldtype": "Section Break",
+   "label": "Price / Discount",
    "permlevel": 0
-  }, 
+  },
   {
-   "default": "Discount Percentage", 
-   "fieldname": "price_or_discount", 
-   "fieldtype": "Select", 
-   "label": "Price or Discount", 
-   "options": "\nPrice\nDiscount Percentage", 
-   "permlevel": 0, 
+   "default": "Discount Percentage",
+   "fieldname": "price_or_discount",
+   "fieldtype": "Select",
+   "label": "Price or Discount",
+   "options": "\nPrice\nDiscount Percentage",
+   "permlevel": 0,
    "reqd": 1
-  }, 
+  },
   {
-   "fieldname": "col_break2", 
-   "fieldtype": "Column Break", 
+   "fieldname": "col_break2",
+   "fieldtype": "Column Break",
    "permlevel": 0
-  }, 
+  },
   {
-   "depends_on": "eval:doc.price_or_discount==\"Price\"", 
-   "fieldname": "price", 
-   "fieldtype": "Float", 
-   "label": "Price", 
+   "depends_on": "eval:doc.price_or_discount==\"Price\"",
+   "fieldname": "price",
+   "fieldtype": "Float",
+   "label": "Price",
    "permlevel": 0
-  }, 
+  },
   {
-   "depends_on": "eval:doc.price_or_discount==\"Discount Percentage\"", 
-   "fieldname": "discount_percentage", 
-   "fieldtype": "Float", 
-   "label": "Discount Percentage", 
+   "depends_on": "eval:doc.price_or_discount==\"Discount Percentage\"",
+   "fieldname": "discount_percentage",
+   "fieldtype": "Float",
+   "label": "Discount Percentage",
    "permlevel": 0
-  }, 
+  },
   {
-   "depends_on": "eval:doc.price_or_discount==\"Discount Percentage\"", 
-   "fieldname": "for_price_list", 
-   "fieldtype": "Link", 
-   "label": "For Price List", 
-   "options": "Price List", 
+   "depends_on": "eval:doc.price_or_discount==\"Discount Percentage\"",
+   "fieldname": "for_price_list",
+   "fieldtype": "Link",
+   "label": "For Price List",
+   "options": "Price List",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "help_section", 
-   "fieldtype": "Section Break", 
-   "label": "", 
-   "options": "Simple", 
+   "fieldname": "help_section",
+   "fieldtype": "Section Break",
+   "label": "",
+   "options": "Simple",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "pricing_rule_help", 
-   "fieldtype": "HTML", 
-   "label": "Pricing Rule Help", 
+   "fieldname": "pricing_rule_help",
+   "fieldtype": "HTML",
+   "label": "Pricing Rule Help",
    "permlevel": 0
   }
- ], 
- "icon": "icon-gift", 
- "idx": 1, 
- "istable": 0, 
- "modified": "2014-05-28 15:36:29.403659", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Pricing Rule", 
- "owner": "Administrator", 
+ ],
+ "icon": "icon-gift",
+ "idx": 1,
+ "istable": 0,
+ "modified": "2014-05-28 15:36:29.403659",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Pricing Rule",
+ "owner": "Administrator",
  "permissions": [
   {
-   "create": 1, 
-   "delete": 1, 
-   "export": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts Manager", 
+   "create": 1,
+   "delete": 1,
+   "export": 0,
+   "import": 0,
+   "permlevel": 0,
+   "read": 1,
+   "report": 1,
+   "role": "Accounts Manager",
    "write": 1
-  }, 
+  },
   {
-   "create": 1, 
-   "delete": 1, 
-   "export": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Sales Manager", 
+   "create": 1,
+   "delete": 1,
+   "export": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 0,
+   "read": 1,
+   "report": 1,
+   "role": "Sales Manager",
    "write": 1
-  }, 
+  },
   {
-   "create": 1, 
-   "delete": 1, 
-   "permlevel": 0, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Purchase Manager", 
+   "create": 1,
+   "delete": 1,
+   "permlevel": 0,
+   "read": 1,
+   "report": 1,
+   "role": "Purchase Manager",
    "write": 1
-  }, 
+  },
   {
-   "create": 1, 
-   "delete": 1, 
-   "permlevel": 0, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Website Manager", 
+   "create": 1,
+   "delete": 1,
+   "permlevel": 0,
+   "read": 1,
+   "report": 1,
+   "role": "Website Manager",
    "write": 1
-  }, 
+  },
   {
-   "create": 1, 
-   "delete": 1, 
-   "export": 1, 
-   "import": 1, 
-   "permlevel": 0, 
-   "read": 1, 
-   "report": 1, 
-   "restrict": 1, 
-   "role": "System Manager", 
+   "create": 1,
+   "delete": 1,
+   "export": 1,
+   "import": 1,
+   "permlevel": 0,
+   "read": 1,
+   "report": 1,
+   "set_user_permissions": 1,
+   "role": "System Manager",
    "write": 1
   }
- ], 
- "sort_field": "modified", 
+ ],
+ "sort_field": "modified",
  "sort_order": "DESC"
-}
\ No newline at end of file
+}
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index b3eb534..23bf3d8 100755
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -146,7 +146,7 @@
   {
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Amended From", 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
@@ -744,7 +744,7 @@
  "icon": "icon-file-text", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2014-05-09 02:16:52.618986", 
+ "modified": "2014-05-26 03:05:50.996094", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Invoice", 
diff --git a/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json b/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
index 6f95a16..147f2f5 100644
--- a/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
+++ b/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
@@ -31,7 +31,6 @@
    "fieldname": "category",
    "fieldtype": "Select",
    "hidden": null,
-   "ignore_restrictions": null,
    "in_filter": null,
    "in_list_view": 0,
    "label": "Consider Tax or Charge for",
@@ -59,7 +58,6 @@
    "fieldname": "add_deduct_tax",
    "fieldtype": "Select",
    "hidden": null,
-   "ignore_restrictions": null,
    "in_filter": null,
    "in_list_view": null,
    "label": "Add or Deduct",
@@ -87,7 +85,6 @@
    "fieldname": "charge_type",
    "fieldtype": "Select",
    "hidden": null,
-   "ignore_restrictions": null,
    "in_filter": null,
    "in_list_view": 1,
    "label": "Type",
@@ -115,7 +112,6 @@
    "fieldname": "row_id",
    "fieldtype": "Data",
    "hidden": 0,
-   "ignore_restrictions": null,
    "in_filter": null,
    "in_list_view": null,
    "label": "Reference Row #",
@@ -143,7 +139,6 @@
    "fieldname": "description",
    "fieldtype": "Small Text",
    "hidden": null,
-   "ignore_restrictions": null,
    "in_filter": null,
    "in_list_view": 1,
    "label": "Description",
@@ -171,7 +166,6 @@
    "fieldname": "col_break1",
    "fieldtype": "Column Break",
    "hidden": null,
-   "ignore_restrictions": null,
    "in_filter": null,
    "in_list_view": null,
    "label": null,
@@ -199,7 +193,6 @@
    "fieldname": "account_head",
    "fieldtype": "Link",
    "hidden": null,
-   "ignore_restrictions": null,
    "in_filter": null,
    "in_list_view": 0,
    "label": "Account Head",
@@ -227,7 +220,6 @@
    "fieldname": "cost_center",
    "fieldtype": "Link",
    "hidden": null,
-   "ignore_restrictions": null,
    "in_filter": null,
    "in_list_view": 0,
    "label": "Cost Center",
@@ -255,7 +247,6 @@
    "fieldname": "rate",
    "fieldtype": "Float",
    "hidden": null,
-   "ignore_restrictions": null,
    "in_filter": null,
    "in_list_view": 1,
    "label": "Rate",
@@ -283,7 +274,6 @@
    "fieldname": "tax_amount",
    "fieldtype": "Currency",
    "hidden": null,
-   "ignore_restrictions": null,
    "in_filter": null,
    "in_list_view": 1,
    "label": "Amount",
@@ -311,7 +301,6 @@
    "fieldname": "total",
    "fieldtype": "Currency",
    "hidden": null,
-   "ignore_restrictions": null,
    "in_filter": null,
    "in_list_view": null,
    "label": "Total",
@@ -339,7 +328,6 @@
    "fieldname": "item_wise_tax_detail",
    "fieldtype": "Small Text",
    "hidden": 1,
-   "ignore_restrictions": null,
    "in_filter": null,
    "in_list_view": null,
    "label": "Item Wise Tax Detail ",
@@ -367,7 +355,6 @@
    "fieldname": "parenttype",
    "fieldtype": "Data",
    "hidden": 1,
-   "ignore_restrictions": null,
    "in_filter": 1,
    "in_list_view": null,
    "label": "Parenttype",
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index ad326df..5d3c50f 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -106,7 +106,7 @@
   {
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Amended From", 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
@@ -1180,7 +1180,7 @@
  "icon": "icon-file-text", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2014-05-09 02:17:00.217556", 
+ "modified": "2014-05-26 03:05:52.871209", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Invoice", 
diff --git a/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json b/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json
index 0b0703f..bba8f7e 100644
--- a/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json
+++ b/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json
@@ -31,7 +31,6 @@
    "fieldname": "charge_type",
    "fieldtype": "Select",
    "hidden": null,
-   "ignore_restrictions": null,
    "in_filter": null,
    "in_list_view": 1,
    "label": "Type",
@@ -59,7 +58,6 @@
    "fieldname": "row_id",
    "fieldtype": "Data",
    "hidden": 0,
-   "ignore_restrictions": null,
    "in_filter": null,
    "in_list_view": null,
    "label": "Reference Row #",
@@ -87,7 +85,6 @@
    "fieldname": "description",
    "fieldtype": "Small Text",
    "hidden": null,
-   "ignore_restrictions": null,
    "in_filter": null,
    "in_list_view": 1,
    "label": "Description",
@@ -115,7 +112,6 @@
    "fieldname": "col_break_1",
    "fieldtype": "Column Break",
    "hidden": null,
-   "ignore_restrictions": null,
    "in_filter": null,
    "in_list_view": null,
    "label": null,
@@ -143,7 +139,6 @@
    "fieldname": "account_head",
    "fieldtype": "Link",
    "hidden": null,
-   "ignore_restrictions": null,
    "in_filter": null,
    "in_list_view": 0,
    "label": "Account Head",
@@ -171,7 +166,6 @@
    "fieldname": "cost_center",
    "fieldtype": "Link",
    "hidden": null,
-   "ignore_restrictions": null,
    "in_filter": null,
    "in_list_view": 0,
    "label": "Cost Center",
@@ -199,7 +193,6 @@
    "fieldname": "rate",
    "fieldtype": "Float",
    "hidden": null,
-   "ignore_restrictions": null,
    "in_filter": null,
    "in_list_view": 1,
    "label": "Rate",
@@ -227,7 +220,6 @@
    "fieldname": "tax_amount",
    "fieldtype": "Currency",
    "hidden": null,
-   "ignore_restrictions": null,
    "in_filter": null,
    "in_list_view": 1,
    "label": "Amount",
@@ -255,7 +247,6 @@
    "fieldname": "total",
    "fieldtype": "Currency",
    "hidden": null,
-   "ignore_restrictions": null,
    "in_filter": null,
    "in_list_view": null,
    "label": "Total",
@@ -283,7 +274,6 @@
    "fieldname": "included_in_print_rate",
    "fieldtype": "Check",
    "hidden": null,
-   "ignore_restrictions": null,
    "in_filter": null,
    "in_list_view": null,
    "label": "Is this Tax included in Basic Rate?",
@@ -311,7 +301,6 @@
    "fieldname": "tax_amount_after_discount_amount",
    "fieldtype": "Currency",
    "hidden": 1,
-   "ignore_restrictions": null,
    "in_filter": null,
    "in_list_view": null,
    "label": "Tax Amount After Discount Amount",
@@ -339,7 +328,6 @@
    "fieldname": "item_wise_tax_detail",
    "fieldtype": "Small Text",
    "hidden": 1,
-   "ignore_restrictions": null,
    "in_filter": null,
    "in_list_view": null,
    "label": "Item Wise Tax Detail",
@@ -367,7 +355,6 @@
    "fieldname": "parenttype",
    "fieldtype": "Data",
    "hidden": 1,
-   "ignore_restrictions": null,
    "in_filter": 1,
    "in_list_view": null,
    "label": "Parenttype",
diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py
index eb6dc02..539ebd1 100644
--- a/erpnext/accounts/party.py
+++ b/erpnext/accounts/party.py
@@ -5,7 +5,7 @@
 
 import frappe
 from frappe import _
-from frappe.defaults import get_restrictions
+from frappe.defaults import get_user_permissions
 from frappe.utils import add_days
 from erpnext.utilities.doctype.address.address import get_address_display
 from erpnext.utilities.doctype.contact.contact import get_contact_details
@@ -86,7 +86,7 @@
 
 def set_price_list(out, party, party_type, given_price_list):
 	# price list
-	price_list = get_restrictions().get("Price List")
+	price_list = get_user_permissions().get("Price List")
 	if isinstance(price_list, list):
 		price_list = None
 
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index 2a954f0..839e788 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -106,7 +106,7 @@
    "fieldname": "amended_from", 
    "fieldtype": "Data", 
    "hidden": 0, 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Amended From", 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
@@ -636,7 +636,7 @@
  "icon": "icon-file-text", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2014-05-09 02:17:04.992233", 
+ "modified": "2014-05-26 03:05:51.544591", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Purchase Order", 
diff --git a/erpnext/buying/doctype/quality_inspection/quality_inspection.json b/erpnext/buying/doctype/quality_inspection/quality_inspection.json
index 815a4bf..4da6e63 100644
--- a/erpnext/buying/doctype/quality_inspection/quality_inspection.json
+++ b/erpnext/buying/doctype/quality_inspection/quality_inspection.json
@@ -1,231 +1,231 @@
 {
- "autoname": "naming_series:",
- "creation": "2013-04-30 13:13:03",
- "docstatus": 0,
- "doctype": "DocType",
+ "autoname": "naming_series:", 
+ "creation": "2013-04-30 13:13:03", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
  "fields": [
   {
-   "fieldname": "qa_inspection",
-   "fieldtype": "Section Break",
-   "label": "QA Inspection",
-   "no_copy": 0,
-   "oldfieldtype": "Section Break",
+   "fieldname": "qa_inspection", 
+   "fieldtype": "Section Break", 
+   "label": "QA Inspection", 
+   "no_copy": 0, 
+   "oldfieldtype": "Section Break", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "column_break0",
-   "fieldtype": "Column Break",
-   "oldfieldtype": "Column Break",
-   "permlevel": 0,
+   "fieldname": "column_break0", 
+   "fieldtype": "Column Break", 
+   "oldfieldtype": "Column Break", 
+   "permlevel": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "fieldname": "naming_series",
-   "fieldtype": "Select",
-   "label": "Series",
-   "no_copy": 1,
-   "options": "QI-",
-   "permlevel": 0,
+   "fieldname": "naming_series", 
+   "fieldtype": "Select", 
+   "label": "Series", 
+   "no_copy": 1, 
+   "options": "QI-", 
+   "permlevel": 0, 
    "reqd": 1
-  },
+  }, 
   {
-   "fieldname": "inspection_type",
-   "fieldtype": "Select",
-   "in_filter": 1,
-   "in_list_view": 1,
-   "label": "Inspection Type",
-   "oldfieldname": "inspection_type",
-   "oldfieldtype": "Select",
-   "options": "\nIncoming\nOutgoing\nIn Process",
-   "permlevel": 0,
+   "fieldname": "inspection_type", 
+   "fieldtype": "Select", 
+   "in_filter": 1, 
+   "in_list_view": 1, 
+   "label": "Inspection Type", 
+   "oldfieldname": "inspection_type", 
+   "oldfieldtype": "Select", 
+   "options": "\nIncoming\nOutgoing\nIn Process", 
+   "permlevel": 0, 
    "reqd": 1
-  },
+  }, 
   {
-   "fieldname": "report_date",
-   "fieldtype": "Date",
-   "in_filter": 1,
-   "in_list_view": 1,
-   "label": "Report Date",
-   "oldfieldname": "report_date",
-   "oldfieldtype": "Date",
-   "permlevel": 0,
-   "reqd": 1,
+   "fieldname": "report_date", 
+   "fieldtype": "Date", 
+   "in_filter": 1, 
+   "in_list_view": 1, 
+   "label": "Report Date", 
+   "oldfieldname": "report_date", 
+   "oldfieldtype": "Date", 
+   "permlevel": 0, 
+   "reqd": 1, 
    "search_index": 1
-  },
+  }, 
   {
-   "fieldname": "item_code",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "in_list_view": 1,
-   "in_filter": 1,
-   "label": "Item Code",
-   "oldfieldname": "item_code",
-   "oldfieldtype": "Link",
-   "options": "Item",
-   "permlevel": 0,
-   "reqd": 1,
+   "fieldname": "item_code", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "in_filter": 1, 
+   "in_list_view": 1, 
+   "label": "Item Code", 
+   "oldfieldname": "item_code", 
+   "oldfieldtype": "Link", 
+   "options": "Item", 
+   "permlevel": 0, 
+   "reqd": 1, 
    "search_index": 1
-  },
+  }, 
   {
-   "fieldname": "sample_size",
-   "fieldtype": "Float",
-   "in_filter": 0,
-   "label": "Sample Size",
-   "oldfieldname": "sample_size",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "reqd": 1,
+   "fieldname": "sample_size", 
+   "fieldtype": "Float", 
+   "in_filter": 0, 
+   "label": "Sample Size", 
+   "oldfieldname": "sample_size", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "reqd": 1, 
    "search_index": 0
-  },
+  }, 
   {
-   "fieldname": "description",
-   "fieldtype": "Small Text",
-   "in_filter": 1,
-   "label": "Description",
-   "oldfieldname": "description",
-   "oldfieldtype": "Small Text",
-   "permlevel": 0,
-   "search_index": 0,
+   "fieldname": "description", 
+   "fieldtype": "Small Text", 
+   "in_filter": 1, 
+   "label": "Description", 
+   "oldfieldname": "description", 
+   "oldfieldtype": "Small Text", 
+   "permlevel": 0, 
+   "search_index": 0, 
    "width": "300px"
-  },
+  }, 
   {
-   "fieldname": "column_break1",
-   "fieldtype": "Column Break",
-   "oldfieldtype": "Column Break",
-   "permlevel": 0,
+   "fieldname": "column_break1", 
+   "fieldtype": "Column Break", 
+   "oldfieldtype": "Column Break", 
+   "permlevel": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "fieldname": "item_serial_no",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "label": "Item Serial No",
-   "oldfieldname": "item_serial_no",
-   "oldfieldtype": "Link",
-   "options": "Serial No",
-   "permlevel": 0,
+   "fieldname": "item_serial_no", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "label": "Item Serial No", 
+   "oldfieldname": "item_serial_no", 
+   "oldfieldtype": "Link", 
+   "options": "Serial No", 
+   "permlevel": 0, 
    "print_hide": 0
-  },
+  }, 
   {
-   "fieldname": "batch_no",
-   "fieldtype": "Link",
-   "label": "Batch No",
-   "oldfieldname": "batch_no",
-   "oldfieldtype": "Link",
-   "options": "Batch",
+   "fieldname": "batch_no", 
+   "fieldtype": "Link", 
+   "label": "Batch No", 
+   "oldfieldname": "batch_no", 
+   "oldfieldtype": "Link", 
+   "options": "Batch", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "purchase_receipt_no",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "in_filter": 1,
-   "label": "Purchase Receipt No",
-   "oldfieldname": "purchase_receipt_no",
-   "oldfieldtype": "Link",
-   "options": "Purchase Receipt",
-   "permlevel": 0,
+   "fieldname": "purchase_receipt_no", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "in_filter": 1, 
+   "label": "Purchase Receipt No", 
+   "oldfieldname": "purchase_receipt_no", 
+   "oldfieldtype": "Link", 
+   "options": "Purchase Receipt", 
+   "permlevel": 0, 
    "search_index": 1
-  },
+  }, 
   {
-   "fieldname": "delivery_note_no",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "in_filter": 1,
-   "label": "Delivery Note No",
-   "oldfieldname": "delivery_note_no",
-   "oldfieldtype": "Link",
-   "options": "Delivery Note",
-   "permlevel": 0,
-   "print_hide": 0,
+   "fieldname": "delivery_note_no", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "in_filter": 1, 
+   "label": "Delivery Note No", 
+   "oldfieldname": "delivery_note_no", 
+   "oldfieldtype": "Link", 
+   "options": "Delivery Note", 
+   "permlevel": 0, 
+   "print_hide": 0, 
    "search_index": 1
-  },
+  }, 
   {
-   "fieldname": "inspected_by",
-   "fieldtype": "Data",
-   "label": "Inspected By",
-   "oldfieldname": "inspected_by",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
+   "fieldname": "inspected_by", 
+   "fieldtype": "Data", 
+   "label": "Inspected By", 
+   "oldfieldname": "inspected_by", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
    "reqd": 1
-  },
+  }, 
   {
-   "fieldname": "remarks",
-   "fieldtype": "Text",
-   "label": "Remarks",
-   "no_copy": 1,
-   "oldfieldname": "remarks",
-   "oldfieldtype": "Text",
+   "fieldname": "remarks", 
+   "fieldtype": "Text", 
+   "label": "Remarks", 
+   "no_copy": 1, 
+   "oldfieldname": "remarks", 
+   "oldfieldtype": "Text", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "verified_by",
-   "fieldtype": "Data",
-   "label": "Verified By",
-   "oldfieldname": "verified_by",
-   "oldfieldtype": "Data",
+   "fieldname": "verified_by", 
+   "fieldtype": "Data", 
+   "label": "Verified By", 
+   "oldfieldname": "verified_by", 
+   "oldfieldtype": "Data", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "amended_from",
-   "fieldtype": "Data",
-   "ignore_restrictions": 1,
-   "label": "Amended From",
-   "no_copy": 1,
-   "oldfieldname": "amended_from",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 1,
+   "fieldname": "amended_from", 
+   "fieldtype": "Data", 
+   "ignore_user_permissions": 1, 
+   "label": "Amended From", 
+   "no_copy": 1, 
+   "oldfieldname": "amended_from", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 1, 
    "read_only": 1
-  },
+  }, 
   {
-   "fieldname": "specification_details",
-   "fieldtype": "Section Break",
-   "label": "Specification Details",
-   "oldfieldtype": "Section Break",
-   "options": "Simple",
+   "fieldname": "specification_details", 
+   "fieldtype": "Section Break", 
+   "label": "Specification Details", 
+   "oldfieldtype": "Section Break", 
+   "options": "Simple", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "get_specification_details",
-   "fieldtype": "Button",
-   "label": "Get Specification Details",
-   "options": "get_item_specification_details",
+   "fieldname": "get_specification_details", 
+   "fieldtype": "Button", 
+   "label": "Get Specification Details", 
+   "options": "get_item_specification_details", 
    "permlevel": 0
-  },
+  }, 
   {
-   "fieldname": "qa_specification_details",
-   "fieldtype": "Table",
-   "label": "Quality Inspection Readings",
-   "oldfieldname": "qa_specification_details",
-   "oldfieldtype": "Table",
-   "options": "Quality Inspection Reading",
+   "fieldname": "qa_specification_details", 
+   "fieldtype": "Table", 
+   "label": "Quality Inspection Readings", 
+   "oldfieldname": "qa_specification_details", 
+   "oldfieldtype": "Table", 
+   "options": "Quality Inspection Reading", 
    "permlevel": 0
   }
- ],
- "icon": "icon-search",
- "idx": 1,
- "is_submittable": 1,
- "modified": "2014-05-06 08:20:33.015328",
- "modified_by": "Administrator",
- "module": "Buying",
- "name": "Quality Inspection",
- "owner": "Administrator",
+ ], 
+ "icon": "icon-search", 
+ "idx": 1, 
+ "is_submittable": 1, 
+ "modified": "2014-05-26 03:05:52.140251", 
+ "modified_by": "Administrator", 
+ "module": "Buying", 
+ "name": "Quality Inspection", 
+ "owner": "Administrator", 
  "permissions": [
   {
-   "amend": 1,
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Quality Manager",
-   "submit": 1,
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Quality Manager", 
+   "submit": 1, 
    "write": 1
   }
- ],
+ ], 
  "search_fields": "item_code, report_date, purchase_receipt_no, delivery_note_no"
-}
+}
\ No newline at end of file
diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index e9a165e..c418d01 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -123,7 +123,7 @@
   {
    "fieldname": "default_currency", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Default Currency", 
    "no_copy": 1, 
    "options": "Currency", 
@@ -132,7 +132,7 @@
   {
    "fieldname": "default_price_list", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Price List", 
    "options": "Price List", 
    "permlevel": 0
@@ -140,7 +140,7 @@
   {
    "fieldname": "default_taxes_and_charges", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Taxes and Charges", 
    "options": "Purchase Taxes and Charges Master", 
    "permlevel": 0
@@ -186,7 +186,7 @@
  ], 
  "icon": "icon-user", 
  "idx": 1, 
- "modified": "2014-05-07 06:08:33.836379", 
+ "modified": "2014-05-26 03:05:54.108284", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Supplier", 
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
index 8c5e273..e41d59b 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -106,7 +106,7 @@
    "fieldname": "amended_from", 
    "fieldtype": "Data", 
    "hidden": 1, 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Amended From", 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
@@ -562,7 +562,7 @@
  "icon": "icon-shopping-cart", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2014-05-09 02:17:10.664189", 
+ "modified": "2014-05-26 03:05:54.245409", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Supplier Quotation", 
diff --git a/erpnext/contacts/doctype/party_type/party_type.json b/erpnext/contacts/doctype/party_type/party_type.json
index c702be2..e5e99d6 100644
--- a/erpnext/contacts/doctype/party_type/party_type.json
+++ b/erpnext/contacts/doctype/party_type/party_type.json
@@ -32,7 +32,7 @@
   {
    "fieldname": "default_price_list", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Default Price List", 
    "options": "Price List", 
    "permlevel": 0
@@ -64,7 +64,7 @@
    "read_only": 1
   }
  ], 
- "modified": "2014-05-07 05:18:29.669293", 
+ "modified": "2014-05-26 03:05:50.667527", 
  "modified_by": "Administrator", 
  "module": "Contacts", 
  "name": "Party Type", 
diff --git a/erpnext/home/doctype/feed/feed.py b/erpnext/home/doctype/feed/feed.py
index 40c05f8..91b1590 100644
--- a/erpnext/home/doctype/feed/feed.py
+++ b/erpnext/home/doctype/feed/feed.py
@@ -17,20 +17,20 @@
 			add index feed_doctype_docname_index(doc_type, doc_name)""")
 
 def get_permission_query_conditions():
-	restrictions = frappe.defaults.get_restrictions()
+	user_permissions = frappe.defaults.get_user_permissions()
 	can_read = frappe.user.get_can_read()
 
 	can_read_doctypes = ['"{}"'.format(doctype) for doctype in
-		list(set(can_read) - set(restrictions.keys()))]
+		list(set(can_read) - set(user_permissions.keys()))]
 
 	if not can_read_doctypes:
 		return ""
 
 	conditions = ["tabFeed.doc_type in ({})".format(", ".join(can_read_doctypes))]
 
-	if restrictions:
+	if user_permissions:
 		can_read_docs = []
-		for doctype, names in restrictions.items():
+		for doctype, names in user_permissions.items():
 			for n in names:
 				can_read_docs.append('"{}|{}"'.format(doctype, n))
 
diff --git a/erpnext/hr/doctype/appraisal/appraisal.json b/erpnext/hr/doctype/appraisal/appraisal.json
index cd02dd6..4893b35 100644
--- a/erpnext/hr/doctype/appraisal/appraisal.json
+++ b/erpnext/hr/doctype/appraisal/appraisal.json
@@ -181,7 +181,7 @@
    "fieldname": "amended_from", 
    "fieldtype": "Data", 
    "hidden": 1, 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Amended From", 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
@@ -196,13 +196,14 @@
  "icon": "icon-thumbs-up", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2014-05-09 02:16:37.334857", 
+ "modified": "2014-05-26 03:05:46.761819", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Appraisal", 
  "owner": "ashwini@webnotestech.com", 
  "permissions": [
   {
+   "apply_user_permissions": 1, 
    "cancel": 0, 
    "create": 1, 
    "delete": 0, 
@@ -211,7 +212,6 @@
    "print": 1, 
    "read": 1, 
    "report": 1, 
-   "restricted": 1, 
    "role": "Employee", 
    "submit": 0, 
    "write": 1
diff --git a/erpnext/hr/doctype/attendance/attendance.json b/erpnext/hr/doctype/attendance/attendance.json
index b6d437d..2c77810 100644
--- a/erpnext/hr/doctype/attendance/attendance.json
+++ b/erpnext/hr/doctype/attendance/attendance.json
@@ -117,7 +117,7 @@
   {
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Amended From", 
    "no_copy": 1, 
    "options": "Attendance", 
@@ -129,7 +129,7 @@
  "icon": "icon-ok", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2014-05-09 02:16:37.761770", 
+ "modified": "2014-05-26 03:05:46.906637", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Attendance", 
diff --git a/erpnext/hr/doctype/employee/employee.json b/erpnext/hr/doctype/employee/employee.json
index 22c1fc2..d7cf5ae 100644
--- a/erpnext/hr/doctype/employee/employee.json
+++ b/erpnext/hr/doctype/employee/employee.json
@@ -1,737 +1,736 @@
 {
- "allow_attach": 1, 
- "allow_import": 1, 
- "allow_rename": 1, 
- "autoname": "naming_series:", 
- "creation": "2013-03-07 09:04:18", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Master", 
+ "allow_attach": 1,
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "naming_series:",
+ "creation": "2013-03-07 09:04:18",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Master",
  "fields": [
   {
-   "fieldname": "basic_information", 
-   "fieldtype": "Section Break", 
-   "label": "Basic Information", 
-   "oldfieldtype": "Section Break", 
+   "fieldname": "basic_information",
+   "fieldtype": "Section Break",
+   "label": "Basic Information",
+   "oldfieldtype": "Section Break",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "column_break0", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0, 
+   "fieldname": "column_break0",
+   "fieldtype": "Column Break",
+   "permlevel": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "fieldname": "image_view", 
-   "fieldtype": "Image", 
-   "in_list_view": 0, 
-   "label": "Image View", 
-   "options": "image", 
+   "fieldname": "image_view",
+   "fieldtype": "Image",
+   "in_list_view": 0,
+   "label": "Image View",
+   "options": "image",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "employee", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "label": "Employee", 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "print_hide": 1, 
+   "fieldname": "employee",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "label": "Employee",
+   "no_copy": 1,
+   "permlevel": 0,
+   "print_hide": 1,
    "report_hide": 1
-  }, 
+  },
   {
-   "fieldname": "naming_series", 
-   "fieldtype": "Select", 
-   "label": "Series", 
-   "no_copy": 1, 
-   "oldfieldname": "naming_series", 
-   "oldfieldtype": "Select", 
-   "options": "EMP/", 
-   "permlevel": 0, 
+   "fieldname": "naming_series",
+   "fieldtype": "Select",
+   "label": "Series",
+   "no_copy": 1,
+   "oldfieldname": "naming_series",
+   "oldfieldtype": "Select",
+   "options": "EMP/",
+   "permlevel": 0,
    "reqd": 0
-  }, 
+  },
   {
-   "fieldname": "salutation", 
-   "fieldtype": "Select", 
-   "label": "Salutation", 
-   "oldfieldname": "salutation", 
-   "oldfieldtype": "Select", 
-   "options": "\nMr\nMs", 
-   "permlevel": 0, 
+   "fieldname": "salutation",
+   "fieldtype": "Select",
+   "label": "Salutation",
+   "oldfieldname": "salutation",
+   "oldfieldtype": "Select",
+   "options": "\nMr\nMs",
+   "permlevel": 0,
    "search_index": 0
-  }, 
+  },
   {
-   "fieldname": "employee_name", 
-   "fieldtype": "Data", 
-   "in_list_view": 1, 
-   "label": "Full Name", 
-   "oldfieldname": "employee_name", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
+   "fieldname": "employee_name",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Full Name",
+   "oldfieldname": "employee_name",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
    "reqd": 1
-  }, 
+  },
   {
-   "fieldname": "image", 
-   "fieldtype": "Select", 
-   "label": "Image", 
-   "options": "attach_files:", 
+   "fieldname": "image",
+   "fieldtype": "Select",
+   "label": "Image",
+   "options": "attach_files:",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "column_break1", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0, 
+   "fieldname": "column_break1",
+   "fieldtype": "Column Break",
+   "permlevel": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "description": "System User (login) ID. If set, it will become default for all HR forms.", 
-   "fieldname": "user_id", 
-   "fieldtype": "Link", 
-   "label": "User ID", 
-   "options": "User", 
+   "description": "System User (login) ID. If set, it will become default for all HR forms.",
+   "fieldname": "user_id",
+   "fieldtype": "Link",
+   "label": "User ID",
+   "options": "User",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "employee_number", 
-   "fieldtype": "Data", 
-   "in_filter": 1, 
-   "label": "Employee Number", 
-   "oldfieldname": "employee_number", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
+   "fieldname": "employee_number",
+   "fieldtype": "Data",
+   "in_filter": 1,
+   "label": "Employee Number",
+   "oldfieldname": "employee_number",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
    "search_index": 0
-  }, 
+  },
   {
-   "fieldname": "date_of_joining", 
-   "fieldtype": "Date", 
-   "label": "Date of Joining", 
-   "oldfieldname": "date_of_joining", 
-   "oldfieldtype": "Date", 
-   "permlevel": 0, 
+   "fieldname": "date_of_joining",
+   "fieldtype": "Date",
+   "label": "Date of Joining",
+   "oldfieldname": "date_of_joining",
+   "oldfieldtype": "Date",
+   "permlevel": 0,
    "reqd": 1
-  }, 
+  },
   {
-   "description": "You can enter any date manually", 
-   "fieldname": "date_of_birth", 
-   "fieldtype": "Date", 
-   "in_filter": 1, 
-   "label": "Date of Birth", 
-   "oldfieldname": "date_of_birth", 
-   "oldfieldtype": "Date", 
-   "permlevel": 0, 
-   "reqd": 1, 
+   "description": "You can enter any date manually",
+   "fieldname": "date_of_birth",
+   "fieldtype": "Date",
+   "in_filter": 1,
+   "label": "Date of Birth",
+   "oldfieldname": "date_of_birth",
+   "oldfieldtype": "Date",
+   "permlevel": 0,
+   "reqd": 1,
    "search_index": 0
-  }, 
+  },
   {
-   "fieldname": "gender", 
-   "fieldtype": "Select", 
-   "in_filter": 1, 
-   "label": "Gender", 
-   "oldfieldname": "gender", 
-   "oldfieldtype": "Select", 
-   "options": "\nMale\nFemale", 
-   "permlevel": 0, 
-   "reqd": 1, 
+   "fieldname": "gender",
+   "fieldtype": "Select",
+   "in_filter": 1,
+   "label": "Gender",
+   "oldfieldname": "gender",
+   "oldfieldtype": "Select",
+   "options": "\nMale\nFemale",
+   "permlevel": 0,
+   "reqd": 1,
    "search_index": 0
-  }, 
+  },
   {
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "in_filter": 1, 
-   "label": "Company", 
-   "options": "Company", 
-   "permlevel": 0, 
-   "print_hide": 1, 
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "in_filter": 1,
+   "label": "Company",
+   "options": "Company",
+   "permlevel": 0,
+   "print_hide": 1,
    "reqd": 1
-  }, 
+  },
   {
-   "fieldname": "employment_details", 
-   "fieldtype": "Section Break", 
-   "label": "Employment Details", 
+   "fieldname": "employment_details",
+   "fieldtype": "Section Break",
+   "label": "Employment Details",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "col_break_21", 
-   "fieldtype": "Column Break", 
+   "fieldname": "col_break_21",
+   "fieldtype": "Column Break",
    "permlevel": 0
-  }, 
+  },
   {
-   "default": "Active", 
-   "fieldname": "status", 
-   "fieldtype": "Select", 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "label": "Status", 
-   "oldfieldname": "status", 
-   "oldfieldtype": "Select", 
-   "options": "\nActive\nLeft", 
-   "permlevel": 0, 
-   "reqd": 1, 
+   "default": "Active",
+   "fieldname": "status",
+   "fieldtype": "Select",
+   "in_filter": 1,
+   "in_list_view": 1,
+   "label": "Status",
+   "oldfieldname": "status",
+   "oldfieldtype": "Select",
+   "options": "\nActive\nLeft",
+   "permlevel": 0,
+   "reqd": 1,
    "search_index": 1
-  }, 
+  },
   {
-   "fieldname": "employment_type", 
-   "fieldtype": "Link", 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "label": "Employment Type", 
-   "oldfieldname": "employment_type", 
-   "oldfieldtype": "Link", 
-   "options": "Employment Type", 
-   "permlevel": 0, 
+   "fieldname": "employment_type",
+   "fieldtype": "Link",
+   "in_filter": 1,
+   "in_list_view": 1,
+   "label": "Employment Type",
+   "oldfieldname": "employment_type",
+   "oldfieldtype": "Link",
+   "options": "Employment Type",
+   "permlevel": 0,
    "search_index": 0
-  }, 
+  },
   {
-   "description": "Applicable Holiday List", 
-   "fieldname": "holiday_list", 
-   "fieldtype": "Link", 
-   "label": "Holiday List", 
-   "oldfieldname": "holiday_list", 
-   "oldfieldtype": "Link", 
-   "options": "Holiday List", 
+   "description": "Applicable Holiday List",
+   "fieldname": "holiday_list",
+   "fieldtype": "Link",
+   "label": "Holiday List",
+   "oldfieldname": "holiday_list",
+   "oldfieldtype": "Link",
+   "options": "Holiday List",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "col_break_22", 
-   "fieldtype": "Column Break", 
+   "fieldname": "col_break_22",
+   "fieldtype": "Column Break",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "scheduled_confirmation_date", 
-   "fieldtype": "Date", 
-   "in_filter": 1, 
-   "label": "Offer Date", 
-   "oldfieldname": "scheduled_confirmation_date", 
-   "oldfieldtype": "Date", 
-   "permlevel": 0, 
+   "fieldname": "scheduled_confirmation_date",
+   "fieldtype": "Date",
+   "in_filter": 1,
+   "label": "Offer Date",
+   "oldfieldname": "scheduled_confirmation_date",
+   "oldfieldtype": "Date",
+   "permlevel": 0,
    "search_index": 0
-  }, 
+  },
   {
-   "fieldname": "final_confirmation_date", 
-   "fieldtype": "Date", 
-   "label": "Confirmation Date", 
-   "oldfieldname": "final_confirmation_date", 
-   "oldfieldtype": "Date", 
-   "permlevel": 0, 
+   "fieldname": "final_confirmation_date",
+   "fieldtype": "Date",
+   "label": "Confirmation Date",
+   "oldfieldname": "final_confirmation_date",
+   "oldfieldtype": "Date",
+   "permlevel": 0,
    "search_index": 0
-  }, 
+  },
   {
-   "fieldname": "contract_end_date", 
-   "fieldtype": "Date", 
-   "in_filter": 1, 
-   "label": "Contract End Date", 
-   "oldfieldname": "contract_end_date", 
-   "oldfieldtype": "Date", 
-   "permlevel": 0, 
+   "fieldname": "contract_end_date",
+   "fieldtype": "Date",
+   "in_filter": 1,
+   "label": "Contract End Date",
+   "oldfieldname": "contract_end_date",
+   "oldfieldtype": "Date",
+   "permlevel": 0,
    "search_index": 0
-  }, 
+  },
   {
-   "fieldname": "date_of_retirement", 
-   "fieldtype": "Date", 
-   "label": "Date Of Retirement", 
-   "oldfieldname": "date_of_retirement", 
-   "oldfieldtype": "Date", 
+   "fieldname": "date_of_retirement",
+   "fieldtype": "Date",
+   "label": "Date Of Retirement",
+   "oldfieldname": "date_of_retirement",
+   "oldfieldtype": "Date",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "job_profile", 
-   "fieldtype": "Section Break", 
-   "label": "Job Profile", 
+   "fieldname": "job_profile",
+   "fieldtype": "Section Break",
+   "label": "Job Profile",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "column_break2", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0, 
+   "fieldname": "column_break2",
+   "fieldtype": "Column Break",
+   "permlevel": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "fieldname": "branch", 
-   "fieldtype": "Link", 
-   "in_filter": 1, 
-   "label": "Branch", 
-   "oldfieldname": "branch", 
-   "oldfieldtype": "Link", 
-   "options": "Branch", 
-   "permlevel": 0, 
+   "fieldname": "branch",
+   "fieldtype": "Link",
+   "in_filter": 1,
+   "label": "Branch",
+   "oldfieldname": "branch",
+   "oldfieldtype": "Link",
+   "options": "Branch",
+   "permlevel": 0,
    "reqd": 0
-  }, 
+  },
   {
-   "fieldname": "department", 
-   "fieldtype": "Link", 
-   "in_filter": 1, 
-   "label": "Department", 
-   "oldfieldname": "department", 
-   "oldfieldtype": "Link", 
-   "options": "Department", 
-   "permlevel": 0, 
+   "fieldname": "department",
+   "fieldtype": "Link",
+   "in_filter": 1,
+   "label": "Department",
+   "oldfieldname": "department",
+   "oldfieldtype": "Link",
+   "options": "Department",
+   "permlevel": 0,
    "reqd": 0
-  }, 
+  },
   {
-   "fieldname": "designation", 
-   "fieldtype": "Link", 
-   "in_filter": 1, 
-   "label": "Designation", 
-   "oldfieldname": "designation", 
-   "oldfieldtype": "Link", 
-   "options": "Designation", 
-   "permlevel": 0, 
-   "reqd": 0, 
+   "fieldname": "designation",
+   "fieldtype": "Link",
+   "in_filter": 1,
+   "label": "Designation",
+   "oldfieldname": "designation",
+   "oldfieldtype": "Link",
+   "options": "Designation",
+   "permlevel": 0,
+   "reqd": 0,
    "search_index": 1
-  }, 
+  },
   {
-   "description": "Provide email id registered in company", 
-   "fieldname": "company_email", 
-   "fieldtype": "Data", 
-   "in_filter": 1, 
-   "label": "Company Email", 
-   "oldfieldname": "company_email", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
+   "description": "Provide email id registered in company",
+   "fieldname": "company_email",
+   "fieldtype": "Data",
+   "in_filter": 1,
+   "label": "Company Email",
+   "oldfieldname": "company_email",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
    "reqd": 0
-  }, 
+  },
   {
-   "fieldname": "notice_number_of_days", 
-   "fieldtype": "Int", 
-   "label": "Notice (days)", 
-   "oldfieldname": "notice_number_of_days", 
-   "oldfieldtype": "Int", 
+   "fieldname": "notice_number_of_days",
+   "fieldtype": "Int",
+   "label": "Notice (days)",
+   "oldfieldname": "notice_number_of_days",
+   "oldfieldtype": "Int",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "salary_information", 
-   "fieldtype": "Column Break", 
-   "label": "Salary Information", 
-   "oldfieldtype": "Section Break", 
-   "permlevel": 0, 
+   "fieldname": "salary_information",
+   "fieldtype": "Column Break",
+   "label": "Salary Information",
+   "oldfieldtype": "Section Break",
+   "permlevel": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "fieldname": "salary_mode", 
-   "fieldtype": "Select", 
-   "label": "Salary Mode", 
-   "oldfieldname": "salary_mode", 
-   "oldfieldtype": "Select", 
-   "options": "\nBank\nCash\nCheque", 
+   "fieldname": "salary_mode",
+   "fieldtype": "Select",
+   "label": "Salary Mode",
+   "oldfieldname": "salary_mode",
+   "oldfieldtype": "Select",
+   "options": "\nBank\nCash\nCheque",
    "permlevel": 0
-  }, 
+  },
   {
-   "depends_on": "eval:doc.salary_mode == 'Bank'", 
-   "fieldname": "bank_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "in_filter": 1, 
-   "label": "Bank Name", 
-   "oldfieldname": "bank_name", 
-   "oldfieldtype": "Link", 
-   "options": "Suggest", 
+   "depends_on": "eval:doc.salary_mode == 'Bank'",
+   "fieldname": "bank_name",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "in_filter": 1,
+   "label": "Bank Name",
+   "oldfieldname": "bank_name",
+   "oldfieldtype": "Link",
+   "options": "Suggest",
    "permlevel": 0
-  }, 
+  },
   {
-   "depends_on": "eval:doc.salary_mode == 'Bank'", 
-   "fieldname": "bank_ac_no", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "label": "Bank A/C No.", 
-   "oldfieldname": "bank_ac_no", 
-   "oldfieldtype": "Data", 
+   "depends_on": "eval:doc.salary_mode == 'Bank'",
+   "fieldname": "bank_ac_no",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "label": "Bank A/C No.",
+   "oldfieldname": "bank_ac_no",
+   "oldfieldtype": "Data",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "organization_profile", 
-   "fieldtype": "Section Break", 
-   "label": "Organization Profile", 
+   "fieldname": "organization_profile",
+   "fieldtype": "Section Break",
+   "label": "Organization Profile",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "reports_to", 
-   "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
-   "label": "Reports to", 
-   "oldfieldname": "reports_to", 
-   "oldfieldtype": "Link", 
-   "options": "Employee", 
+   "fieldname": "reports_to",
+   "fieldtype": "Link",
+   "ignore_user_permissions": 1,
+   "label": "Reports to",
+   "oldfieldname": "reports_to",
+   "oldfieldtype": "Link",
+   "options": "Employee",
    "permlevel": 0
-  }, 
+  },
   {
-   "description": "The first Leave Approver in the list will be set as the default Leave Approver", 
-   "fieldname": "employee_leave_approvers", 
-   "fieldtype": "Table", 
-   "label": "Leave Approvers", 
-   "options": "Employee Leave Approver", 
+   "description": "The first Leave Approver in the list will be set as the default Leave Approver",
+   "fieldname": "employee_leave_approvers",
+   "fieldtype": "Table",
+   "label": "Leave Approvers",
+   "options": "Employee Leave Approver",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "contact_details", 
-   "fieldtype": "Section Break", 
-   "label": "Contact Details", 
+   "fieldname": "contact_details",
+   "fieldtype": "Section Break",
+   "label": "Contact Details",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "column_break3", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0, 
+   "fieldname": "column_break3",
+   "fieldtype": "Column Break",
+   "permlevel": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "fieldname": "cell_number", 
-   "fieldtype": "Data", 
-   "label": "Cell Number", 
+   "fieldname": "cell_number",
+   "fieldtype": "Data",
+   "label": "Cell Number",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "personal_email", 
-   "fieldtype": "Data", 
-   "label": "Personal Email", 
+   "fieldname": "personal_email",
+   "fieldtype": "Data",
+   "label": "Personal Email",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "unsubscribed", 
-   "fieldtype": "Check", 
-   "label": "Unsubscribed", 
+   "fieldname": "unsubscribed",
+   "fieldtype": "Check",
+   "label": "Unsubscribed",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "emergency_contact_details", 
-   "fieldtype": "HTML", 
-   "label": "Emergency Contact Details", 
-   "options": "<h4 class=\"text-muted\">Emergency Contact Details</h4>", 
+   "fieldname": "emergency_contact_details",
+   "fieldtype": "HTML",
+   "label": "Emergency Contact Details",
+   "options": "<h4 class=\"text-muted\">Emergency Contact Details</h4>",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "person_to_be_contacted", 
-   "fieldtype": "Data", 
-   "label": "Emergency Contact", 
+   "fieldname": "person_to_be_contacted",
+   "fieldtype": "Data",
+   "label": "Emergency Contact",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "relation", 
-   "fieldtype": "Data", 
-   "label": "Relation", 
+   "fieldname": "relation",
+   "fieldtype": "Data",
+   "label": "Relation",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "emergency_phone_number", 
-   "fieldtype": "Data", 
-   "label": "Emergency Phone", 
+   "fieldname": "emergency_phone_number",
+   "fieldtype": "Data",
+   "label": "Emergency Phone",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "column_break4", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0, 
+   "fieldname": "column_break4",
+   "fieldtype": "Column Break",
+   "permlevel": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "fieldname": "permanent_accommodation_type", 
-   "fieldtype": "Select", 
-   "label": "Permanent Address Is", 
-   "options": "\nRented\nOwned", 
+   "fieldname": "permanent_accommodation_type",
+   "fieldtype": "Select",
+   "label": "Permanent Address Is",
+   "options": "\nRented\nOwned",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "permanent_address", 
-   "fieldtype": "Small Text", 
-   "label": "Permanent Address", 
+   "fieldname": "permanent_address",
+   "fieldtype": "Small Text",
+   "label": "Permanent Address",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "current_accommodation_type", 
-   "fieldtype": "Select", 
-   "label": "Current Address Is", 
-   "options": "\nRented\nOwned", 
+   "fieldname": "current_accommodation_type",
+   "fieldtype": "Select",
+   "label": "Current Address Is",
+   "options": "\nRented\nOwned",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "current_address", 
-   "fieldtype": "Small Text", 
-   "label": "Current Address", 
+   "fieldname": "current_address",
+   "fieldtype": "Small Text",
+   "label": "Current Address",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "sb53", 
-   "fieldtype": "Section Break", 
-   "label": "Bio", 
+   "fieldname": "sb53",
+   "fieldtype": "Section Break",
+   "label": "Bio",
    "permlevel": 0
-  }, 
+  },
   {
-   "description": "Short biography for website and other publications.", 
-   "fieldname": "bio", 
-   "fieldtype": "Text Editor", 
-   "label": "Bio", 
+   "description": "Short biography for website and other publications.",
+   "fieldname": "bio",
+   "fieldtype": "Text Editor",
+   "label": "Bio",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "personal_details", 
-   "fieldtype": "Section Break", 
-   "label": "Personal Details", 
+   "fieldname": "personal_details",
+   "fieldtype": "Section Break",
+   "label": "Personal Details",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "column_break5", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0, 
+   "fieldname": "column_break5",
+   "fieldtype": "Column Break",
+   "permlevel": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "fieldname": "passport_number", 
-   "fieldtype": "Data", 
-   "label": "Passport Number", 
+   "fieldname": "passport_number",
+   "fieldtype": "Data",
+   "label": "Passport Number",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "date_of_issue", 
-   "fieldtype": "Date", 
-   "label": "Date of Issue", 
+   "fieldname": "date_of_issue",
+   "fieldtype": "Date",
+   "label": "Date of Issue",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "valid_upto", 
-   "fieldtype": "Date", 
-   "label": "Valid Upto", 
+   "fieldname": "valid_upto",
+   "fieldtype": "Date",
+   "label": "Valid Upto",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "place_of_issue", 
-   "fieldtype": "Data", 
-   "label": "Place of Issue", 
+   "fieldname": "place_of_issue",
+   "fieldtype": "Data",
+   "label": "Place of Issue",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "column_break6", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0, 
+   "fieldname": "column_break6",
+   "fieldtype": "Column Break",
+   "permlevel": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "fieldname": "marital_status", 
-   "fieldtype": "Select", 
-   "label": "Marital Status", 
-   "options": "\nSingle\nMarried\nDivorced\nWidowed", 
+   "fieldname": "marital_status",
+   "fieldtype": "Select",
+   "label": "Marital Status",
+   "options": "\nSingle\nMarried\nDivorced\nWidowed",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "blood_group", 
-   "fieldtype": "Select", 
-   "label": "Blood Group", 
-   "options": "\nA+\nA-\nB+\nB-\nAB+\nAB-\nO+\nO-", 
+   "fieldname": "blood_group",
+   "fieldtype": "Select",
+   "label": "Blood Group",
+   "options": "\nA+\nA-\nB+\nB-\nAB+\nAB-\nO+\nO-",
    "permlevel": 0
-  }, 
+  },
   {
-   "description": "Here you can maintain family details like name and occupation of parent, spouse and children", 
-   "fieldname": "family_background", 
-   "fieldtype": "Small Text", 
-   "label": "Family Background", 
+   "description": "Here you can maintain family details like name and occupation of parent, spouse and children",
+   "fieldname": "family_background",
+   "fieldtype": "Small Text",
+   "label": "Family Background",
    "permlevel": 0
-  }, 
+  },
   {
-   "description": "Here you can maintain height, weight, allergies, medical concerns etc", 
-   "fieldname": "health_details", 
-   "fieldtype": "Small Text", 
-   "label": "Health Details", 
+   "description": "Here you can maintain height, weight, allergies, medical concerns etc",
+   "fieldname": "health_details",
+   "fieldtype": "Small Text",
+   "label": "Health Details",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "educational_qualification", 
-   "fieldtype": "Section Break", 
-   "label": "Educational Qualification", 
+   "fieldname": "educational_qualification",
+   "fieldtype": "Section Break",
+   "label": "Educational Qualification",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "educational_qualification_details", 
-   "fieldtype": "Table", 
-   "label": "Educational Qualification Details", 
-   "options": "Employee Education", 
+   "fieldname": "educational_qualification_details",
+   "fieldtype": "Table",
+   "label": "Educational Qualification Details",
+   "options": "Employee Education",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "previous_work_experience", 
-   "fieldtype": "Section Break", 
-   "label": "Previous Work Experience", 
-   "options": "Simple", 
+   "fieldname": "previous_work_experience",
+   "fieldtype": "Section Break",
+   "label": "Previous Work Experience",
+   "options": "Simple",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "previous_experience_details", 
-   "fieldtype": "Table", 
-   "label": "Employee External Work History", 
-   "options": "Employee External Work History", 
+   "fieldname": "previous_experience_details",
+   "fieldtype": "Table",
+   "label": "Employee External Work History",
+   "options": "Employee External Work History",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "history_in_company", 
-   "fieldtype": "Section Break", 
-   "label": "History In Company", 
-   "options": "Simple", 
+   "fieldname": "history_in_company",
+   "fieldtype": "Section Break",
+   "label": "History In Company",
+   "options": "Simple",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "experience_in_company_details", 
-   "fieldtype": "Table", 
-   "label": "Employee Internal Work Historys", 
-   "options": "Employee Internal Work History", 
+   "fieldname": "experience_in_company_details",
+   "fieldtype": "Table",
+   "label": "Employee Internal Work Historys",
+   "options": "Employee Internal Work History",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "exit", 
-   "fieldtype": "Section Break", 
-   "label": "Exit", 
-   "oldfieldtype": "Section Break", 
+   "fieldname": "exit",
+   "fieldtype": "Section Break",
+   "label": "Exit",
+   "oldfieldtype": "Section Break",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "column_break7", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0, 
+   "fieldname": "column_break7",
+   "fieldtype": "Column Break",
+   "permlevel": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "fieldname": "resignation_letter_date", 
-   "fieldtype": "Date", 
-   "label": "Resignation Letter Date", 
-   "oldfieldname": "resignation_letter_date", 
-   "oldfieldtype": "Date", 
+   "fieldname": "resignation_letter_date",
+   "fieldtype": "Date",
+   "label": "Resignation Letter Date",
+   "oldfieldname": "resignation_letter_date",
+   "oldfieldtype": "Date",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "relieving_date", 
-   "fieldtype": "Date", 
-   "in_filter": 1, 
-   "label": "Relieving Date", 
-   "oldfieldname": "relieving_date", 
-   "oldfieldtype": "Date", 
+   "fieldname": "relieving_date",
+   "fieldtype": "Date",
+   "in_filter": 1,
+   "label": "Relieving Date",
+   "oldfieldname": "relieving_date",
+   "oldfieldtype": "Date",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "reason_for_leaving", 
-   "fieldtype": "Data", 
-   "label": "Reason for Leaving", 
-   "oldfieldname": "reason_for_leaving", 
-   "oldfieldtype": "Data", 
+   "fieldname": "reason_for_leaving",
+   "fieldtype": "Data",
+   "label": "Reason for Leaving",
+   "oldfieldname": "reason_for_leaving",
+   "oldfieldtype": "Data",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "leave_encashed", 
-   "fieldtype": "Select", 
-   "label": "Leave Encashed?", 
-   "oldfieldname": "leave_encashed", 
-   "oldfieldtype": "Select", 
-   "options": "\nYes\nNo", 
+   "fieldname": "leave_encashed",
+   "fieldtype": "Select",
+   "label": "Leave Encashed?",
+   "oldfieldname": "leave_encashed",
+   "oldfieldtype": "Select",
+   "options": "\nYes\nNo",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "encashment_date", 
-   "fieldtype": "Date", 
-   "label": "Encashment Date", 
-   "oldfieldname": "encashment_date", 
-   "oldfieldtype": "Date", 
+   "fieldname": "encashment_date",
+   "fieldtype": "Date",
+   "label": "Encashment Date",
+   "oldfieldname": "encashment_date",
+   "oldfieldtype": "Date",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "exit_interview_details", 
-   "fieldtype": "Column Break", 
-   "label": "Exit Interview Details", 
-   "oldfieldname": "col_brk6", 
-   "oldfieldtype": "Column Break", 
-   "permlevel": 0, 
+   "fieldname": "exit_interview_details",
+   "fieldtype": "Column Break",
+   "label": "Exit Interview Details",
+   "oldfieldname": "col_brk6",
+   "oldfieldtype": "Column Break",
+   "permlevel": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "fieldname": "held_on", 
-   "fieldtype": "Date", 
-   "label": "Held On", 
-   "oldfieldname": "held_on", 
-   "oldfieldtype": "Date", 
+   "fieldname": "held_on",
+   "fieldtype": "Date",
+   "label": "Held On",
+   "oldfieldname": "held_on",
+   "oldfieldtype": "Date",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "reason_for_resignation", 
-   "fieldtype": "Select", 
-   "label": "Reason for Resignation", 
-   "oldfieldname": "reason_for_resignation", 
-   "oldfieldtype": "Select", 
-   "options": "\nBetter Prospects\nHealth Concerns", 
+   "fieldname": "reason_for_resignation",
+   "fieldtype": "Select",
+   "label": "Reason for Resignation",
+   "oldfieldname": "reason_for_resignation",
+   "oldfieldtype": "Select",
+   "options": "\nBetter Prospects\nHealth Concerns",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "new_workplace", 
-   "fieldtype": "Data", 
-   "label": "New Workplace", 
-   "oldfieldname": "new_workplace", 
-   "oldfieldtype": "Data", 
+   "fieldname": "new_workplace",
+   "fieldtype": "Data",
+   "label": "New Workplace",
+   "oldfieldname": "new_workplace",
+   "oldfieldtype": "Data",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "feedback", 
-   "fieldtype": "Small Text", 
-   "label": "Feedback", 
-   "oldfieldname": "feedback", 
-   "oldfieldtype": "Text", 
+   "fieldname": "feedback",
+   "fieldtype": "Small Text",
+   "label": "Feedback",
+   "oldfieldname": "feedback",
+   "oldfieldtype": "Text",
    "permlevel": 0
   }
- ], 
- "icon": "icon-user", 
- "idx": 1, 
- "modified": "2014-05-21 07:49:56.180832", 
- "modified_by": "Administrator", 
- "module": "HR", 
- "name": "Employee", 
- "owner": "Administrator", 
+ ],
+ "icon": "icon-user",
+ "idx": 1,
+ "modified": "2014-05-26 03:05:48.422199",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Employee",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "restricted": 1, 
-   "role": "Employee", 
-   "submit": 0, 
+   "amend": 0,
+   "apply_user_permissions": 1,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "email": 1,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Employee",
+   "submit": 0,
    "write": 0
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "restrict": 0, 
-   "role": "HR User", 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "HR User",
+   "submit": 0,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "restrict": 1, 
-   "role": "HR Manager", 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "set_user_permissions": 1,
+   "role": "HR Manager",
+   "submit": 0,
    "write": 1
-  }, 
+  },
   {
-   "permlevel": 0, 
-   "read": 1, 
-   "restricted": 1, 
+   "apply_user_permissions": 1,
+   "permlevel": 0,
+   "read": 1,
    "role": "Leave Approver"
   }
- ], 
- "search_fields": "employee_name", 
- "sort_field": "modified", 
- "sort_order": "DESC", 
+ ],
+ "search_fields": "employee_name",
+ "sort_field": "modified",
+ "sort_order": "DESC",
  "title_field": "employee_name"
-}
\ No newline at end of file
+}
diff --git a/erpnext/hr/doctype/employee/employee.py b/erpnext/hr/doctype/employee/employee.py
index 9840df7..1876916 100644
--- a/erpnext/hr/doctype/employee/employee.py
+++ b/erpnext/hr/doctype/employee/employee.py
@@ -8,7 +8,7 @@
 from frappe.model.naming import make_autoname
 from frappe import throw, _
 import frappe.permissions
-from frappe.defaults import get_restrictions
+from frappe.defaults import get_user_permissions
 from frappe.model.document import Document
 from frappe.model.mapper import get_mapped_doc
 
@@ -72,9 +72,9 @@
 
 	def add_restriction_if_required(self, doctype, user):
 		if frappe.permissions.has_only_non_restrict_role(doctype, user) \
-			and self.name not in get_restrictions(user).get("Employee", []):
+			and self.name not in get_user_permissions(user).get("Employee", []):
 
-			frappe.defaults.add_default("Employee", self.name, user, "Restriction")
+			frappe.defaults.add_default("Employee", self.name, user, "User Permission")
 
 	def update_user(self):
 		# add employee role if missing
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.json b/erpnext/hr/doctype/expense_claim/expense_claim.json
index 0da31f7..311903f 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.json
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.json
@@ -172,7 +172,7 @@
   {
    "fieldname": "amended_from", 
    "fieldtype": "Data", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Amended From", 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
@@ -187,13 +187,14 @@
  "icon": "icon-money", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2014-05-09 02:16:38.198490", 
+ "modified": "2014-05-26 03:05:48.690180", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Expense Claim", 
  "owner": "harshada@webnotestech.com", 
  "permissions": [
   {
+   "apply_user_permissions": 1, 
    "create": 1, 
    "delete": 0, 
    "email": 1, 
@@ -201,7 +202,6 @@
    "print": 1, 
    "read": 1, 
    "report": 1, 
-   "restricted": 1, 
    "role": "Employee", 
    "write": 1
   }, 
diff --git a/erpnext/hr/doctype/leave_allocation/leave_allocation.json b/erpnext/hr/doctype/leave_allocation/leave_allocation.json
index d6e65f7..99845bb 100644
--- a/erpnext/hr/doctype/leave_allocation/leave_allocation.json
+++ b/erpnext/hr/doctype/leave_allocation/leave_allocation.json
@@ -123,7 +123,7 @@
    "fieldname": "amended_from", 
    "fieldtype": "Data", 
    "hidden": 0, 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Amended From", 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
@@ -136,7 +136,7 @@
  "icon": "icon-ok", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2014-05-09 02:16:39.508488", 
+ "modified": "2014-05-26 03:05:49.674303", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Leave Allocation", 
@@ -144,6 +144,7 @@
  "permissions": [
   {
    "amend": 1, 
+   "apply_user_permissions": 1, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
@@ -152,7 +153,6 @@
    "print": 1, 
    "read": 1, 
    "report": 1, 
-   "restricted": 1, 
    "role": "HR User", 
    "submit": 1, 
    "write": 1
diff --git a/erpnext/hr/doctype/leave_application/leave_application.json b/erpnext/hr/doctype/leave_application/leave_application.json
index eb9b239..8dd58bb 100644
--- a/erpnext/hr/doctype/leave_application/leave_application.json
+++ b/erpnext/hr/doctype/leave_application/leave_application.json
@@ -1,269 +1,269 @@
 {
- "allow_attach": 1, 
- "autoname": "LAP/.#####", 
- "creation": "2013-02-20 11:18:11", 
- "description": "Apply / Approve Leaves", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Transaction", 
+ "allow_attach": 1,
+ "autoname": "LAP/.#####",
+ "creation": "2013-02-20 11:18:11",
+ "description": "Apply / Approve Leaves",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Transaction",
  "fields": [
   {
-   "default": "Open", 
-   "fieldname": "status", 
-   "fieldtype": "Select", 
-   "in_list_view": 1, 
-   "label": "Status", 
-   "no_copy": 1, 
-   "options": "Open\nApproved\nRejected", 
+   "default": "Open",
+   "fieldname": "status",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "Status",
+   "no_copy": 1,
+   "options": "Open\nApproved\nRejected",
    "permlevel": 1
-  }, 
+  },
   {
-   "description": "Leave can be approved by users with Role, \"Leave Approver\"", 
-   "fieldname": "leave_approver", 
-   "fieldtype": "Select", 
-   "label": "Leave Approver", 
-   "options": "[Select]", 
+   "description": "Leave can be approved by users with Role, \"Leave Approver\"",
+   "fieldname": "leave_approver",
+   "fieldtype": "Select",
+   "label": "Leave Approver",
+   "options": "[Select]",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "leave_type", 
-   "fieldtype": "Link", 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "label": "Leave Type", 
-   "options": "Leave Type", 
-   "permlevel": 0, 
-   "reqd": 1, 
+   "fieldname": "leave_type",
+   "fieldtype": "Link",
+   "in_filter": 1,
+   "in_list_view": 1,
+   "label": "Leave Type",
+   "options": "Leave Type",
+   "permlevel": 0,
+   "reqd": 1,
    "search_index": 1
-  }, 
+  },
   {
-   "fieldname": "from_date", 
-   "fieldtype": "Date", 
-   "in_list_view": 1, 
-   "label": "From Date", 
-   "permlevel": 0, 
-   "reqd": 1, 
+   "fieldname": "from_date",
+   "fieldtype": "Date",
+   "in_list_view": 1,
+   "label": "From Date",
+   "permlevel": 0,
+   "reqd": 1,
    "search_index": 1
-  }, 
+  },
   {
-   "fieldname": "to_date", 
-   "fieldtype": "Date", 
-   "in_list_view": 0, 
-   "label": "To Date", 
-   "permlevel": 0, 
-   "reqd": 1, 
+   "fieldname": "to_date",
+   "fieldtype": "Date",
+   "in_list_view": 0,
+   "label": "To Date",
+   "permlevel": 0,
+   "reqd": 1,
    "search_index": 1
-  }, 
+  },
   {
-   "fieldname": "half_day", 
-   "fieldtype": "Check", 
-   "label": "Half Day", 
+   "fieldname": "half_day",
+   "fieldtype": "Check",
+   "label": "Half Day",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "column_break1", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0, 
-   "print_width": "50%", 
+   "fieldname": "column_break1",
+   "fieldtype": "Column Break",
+   "permlevel": 0,
+   "print_width": "50%",
    "width": "50%"
-  }, 
+  },
   {
-   "fieldname": "description", 
-   "fieldtype": "Small Text", 
-   "label": "Reason", 
+   "fieldname": "description",
+   "fieldtype": "Small Text",
+   "label": "Reason",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "employee", 
-   "fieldtype": "Link", 
-   "in_filter": 1, 
-   "label": "Employee", 
-   "options": "Employee", 
-   "permlevel": 0, 
-   "reqd": 1, 
+   "fieldname": "employee",
+   "fieldtype": "Link",
+   "in_filter": 1,
+   "label": "Employee",
+   "options": "Employee",
+   "permlevel": 0,
+   "reqd": 1,
    "search_index": 1
-  }, 
+  },
   {
-   "fieldname": "employee_name", 
-   "fieldtype": "Data", 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "label": "Employee Name", 
-   "permlevel": 0, 
-   "read_only": 1, 
+   "fieldname": "employee_name",
+   "fieldtype": "Data",
+   "in_filter": 1,
+   "in_list_view": 1,
+   "label": "Employee Name",
+   "permlevel": 0,
+   "read_only": 1,
    "search_index": 0
-  }, 
+  },
   {
-   "fieldname": "leave_balance", 
-   "fieldtype": "Float", 
-   "label": "Leave Balance Before Application", 
-   "no_copy": 1, 
-   "permlevel": 0, 
+   "fieldname": "leave_balance",
+   "fieldtype": "Float",
+   "label": "Leave Balance Before Application",
+   "no_copy": 1,
+   "permlevel": 0,
    "read_only": 1
-  }, 
+  },
   {
-   "fieldname": "total_leave_days", 
-   "fieldtype": "Float", 
-   "label": "Total Leave Days", 
-   "no_copy": 1, 
-   "permlevel": 0, 
+   "fieldname": "total_leave_days",
+   "fieldtype": "Float",
+   "label": "Total Leave Days",
+   "no_copy": 1,
+   "permlevel": 0,
    "read_only": 1
-  }, 
+  },
   {
-   "fieldname": "sb10", 
-   "fieldtype": "Section Break", 
-   "label": "More Info", 
+   "fieldname": "sb10",
+   "fieldtype": "Section Break",
+   "label": "More Info",
    "permlevel": 0
-  }, 
+  },
   {
-   "allow_on_submit": 1, 
-   "default": "1", 
-   "fieldname": "follow_via_email", 
-   "fieldtype": "Check", 
-   "label": "Follow via Email", 
-   "permlevel": 0, 
+   "allow_on_submit": 1,
+   "default": "1",
+   "fieldname": "follow_via_email",
+   "fieldtype": "Check",
+   "label": "Follow via Email",
+   "permlevel": 0,
    "print_hide": 1
-  }, 
+  },
   {
-   "default": "Today", 
-   "fieldname": "posting_date", 
-   "fieldtype": "Date", 
-   "label": "Posting Date", 
-   "no_copy": 1, 
-   "permlevel": 0, 
+   "default": "Today",
+   "fieldname": "posting_date",
+   "fieldtype": "Date",
+   "label": "Posting Date",
+   "no_copy": 1,
+   "permlevel": 0,
    "reqd": 1
-  }, 
+  },
   {
-   "fieldname": "fiscal_year", 
-   "fieldtype": "Link", 
-   "in_filter": 1, 
-   "label": "Fiscal Year", 
-   "options": "Fiscal Year", 
-   "permlevel": 0, 
-   "read_only": 0, 
-   "reqd": 1, 
+   "fieldname": "fiscal_year",
+   "fieldtype": "Link",
+   "in_filter": 1,
+   "label": "Fiscal Year",
+   "options": "Fiscal Year",
+   "permlevel": 0,
+   "read_only": 0,
+   "reqd": 1,
    "search_index": 0
-  }, 
+  },
   {
-   "fieldname": "column_break_17", 
-   "fieldtype": "Column Break", 
+   "fieldname": "column_break_17",
+   "fieldtype": "Column Break",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "label": "Company", 
-   "options": "Company", 
-   "permlevel": 0, 
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "label": "Company",
+   "options": "Company",
+   "permlevel": 0,
    "reqd": 1
-  }, 
+  },
   {
-   "fieldname": "letter_head", 
-   "fieldtype": "Link", 
-   "label": "Letter Head", 
-   "options": "Letter Head", 
-   "permlevel": 0, 
-   "print_hide": 1, 
+   "fieldname": "letter_head",
+   "fieldtype": "Link",
+   "label": "Letter Head",
+   "options": "Letter Head",
+   "permlevel": 0,
+   "print_hide": 1,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "amended_from", 
-   "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
-   "label": "Amended From", 
-   "no_copy": 1, 
-   "options": "Leave Application", 
-   "permlevel": 0, 
-   "print_hide": 1, 
+   "fieldname": "amended_from",
+   "fieldtype": "Link",
+   "ignore_user_permissions": 1,
+   "label": "Amended From",
+   "no_copy": 1,
+   "options": "Leave Application",
+   "permlevel": 0,
+   "print_hide": 1,
    "read_only": 1
   }
- ], 
- "icon": "icon-calendar", 
- "idx": 1, 
- "is_submittable": 1, 
- "max_attachments": 3, 
- "modified": "2014-05-15 19:30:47.331357", 
- "modified_by": "Administrator", 
- "module": "HR", 
- "name": "Leave Application", 
- "owner": "Administrator", 
+ ],
+ "icon": "icon-calendar",
+ "idx": 1,
+ "is_submittable": 1,
+ "max_attachments": 3,
+ "modified": "2014-05-26 03:05:49.838899",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Leave Application",
+ "owner": "Administrator",
  "permissions": [
   {
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Employee", 
+   "create": 1,
+   "delete": 0,
+   "email": 1,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Employee",
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "permlevel": 1, 
-   "read": 1, 
-   "role": "All", 
+   "amend": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "permlevel": 1,
+   "read": 1,
+   "role": "All",
    "submit": 0
-  }, 
+  },
   {
-   "amend": 1, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "restrict": 1, 
-   "role": "HR User", 
-   "submit": 1, 
+   "amend": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "set_user_permissions": 1,
+   "role": "HR User",
+   "submit": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 1, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Leave Approver", 
-   "submit": 1, 
+   "amend": 1,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "email": 1,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Leave Approver",
+   "submit": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "permlevel": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "HR User", 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "permlevel": 1,
+   "read": 1,
+   "report": 1,
+   "role": "HR User",
+   "submit": 0,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "permlevel": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Leave Approver", 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "permlevel": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Leave Approver",
+   "submit": 0,
    "write": 1
   }
- ], 
- "search_fields": "employee,employee_name,leave_type,from_date,to_date,total_leave_days,fiscal_year", 
- "sort_field": "modified", 
+ ],
+ "search_fields": "employee,employee_name,leave_type,from_date,to_date,total_leave_days,fiscal_year",
+ "sort_field": "modified",
  "sort_order": "DESC"
-}
\ No newline at end of file
+}
diff --git a/erpnext/hr/doctype/leave_application/test_leave_application.py b/erpnext/hr/doctype/leave_application/test_leave_application.py
index f6faf52..dbf8a71 100644
--- a/erpnext/hr/doctype/leave_application/test_leave_application.py
+++ b/erpnext/hr/doctype/leave_application/test_leave_application.py
@@ -5,7 +5,7 @@
 import unittest
 
 from erpnext.hr.doctype.leave_application.leave_application import LeaveDayBlockedError, OverlapError
-from frappe.core.page.user_properties.user_properties import clear_restrictions
+from frappe.core.page.user_permissions.user_permissions import clear_user_permissions
 
 test_dependencies = ["Leave Allocation", "Leave Block List"]
 
@@ -91,7 +91,7 @@
 
 		from frappe.utils.user import add_role
 		add_role("test1@example.com", "HR User")
-		clear_restrictions("Employee")
+		clear_user_permissions("Employee")
 
 		frappe.db.set_value("Department", "_Test Department",
 			"leave_block_list", "_Test Leave Block List")
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.json b/erpnext/hr/doctype/salary_slip/salary_slip.json
index ff26d25..4035481 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.json
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.json
@@ -182,7 +182,7 @@
    "fieldname": "amended_from", 
    "fieldtype": "Data", 
    "hidden": 0, 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Amended From", 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
@@ -325,7 +325,7 @@
  "icon": "icon-file-text", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2014-05-09 02:17:14.634335", 
+ "modified": "2014-05-26 03:05:52.624169", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Salary Slip", 
@@ -361,7 +361,6 @@
   {
    "permlevel": 0, 
    "read": 1, 
-   "restricted": 0, 
    "role": "Employee"
   }
  ], 
diff --git a/erpnext/manufacturing/doctype/bom/bom.json b/erpnext/manufacturing/doctype/bom/bom.json
index 6dcefbd..958d6bf 100644
--- a/erpnext/manufacturing/doctype/bom/bom.json
+++ b/erpnext/manufacturing/doctype/bom/bom.json
@@ -194,7 +194,7 @@
   {
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Amended From", 
    "no_copy": 1, 
    "options": "BOM", 
@@ -233,7 +233,7 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2014-05-09 02:16:39.975486", 
+ "modified": "2014-05-26 03:05:46.985950", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "BOM", 
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.json b/erpnext/manufacturing/doctype/production_order/production_order.json
index 98e8f0c..4ade719 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.json
+++ b/erpnext/manufacturing/doctype/production_order/production_order.json
@@ -211,7 +211,7 @@
   {
    "fieldname": "amended_from", 
    "fieldtype": "Data", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Amended From", 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
@@ -224,7 +224,7 @@
  "idx": 1, 
  "in_create": 0, 
  "is_submittable": 1, 
- "modified": "2014-05-07 05:41:33.127710", 
+ "modified": "2014-05-26 03:05:50.799576", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Production Order", 
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index dc5bb57..7694d54 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -1,8 +1,10 @@
 execute:import unidecode # new requirement
 
 erpnext.patches.v4_0.validate_v3_patch
+erpnext.patches.v4_0.fix_employee_user_id
 erpnext.patches.v4_0.update_user_properties
 erpnext.patches.v4_0.move_warehouse_user_to_restrictions
+execute:frappe.delete_doc_if_exists("DocType", "Warehouse User")
 erpnext.patches.v4_0.new_permissions
 erpnext.patches.v4_0.global_defaults_to_system_settings
 erpnext.patches.v4_0.update_incharge_name_to_sales_person_in_maintenance_schedule
@@ -30,7 +32,6 @@
 execute:frappe.db.sql("""delete from `tabWebsite Item Group` where ifnull(item_group, '')=''""")
 erpnext.patches.v4_0.remove_module_home_pages
 erpnext.patches.v4_0.split_email_settings
-erpnext.patches.v4_0.fix_employee_user_id
 erpnext.patches.v4_0.import_country_codes
 erpnext.patches.v4_0.countrywise_coa
 execute:frappe.delete_doc("DocType", "MIS Control")
@@ -39,7 +40,6 @@
 execute:frappe.db.sql("update `tabJournal Voucher` set voucher_type='Journal Entry' where ifnull(voucher_type, '')=''")
 execute:frappe.delete_doc("DocType", "Grade")
 erpnext.patches.v4_0.remove_india_specific_fields
-execute:frappe.delete_doc_if_exists("DocType", "Warehouse User")
 execute:frappe.db.sql("delete from `tabWebsite Item Group` where ifnull(item_group, '')=''")
 execute:frappe.delete_doc("Print Format", "SalesInvoice")
 execute:import frappe.defaults;frappe.defaults.clear_default("price_list_currency")
diff --git a/erpnext/patches/v4_0/move_warehouse_user_to_restrictions.py b/erpnext/patches/v4_0/move_warehouse_user_to_restrictions.py
index 16d3b29..64d5347 100644
--- a/erpnext/patches/v4_0/move_warehouse_user_to_restrictions.py
+++ b/erpnext/patches/v4_0/move_warehouse_user_to_restrictions.py
@@ -5,9 +5,9 @@
 import frappe
 
 def execute():
-	from frappe.core.page.user_properties import user_properties
+	from frappe.core.page.user_permissions import user_permissions
 	for warehouse, user in frappe.db.sql("""select parent, user from `tabWarehouse User`"""):
-		user_properties.add(user, "Warehouse", warehouse)
+		user_permissions.add(user, "Warehouse", warehouse)
 	
 	frappe.delete_doc("DocType", "Warehouse User")
 	frappe.reload_doc("stock", "doctype", "warehouse")
\ No newline at end of file
diff --git a/erpnext/patches/v4_0/update_user_properties.py b/erpnext/patches/v4_0/update_user_properties.py
index 1c746d3..54a907a 100644
--- a/erpnext/patches/v4_0/update_user_properties.py
+++ b/erpnext/patches/v4_0/update_user_properties.py
@@ -9,15 +9,15 @@
 def execute():
 	frappe.reload_doc("core", "doctype", "docperm")
 	frappe.reload_doc("hr", "doctype", "employee")
-	update_user_properties()
+	update_user_permissions()
 	update_user_match()
-	add_employee_restrictions_to_leave_approver()
+	add_employee_user_permissions_to_leave_approver()
 	update_permissions()
-	remove_duplicate_restrictions()
+	remove_duplicate_user_permissions()
 	frappe.defaults.clear_cache()
 	frappe.clear_cache()
 
-def update_user_properties():
+def update_user_permissions():
 	frappe.reload_doc("core", "doctype", "docfield")
 	
 	for d in frappe.db.sql("""select parent, defkey, defvalue from tabDefaultValue
@@ -27,7 +27,7 @@
 		
 		if df:
 			frappe.db.sql("""update tabDefaultValue
-				set defkey=%s, parenttype='Restriction'
+				set defkey=%s, parenttype='User Permission'
 				where defkey=%s and
 				parent not in ('__global', '__default')""", (df[0].options, d.defkey))
 
@@ -71,17 +71,17 @@
 				for name in frappe.db.sql_list("""select name from `tab{doctype}`
 					where `{field}`=%s""".format(doctype=doctype, field=match.split(":")[0]), user):
 					
-					frappe.defaults.add_default(doctype, name, user, "Restriction")
+					frappe.defaults.add_default(doctype, name, user, "User Permission")
 					
-def add_employee_restrictions_to_leave_approver():
-	from frappe.core.page.user_properties import user_properties
+def add_employee_user_permissions_to_leave_approver():
+	from frappe.core.page.user_permissions import user_permissions
 	
 	# add restrict rights to HR User and HR Manager
 	frappe.db.sql("""update `tabDocPerm` set `restrict`=1 where parent in ('Employee', 'Leave Application')
 		and role in ('HR User', 'HR Manager') and permlevel=0 and `read`=1""")
 	frappe.clear_cache()
 	
-	# add Employee restrictions (in on_update method)
+	# add Employee user_permissions (in on_update method)
 	for employee in frappe.db.sql_list("""select name from `tabEmployee`
 		where (exists(select leave_approver from `tabEmployee Leave Approver`
 			where `tabEmployee Leave Approver`.parent=`tabEmployee`.name)
@@ -94,8 +94,8 @@
 	frappe.db.sql("""update tabDocPerm set `match`=''
 		where ifnull(`match`,'') not in ('', 'owner')""")
 
-def remove_duplicate_restrictions():
-	# remove duplicate restrictions (if they exist)
+def remove_duplicate_user_permissions():
+	# remove duplicate user_permissions (if they exist)
 	for d in frappe.db.sql("""select parent, defkey, defvalue,
 		count(*) as cnt from tabDefaultValue
 		where parent not in ('__global', '__default')
diff --git a/erpnext/projects/doctype/time_log/time_log.json b/erpnext/projects/doctype/time_log/time_log.json
index 73849b3..49c52f7d 100644
--- a/erpnext/projects/doctype/time_log/time_log.json
+++ b/erpnext/projects/doctype/time_log/time_log.json
@@ -140,7 +140,7 @@
   {
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Amended From", 
    "no_copy": 1, 
    "options": "Time Log", 
@@ -152,7 +152,7 @@
  "icon": "icon-time", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2014-05-06 11:53:04.133874", 
+ "modified": "2014-05-26 03:05:54.597160", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Time Log", 
@@ -160,6 +160,7 @@
  "permissions": [
   {
    "amend": 1, 
+   "apply_user_permissions": 1, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
@@ -168,7 +169,6 @@
    "print": 1, 
    "read": 1, 
    "report": 1, 
-   "restricted": 1, 
    "role": "Projects User", 
    "submit": 1, 
    "write": 1
diff --git a/erpnext/projects/doctype/time_log_batch/time_log_batch.json b/erpnext/projects/doctype/time_log_batch/time_log_batch.json
index 9d98a34..a20f45e 100644
--- a/erpnext/projects/doctype/time_log_batch/time_log_batch.json
+++ b/erpnext/projects/doctype/time_log_batch/time_log_batch.json
@@ -1,6 +1,6 @@
 {
  "autoname": "naming_series:", 
- "creation": "2013-02-28 17:57:33.000000", 
+ "creation": "2013-02-28 17:57:33", 
  "description": "Batch Time Logs for Billing.", 
  "docstatus": 0, 
  "doctype": "DocType", 
@@ -71,7 +71,7 @@
   {
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Amended From", 
    "no_copy": 1, 
    "options": "Time Log Batch", 
@@ -83,7 +83,7 @@
  "icon": "icon-time", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2014-01-20 17:49:34.000000", 
+ "modified": "2014-05-26 03:05:54.728928", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Time Log Batch", 
diff --git a/erpnext/selling/doctype/campaign/campaign.json b/erpnext/selling/doctype/campaign/campaign.json
index 7764a23..f179b2c 100644
--- a/erpnext/selling/doctype/campaign/campaign.json
+++ b/erpnext/selling/doctype/campaign/campaign.json
@@ -1,163 +1,58 @@
 {
- "_last_update": null,
- "_user_tags": null,
- "allow_attach": null,
- "allow_copy": null,
- "allow_email": null,
  "allow_import": 1,
- "allow_print": null,
  "allow_rename": 1,
- "allow_trash": null,
  "autoname": "naming_series:",
- "change_log": null,
- "client_script": null,
- "client_script_core": null,
- "client_string": null,
- "colour": null,
  "creation": "2013-01-10 16:34:18",
- "custom": null,
- "default_print_format": null,
  "description": "Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. ",
  "docstatus": 0,
  "doctype": "DocType",
  "document_type": "Master",
- "dt_template": null,
  "fields": [
   {
-   "allow_on_submit": null,
-   "default": null,
-   "depends_on": null,
-   "description": null,
    "fieldname": "campaign",
    "fieldtype": "Section Break",
-   "hidden": null,
-   "ignore_restrictions": null,
-   "in_filter": null,
    "in_list_view": 0,
    "label": "Campaign",
-   "no_column": null,
-   "no_copy": null,
-   "oldfieldname": null,
    "oldfieldtype": "Section Break",
-   "options": null,
-   "permlevel": 0,
-   "print_hide": null,
-   "print_width": null,
-   "read_only": null,
-   "report_hide": null,
-   "reqd": null,
-   "search_index": null,
-   "set_only_once": null,
-   "trigger": null,
-   "width": null
+   "permlevel": 0
   },
   {
-   "allow_on_submit": null,
-   "default": null,
-   "depends_on": null,
-   "description": null,
    "fieldname": "campaign_name",
    "fieldtype": "Data",
-   "hidden": null,
-   "ignore_restrictions": null,
-   "in_filter": null,
    "in_list_view": 1,
    "label": "Campaign Name",
-   "no_column": null,
-   "no_copy": null,
    "oldfieldname": "campaign_name",
    "oldfieldtype": "Data",
-   "options": null,
    "permlevel": 0,
-   "print_hide": null,
-   "print_width": null,
-   "read_only": null,
-   "report_hide": null,
-   "reqd": 1,
-   "search_index": null,
-   "set_only_once": null,
-   "trigger": null,
-   "width": null
+   "reqd": 1
   },
   {
-   "allow_on_submit": null,
-   "default": null,
-   "depends_on": null,
-   "description": null,
    "fieldname": "naming_series",
    "fieldtype": "Select",
-   "hidden": null,
-   "ignore_restrictions": null,
-   "in_filter": null,
    "in_list_view": 0,
    "label": "Naming Series",
-   "no_column": null,
-   "no_copy": null,
-   "oldfieldname": null,
-   "oldfieldtype": null,
    "options": "Campaign-.####",
    "permlevel": 0,
-   "print_hide": null,
-   "print_width": null,
-   "read_only": null,
-   "report_hide": null,
-   "reqd": 0,
-   "search_index": null,
-   "set_only_once": null,
-   "trigger": null,
-   "width": null
+   "reqd": 0
   },
   {
-   "allow_on_submit": null,
-   "default": null,
-   "depends_on": null,
-   "description": null,
    "fieldname": "description",
    "fieldtype": "Text",
-   "hidden": null,
-   "ignore_restrictions": null,
-   "in_filter": null,
    "in_list_view": 1,
    "label": "Description",
-   "no_column": null,
-   "no_copy": null,
    "oldfieldname": "description",
    "oldfieldtype": "Text",
-   "options": null,
    "permlevel": 0,
-   "print_hide": null,
-   "print_width": null,
-   "read_only": null,
-   "report_hide": null,
-   "reqd": null,
-   "search_index": null,
-   "set_only_once": null,
-   "trigger": null,
    "width": "300px"
   }
  ],
- "hide_heading": null,
- "hide_toolbar": null,
  "icon": "icon-bullhorn",
  "idx": 1,
- "in_create": null,
- "in_dialog": null,
- "is_submittable": null,
- "is_transaction_doc": null,
- "issingle": null,
- "istable": null,
- "max_attachments": null,
- "menu_index": null,
- "modified": "2014-04-16 12:36:34.606593",
+ "modified": "2014-05-26 03:45:48.713672",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Campaign",
- "name_case": null,
  "owner": "Administrator",
- "parent": null,
- "parent_node": null,
- "parentfield": null,
- "parenttype": null,
  "permissions": [
   {
    "amend": 0,
@@ -165,15 +60,11 @@
    "create": 0,
    "delete": 0,
    "email": 1,
-   "export": null,
    "import": 0,
-   "match": null,
    "permlevel": 0,
    "print": 1,
    "read": 1,
    "report": 0,
-   "restrict": null,
-   "restricted": null,
    "role": "Sales Manager",
    "submit": 0,
    "write": 0
@@ -184,15 +75,10 @@
    "create": 0,
    "delete": 0,
    "email": 1,
-   "export": null,
-   "import": null,
-   "match": null,
    "permlevel": 0,
    "print": 1,
    "read": 1,
    "report": 1,
-   "restrict": null,
-   "restricted": null,
    "role": "Sales User",
    "submit": 0,
    "write": 0
@@ -203,34 +89,13 @@
    "create": 1,
    "delete": 1,
    "email": 1,
-   "export": null,
-   "import": null,
-   "match": null,
    "permlevel": 0,
    "print": 1,
    "read": 1,
    "report": 1,
-   "restrict": null,
-   "restricted": null,
    "role": "Sales Master Manager",
    "submit": 0,
    "write": 1
   }
- ],
- "plugin": null,
- "print_outline": null,
- "read_only": null,
- "read_only_onload": null,
- "search_fields": null,
- "server_code": null,
- "server_code_compiled": null,
- "server_code_core": null,
- "server_code_error": null,
- "show_in_menu": null,
- "smallicon": null,
- "subject": null,
- "tag_fields": null,
- "title_field": null,
- "use_template": null,
- "version": null
+ ]
 }
diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json
index 7d854ac..5b82281 100644
--- a/erpnext/selling/doctype/customer/customer.json
+++ b/erpnext/selling/doctype/customer/customer.json
@@ -1,337 +1,337 @@
 {
- "allow_import": 1, 
- "allow_rename": 1, 
- "autoname": "naming_series:", 
- "creation": "2013-06-11 14:26:44", 
- "description": "Buyer of Goods and Services.", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Master", 
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "naming_series:",
+ "creation": "2013-06-11 14:26:44",
+ "description": "Buyer of Goods and Services.",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Master",
  "fields": [
   {
-   "fieldname": "basic_info", 
-   "fieldtype": "Section Break", 
-   "label": "Basic Info", 
-   "oldfieldtype": "Section Break", 
-   "options": "icon-user", 
-   "permlevel": 0, 
+   "fieldname": "basic_info",
+   "fieldtype": "Section Break",
+   "label": "Basic Info",
+   "oldfieldtype": "Section Break",
+   "options": "icon-user",
+   "permlevel": 0,
    "reqd": 0
-  }, 
+  },
   {
-   "fieldname": "naming_series", 
-   "fieldtype": "Select", 
-   "label": "Series", 
-   "no_copy": 1, 
-   "options": "CUST-", 
-   "permlevel": 0, 
+   "fieldname": "naming_series",
+   "fieldtype": "Select",
+   "label": "Series",
+   "no_copy": 1,
+   "options": "CUST-",
+   "permlevel": 0,
    "print_hide": 0
-  }, 
+  },
   {
-   "fieldname": "customer_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "label": "Full Name", 
-   "no_copy": 1, 
-   "oldfieldname": "customer_name", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
+   "fieldname": "customer_name",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "in_filter": 1,
+   "in_list_view": 1,
+   "label": "Full Name",
+   "no_copy": 1,
+   "oldfieldname": "customer_name",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 0,
+   "report_hide": 0,
+   "reqd": 1,
    "search_index": 1
-  }, 
+  },
   {
-   "fieldname": "customer_type", 
-   "fieldtype": "Select", 
-   "label": "Type", 
-   "oldfieldname": "customer_type", 
-   "oldfieldtype": "Select", 
-   "options": "\nCompany\nIndividual", 
-   "permlevel": 0, 
+   "fieldname": "customer_type",
+   "fieldtype": "Select",
+   "label": "Type",
+   "oldfieldname": "customer_type",
+   "oldfieldtype": "Select",
+   "options": "\nCompany\nIndividual",
+   "permlevel": 0,
    "reqd": 1
-  }, 
+  },
   {
-   "fieldname": "lead_name", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "in_filter": 1, 
-   "label": "From Lead", 
-   "no_copy": 1, 
-   "oldfieldname": "lead_name", 
-   "oldfieldtype": "Link", 
-   "options": "Lead", 
-   "permlevel": 0, 
-   "print_hide": 1, 
+   "fieldname": "lead_name",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "in_filter": 1,
+   "label": "From Lead",
+   "no_copy": 1,
+   "oldfieldname": "lead_name",
+   "oldfieldtype": "Link",
+   "options": "Lead",
+   "permlevel": 0,
+   "print_hide": 1,
    "report_hide": 1
-  }, 
+  },
   {
-   "fieldname": "column_break0", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0, 
+   "fieldname": "column_break0",
+   "fieldtype": "Column Break",
+   "permlevel": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "description": "<a href=\"#Sales Browser/Customer Group\">Add / Edit</a>", 
-   "fieldname": "customer_group", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "in_filter": 1, 
-   "label": "Customer Group", 
-   "oldfieldname": "customer_group", 
-   "oldfieldtype": "Link", 
-   "options": "Customer Group", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "reqd": 1, 
+   "description": "<a href=\"#Sales Browser/Customer Group\">Add / Edit</a>",
+   "fieldname": "customer_group",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "in_filter": 1,
+   "label": "Customer Group",
+   "oldfieldname": "customer_group",
+   "oldfieldtype": "Link",
+   "options": "Customer Group",
+   "permlevel": 0,
+   "print_hide": 0,
+   "reqd": 1,
    "search_index": 1
-  }, 
+  },
   {
-   "description": "<a href=\"#Sales Browser/Territory\">Add / Edit</a>", 
-   "fieldname": "territory", 
-   "fieldtype": "Link", 
-   "in_list_view": 1, 
-   "label": "Territory", 
-   "oldfieldname": "territory", 
-   "oldfieldtype": "Link", 
-   "options": "Territory", 
-   "permlevel": 0, 
-   "print_hide": 1, 
+   "description": "<a href=\"#Sales Browser/Territory\">Add / Edit</a>",
+   "fieldname": "territory",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Territory",
+   "oldfieldname": "territory",
+   "oldfieldtype": "Link",
+   "options": "Territory",
+   "permlevel": 0,
+   "print_hide": 1,
    "reqd": 1
-  }, 
+  },
   {
-   "depends_on": "eval:!doc.__islocal", 
-   "fieldname": "address_contacts", 
-   "fieldtype": "Section Break", 
-   "label": "Address & Contacts", 
-   "options": "icon-map-marker", 
+   "depends_on": "eval:!doc.__islocal",
+   "fieldname": "address_contacts",
+   "fieldtype": "Section Break",
+   "label": "Address & Contacts",
+   "options": "icon-map-marker",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "address_html", 
-   "fieldtype": "HTML", 
-   "label": "Address HTML", 
-   "permlevel": 0, 
+   "fieldname": "address_html",
+   "fieldtype": "HTML",
+   "label": "Address HTML",
+   "permlevel": 0,
    "read_only": 1
-  }, 
+  },
   {
-   "fieldname": "column_break1", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0, 
+   "fieldname": "column_break1",
+   "fieldtype": "Column Break",
+   "permlevel": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "fieldname": "contact_html", 
-   "fieldtype": "HTML", 
-   "label": "Contact HTML", 
-   "oldfieldtype": "HTML", 
-   "permlevel": 0, 
+   "fieldname": "contact_html",
+   "fieldtype": "HTML",
+   "label": "Contact HTML",
+   "oldfieldtype": "HTML",
+   "permlevel": 0,
    "read_only": 1
-  }, 
+  },
   {
-   "depends_on": "eval:!doc.__islocal", 
-   "fieldname": "communication_history", 
-   "fieldtype": "Section Break", 
-   "label": "Communication History", 
-   "options": "icon-comments", 
-   "permlevel": 0, 
+   "depends_on": "eval:!doc.__islocal",
+   "fieldname": "communication_history",
+   "fieldtype": "Section Break",
+   "label": "Communication History",
+   "options": "icon-comments",
+   "permlevel": 0,
    "print_hide": 1
-  }, 
+  },
   {
-   "fieldname": "communication_html", 
-   "fieldtype": "HTML", 
-   "label": "Communication HTML", 
-   "permlevel": 0, 
+   "fieldname": "communication_html",
+   "fieldtype": "HTML",
+   "label": "Communication HTML",
+   "permlevel": 0,
    "print_hide": 1
-  }, 
+  },
   {
-   "fieldname": "more_info", 
-   "fieldtype": "Section Break", 
-   "label": "More Info", 
-   "oldfieldtype": "Section Break", 
-   "options": "icon-file-text", 
+   "fieldname": "more_info",
+   "fieldtype": "Section Break",
+   "label": "More Info",
+   "oldfieldtype": "Section Break",
+   "options": "icon-file-text",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "column_break2", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0, 
+   "fieldname": "column_break2",
+   "fieldtype": "Column Break",
+   "permlevel": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "description": "To create an Account Head under a different company, select the company and save customer.", 
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "in_filter": 1, 
-   "label": "Company", 
-   "oldfieldname": "company", 
-   "oldfieldtype": "Link", 
-   "options": "Company", 
-   "permlevel": 0, 
-   "reqd": 1, 
+   "description": "To create an Account Head under a different company, select the company and save customer.",
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "in_filter": 1,
+   "label": "Company",
+   "oldfieldname": "company",
+   "oldfieldtype": "Link",
+   "options": "Company",
+   "permlevel": 0,
+   "reqd": 1,
    "search_index": 1
-  }, 
+  },
   {
-   "description": "Your Customer's TAX registration numbers (if applicable) or any general information", 
-   "fieldname": "customer_details", 
-   "fieldtype": "Text", 
-   "label": "Customer Details", 
-   "oldfieldname": "customer_details", 
-   "oldfieldtype": "Code", 
+   "description": "Your Customer's TAX registration numbers (if applicable) or any general information",
+   "fieldname": "customer_details",
+   "fieldtype": "Text",
+   "label": "Customer Details",
+   "oldfieldname": "customer_details",
+   "oldfieldtype": "Code",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "column_break3", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0, 
+   "fieldname": "column_break3",
+   "fieldtype": "Column Break",
+   "permlevel": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "fieldname": "default_currency", 
-   "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
-   "label": "Currency", 
-   "no_copy": 1, 
-   "options": "Currency", 
+   "fieldname": "default_currency",
+   "fieldtype": "Link",
+   "ignore_user_permissions": 1,
+   "label": "Currency",
+   "no_copy": 1,
+   "options": "Currency",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "default_price_list", 
-   "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
-   "label": "Price List", 
-   "options": "Price List", 
+   "fieldname": "default_price_list",
+   "fieldtype": "Link",
+   "ignore_user_permissions": 1,
+   "label": "Price List",
+   "options": "Price List",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "default_taxes_and_charges", 
-   "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
-   "label": "Taxes and Charges", 
-   "options": "Sales Taxes and Charges Master", 
+   "fieldname": "default_taxes_and_charges",
+   "fieldtype": "Link",
+   "ignore_user_permissions": 1,
+   "label": "Taxes and Charges",
+   "options": "Sales Taxes and Charges Master",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "credit_days", 
-   "fieldtype": "Int", 
-   "label": "Credit Days", 
-   "oldfieldname": "credit_days", 
-   "oldfieldtype": "Int", 
+   "fieldname": "credit_days",
+   "fieldtype": "Int",
+   "label": "Credit Days",
+   "oldfieldname": "credit_days",
+   "oldfieldtype": "Int",
    "permlevel": 1
-  }, 
+  },
   {
-   "fieldname": "credit_limit", 
-   "fieldtype": "Currency", 
-   "label": "Credit Limit", 
-   "oldfieldname": "credit_limit", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
+   "fieldname": "credit_limit",
+   "fieldtype": "Currency",
+   "label": "Credit Limit",
+   "oldfieldname": "credit_limit",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
    "permlevel": 1
-  }, 
+  },
   {
-   "fieldname": "website", 
-   "fieldtype": "Data", 
-   "label": "Website", 
+   "fieldname": "website",
+   "fieldtype": "Data",
+   "label": "Website",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "sales_team_section_break", 
-   "fieldtype": "Section Break", 
-   "label": "Sales Team", 
-   "oldfieldtype": "Section Break", 
-   "options": "icon-group", 
+   "fieldname": "sales_team_section_break",
+   "fieldtype": "Section Break",
+   "label": "Sales Team",
+   "oldfieldtype": "Section Break",
+   "options": "icon-group",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "default_sales_partner", 
-   "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
-   "label": "Sales Partner", 
-   "oldfieldname": "default_sales_partner", 
-   "oldfieldtype": "Link", 
-   "options": "Sales Partner", 
+   "fieldname": "default_sales_partner",
+   "fieldtype": "Link",
+   "ignore_user_permissions": 1,
+   "label": "Sales Partner",
+   "oldfieldname": "default_sales_partner",
+   "oldfieldtype": "Link",
+   "options": "Sales Partner",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "default_commission_rate", 
-   "fieldtype": "Float", 
-   "label": "Commission Rate", 
-   "oldfieldname": "default_commission_rate", 
-   "oldfieldtype": "Currency", 
+   "fieldname": "default_commission_rate",
+   "fieldtype": "Float",
+   "label": "Commission Rate",
+   "oldfieldname": "default_commission_rate",
+   "oldfieldtype": "Currency",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "sales_team", 
-   "fieldtype": "Table", 
-   "label": "Sales Team Details", 
-   "oldfieldname": "sales_team", 
-   "oldfieldtype": "Table", 
-   "options": "Sales Team", 
+   "fieldname": "sales_team",
+   "fieldtype": "Table",
+   "label": "Sales Team Details",
+   "oldfieldname": "sales_team",
+   "oldfieldtype": "Table",
+   "options": "Sales Team",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "communications", 
-   "fieldtype": "Table", 
-   "hidden": 1, 
-   "label": "Communications", 
-   "options": "Communication", 
-   "permlevel": 0, 
+   "fieldname": "communications",
+   "fieldtype": "Table",
+   "hidden": 1,
+   "label": "Communications",
+   "options": "Communication",
+   "permlevel": 0,
    "print_hide": 1
   }
- ], 
- "icon": "icon-user", 
- "idx": 1, 
- "modified": "2014-05-07 05:36:46.466246", 
- "modified_by": "Administrator", 
- "module": "Selling", 
- "name": "Customer", 
- "owner": "Administrator", 
+ ],
+ "icon": "icon-user",
+ "idx": 1,
+ "modified": "2014-05-26 03:05:47.563605",
+ "modified_by": "Administrator",
+ "module": "Selling",
+ "name": "Customer",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Sales User", 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 0,
+   "email": 1,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Sales User",
+   "submit": 0,
    "write": 1
-  }, 
+  },
   {
-   "cancel": 0, 
-   "delete": 0, 
-   "permlevel": 1, 
-   "read": 1, 
+   "cancel": 0,
+   "delete": 0,
+   "permlevel": 1,
+   "read": 1,
    "role": "Sales User"
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "restrict": 1, 
-   "role": "Sales Master Manager", 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "set_user_permissions": 1,
+   "role": "Sales Master Manager",
+   "submit": 0,
    "write": 1
-  }, 
+  },
   {
-   "cancel": 0, 
-   "delete": 0, 
-   "permlevel": 1, 
-   "read": 1, 
-   "role": "Sales Master Manager", 
+   "cancel": 0,
+   "delete": 0,
+   "permlevel": 1,
+   "read": 1,
+   "role": "Sales Master Manager",
    "write": 1
   }
- ], 
+ ],
  "search_fields": "customer_name,customer_group,territory"
-}
\ No newline at end of file
+}
diff --git a/erpnext/selling/doctype/installation_note/installation_note.json b/erpnext/selling/doctype/installation_note/installation_note.json
index 599dd81..5097a38 100644
--- a/erpnext/selling/doctype/installation_note/installation_note.json
+++ b/erpnext/selling/doctype/installation_note/installation_note.json
@@ -196,7 +196,7 @@
   {
    "fieldname": "amended_from", 
    "fieldtype": "Data", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Amended From", 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
@@ -235,7 +235,7 @@
  "icon": "icon-wrench", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2014-05-09 02:17:16.592562", 
+ "modified": "2014-05-26 03:05:48.899177", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Installation Note", 
diff --git a/erpnext/selling/doctype/opportunity/opportunity.json b/erpnext/selling/doctype/opportunity/opportunity.json
index 9a1b172..bfb2fe5 100644
--- a/erpnext/selling/doctype/opportunity/opportunity.json
+++ b/erpnext/selling/doctype/opportunity/opportunity.json
@@ -386,7 +386,7 @@
   {
    "fieldname": "amended_from", 
    "fieldtype": "Data", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Amended From", 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
@@ -409,7 +409,7 @@
  "icon": "icon-info-sign", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2014-05-09 02:16:41.042535", 
+ "modified": "2014-05-26 03:05:50.362530", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Opportunity", 
diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index f4506b2..0e76ec4 100644
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -140,7 +140,7 @@
   {
    "fieldname": "amended_from", 
    "fieldtype": "Data", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Amended From", 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
@@ -818,7 +818,7 @@
  "idx": 1, 
  "is_submittable": 1, 
  "max_attachments": 1, 
- "modified": "2014-05-09 02:17:19.143693", 
+ "modified": "2014-05-26 03:05:52.328681", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Quotation", 
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index 0377880..cf7744d 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -114,7 +114,7 @@
    "fieldname": "amended_from", 
    "fieldtype": "Data", 
    "hidden": 1, 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Amended From", 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
@@ -874,7 +874,7 @@
  "idx": 1, 
  "is_submittable": 1, 
  "issingle": 0, 
- "modified": "2014-05-09 02:17:52.206802", 
+ "modified": "2014-05-26 03:05:53.316938", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Sales Order", 
diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py
index 52bde1e..dbf173c 100644
--- a/erpnext/selling/doctype/sales_order/test_sales_order.py
+++ b/erpnext/selling/doctype/sales_order/test_sales_order.py
@@ -283,7 +283,7 @@
 			so.get("sales_order_details")[0].warehouse, 20.0)
 
 	def test_warehouse_user(self):
-		frappe.defaults.add_default("Warehouse", "_Test Warehouse 1 - _TC1", "test@example.com", "Restriction")
+		frappe.defaults.add_default("Warehouse", "_Test Warehouse 1 - _TC1", "test@example.com", "User Permission")
 		frappe.get_doc("User", "test@example.com")\
 			.add_roles("Sales User", "Sales Manager", "Material User", "Material Manager")
 
@@ -302,7 +302,7 @@
 		frappe.set_user("test2@example.com")
 		so.insert()
 
-		frappe.defaults.clear_default("Warehouse", "_Test Warehouse 1 - _TC1", "test@example.com", parenttype="Restriction")
+		frappe.defaults.clear_default("Warehouse", "_Test Warehouse 1 - _TC1", "test@example.com", parenttype="User Permission")
 
 test_dependencies = ["Sales BOM", "Currency Exchange"]
 
diff --git a/erpnext/selling/doctype/selling_settings/selling_settings.json b/erpnext/selling/doctype/selling_settings/selling_settings.json
index 948d6ad..25b0819 100644
--- a/erpnext/selling/doctype/selling_settings/selling_settings.json
+++ b/erpnext/selling/doctype/selling_settings/selling_settings.json
@@ -31,7 +31,6 @@
    "fieldname": "cust_master_name",
    "fieldtype": "Select",
    "hidden": null,
-   "ignore_restrictions": null,
    "in_filter": null,
    "in_list_view": 1,
    "label": "Customer Naming By",
@@ -59,7 +58,6 @@
    "fieldname": "campaign_naming_by",
    "fieldtype": "Select",
    "hidden": null,
-   "ignore_restrictions": null,
    "in_filter": null,
    "in_list_view": 1,
    "label": "Campaign Naming By",
@@ -87,7 +85,6 @@
    "fieldname": "customer_group",
    "fieldtype": "Link",
    "hidden": null,
-   "ignore_restrictions": null,
    "in_filter": null,
    "in_list_view": 1,
    "label": "Default Customer Group",
@@ -115,7 +112,6 @@
    "fieldname": "territory",
    "fieldtype": "Link",
    "hidden": null,
-   "ignore_restrictions": null,
    "in_filter": null,
    "in_list_view": 1,
    "label": "Default Territory",
@@ -143,7 +139,6 @@
    "fieldname": "selling_price_list",
    "fieldtype": "Link",
    "hidden": null,
-   "ignore_restrictions": null,
    "in_filter": null,
    "in_list_view": 1,
    "label": "Default Price List",
@@ -171,7 +166,6 @@
    "fieldname": "column_break_5",
    "fieldtype": "Column Break",
    "hidden": null,
-   "ignore_restrictions": null,
    "in_filter": null,
    "in_list_view": null,
    "label": null,
@@ -199,7 +193,6 @@
    "fieldname": "so_required",
    "fieldtype": "Select",
    "hidden": null,
-   "ignore_restrictions": null,
    "in_filter": null,
    "in_list_view": null,
    "label": "Sales Order Required",
@@ -227,7 +220,6 @@
    "fieldname": "dn_required",
    "fieldtype": "Select",
    "hidden": null,
-   "ignore_restrictions": null,
    "in_filter": null,
    "in_list_view": null,
    "label": "Delivery Note Required",
@@ -255,7 +247,6 @@
    "fieldname": "maintain_same_sales_rate",
    "fieldtype": "Check",
    "hidden": null,
-   "ignore_restrictions": null,
    "in_filter": null,
    "in_list_view": null,
    "label": "Maintain Same Rate Throughout Sales Cycle",
@@ -283,7 +274,6 @@
    "fieldname": "editable_price_list_rate",
    "fieldtype": "Check",
    "hidden": null,
-   "ignore_restrictions": null,
    "in_filter": null,
    "in_list_view": null,
    "label": "Allow user to edit Price List Rate in transactions",
@@ -341,7 +331,6 @@
    "read": 1,
    "report": null,
    "restrict": null,
-   "restricted": null,
    "role": "System Manager",
    "submit": null,
    "write": 1
diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json
index a73b8ad..ea82fac 100644
--- a/erpnext/setup/doctype/company/company.json
+++ b/erpnext/setup/doctype/company/company.json
@@ -63,7 +63,6 @@
   {
    "fieldname": "country", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 0, 
    "in_list_view": 1, 
    "label": "Country", 
    "options": "Country", 
@@ -73,7 +72,7 @@
   {
    "fieldname": "chart_of_accounts", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Chart of Accounts", 
    "options": "Chart of Accounts", 
    "permlevel": 0
@@ -90,7 +89,7 @@
    "depends_on": "eval:!doc.__islocal", 
    "fieldname": "default_bank_account", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Default Bank Account", 
    "no_copy": 1, 
    "oldfieldname": "default_bank_account", 
@@ -102,7 +101,7 @@
   {
    "fieldname": "default_cash_account", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Default Cash Account", 
    "no_copy": 1, 
    "options": "Account", 
@@ -113,7 +112,7 @@
    "depends_on": "eval:!doc.__islocal", 
    "fieldname": "receivables_group", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Receivables Group", 
    "no_copy": 1, 
    "oldfieldname": "receivables_group", 
@@ -126,7 +125,7 @@
    "depends_on": "eval:!doc.__islocal", 
    "fieldname": "payables_group", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Payables Group", 
    "no_copy": 1, 
    "oldfieldname": "payables_group", 
@@ -138,7 +137,7 @@
   {
    "fieldname": "default_expense_account", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Default Expense Account", 
    "no_copy": 1, 
    "options": "Account", 
@@ -147,7 +146,7 @@
   {
    "fieldname": "default_income_account", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Default Income Account", 
    "no_copy": 1, 
    "options": "Account", 
@@ -164,7 +163,7 @@
   {
    "fieldname": "default_currency", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Default Currency", 
    "options": "Currency", 
    "permlevel": 0, 
@@ -175,7 +174,7 @@
    "depends_on": "eval:!doc.__islocal", 
    "fieldname": "cost_center", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Cost Center", 
    "no_copy": 1, 
    "options": "Cost Center", 
@@ -235,7 +234,7 @@
   {
    "fieldname": "stock_received_but_not_billed", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Stock Received But Not Billed", 
    "no_copy": 1, 
    "options": "Account", 
@@ -245,7 +244,7 @@
   {
    "fieldname": "stock_adjustment_account", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Stock Adjustment Account", 
    "no_copy": 1, 
    "options": "Account", 
@@ -255,7 +254,7 @@
   {
    "fieldname": "expenses_included_in_valuation", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Expenses Included In Valuation", 
    "no_copy": 1, 
    "options": "Account", 
@@ -349,7 +348,7 @@
  ], 
  "icon": "icon-building", 
  "idx": 1, 
- "modified": "2014-05-07 06:39:40.682148", 
+ "modified": "2014-05-26 03:05:47.284171", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Company", 
diff --git a/erpnext/setup/doctype/customer_group/customer_group.json b/erpnext/setup/doctype/customer_group/customer_group.json
index 0189fab..921803f 100644
--- a/erpnext/setup/doctype/customer_group/customer_group.json
+++ b/erpnext/setup/doctype/customer_group/customer_group.json
@@ -22,7 +22,7 @@
    "description": "<a href=\"#Sales Browser/Customer Group\">Add / Edit</a>", 
    "fieldname": "parent_customer_group", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "in_list_view": 1, 
    "label": "Parent Customer Group", 
    "oldfieldname": "parent_customer_group", 
@@ -51,7 +51,7 @@
   {
    "fieldname": "default_price_list", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Default Price List", 
    "options": "Price List", 
    "permlevel": 0
@@ -87,7 +87,7 @@
    "fieldname": "old_parent", 
    "fieldtype": "Link", 
    "hidden": 1, 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "old_parent", 
    "no_copy": 1, 
    "oldfieldname": "old_parent", 
@@ -101,7 +101,7 @@
  "icon": "icon-sitemap", 
  "idx": 1, 
  "in_create": 1, 
- "modified": "2014-05-07 06:39:41.073285", 
+ "modified": "2014-05-26 03:05:47.746202", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Customer Group", 
diff --git a/erpnext/setup/doctype/global_defaults/global_defaults.json b/erpnext/setup/doctype/global_defaults/global_defaults.json
index 22997dd..fc9c335 100644
--- a/erpnext/setup/doctype/global_defaults/global_defaults.json
+++ b/erpnext/setup/doctype/global_defaults/global_defaults.json
@@ -24,7 +24,7 @@
    "default": "INR", 
    "fieldname": "default_currency", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "in_list_view": 1, 
    "label": "Default Currency", 
    "options": "Currency", 
@@ -53,7 +53,7 @@
   {
    "fieldname": "default_company", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Default Company", 
    "options": "Company", 
    "permlevel": 0, 
@@ -105,7 +105,7 @@
  "idx": 1, 
  "in_create": 1, 
  "issingle": 1, 
- "modified": "2014-05-07 05:25:24.237036", 
+ "modified": "2014-05-26 03:05:48.838329", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Global Defaults", 
diff --git a/erpnext/setup/doctype/item_group/item_group.json b/erpnext/setup/doctype/item_group/item_group.json
index a77978e..7f8c519 100644
--- a/erpnext/setup/doctype/item_group/item_group.json
+++ b/erpnext/setup/doctype/item_group/item_group.json
@@ -39,7 +39,7 @@
    "description": "<a href=\"#Sales Browser/Item Group\">Add / Edit</a>", 
    "fieldname": "parent_item_group", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "in_list_view": 1, 
    "label": "Parent Item Group", 
    "no_copy": 0, 
@@ -145,7 +145,7 @@
    "fieldname": "old_parent", 
    "fieldtype": "Link", 
    "hidden": 1, 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "old_parent", 
    "no_copy": 1, 
    "oldfieldname": "old_parent", 
@@ -162,7 +162,7 @@
  "in_create": 1, 
  "issingle": 0, 
  "max_attachments": 3, 
- "modified": "2014-05-16 15:26:47.322787", 
+ "modified": "2014-05-26 03:05:49.376278", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Item Group", 
diff --git a/erpnext/setup/doctype/sales_person/sales_person.json b/erpnext/setup/doctype/sales_person/sales_person.json
index 55b32a2..aa567ea 100644
--- a/erpnext/setup/doctype/sales_person/sales_person.json
+++ b/erpnext/setup/doctype/sales_person/sales_person.json
@@ -2,7 +2,7 @@
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:sales_person_name", 
- "creation": "2013-01-10 16:34:24.000000", 
+ "creation": "2013-01-10 16:34:24", 
  "description": "All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.", 
  "docstatus": 0, 
  "doctype": "DocType", 
@@ -19,6 +19,7 @@
    "fieldname": "sales_person_name", 
    "fieldtype": "Data", 
    "in_filter": 1, 
+   "in_list_view": 1, 
    "label": "Sales Person Name", 
    "oldfieldname": "sales_person_name", 
    "oldfieldtype": "Data", 
@@ -30,7 +31,8 @@
    "description": "Select company name first.", 
    "fieldname": "parent_sales_person", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
+   "in_list_view": 1, 
    "label": "Parent Sales Person", 
    "oldfieldname": "parent_sales_person", 
    "oldfieldtype": "Link", 
@@ -41,6 +43,7 @@
   {
    "fieldname": "is_group", 
    "fieldtype": "Select", 
+   "in_list_view": 1, 
    "label": "Has Child Node", 
    "oldfieldname": "is_group", 
    "oldfieldtype": "Select", 
@@ -140,7 +143,7 @@
  "icon": "icon-user", 
  "idx": 1, 
  "in_create": 1, 
- "modified": "2014-01-20 17:49:25.000000", 
+ "modified": "2014-05-26 03:05:53.652608", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Sales Person", 
diff --git a/erpnext/setup/doctype/territory/territory.json b/erpnext/setup/doctype/territory/territory.json
index ab95e8d..12559ff 100644
--- a/erpnext/setup/doctype/territory/territory.json
+++ b/erpnext/setup/doctype/territory/territory.json
@@ -23,7 +23,7 @@
    "description": "<a href=\"#Sales Browser/Territory\">Add / Edit</a>", 
    "fieldname": "parent_territory", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "in_list_view": 1, 
    "label": "Parent Territory", 
    "oldfieldname": "parent_territory", 
@@ -95,7 +95,7 @@
    "fieldname": "old_parent", 
    "fieldtype": "Link", 
    "hidden": 1, 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "old_parent", 
    "no_copy": 1, 
    "oldfieldname": "old_parent", 
@@ -136,7 +136,7 @@
  "icon": "icon-map-marker", 
  "idx": 1, 
  "in_create": 1, 
- "modified": "2014-05-07 06:32:11.724588", 
+ "modified": "2014-05-26 03:05:54.517648", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Territory", 
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index 5cc7ea9..b6125a6 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -130,7 +130,7 @@
    "allow_on_submit": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Data", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Amended From", 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
@@ -999,7 +999,7 @@
  "idx": 1, 
  "in_create": 0, 
  "is_submittable": 1, 
- "modified": "2014-05-09 02:17:22.579628", 
+ "modified": "2014-05-26 03:05:48.020967", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Delivery Note", 
diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index 92c16f8..03febbc 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -1,903 +1,903 @@
 {
- "allow_attach": 1, 
- "allow_import": 1, 
- "allow_rename": 1, 
- "autoname": "field:item_code", 
- "creation": "2013-05-03 10:45:46", 
- "default_print_format": "Standard", 
- "description": "A Product or a Service that is bought, sold or kept in stock.", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Master", 
+ "allow_attach": 1,
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "field:item_code",
+ "creation": "2013-05-03 10:45:46",
+ "default_print_format": "Standard",
+ "description": "A Product or a Service that is bought, sold or kept in stock.",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Master",
  "fields": [
   {
-   "fieldname": "name_and_description_section", 
-   "fieldtype": "Section Break", 
-   "label": "Name and Description", 
-   "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "options": "icon-flag", 
-   "permlevel": 0, 
+   "fieldname": "name_and_description_section",
+   "fieldtype": "Section Break",
+   "label": "Name and Description",
+   "no_copy": 0,
+   "oldfieldtype": "Section Break",
+   "options": "icon-flag",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "naming_series", 
-   "fieldtype": "Select", 
-   "label": "Series", 
-   "options": "ITEM-", 
-   "permlevel": 0, 
+   "fieldname": "naming_series",
+   "fieldtype": "Select",
+   "label": "Series",
+   "options": "ITEM-",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "description": "Item will be saved by this name in the data base.", 
-   "fieldname": "item_code", 
-   "fieldtype": "Data", 
-   "in_filter": 0, 
-   "label": "Item Code", 
-   "no_copy": 1, 
-   "oldfieldname": "item_code", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "read_only": 0, 
-   "reqd": 0, 
+   "description": "Item will be saved by this name in the data base.",
+   "fieldname": "item_code",
+   "fieldtype": "Data",
+   "in_filter": 0,
+   "label": "Item Code",
+   "no_copy": 1,
+   "oldfieldname": "item_code",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "read_only": 0,
+   "reqd": 0,
    "search_index": 0
-  }, 
+  },
   {
-   "fieldname": "item_name", 
-   "fieldtype": "Data", 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "label": "Item Name", 
-   "oldfieldname": "item_name", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "read_only": 0, 
-   "reqd": 1, 
+   "fieldname": "item_name",
+   "fieldtype": "Data",
+   "in_filter": 1,
+   "in_list_view": 1,
+   "label": "Item Name",
+   "oldfieldname": "item_name",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "read_only": 0,
+   "reqd": 1,
    "search_index": 1
-  }, 
+  },
   {
-   "description": "<a href=\"#Sales Browser/Item Group\">Add / Edit</a>", 
-   "fieldname": "item_group", 
-   "fieldtype": "Link", 
-   "in_filter": 1, 
-   "label": "Item Group", 
-   "oldfieldname": "item_group", 
-   "oldfieldtype": "Link", 
-   "options": "Item Group", 
-   "permlevel": 0, 
-   "read_only": 0, 
+   "description": "<a href=\"#Sales Browser/Item Group\">Add / Edit</a>",
+   "fieldname": "item_group",
+   "fieldtype": "Link",
+   "in_filter": 1,
+   "label": "Item Group",
+   "oldfieldname": "item_group",
+   "oldfieldtype": "Link",
+   "options": "Item Group",
+   "permlevel": 0,
+   "read_only": 0,
    "reqd": 1
-  }, 
+  },
   {
-   "description": "Unit of measurement of this item (e.g. Kg, Unit, No, Pair).", 
-   "fieldname": "stock_uom", 
-   "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
-   "label": "Default Unit of Measure", 
-   "oldfieldname": "stock_uom", 
-   "oldfieldtype": "Link", 
-   "options": "UOM", 
-   "permlevel": 0, 
-   "read_only": 0, 
+   "description": "Unit of measurement of this item (e.g. Kg, Unit, No, Pair).",
+   "fieldname": "stock_uom",
+   "fieldtype": "Link",
+   "ignore_user_permissions": 1,
+   "label": "Default Unit of Measure",
+   "oldfieldname": "stock_uom",
+   "oldfieldtype": "Link",
+   "options": "UOM",
+   "permlevel": 0,
+   "read_only": 0,
    "reqd": 1
-  }, 
+  },
   {
-   "fieldname": "brand", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "label": "Brand", 
-   "oldfieldname": "brand", 
-   "oldfieldtype": "Link", 
-   "options": "Brand", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
+   "fieldname": "brand",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "label": "Brand",
+   "oldfieldname": "brand",
+   "oldfieldtype": "Link",
+   "options": "Brand",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
    "reqd": 0
-  }, 
+  },
   {
-   "fieldname": "barcode", 
-   "fieldtype": "Data", 
-   "label": "Barcode", 
-   "permlevel": 0, 
+   "fieldname": "barcode",
+   "fieldtype": "Data",
+   "label": "Barcode",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "column_break0", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0, 
+   "fieldname": "column_break0",
+   "fieldtype": "Column Break",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "image", 
-   "fieldtype": "Attach", 
-   "label": "Image", 
-   "options": "", 
-   "permlevel": 0, 
+   "fieldname": "image",
+   "fieldtype": "Attach",
+   "label": "Image",
+   "options": "",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "image_view", 
-   "fieldtype": "Image", 
-   "in_list_view": 1, 
-   "label": "Image View", 
-   "options": "image", 
-   "permlevel": 0, 
+   "fieldname": "image_view",
+   "fieldtype": "Image",
+   "in_list_view": 1,
+   "label": "Image View",
+   "options": "image",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "description", 
-   "fieldtype": "Small Text", 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Description", 
-   "oldfieldname": "description", 
-   "oldfieldtype": "Text", 
-   "permlevel": 0, 
-   "read_only": 0, 
-   "reqd": 1, 
+   "fieldname": "description",
+   "fieldtype": "Small Text",
+   "in_filter": 0,
+   "in_list_view": 1,
+   "label": "Description",
+   "oldfieldname": "description",
+   "oldfieldtype": "Text",
+   "permlevel": 0,
+   "read_only": 0,
+   "reqd": 1,
    "search_index": 0
-  }, 
+  },
   {
-   "fieldname": "description_html", 
-   "fieldtype": "Small Text", 
-   "label": "Description HTML", 
-   "permlevel": 0, 
+   "fieldname": "description_html",
+   "fieldtype": "Small Text",
+   "label": "Description HTML",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "description": "Generates HTML to include selected image in the description", 
-   "fieldname": "add_image", 
-   "fieldtype": "Button", 
-   "label": "Generate Description HTML", 
-   "permlevel": 0, 
+   "description": "Generates HTML to include selected image in the description",
+   "fieldname": "add_image",
+   "fieldtype": "Button",
+   "label": "Generate Description HTML",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "inventory", 
-   "fieldtype": "Section Break", 
-   "label": "Inventory", 
-   "oldfieldtype": "Section Break", 
-   "options": "icon-truck", 
-   "permlevel": 0, 
+   "fieldname": "inventory",
+   "fieldtype": "Section Break",
+   "label": "Inventory",
+   "oldfieldtype": "Section Break",
+   "options": "icon-truck",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "default": "Yes", 
-   "description": "Select \"Yes\" if you are maintaining stock of this item in your Inventory.", 
-   "fieldname": "is_stock_item", 
-   "fieldtype": "Select", 
-   "label": "Is Stock Item", 
-   "oldfieldname": "is_stock_item", 
-   "oldfieldtype": "Select", 
-   "options": "Yes\nNo", 
-   "permlevel": 0, 
-   "read_only": 0, 
+   "default": "Yes",
+   "description": "Select \"Yes\" if you are maintaining stock of this item in your Inventory.",
+   "fieldname": "is_stock_item",
+   "fieldtype": "Select",
+   "label": "Is Stock Item",
+   "oldfieldname": "is_stock_item",
+   "oldfieldtype": "Select",
+   "options": "Yes\nNo",
+   "permlevel": 0,
+   "read_only": 0,
    "reqd": 1
-  }, 
+  },
   {
-   "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
-   "description": "Mandatory if Stock Item is \"Yes\". Also the default warehouse where reserved quantity is set from Sales Order.", 
-   "fieldname": "default_warehouse", 
-   "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
-   "label": "Default Warehouse", 
-   "oldfieldname": "default_warehouse", 
-   "oldfieldtype": "Link", 
-   "options": "Warehouse", 
-   "permlevel": 0, 
+   "depends_on": "eval:doc.is_stock_item==\"Yes\"",
+   "description": "Mandatory if Stock Item is \"Yes\". Also the default warehouse where reserved quantity is set from Sales Order.",
+   "fieldname": "default_warehouse",
+   "fieldtype": "Link",
+   "ignore_user_permissions": 1,
+   "label": "Default Warehouse",
+   "oldfieldname": "default_warehouse",
+   "oldfieldtype": "Link",
+   "options": "Warehouse",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
-   "description": "Percentage variation in quantity to be allowed while receiving or delivering this item.", 
-   "fieldname": "tolerance", 
-   "fieldtype": "Float", 
-   "label": "Allowance Percent", 
-   "oldfieldname": "tolerance", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
+   "depends_on": "eval:doc.is_stock_item==\"Yes\"",
+   "description": "Percentage variation in quantity to be allowed while receiving or delivering this item.",
+   "fieldname": "tolerance",
+   "fieldtype": "Float",
+   "label": "Allowance Percent",
+   "oldfieldname": "tolerance",
+   "oldfieldtype": "Currency",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
-   "fieldname": "valuation_method", 
-   "fieldtype": "Select", 
-   "label": "Valuation Method", 
-   "options": "\nFIFO\nMoving Average", 
-   "permlevel": 0, 
+   "depends_on": "eval:doc.is_stock_item==\"Yes\"",
+   "fieldname": "valuation_method",
+   "fieldtype": "Select",
+   "label": "Valuation Method",
+   "options": "\nFIFO\nMoving Average",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "default": "0.00", 
-   "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
-   "description": "You can enter the minimum quantity of this item to be ordered.", 
-   "fieldname": "min_order_qty", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "label": "Minimum Order Qty", 
-   "oldfieldname": "min_order_qty", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
+   "default": "0.00",
+   "depends_on": "eval:doc.is_stock_item==\"Yes\"",
+   "description": "You can enter the minimum quantity of this item to be ordered.",
+   "fieldname": "min_order_qty",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "label": "Minimum Order Qty",
+   "oldfieldname": "min_order_qty",
+   "oldfieldtype": "Currency",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
-   "fieldname": "column_break1", 
-   "fieldtype": "Column Break", 
-   "oldfieldtype": "Column Break", 
-   "permlevel": 0, 
-   "read_only": 0, 
+   "depends_on": "eval:doc.is_stock_item==\"Yes\"",
+   "fieldname": "column_break1",
+   "fieldtype": "Column Break",
+   "oldfieldtype": "Column Break",
+   "permlevel": 0,
+   "read_only": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "default": "No", 
-   "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
-   "description": "Select \"Yes\" if this item is used for some internal purpose in your company.", 
-   "fieldname": "is_asset_item", 
-   "fieldtype": "Select", 
-   "label": "Is Fixed Asset Item", 
-   "oldfieldname": "is_asset_item", 
-   "oldfieldtype": "Select", 
-   "options": "Yes\nNo", 
-   "permlevel": 0, 
-   "read_only": 0, 
+   "default": "No",
+   "depends_on": "eval:doc.is_stock_item==\"Yes\"",
+   "description": "Select \"Yes\" if this item is used for some internal purpose in your company.",
+   "fieldname": "is_asset_item",
+   "fieldtype": "Select",
+   "label": "Is Fixed Asset Item",
+   "oldfieldname": "is_asset_item",
+   "oldfieldtype": "Select",
+   "options": "Yes\nNo",
+   "permlevel": 0,
+   "read_only": 0,
    "reqd": 1
-  }, 
+  },
   {
-   "default": "No", 
-   "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
-   "fieldname": "has_batch_no", 
-   "fieldtype": "Select", 
-   "label": "Has Batch No", 
-   "oldfieldname": "has_batch_no", 
-   "oldfieldtype": "Select", 
-   "options": "Yes\nNo", 
-   "permlevel": 0, 
-   "read_only": 0, 
+   "default": "No",
+   "depends_on": "eval:doc.is_stock_item==\"Yes\"",
+   "fieldname": "has_batch_no",
+   "fieldtype": "Select",
+   "label": "Has Batch No",
+   "oldfieldname": "has_batch_no",
+   "oldfieldtype": "Select",
+   "options": "Yes\nNo",
+   "permlevel": 0,
+   "read_only": 0,
    "reqd": 1
-  }, 
+  },
   {
-   "default": "No", 
-   "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
-   "description": "Selecting \"Yes\" will give a unique identity to each entity of this item which can be viewed in the Serial No master.", 
-   "fieldname": "has_serial_no", 
-   "fieldtype": "Select", 
-   "in_filter": 1, 
-   "label": "Has Serial No", 
-   "oldfieldname": "has_serial_no", 
-   "oldfieldtype": "Select", 
-   "options": "Yes\nNo", 
-   "permlevel": 0, 
-   "read_only": 0, 
+   "default": "No",
+   "depends_on": "eval:doc.is_stock_item==\"Yes\"",
+   "description": "Selecting \"Yes\" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",
+   "fieldname": "has_serial_no",
+   "fieldtype": "Select",
+   "in_filter": 1,
+   "label": "Has Serial No",
+   "oldfieldname": "has_serial_no",
+   "oldfieldtype": "Select",
+   "options": "Yes\nNo",
+   "permlevel": 0,
+   "read_only": 0,
    "reqd": 1
-  }, 
+  },
   {
-   "depends_on": "eval: doc.has_serial_no===\"Yes\"", 
-   "description": "Example: ABCD.#####\nIf series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.", 
-   "fieldname": "serial_no_series", 
-   "fieldtype": "Data", 
-   "label": "Serial Number Series", 
-   "no_copy": 1, 
+   "depends_on": "eval: doc.has_serial_no===\"Yes\"",
+   "description": "Example: ABCD.#####\nIf series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.",
+   "fieldname": "serial_no_series",
+   "fieldtype": "Data",
+   "label": "Serial Number Series",
+   "no_copy": 1,
    "permlevel": 0
-  }, 
+  },
   {
-   "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
-   "fieldname": "warranty_period", 
-   "fieldtype": "Data", 
-   "label": "Warranty Period (in days)", 
-   "oldfieldname": "warranty_period", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
+   "depends_on": "eval:doc.is_stock_item==\"Yes\"",
+   "fieldname": "warranty_period",
+   "fieldtype": "Data",
+   "label": "Warranty Period (in days)",
+   "oldfieldname": "warranty_period",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
-   "fieldname": "end_of_life", 
-   "fieldtype": "Date", 
-   "label": "End of Life", 
-   "oldfieldname": "end_of_life", 
-   "oldfieldtype": "Date", 
-   "permlevel": 0, 
+   "depends_on": "eval:doc.is_stock_item==\"Yes\"",
+   "fieldname": "end_of_life",
+   "fieldtype": "Date",
+   "label": "End of Life",
+   "oldfieldname": "end_of_life",
+   "oldfieldtype": "Date",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
-   "description": "Net Weight of each Item", 
-   "fieldname": "net_weight", 
-   "fieldtype": "Float", 
-   "label": "Net Weight", 
-   "permlevel": 0, 
+   "depends_on": "eval:doc.is_stock_item==\"Yes\"",
+   "description": "Net Weight of each Item",
+   "fieldname": "net_weight",
+   "fieldtype": "Float",
+   "label": "Net Weight",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
-   "fieldname": "weight_uom", 
-   "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
-   "label": "Weight UOM", 
-   "options": "UOM", 
-   "permlevel": 0, 
+   "depends_on": "eval:doc.is_stock_item==\"Yes\"",
+   "fieldname": "weight_uom",
+   "fieldtype": "Link",
+   "ignore_user_permissions": 1,
+   "label": "Weight UOM",
+   "options": "UOM",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "description": "Auto-raise Material Request if quantity goes below re-order level in a warehouse", 
-   "fieldname": "reorder_section", 
-   "fieldtype": "Section Break", 
-   "label": "Re-order", 
-   "options": "icon-rss", 
-   "permlevel": 0, 
+   "description": "Auto-raise Material Request if quantity goes below re-order level in a warehouse",
+   "fieldname": "reorder_section",
+   "fieldtype": "Section Break",
+   "label": "Re-order",
+   "options": "icon-rss",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
-   "fieldname": "re_order_level", 
-   "fieldtype": "Float", 
-   "label": "Re-Order Level", 
-   "oldfieldname": "re_order_level", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
+   "depends_on": "eval:doc.is_stock_item==\"Yes\"",
+   "fieldname": "re_order_level",
+   "fieldtype": "Float",
+   "label": "Re-Order Level",
+   "oldfieldname": "re_order_level",
+   "oldfieldtype": "Currency",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
-   "fieldname": "re_order_qty", 
-   "fieldtype": "Float", 
-   "label": "Re-Order Qty", 
-   "permlevel": 0, 
+   "depends_on": "eval:doc.is_stock_item==\"Yes\"",
+   "fieldname": "re_order_qty",
+   "fieldtype": "Float",
+   "label": "Re-Order Qty",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "section_break_31", 
-   "fieldtype": "Section Break", 
-   "permlevel": 0, 
+   "fieldname": "section_break_31",
+   "fieldtype": "Section Break",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "item_reorder", 
-   "fieldtype": "Table", 
-   "label": "Warehouse-wise Item Reorder", 
-   "options": "Item Reorder", 
-   "permlevel": 0, 
+   "fieldname": "item_reorder",
+   "fieldtype": "Table",
+   "label": "Warehouse-wise Item Reorder",
+   "options": "Item Reorder",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "purchase_details", 
-   "fieldtype": "Section Break", 
-   "label": "Purchase Details", 
-   "oldfieldtype": "Section Break", 
-   "options": "icon-shopping-cart", 
-   "permlevel": 0, 
+   "fieldname": "purchase_details",
+   "fieldtype": "Section Break",
+   "label": "Purchase Details",
+   "oldfieldtype": "Section Break",
+   "options": "icon-shopping-cart",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "default": "Yes", 
-   "description": "Selecting \"Yes\" will allow this item to appear in Purchase Order , Purchase Receipt.", 
-   "fieldname": "is_purchase_item", 
-   "fieldtype": "Select", 
-   "label": "Is Purchase Item", 
-   "oldfieldname": "is_purchase_item", 
-   "oldfieldtype": "Select", 
-   "options": "Yes\nNo", 
-   "permlevel": 0, 
-   "read_only": 0, 
+   "default": "Yes",
+   "description": "Selecting \"Yes\" will allow this item to appear in Purchase Order , Purchase Receipt.",
+   "fieldname": "is_purchase_item",
+   "fieldtype": "Select",
+   "label": "Is Purchase Item",
+   "oldfieldname": "is_purchase_item",
+   "oldfieldtype": "Select",
+   "options": "Yes\nNo",
+   "permlevel": 0,
+   "read_only": 0,
    "reqd": 1
-  }, 
+  },
   {
-   "fieldname": "default_supplier", 
-   "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
-   "label": "Default Supplier", 
-   "options": "Supplier", 
+   "fieldname": "default_supplier",
+   "fieldtype": "Link",
+   "ignore_user_permissions": 1,
+   "label": "Default Supplier",
+   "options": "Supplier",
    "permlevel": 0
-  }, 
+  },
   {
-   "depends_on": "eval:doc.is_purchase_item==\"Yes\"", 
-   "description": "Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Material Request when you select this item.", 
-   "fieldname": "lead_time_days", 
-   "fieldtype": "Int", 
-   "label": "Lead Time Days", 
-   "no_copy": 1, 
-   "oldfieldname": "lead_time_days", 
-   "oldfieldtype": "Int", 
-   "permlevel": 0, 
+   "depends_on": "eval:doc.is_purchase_item==\"Yes\"",
+   "description": "Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Material Request when you select this item.",
+   "fieldname": "lead_time_days",
+   "fieldtype": "Int",
+   "label": "Lead Time Days",
+   "no_copy": 1,
+   "oldfieldname": "lead_time_days",
+   "oldfieldtype": "Int",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "depends_on": "eval:doc.is_purchase_item==\"Yes\"", 
-   "description": "Default Purchase Account in which cost of the item will be debited.", 
-   "fieldname": "expense_account", 
-   "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
-   "label": "Default Expense Account", 
-   "oldfieldname": "purchase_account", 
-   "oldfieldtype": "Link", 
-   "options": "Account", 
-   "permlevel": 0, 
+   "depends_on": "eval:doc.is_purchase_item==\"Yes\"",
+   "description": "Default Purchase Account in which cost of the item will be debited.",
+   "fieldname": "expense_account",
+   "fieldtype": "Link",
+   "ignore_user_permissions": 1,
+   "label": "Default Expense Account",
+   "oldfieldname": "purchase_account",
+   "oldfieldtype": "Link",
+   "options": "Account",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "depends_on": "eval:doc.is_purchase_item==\"Yes\"", 
-   "description": "Default Cost Center for tracking expense for this item.", 
-   "fieldname": "buying_cost_center", 
-   "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
-   "label": "Default Buying Cost Center", 
-   "oldfieldname": "cost_center", 
-   "oldfieldtype": "Link", 
-   "options": "Cost Center", 
-   "permlevel": 0, 
+   "depends_on": "eval:doc.is_purchase_item==\"Yes\"",
+   "description": "Default Cost Center for tracking expense for this item.",
+   "fieldname": "buying_cost_center",
+   "fieldtype": "Link",
+   "ignore_user_permissions": 1,
+   "label": "Default Buying Cost Center",
+   "oldfieldname": "cost_center",
+   "oldfieldtype": "Link",
+   "options": "Cost Center",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "depends_on": "eval:doc.is_purchase_item==\"Yes\"", 
-   "fieldname": "last_purchase_rate", 
-   "fieldtype": "Float", 
-   "label": "Last Purchase Rate", 
-   "no_copy": 1, 
-   "oldfieldname": "last_purchase_rate", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
+   "depends_on": "eval:doc.is_purchase_item==\"Yes\"",
+   "fieldname": "last_purchase_rate",
+   "fieldtype": "Float",
+   "label": "Last Purchase Rate",
+   "no_copy": 1,
+   "oldfieldname": "last_purchase_rate",
+   "oldfieldtype": "Currency",
+   "permlevel": 0,
    "read_only": 1
-  }, 
+  },
   {
-   "depends_on": "eval:doc.is_purchase_item==\"Yes\"", 
-   "fieldname": "column_break2", 
-   "fieldtype": "Column Break", 
-   "oldfieldtype": "Column Break", 
-   "permlevel": 0, 
-   "read_only": 0, 
+   "depends_on": "eval:doc.is_purchase_item==\"Yes\"",
+   "fieldname": "column_break2",
+   "fieldtype": "Column Break",
+   "oldfieldtype": "Column Break",
+   "permlevel": 0,
+   "read_only": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "depends_on": "eval:doc.is_purchase_item==\"Yes\"", 
-   "fieldname": "uom_conversion_details", 
-   "fieldtype": "Table", 
-   "label": "UOM Conversion Details", 
-   "no_copy": 1, 
-   "oldfieldname": "uom_conversion_details", 
-   "oldfieldtype": "Table", 
-   "options": "UOM Conversion Detail", 
-   "permlevel": 0, 
+   "depends_on": "eval:doc.is_purchase_item==\"Yes\"",
+   "fieldname": "uom_conversion_details",
+   "fieldtype": "Table",
+   "label": "UOM Conversion Details",
+   "no_copy": 1,
+   "oldfieldname": "uom_conversion_details",
+   "oldfieldtype": "Table",
+   "options": "UOM Conversion Detail",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "depends_on": "eval:doc.is_purchase_item==\"Yes\"", 
-   "fieldname": "manufacturer", 
-   "fieldtype": "Data", 
-   "label": "Manufacturer", 
-   "permlevel": 0, 
+   "depends_on": "eval:doc.is_purchase_item==\"Yes\"",
+   "fieldname": "manufacturer",
+   "fieldtype": "Data",
+   "label": "Manufacturer",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "depends_on": "eval:doc.is_purchase_item==\"Yes\"", 
-   "fieldname": "manufacturer_part_no", 
-   "fieldtype": "Data", 
-   "label": "Manufacturer Part Number", 
-   "permlevel": 0, 
+   "depends_on": "eval:doc.is_purchase_item==\"Yes\"",
+   "fieldname": "manufacturer_part_no",
+   "fieldtype": "Data",
+   "label": "Manufacturer Part Number",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "depends_on": "eval:doc.is_purchase_item==\"Yes\"", 
-   "fieldname": "item_supplier_details", 
-   "fieldtype": "Table", 
-   "label": "Item Supplier Details", 
-   "options": "Item Supplier", 
-   "permlevel": 0, 
+   "depends_on": "eval:doc.is_purchase_item==\"Yes\"",
+   "fieldname": "item_supplier_details",
+   "fieldtype": "Table",
+   "label": "Item Supplier Details",
+   "options": "Item Supplier",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "sales_details", 
-   "fieldtype": "Section Break", 
-   "label": "Sales Details", 
-   "oldfieldtype": "Section Break", 
-   "options": "icon-tag", 
-   "permlevel": 0, 
+   "fieldname": "sales_details",
+   "fieldtype": "Section Break",
+   "label": "Sales Details",
+   "oldfieldtype": "Section Break",
+   "options": "icon-tag",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "default": "Yes", 
-   "description": "Selecting \"Yes\" will allow this item to figure in Sales Order, Delivery Note", 
-   "fieldname": "is_sales_item", 
-   "fieldtype": "Select", 
-   "in_filter": 1, 
-   "label": "Is Sales Item", 
-   "oldfieldname": "is_sales_item", 
-   "oldfieldtype": "Select", 
-   "options": "Yes\nNo", 
-   "permlevel": 0, 
-   "read_only": 0, 
+   "default": "Yes",
+   "description": "Selecting \"Yes\" will allow this item to figure in Sales Order, Delivery Note",
+   "fieldname": "is_sales_item",
+   "fieldtype": "Select",
+   "in_filter": 1,
+   "label": "Is Sales Item",
+   "oldfieldname": "is_sales_item",
+   "oldfieldtype": "Select",
+   "options": "Yes\nNo",
+   "permlevel": 0,
+   "read_only": 0,
    "reqd": 1
-  }, 
+  },
   {
-   "default": "No", 
-   "depends_on": "eval:doc.is_sales_item==\"Yes\"", 
-   "description": "Select \"Yes\" if this item represents some work like training, designing, consulting etc.", 
-   "fieldname": "is_service_item", 
-   "fieldtype": "Select", 
-   "in_filter": 1, 
-   "label": "Is Service Item", 
-   "oldfieldname": "is_service_item", 
-   "oldfieldtype": "Select", 
-   "options": "Yes\nNo", 
-   "permlevel": 0, 
-   "read_only": 0, 
+   "default": "No",
+   "depends_on": "eval:doc.is_sales_item==\"Yes\"",
+   "description": "Select \"Yes\" if this item represents some work like training, designing, consulting etc.",
+   "fieldname": "is_service_item",
+   "fieldtype": "Select",
+   "in_filter": 1,
+   "label": "Is Service Item",
+   "oldfieldname": "is_service_item",
+   "oldfieldtype": "Select",
+   "options": "Yes\nNo",
+   "permlevel": 0,
+   "read_only": 0,
    "reqd": 1
-  }, 
+  },
   {
-   "depends_on": "eval:doc.is_sales_item==\"Yes\"", 
-   "fieldname": "max_discount", 
-   "fieldtype": "Float", 
-   "label": "Max Discount (%)", 
-   "oldfieldname": "max_discount", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
+   "depends_on": "eval:doc.is_sales_item==\"Yes\"",
+   "fieldname": "max_discount",
+   "fieldtype": "Float",
+   "label": "Max Discount (%)",
+   "oldfieldname": "max_discount",
+   "oldfieldtype": "Currency",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "depends_on": "eval:doc.is_sales_item==\"Yes\"", 
-   "fieldname": "income_account", 
-   "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
-   "label": "Default Income Account", 
-   "options": "Account", 
-   "permlevel": 0, 
+   "depends_on": "eval:doc.is_sales_item==\"Yes\"",
+   "fieldname": "income_account",
+   "fieldtype": "Link",
+   "ignore_user_permissions": 1,
+   "label": "Default Income Account",
+   "options": "Account",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "depends_on": "eval:doc.is_sales_item==\"Yes\"", 
-   "fieldname": "selling_cost_center", 
-   "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
-   "label": "Default Selling Cost Center", 
-   "options": "Cost Center", 
-   "permlevel": 0, 
+   "depends_on": "eval:doc.is_sales_item==\"Yes\"",
+   "fieldname": "selling_cost_center",
+   "fieldtype": "Link",
+   "ignore_user_permissions": 1,
+   "label": "Default Selling Cost Center",
+   "options": "Cost Center",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "depends_on": "eval:doc.is_sales_item==\"Yes\"", 
-   "fieldname": "column_break3", 
-   "fieldtype": "Column Break", 
-   "oldfieldtype": "Column Break", 
-   "permlevel": 0, 
-   "read_only": 0, 
+   "depends_on": "eval:doc.is_sales_item==\"Yes\"",
+   "fieldname": "column_break3",
+   "fieldtype": "Column Break",
+   "oldfieldtype": "Column Break",
+   "permlevel": 0,
+   "read_only": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "depends_on": "eval:doc.is_sales_item==\"Yes\"", 
-   "description": "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes", 
-   "fieldname": "item_customer_details", 
-   "fieldtype": "Table", 
-   "label": "Customer Codes", 
-   "options": "Item Customer Detail", 
-   "permlevel": 0, 
+   "depends_on": "eval:doc.is_sales_item==\"Yes\"",
+   "description": "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",
+   "fieldname": "item_customer_details",
+   "fieldtype": "Table",
+   "label": "Customer Codes",
+   "options": "Item Customer Detail",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "item_tax_section_break", 
-   "fieldtype": "Section Break", 
-   "label": "Item Tax", 
-   "oldfieldtype": "Section Break", 
-   "options": "icon-money", 
-   "permlevel": 0, 
+   "fieldname": "item_tax_section_break",
+   "fieldtype": "Section Break",
+   "label": "Item Tax",
+   "oldfieldtype": "Section Break",
+   "options": "icon-money",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "item_tax", 
-   "fieldtype": "Table", 
-   "label": "Item Tax1", 
-   "oldfieldname": "item_tax", 
-   "oldfieldtype": "Table", 
-   "options": "Item Tax", 
-   "permlevel": 0, 
+   "fieldname": "item_tax",
+   "fieldtype": "Table",
+   "label": "Item Tax1",
+   "oldfieldname": "item_tax",
+   "oldfieldtype": "Table",
+   "options": "Item Tax",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "inspection_criteria", 
-   "fieldtype": "Section Break", 
-   "label": "Inspection Criteria", 
-   "oldfieldtype": "Section Break", 
-   "options": "icon-search", 
-   "permlevel": 0, 
+   "fieldname": "inspection_criteria",
+   "fieldtype": "Section Break",
+   "label": "Inspection Criteria",
+   "oldfieldtype": "Section Break",
+   "options": "icon-search",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "default": "No", 
-   "fieldname": "inspection_required", 
-   "fieldtype": "Select", 
-   "label": "Inspection Required", 
-   "no_copy": 0, 
-   "oldfieldname": "inspection_required", 
-   "oldfieldtype": "Select", 
-   "options": "\nYes\nNo", 
-   "permlevel": 0, 
-   "read_only": 0, 
+   "default": "No",
+   "fieldname": "inspection_required",
+   "fieldtype": "Select",
+   "label": "Inspection Required",
+   "no_copy": 0,
+   "oldfieldname": "inspection_required",
+   "oldfieldtype": "Select",
+   "options": "\nYes\nNo",
+   "permlevel": 0,
+   "read_only": 0,
    "reqd": 1
-  }, 
+  },
   {
-   "depends_on": "eval:doc.inspection_required==\"Yes\"", 
-   "description": "Quality Inspection Parameters", 
-   "fieldname": "item_specification_details", 
-   "fieldtype": "Table", 
-   "label": "Item Quality Inspection Parameter", 
-   "oldfieldname": "item_specification_details", 
-   "oldfieldtype": "Table", 
-   "options": "Item Quality Inspection Parameter", 
-   "permlevel": 0, 
+   "depends_on": "eval:doc.inspection_required==\"Yes\"",
+   "description": "Quality Inspection Parameters",
+   "fieldname": "item_specification_details",
+   "fieldtype": "Table",
+   "label": "Item Quality Inspection Parameter",
+   "oldfieldname": "item_specification_details",
+   "oldfieldtype": "Table",
+   "options": "Item Quality Inspection Parameter",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "manufacturing", 
-   "fieldtype": "Section Break", 
-   "label": "Manufacturing", 
-   "oldfieldtype": "Section Break", 
-   "options": "icon-cogs", 
-   "permlevel": 0, 
+   "fieldname": "manufacturing",
+   "fieldtype": "Section Break",
+   "label": "Manufacturing",
+   "oldfieldtype": "Section Break",
+   "options": "icon-cogs",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "default": "No", 
-   "description": "Selecting \"Yes\" will allow you to create Bill of Material showing raw material and operational costs incurred to manufacture this item.", 
-   "fieldname": "is_manufactured_item", 
-   "fieldtype": "Select", 
-   "label": "Allow Bill of Materials", 
-   "oldfieldname": "is_manufactured_item", 
-   "oldfieldtype": "Select", 
-   "options": "Yes\nNo", 
-   "permlevel": 0, 
-   "read_only": 0, 
+   "default": "No",
+   "description": "Selecting \"Yes\" will allow you to create Bill of Material showing raw material and operational costs incurred to manufacture this item.",
+   "fieldname": "is_manufactured_item",
+   "fieldtype": "Select",
+   "label": "Allow Bill of Materials",
+   "oldfieldname": "is_manufactured_item",
+   "oldfieldtype": "Select",
+   "options": "Yes\nNo",
+   "permlevel": 0,
+   "read_only": 0,
    "reqd": 1
-  }, 
+  },
   {
-   "depends_on": "eval:doc.is_manufactured_item==\"Yes\"", 
-   "fieldname": "default_bom", 
-   "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
-   "label": "Default BOM", 
-   "no_copy": 1, 
-   "oldfieldname": "default_bom", 
-   "oldfieldtype": "Link", 
-   "options": "BOM", 
-   "permlevel": 0, 
+   "depends_on": "eval:doc.is_manufactured_item==\"Yes\"",
+   "fieldname": "default_bom",
+   "fieldtype": "Link",
+   "ignore_user_permissions": 1,
+   "label": "Default BOM",
+   "no_copy": 1,
+   "oldfieldname": "default_bom",
+   "oldfieldtype": "Link",
+   "options": "BOM",
+   "permlevel": 0,
    "read_only": 1
-  }, 
+  },
   {
-   "default": "No", 
-   "depends_on": "eval:doc.is_manufactured_item==\"Yes\"", 
-   "description": "Selecting \"Yes\" will allow you to make a Production Order for this item.", 
-   "fieldname": "is_pro_applicable", 
-   "fieldtype": "Select", 
-   "label": "Allow Production Order", 
-   "oldfieldname": "is_pro_applicable", 
-   "oldfieldtype": "Select", 
-   "options": "Yes\nNo", 
-   "permlevel": 0, 
-   "read_only": 0, 
+   "default": "No",
+   "depends_on": "eval:doc.is_manufactured_item==\"Yes\"",
+   "description": "Selecting \"Yes\" will allow you to make a Production Order for this item.",
+   "fieldname": "is_pro_applicable",
+   "fieldtype": "Select",
+   "label": "Allow Production Order",
+   "oldfieldname": "is_pro_applicable",
+   "oldfieldtype": "Select",
+   "options": "Yes\nNo",
+   "permlevel": 0,
+   "read_only": 0,
    "reqd": 1
-  }, 
+  },
   {
-   "default": "No", 
-   "description": "Select \"Yes\" if you supply raw materials to your supplier to manufacture this item.", 
-   "fieldname": "is_sub_contracted_item", 
-   "fieldtype": "Select", 
-   "label": "Is Sub Contracted Item", 
-   "oldfieldname": "is_sub_contracted_item", 
-   "oldfieldtype": "Select", 
-   "options": "Yes\nNo", 
-   "permlevel": 0, 
-   "read_only": 0, 
+   "default": "No",
+   "description": "Select \"Yes\" if you supply raw materials to your supplier to manufacture this item.",
+   "fieldname": "is_sub_contracted_item",
+   "fieldtype": "Select",
+   "label": "Is Sub Contracted Item",
+   "oldfieldname": "is_sub_contracted_item",
+   "oldfieldtype": "Select",
+   "options": "Yes\nNo",
+   "permlevel": 0,
+   "read_only": 0,
    "reqd": 1
-  }, 
+  },
   {
-   "fieldname": "customer_code", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "in_filter": 1, 
-   "label": "Customer Code", 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "print_hide": 1, 
+   "fieldname": "customer_code",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "in_filter": 1,
+   "label": "Customer Code",
+   "no_copy": 1,
+   "permlevel": 0,
+   "print_hide": 1,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "website_section", 
-   "fieldtype": "Section Break", 
-   "label": "Website", 
-   "options": "icon-globe", 
-   "permlevel": 0, 
+   "fieldname": "website_section",
+   "fieldtype": "Section Break",
+   "label": "Website",
+   "options": "icon-globe",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "show_in_website", 
-   "fieldtype": "Check", 
-   "label": "Show in Website", 
-   "permlevel": 0, 
+   "fieldname": "show_in_website",
+   "fieldtype": "Check",
+   "label": "Show in Website",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "depends_on": "show_in_website", 
-   "description": "website page link", 
-   "fieldname": "page_name", 
-   "fieldtype": "Data", 
-   "label": "Page Name", 
-   "no_copy": 1, 
-   "permlevel": 0, 
+   "depends_on": "show_in_website",
+   "description": "website page link",
+   "fieldname": "page_name",
+   "fieldtype": "Data",
+   "label": "Page Name",
+   "no_copy": 1,
+   "permlevel": 0,
    "read_only": 1
-  }, 
+  },
   {
-   "depends_on": "show_in_website", 
-   "description": "Products will be sorted by weight-age in default searches. More the weight-age, higher the product will appear in the list.", 
-   "fieldname": "weightage", 
-   "fieldtype": "Int", 
-   "label": "Weightage", 
-   "permlevel": 0, 
-   "read_only": 0, 
+   "depends_on": "show_in_website",
+   "description": "Products will be sorted by weight-age in default searches. More the weight-age, higher the product will appear in the list.",
+   "fieldname": "weightage",
+   "fieldtype": "Int",
+   "label": "Weightage",
+   "permlevel": 0,
+   "read_only": 0,
    "search_index": 1
-  }, 
+  },
   {
-   "depends_on": "show_in_website", 
-   "description": "Show a slideshow at the top of the page", 
-   "fieldname": "slideshow", 
-   "fieldtype": "Link", 
-   "label": "Slideshow", 
-   "options": "Website Slideshow", 
-   "permlevel": 0, 
+   "depends_on": "show_in_website",
+   "description": "Show a slideshow at the top of the page",
+   "fieldname": "slideshow",
+   "fieldtype": "Link",
+   "label": "Slideshow",
+   "options": "Website Slideshow",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "depends_on": "show_in_website", 
-   "description": "Item Image (if not slideshow)", 
-   "fieldname": "website_image", 
-   "fieldtype": "Select", 
-   "label": "Image", 
-   "options": "attach_files:", 
-   "permlevel": 0, 
+   "depends_on": "show_in_website",
+   "description": "Item Image (if not slideshow)",
+   "fieldname": "website_image",
+   "fieldtype": "Select",
+   "label": "Image",
+   "options": "attach_files:",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "cb72", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0, 
+   "fieldname": "cb72",
+   "fieldtype": "Column Break",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "depends_on": "show_in_website", 
-   "description": "Show \"In Stock\" or \"Not in Stock\" based on stock available in this warehouse.", 
-   "fieldname": "website_warehouse", 
-   "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
-   "label": "Website Warehouse", 
-   "options": "Warehouse", 
-   "permlevel": 0, 
+   "depends_on": "show_in_website",
+   "description": "Show \"In Stock\" or \"Not in Stock\" based on stock available in this warehouse.",
+   "fieldname": "website_warehouse",
+   "fieldtype": "Link",
+   "ignore_user_permissions": 1,
+   "label": "Website Warehouse",
+   "options": "Warehouse",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "depends_on": "show_in_website", 
-   "description": "List this Item in multiple groups on the website.", 
-   "fieldname": "website_item_groups", 
-   "fieldtype": "Table", 
-   "label": "Website Item Groups", 
-   "options": "Website Item Group", 
-   "permlevel": 0, 
+   "depends_on": "show_in_website",
+   "description": "List this Item in multiple groups on the website.",
+   "fieldname": "website_item_groups",
+   "fieldtype": "Table",
+   "label": "Website Item Groups",
+   "options": "Website Item Group",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "depends_on": "show_in_website", 
-   "fieldname": "sb72", 
-   "fieldtype": "Section Break", 
-   "permlevel": 0, 
+   "depends_on": "show_in_website",
+   "fieldname": "sb72",
+   "fieldtype": "Section Break",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "depends_on": "show_in_website", 
-   "fieldname": "copy_from_item_group", 
-   "fieldtype": "Button", 
-   "label": "Copy From Item Group", 
-   "permlevel": 0, 
+   "depends_on": "show_in_website",
+   "fieldname": "copy_from_item_group",
+   "fieldtype": "Button",
+   "label": "Copy From Item Group",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "depends_on": "show_in_website", 
-   "fieldname": "item_website_specifications", 
-   "fieldtype": "Table", 
-   "label": "Item Website Specifications", 
-   "options": "Item Website Specification", 
-   "permlevel": 0, 
+   "depends_on": "show_in_website",
+   "fieldname": "item_website_specifications",
+   "fieldtype": "Table",
+   "label": "Item Website Specifications",
+   "options": "Item Website Specification",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "depends_on": "show_in_website", 
-   "fieldname": "web_long_description", 
-   "fieldtype": "Text Editor", 
-   "label": "Website Description", 
-   "permlevel": 0, 
+   "depends_on": "show_in_website",
+   "fieldname": "web_long_description",
+   "fieldtype": "Text Editor",
+   "label": "Website Description",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "parent_website_route", 
-   "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
-   "label": "Parent Website Route", 
-   "no_copy": 1, 
-   "options": "Website Route", 
+   "fieldname": "parent_website_route",
+   "fieldtype": "Link",
+   "ignore_user_permissions": 1,
+   "label": "Parent Website Route",
+   "no_copy": 1,
+   "options": "Website Route",
    "permlevel": 0
   }
- ], 
- "icon": "icon-tag", 
- "idx": 1, 
- "max_attachments": 1, 
- "modified": "2014-05-29 16:05:53.126214", 
- "modified_by": "Administrator", 
- "module": "Stock", 
- "name": "Item", 
- "owner": "Administrator", 
+ ],
+ "icon": "icon-tag",
+ "idx": 1,
+ "max_attachments": 1,
+ "modified": "2014-05-29 16:05:53.126214",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Item",
+ "owner": "Administrator",
  "permissions": [
   {
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "import": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Material Master Manager", 
-   "submit": 0, 
+   "cancel": 0,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "import": 1,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Material Master Manager",
+   "submit": 0,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Material Manager", 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "email": 1,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Material Manager",
+   "submit": 0,
    "write": 0
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Material User", 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "email": 1,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Material User",
+   "submit": 0,
    "write": 0
-  }, 
+  },
   {
-   "permlevel": 0, 
-   "read": 1, 
+   "permlevel": 0,
+   "read": 1,
    "role": "Sales User"
-  }, 
+  },
   {
-   "permlevel": 0, 
-   "read": 1, 
+   "permlevel": 0,
+   "read": 1,
    "role": "Purchase User"
-  }, 
+  },
   {
-   "permlevel": 0, 
-   "read": 1, 
+   "permlevel": 0,
+   "read": 1,
    "role": "Maintenance User"
-  }, 
+  },
   {
-   "permlevel": 0, 
-   "read": 1, 
+   "permlevel": 0,
+   "read": 1,
    "role": "Accounts User"
-  }, 
+  },
   {
-   "permlevel": 0, 
-   "read": 1, 
+   "permlevel": 0,
+   "read": 1,
    "role": "Manufacturing User"
   }
- ], 
+ ],
  "search_fields": "item_name,description,item_group,customer_code"
-}
\ No newline at end of file
+}
diff --git a/erpnext/stock/doctype/material_request/material_request.json b/erpnext/stock/doctype/material_request/material_request.json
index 0044613..1e5ddcd 100644
--- a/erpnext/stock/doctype/material_request/material_request.json
+++ b/erpnext/stock/doctype/material_request/material_request.json
@@ -42,7 +42,7 @@
   {
    "fieldname": "amended_from", 
    "fieldtype": "Data", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Amended From", 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
@@ -229,7 +229,7 @@
  "icon": "icon-ticket", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2014-05-09 02:17:25.742502", 
+ "modified": "2014-05-26 03:05:50.138188", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Material Request", 
diff --git a/erpnext/stock/doctype/packing_slip/packing_slip.json b/erpnext/stock/doctype/packing_slip/packing_slip.json
index ec8cd9b..47eb75d 100644
--- a/erpnext/stock/doctype/packing_slip/packing_slip.json
+++ b/erpnext/stock/doctype/packing_slip/packing_slip.json
@@ -1,262 +1,262 @@
 {
- "autoname": "PS.#######", 
- "creation": "2013-04-11 15:32:24", 
- "description": "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Transaction", 
+ "autoname": "PS.#######",
+ "creation": "2013-04-11 15:32:24",
+ "description": "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Transaction",
  "fields": [
   {
-   "fieldname": "packing_slip_details", 
-   "fieldtype": "Section Break", 
-   "label": "Packing Slip Items", 
-   "permlevel": 0, 
+   "fieldname": "packing_slip_details",
+   "fieldtype": "Section Break",
+   "label": "Packing Slip Items",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "column_break0", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0, 
+   "fieldname": "column_break0",
+   "fieldtype": "Column Break",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "description": "Indicates that the package is a part of this delivery (Only Draft)", 
-   "fieldname": "delivery_note", 
-   "fieldtype": "Link", 
-   "in_list_view": 1, 
-   "label": "Delivery Note", 
-   "options": "Delivery Note", 
-   "permlevel": 0, 
-   "read_only": 0, 
+   "description": "Indicates that the package is a part of this delivery (Only Draft)",
+   "fieldname": "delivery_note",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Delivery Note",
+   "options": "Delivery Note",
+   "permlevel": 0,
+   "read_only": 0,
    "reqd": 1
-  }, 
+  },
   {
-   "fieldname": "column_break1", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0, 
+   "fieldname": "column_break1",
+   "fieldtype": "Column Break",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "naming_series", 
-   "fieldtype": "Select", 
-   "label": "Series", 
-   "no_copy": 0, 
-   "options": "PS-", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
+   "fieldname": "naming_series",
+   "fieldtype": "Select",
+   "label": "Series",
+   "no_copy": 0,
+   "options": "PS-",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
    "reqd": 1
-  }, 
+  },
   {
-   "fieldname": "section_break0", 
-   "fieldtype": "Section Break", 
-   "permlevel": 0, 
+   "fieldname": "section_break0",
+   "fieldtype": "Section Break",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "column_break2", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0, 
+   "fieldname": "column_break2",
+   "fieldtype": "Column Break",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "description": "Identification of the package for the delivery (for print)", 
-   "fieldname": "from_case_no", 
-   "fieldtype": "Data", 
-   "in_list_view": 1, 
-   "label": "From Package No.", 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "read_only": 0, 
-   "reqd": 1, 
+   "description": "Identification of the package for the delivery (for print)",
+   "fieldname": "from_case_no",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "From Package No.",
+   "no_copy": 1,
+   "permlevel": 0,
+   "read_only": 0,
+   "reqd": 1,
    "width": "50px"
-  }, 
+  },
   {
-   "fieldname": "column_break3", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0, 
+   "fieldname": "column_break3",
+   "fieldtype": "Column Break",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "description": "If more than one package of the same type (for print)", 
-   "fieldname": "to_case_no", 
-   "fieldtype": "Data", 
-   "in_list_view": 1, 
-   "label": "To Package No.", 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "read_only": 0, 
+   "description": "If more than one package of the same type (for print)",
+   "fieldname": "to_case_no",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "To Package No.",
+   "no_copy": 1,
+   "permlevel": 0,
+   "read_only": 0,
    "width": "50px"
-  }, 
+  },
   {
-   "fieldname": "package_item_details", 
-   "fieldtype": "Section Break", 
-   "label": "Package Item Details", 
-   "permlevel": 0, 
+   "fieldname": "package_item_details",
+   "fieldtype": "Section Break",
+   "label": "Package Item Details",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "get_items", 
-   "fieldtype": "Button", 
-   "label": "Get Items", 
+   "fieldname": "get_items",
+   "fieldtype": "Button",
+   "label": "Get Items",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "item_details", 
-   "fieldtype": "Table", 
-   "label": "Items", 
-   "options": "Packing Slip Item", 
-   "permlevel": 0, 
+   "fieldname": "item_details",
+   "fieldtype": "Table",
+   "label": "Items",
+   "options": "Packing Slip Item",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "package_weight_details", 
-   "fieldtype": "Section Break", 
-   "label": "Package Weight Details", 
-   "permlevel": 0, 
+   "fieldname": "package_weight_details",
+   "fieldtype": "Section Break",
+   "label": "Package Weight Details",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "description": "The net weight of this package. (calculated automatically as sum of net weight of items)", 
-   "fieldname": "net_weight_pkg", 
-   "fieldtype": "Float", 
-   "label": "Net Weight", 
-   "no_copy": 1, 
-   "permlevel": 0, 
+   "description": "The net weight of this package. (calculated automatically as sum of net weight of items)",
+   "fieldname": "net_weight_pkg",
+   "fieldtype": "Float",
+   "label": "Net Weight",
+   "no_copy": 1,
+   "permlevel": 0,
    "read_only": 1
-  }, 
+  },
   {
-   "fieldname": "net_weight_uom", 
-   "fieldtype": "Link", 
-   "label": "Net Weight UOM", 
-   "no_copy": 1, 
-   "options": "UOM", 
-   "permlevel": 0, 
+   "fieldname": "net_weight_uom",
+   "fieldtype": "Link",
+   "label": "Net Weight UOM",
+   "no_copy": 1,
+   "options": "UOM",
+   "permlevel": 0,
    "read_only": 1
-  }, 
+  },
   {
-   "fieldname": "column_break4", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0, 
+   "fieldname": "column_break4",
+   "fieldtype": "Column Break",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "description": "The gross weight of the package. Usually net weight + packaging material weight. (for print)", 
-   "fieldname": "gross_weight_pkg", 
-   "fieldtype": "Float", 
-   "label": "Gross Weight", 
-   "no_copy": 1, 
-   "permlevel": 0, 
+   "description": "The gross weight of the package. Usually net weight + packaging material weight. (for print)",
+   "fieldname": "gross_weight_pkg",
+   "fieldtype": "Float",
+   "label": "Gross Weight",
+   "no_copy": 1,
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "gross_weight_uom", 
-   "fieldtype": "Link", 
-   "label": "Gross Weight UOM", 
-   "no_copy": 1, 
-   "options": "UOM", 
-   "permlevel": 0, 
+   "fieldname": "gross_weight_uom",
+   "fieldtype": "Link",
+   "label": "Gross Weight UOM",
+   "no_copy": 1,
+   "options": "UOM",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "misc_details", 
-   "fieldtype": "Section Break", 
-   "label": "Misc Details", 
-   "permlevel": 0, 
+   "fieldname": "misc_details",
+   "fieldtype": "Section Break",
+   "label": "Misc Details",
+   "permlevel": 0,
    "read_only": 0
-  }, 
+  },
   {
-   "fieldname": "amended_from", 
-   "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
-   "label": "Amended From", 
-   "no_copy": 1, 
-   "options": "Packing Slip", 
-   "permlevel": 0, 
-   "print_hide": 1, 
+   "fieldname": "amended_from",
+   "fieldtype": "Link",
+   "ignore_user_permissions": 1,
+   "label": "Amended From",
+   "no_copy": 1,
+   "options": "Packing Slip",
+   "permlevel": 0,
+   "print_hide": 1,
    "read_only": 1
   }
- ], 
- "icon": "icon-suitcase", 
- "idx": 1, 
- "is_submittable": 1, 
- "modified": "2014-05-26 03:19:59.409839", 
- "modified_by": "Administrator", 
- "module": "Stock", 
- "name": "Packing Slip", 
- "owner": "Administrator", 
+ ],
+ "icon": "icon-suitcase",
+ "idx": 1,
+ "is_submittable": 1,
+ "modified": "2014-05-26 03:07:50.514014",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Packing Slip",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 1, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Material User", 
-   "submit": 1, 
+   "amend": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Material User",
+   "submit": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 1, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Sales User", 
-   "submit": 1, 
+   "amend": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Sales User",
+   "submit": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 1, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Material Master Manager", 
-   "submit": 1, 
+   "amend": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Material Master Manager",
+   "submit": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 1, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Material Manager", 
-   "submit": 1, 
+   "amend": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Material Manager",
+   "submit": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 1, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Sales Manager", 
-   "submit": 1, 
+   "amend": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Sales Manager",
+   "submit": 1,
    "write": 1
   }
- ], 
- "read_only_onload": 1, 
+ ],
+ "read_only_onload": 1,
  "search_fields": "delivery_note"
-}
\ No newline at end of file
+}
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
index 85216a0..314886e 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -518,7 +518,7 @@
    "fieldname": "amended_from", 
    "fieldtype": "Data", 
    "hidden": 1, 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Amended From", 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
@@ -754,7 +754,7 @@
  "icon": "icon-truck", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2014-05-09 02:17:29.990590", 
+ "modified": "2014-05-26 03:05:51.846204", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Purchase Receipt", 
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.json b/erpnext/stock/doctype/stock_entry/stock_entry.json
index df475a9..bea6732 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.json
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -539,7 +539,7 @@
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "in_filter": 0, 
    "label": "Amended From", 
    "no_copy": 1, 
@@ -580,7 +580,7 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "max_attachments": 0, 
- "modified": "2014-05-09 02:17:33.093429", 
+ "modified": "2014-05-26 03:05:53.832569", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Entry", 
diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
index 2accfb8..e2540a3 100644
--- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
@@ -774,8 +774,8 @@
 	def test_warehouse_user(self):
 		set_perpetual_inventory(0)
 
-		frappe.defaults.add_default("Warehouse", "_Test Warehouse 1 - _TC", "test@example.com", "Restriction")
-		frappe.defaults.add_default("Warehouse", "_Test Warehouse 2 - _TC1", "test2@example.com", "Restriction")
+		frappe.defaults.add_default("Warehouse", "_Test Warehouse 1 - _TC", "test@example.com", "User Permission")
+		frappe.defaults.add_default("Warehouse", "_Test Warehouse 2 - _TC1", "test2@example.com", "User Permission")
 		frappe.get_doc("User", "test@example.com")\
 			.add_roles("Sales User", "Sales Manager", "Material User", "Material Manager")
 		frappe.get_doc("User", "test2@example.com")\
@@ -795,9 +795,9 @@
 		st1.submit()
 
 		frappe.defaults.clear_default("Warehouse", "_Test Warehouse 1 - _TC",
-			"test@example.com", parenttype="Restriction")
+			"test@example.com", parenttype="User Permission")
 		frappe.defaults.clear_default("Warehouse", "_Test Warehouse 2 - _TC1",
-			"test2@example.com", parenttype="Restriction")
+			"test2@example.com", parenttype="User Permission")
 
 	def test_freeze_stocks (self):
 		self._clear_stock_account_balance()
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
index 70a938b..d561d00 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
@@ -34,7 +34,7 @@
   {
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Amended From", 
    "no_copy": 1, 
    "options": "Stock Reconciliation", 
@@ -119,7 +119,7 @@
  "idx": 1, 
  "is_submittable": 1, 
  "max_attachments": 1, 
- "modified": "2014-05-09 02:17:34.080012", 
+ "modified": "2014-05-26 03:05:54.024413", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Reconciliation", 
diff --git a/erpnext/support/doctype/customer_issue/customer_issue.json b/erpnext/support/doctype/customer_issue/customer_issue.json
index 6c4e22e..0c3515d 100644
--- a/erpnext/support/doctype/customer_issue/customer_issue.json
+++ b/erpnext/support/doctype/customer_issue/customer_issue.json
@@ -381,7 +381,7 @@
    "fieldname": "amended_from", 
    "fieldtype": "Data", 
    "hidden": 1, 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Amended From", 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
@@ -394,7 +394,7 @@
  "icon": "icon-bug", 
  "idx": 1, 
  "is_submittable": 0, 
- "modified": "2014-05-09 02:16:43.267003", 
+ "modified": "2014-05-26 03:05:47.828178", 
  "modified_by": "Administrator", 
  "module": "Support", 
  "name": "Customer Issue", 
diff --git a/erpnext/support/doctype/maintenance_visit/maintenance_visit.json b/erpnext/support/doctype/maintenance_visit/maintenance_visit.json
index ddb258d..f56bd8b 100644
--- a/erpnext/support/doctype/maintenance_visit/maintenance_visit.json
+++ b/erpnext/support/doctype/maintenance_visit/maintenance_visit.json
@@ -191,7 +191,7 @@
   {
    "fieldname": "amended_from", 
    "fieldtype": "Data", 
-   "ignore_restrictions": 1, 
+   "ignore_user_permissions": 1, 
    "label": "Amended From", 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
@@ -278,7 +278,7 @@
  "icon": "icon-file-text", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2014-05-09 02:16:43.663232", 
+ "modified": "2014-05-26 03:05:50.014543", 
  "modified_by": "Administrator", 
  "module": "Support", 
  "name": "Maintenance Visit", 
diff --git a/erpnext/utilities/doctype/note/note.json b/erpnext/utilities/doctype/note/note.json
index 9eab6a1..a1cbd5b 100644
--- a/erpnext/utilities/doctype/note/note.json
+++ b/erpnext/utilities/doctype/note/note.json
@@ -1,69 +1,68 @@
 {
- "allow_rename": 1, 
- "creation": "2013-05-24 13:41:00.000000", 
- "description": "Note is a free page where users can share documents / notes", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Transaction", 
+ "allow_rename": 1,
+ "creation": "2013-05-24 13:41:00.000000",
+ "description": "Note is a free page where users can share documents / notes",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Transaction",
  "fields": [
   {
-   "fieldname": "title", 
-   "fieldtype": "Data", 
-   "label": "Title", 
-   "permlevel": 0, 
+   "fieldname": "title",
+   "fieldtype": "Data",
+   "label": "Title",
+   "permlevel": 0,
    "print_hide": 1
-  }, 
+  },
   {
-   "description": "Help: To link to another record in the system, use \"#Form/Note/[Note Name]\" as the Link URL. (don't use \"http://\")", 
-   "fieldname": "content", 
-   "fieldtype": "Text Editor", 
-   "in_list_view": 0, 
-   "label": "Content", 
+   "description": "Help: To link to another record in the system, use \"#Form/Note/[Note Name]\" as the Link URL. (don't use \"http://\")",
+   "fieldname": "content",
+   "fieldtype": "Text Editor",
+   "in_list_view": 0,
+   "label": "Content",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "share", 
-   "fieldtype": "Section Break", 
-   "label": "Share", 
+   "fieldname": "share",
+   "fieldtype": "Section Break",
+   "label": "Share",
    "permlevel": 0
-  }, 
+  },
   {
-   "description": "Everyone can read", 
-   "fieldname": "public", 
-   "fieldtype": "Check", 
-   "label": "Public", 
-   "permlevel": 0, 
+   "description": "Everyone can read",
+   "fieldname": "public",
+   "fieldtype": "Check",
+   "label": "Public",
+   "permlevel": 0,
    "print_hide": 1
-  }, 
+  },
   {
-   "fieldname": "share_with", 
-   "fieldtype": "Table", 
-   "label": "Share With", 
-   "options": "Note User", 
-   "permlevel": 0, 
+   "fieldname": "share_with",
+   "fieldtype": "Table",
+   "label": "Share With",
+   "options": "Note User",
+   "permlevel": 0,
    "print_hide": 1
   }
- ], 
- "icon": "icon-file-text", 
- "idx": 1, 
- "modified": "2014-01-22 16:05:35.000000", 
- "modified_by": "Administrator", 
- "module": "Utilities", 
- "name": "Note", 
- "owner": "Administrator", 
+ ],
+ "icon": "icon-file-text",
+ "idx": 1,
+ "modified": "2014-01-22 16:05:35.000000",
+ "modified_by": "Administrator",
+ "module": "Utilities",
+ "name": "Note",
+ "owner": "Administrator",
  "permissions": [
   {
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "restricted": 1, 
-   "role": "All", 
+   "cancel": 0,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "role": "All",
    "write": 1
   }
- ], 
+ ],
  "read_only_onload": 1
-}
\ No newline at end of file
+}