diff --git a/accounts/doctype/account/account.txt b/accounts/doctype/account/account.txt
index b649c9ab18..2beb08aa26 100644
--- a/accounts/doctype/account/account.txt
+++ b/accounts/doctype/account/account.txt
@@ -1,396 +1,324 @@
-# DocType, Account
 [
-
-	# These values are common in all dictionaries
-	{
-		'creation': '2012-07-03 13:30:50',
-		'docstatus': 0,
-		'modified': '2012-07-11 13:58:44',
-		'modified_by': u'Administrator',
-		'owner': u'Administrator'
-	},
-
-	# These values are common for all DocType
-	{
-		'_last_update': u'1325570645',
-		'allow_copy': 1,
-		'allow_trash': 1,
-		'colour': u'White:FFF',
-		'default_print_format': u'Standard',
-		'description': u'An **Account** is heading under which financial and business transactions are carried on. For example, \u201cTravel Expense\u201d is an account, \u201cCustomer Zoe\u201d, \u201cSupplier Mae\u201d are accounts. \n\n**Note:** ERPNext creates accounts for Customers and Suppliers automatically.\n\n### Groups and Ledgers\n\nThere are two main kinds of Accounts in ERPNext - Group and Ledger. Groups can have sub-groups and ledgers within them, whereas ledgers are the leaf nodes of your chart and cannot be further classified.\n\nAccounting Transactions can only be made against Ledger Accounts (not Groups)\n',
-		'doctype': 'DocType',
-		'document_type': u'Master',
-		'in_create': 1,
-		'module': u'Accounts',
-		'name': '__common__',
-		'search_fields': u'debit_or_credit, group_or_ledger',
-		'section_style': u'Tray',
-		'server_code_error': u' ',
-		'show_in_menu': 0,
-		'version': 1
-	},
-
-	# These values are common for all DocField
-	{
-		'doctype': u'DocField',
-		'name': '__common__',
-		'parent': u'Account',
-		'parentfield': u'fields',
-		'parenttype': u'DocType'
-	},
-
-	# These values are common for all DocPerm
-	{
-		'amend': 0,
-		'doctype': u'DocPerm',
-		'name': '__common__',
-		'parent': u'Account',
-		'parentfield': u'permissions',
-		'parenttype': u'DocType',
-		'read': 1,
-		'submit': 0
-	},
-
-	# DocType, Account
-	{
-		'doctype': 'DocType',
-		'name': u'Account'
-	},
-
-	# DocPerm
-	{
-		'cancel': 0,
-		'create': 0,
-		'doctype': u'DocPerm',
-		'permlevel': 0,
-		'role': u'Auditor',
-		'write': 1
-	},
-
-	# DocPerm
-	{
-		'cancel': 0,
-		'create': 0,
-		'doctype': u'DocPerm',
-		'permlevel': 1,
-		'role': u'Auditor',
-		'write': 0
-	},
-
-	# DocPerm
-	{
-		'cancel': 0,
-		'create': 0,
-		'doctype': u'DocPerm',
-		'permlevel': 2,
-		'role': u'Auditor',
-		'write': 0
-	},
-
-	# DocPerm
-	{
-		'cancel': 0,
-		'create': 0,
-		'doctype': u'DocPerm',
-		'permlevel': 0,
-		'role': u'Sales User',
-		'write': 0
-	},
-
-	# DocPerm
-	{
-		'cancel': 0,
-		'create': 0,
-		'doctype': u'DocPerm',
-		'permlevel': 0,
-		'role': u'Purchase User',
-		'write': 0
-	},
-
-	# DocPerm
-	{
-		'cancel': 0,
-		'create': 0,
-		'doctype': u'DocPerm',
-		'permlevel': 0,
-		'role': u'Accounts User',
-		'write': 1
-	},
-
-	# DocPerm
-	{
-		'cancel': 1,
-		'create': 1,
-		'doctype': u'DocPerm',
-		'permlevel': 0,
-		'role': u'Accounts Manager',
-		'write': 1
-	},
-
-	# DocPerm
-	{
-		'cancel': 0,
-		'create': 0,
-		'doctype': u'DocPerm',
-		'permlevel': 1,
-		'role': u'Accounts User',
-		'write': 0
-	},
-
-	# DocPerm
-	{
-		'cancel': 0,
-		'create': 0,
-		'doctype': u'DocPerm',
-		'permlevel': 1,
-		'role': u'Accounts Manager',
-		'write': 0
-	},
-
-	# DocPerm
-	{
-		'cancel': 0,
-		'create': 0,
-		'doctype': u'DocPerm',
-		'permlevel': 2,
-		'role': u'Accounts Manager',
-		'write': 1
-	},
-
-	# DocPerm
-	{
-		'cancel': 0,
-		'create': 0,
-		'doctype': u'DocPerm',
-		'permlevel': 2,
-		'role': u'Accounts User',
-		'write': 0
-	},
-
-	# DocField
-	{
-		'doctype': u'DocField',
-		'fieldname': u'properties',
-		'fieldtype': u'Section Break',
-		'label': u'Account Details',
-		'oldfieldtype': u'Section Break',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'doctype': u'DocField',
-		'fieldname': u'column_break0',
-		'fieldtype': u'Column Break',
-		'permlevel': 0,
-		'width': u'50%'
-	},
-
-	# DocField
-	{
-		'doctype': u'DocField',
-		'fieldname': u'account_name',
-		'fieldtype': u'Data',
-		'in_filter': 1,
-		'label': u'Account Name',
-		'no_copy': 1,
-		'oldfieldname': u'account_name',
-		'oldfieldtype': u'Data',
-		'permlevel': 1,
-		'reqd': 1,
-		'search_index': 1
-	},
-
-	# DocField
-	{
-		'doctype': u'DocField',
-		'fieldname': u'level',
-		'fieldtype': u'Int',
-		'hidden': 1,
-		'label': u'Level',
-		'oldfieldname': u'level',
-		'oldfieldtype': u'Int',
-		'permlevel': 1,
-		'print_hide': 1
-	},
-
-	# DocField
-	{
-		'default': u'Ledger',
-		'doctype': u'DocField',
-		'fieldname': u'group_or_ledger',
-		'fieldtype': u'Select',
-		'in_filter': 1,
-		'label': u'Group or Ledger',
-		'oldfieldname': u'group_or_ledger',
-		'oldfieldtype': u'Select',
-		'options': u'\nLedger\nGroup',
-		'permlevel': 1,
-		'reqd': 1,
-		'search_index': 1
-	},
-
-	# DocField
-	{
-		'doctype': u'DocField',
-		'fieldname': u'debit_or_credit',
-		'fieldtype': u'Data',
-		'in_filter': 1,
-		'label': u'Debit or Credit',
-		'oldfieldname': u'debit_or_credit',
-		'oldfieldtype': u'Data',
-		'permlevel': 1,
-		'search_index': 1
-	},
-
-	# DocField
-	{
-		'doctype': u'DocField',
-		'fieldname': u'is_pl_account',
-		'fieldtype': u'Select',
-		'in_filter': 1,
-		'label': u'Is PL Account',
-		'oldfieldname': u'is_pl_account',
-		'oldfieldtype': u'Select',
-		'options': u'Yes\nNo',
-		'permlevel': 1,
-		'search_index': 1
-	},
-
-	# DocField
-	{
-		'doctype': u'DocField',
-		'fieldname': u'company',
-		'fieldtype': u'Link',
-		'in_filter': 1,
-		'label': u'Company',
-		'oldfieldname': u'company',
-		'oldfieldtype': u'Link',
-		'options': u'Company',
-		'permlevel': 1,
-		'reqd': 1,
-		'search_index': 1
-	},
-
-	# DocField
-	{
-		'doctype': u'DocField',
-		'fieldname': u'column_break1',
-		'fieldtype': u'Column Break',
-		'permlevel': 0,
-		'width': u'50%'
-	},
-
-	# DocField
-	{
-		'doctype': u'DocField',
-		'fieldname': u'parent_account',
-		'fieldtype': u'Link',
-		'label': u'Parent Account',
-		'oldfieldname': u'parent_account',
-		'oldfieldtype': u'Link',
-		'options': u'Account',
-		'permlevel': 0,
-		'search_index': 1,
-		'trigger': u'Client'
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'description': u'Setting Account Type helps in selecting this Account in transactions.',
-		'doctype': u'DocField',
-		'fieldname': u'account_type',
-		'fieldtype': u'Select',
-		'in_filter': 1,
-		'label': u'Account Type',
-		'oldfieldname': u'account_type',
-		'oldfieldtype': u'Select',
-		'options': u'\nFixed Asset Account\nBank or Cash\nExpense Account\nTax\nIncome Account\nChargeable',
-		'permlevel': 0,
-		'search_index': 0,
-		'trigger': u'Client'
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'description': u'Rate at which this tax is applied',
-		'doctype': u'DocField',
-		'fieldname': u'tax_rate',
-		'fieldtype': u'Currency',
-		'hidden': 0,
-		'label': u'Rate',
-		'oldfieldname': u'tax_rate',
-		'oldfieldtype': u'Currency',
-		'permlevel': 0,
-		'reqd': 0
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'description': u'If the account is frozen, entries are allowed for the "Account Manager" only.',
-		'doctype': u'DocField',
-		'fieldname': u'freeze_account',
-		'fieldtype': u'Select',
-		'label': u'Frozen',
-		'oldfieldname': u'freeze_account',
-		'oldfieldtype': u'Select',
-		'options': u'No\nYes',
-		'permlevel': 2
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'doctype': u'DocField',
-		'fieldname': u'credit_days',
-		'fieldtype': u'Int',
-		'hidden': 1,
-		'label': u'Credit Days',
-		'oldfieldname': u'credit_days',
-		'oldfieldtype': u'Int',
-		'permlevel': 0,
-		'print_hide': 1
-	},
-
-	# DocField
-	{
-		'doctype': u'DocField',
-		'fieldname': u'credit_limit',
-		'fieldtype': u'Currency',
-		'hidden': 1,
-		'label': u'Credit Limit',
-		'oldfieldname': u'credit_limit',
-		'oldfieldtype': u'Currency',
-		'permlevel': 0,
-		'print_hide': 1
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'description': u'If this Account represents a Customer, Supplier or Employee, set it here.',
-		'doctype': u'DocField',
-		'fieldname': u'master_type',
-		'fieldtype': u'Select',
-		'label': u'Master Type',
-		'oldfieldname': u'master_type',
-		'oldfieldtype': u'Select',
-		'options': u'\nSupplier\nCustomer\nEmployee',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'doctype': u'DocField',
-		'fieldname': u'master_name',
-		'fieldtype': u'Link',
-		'label': u'Master Name',
-		'oldfieldname': u'master_name',
-		'oldfieldtype': u'Link',
-		'permlevel': 0,
-		'trigger': u'Client'
-	}
+ {
+  "owner": "Administrator", 
+  "docstatus": 0, 
+  "creation": "2012-11-16 10:32:50", 
+  "modified_by": "Administrator", 
+  "modified": "2012-12-03 11:26:49"
+ }, 
+ {
+  "in_create": 1, 
+  "search_fields": "debit_or_credit, group_or_ledger", 
+  "module": "Accounts", 
+  "document_type": "Master", 
+  "description": "Heads (or groups) against which Accounting Entries are made and balances are maintained.", 
+  "name": "__common__", 
+  "default_print_format": "Standard", 
+  "allow_rename": 1, 
+  "doctype": "DocType", 
+  "allow_copy": 1
+ }, 
+ {
+  "name": "__common__", 
+  "parent": "Account", 
+  "doctype": "DocField", 
+  "parenttype": "DocType", 
+  "parentfield": "fields"
+ }, 
+ {
+  "name": "__common__", 
+  "parent": "Account", 
+  "amend": 0, 
+  "submit": 0, 
+  "doctype": "DocPerm", 
+  "read": 1, 
+  "parenttype": "DocType", 
+  "parentfield": "permissions"
+ }, 
+ {
+  "name": "Account", 
+  "doctype": "DocType"
+ }, 
+ {
+  "oldfieldtype": "Section Break", 
+  "doctype": "DocField", 
+  "label": "Account Details", 
+  "fieldname": "properties", 
+  "fieldtype": "Section Break", 
+  "permlevel": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "width": "50%", 
+  "fieldname": "column_break0", 
+  "fieldtype": "Column Break", 
+  "permlevel": 0
+ }, 
+ {
+  "no_copy": 1, 
+  "oldfieldtype": "Data", 
+  "doctype": "DocField", 
+  "label": "Account Name", 
+  "oldfieldname": "account_name", 
+  "fieldname": "account_name", 
+  "fieldtype": "Data", 
+  "search_index": 1, 
+  "reqd": 1, 
+  "permlevel": 1, 
+  "in_filter": 1
+ }, 
+ {
+  "print_hide": 1, 
+  "oldfieldtype": "Int", 
+  "doctype": "DocField", 
+  "label": "Level", 
+  "oldfieldname": "level", 
+  "fieldname": "level", 
+  "fieldtype": "Int", 
+  "hidden": 1, 
+  "permlevel": 1
+ }, 
+ {
+  "default": "Ledger", 
+  "oldfieldtype": "Select", 
+  "doctype": "DocField", 
+  "label": "Group or Ledger", 
+  "oldfieldname": "group_or_ledger", 
+  "permlevel": 1, 
+  "fieldname": "group_or_ledger", 
+  "fieldtype": "Select", 
+  "search_index": 1, 
+  "reqd": 1, 
+  "options": "\nLedger\nGroup", 
+  "in_filter": 1
+ }, 
+ {
+  "oldfieldtype": "Data", 
+  "doctype": "DocField", 
+  "label": "Debit or Credit", 
+  "oldfieldname": "debit_or_credit", 
+  "fieldname": "debit_or_credit", 
+  "fieldtype": "Data", 
+  "search_index": 1, 
+  "permlevel": 1, 
+  "in_filter": 1
+ }, 
+ {
+  "oldfieldtype": "Select", 
+  "doctype": "DocField", 
+  "label": "Is PL Account", 
+  "oldfieldname": "is_pl_account", 
+  "options": "Yes\nNo", 
+  "fieldname": "is_pl_account", 
+  "fieldtype": "Select", 
+  "search_index": 1, 
+  "permlevel": 1, 
+  "in_filter": 1
+ }, 
+ {
+  "oldfieldtype": "Link", 
+  "doctype": "DocField", 
+  "label": "Company", 
+  "oldfieldname": "company", 
+  "options": "Company", 
+  "fieldname": "company", 
+  "fieldtype": "Link", 
+  "search_index": 1, 
+  "reqd": 1, 
+  "permlevel": 1, 
+  "in_filter": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "width": "50%", 
+  "fieldname": "column_break1", 
+  "fieldtype": "Column Break", 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Link", 
+  "doctype": "DocField", 
+  "label": "Parent Account", 
+  "oldfieldname": "parent_account", 
+  "trigger": "Client", 
+  "fieldname": "parent_account", 
+  "fieldtype": "Link", 
+  "search_index": 1, 
+  "options": "Account", 
+  "permlevel": 0
+ }, 
+ {
+  "description": "Setting Account Type helps in selecting this Account in transactions.", 
+  "oldfieldtype": "Select", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Account Type", 
+  "oldfieldname": "account_type", 
+  "permlevel": 0, 
+  "trigger": "Client", 
+  "fieldname": "account_type", 
+  "fieldtype": "Select", 
+  "search_index": 0, 
+  "in_filter": 1, 
+  "options": "\nFixed Asset Account\nBank or Cash\nExpense Account\nTax\nIncome Account\nChargeable"
+ }, 
+ {
+  "description": "Rate at which this tax is applied", 
+  "oldfieldtype": "Currency", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Rate", 
+  "oldfieldname": "tax_rate", 
+  "fieldname": "tax_rate", 
+  "fieldtype": "Currency", 
+  "reqd": 0, 
+  "hidden": 0, 
+  "permlevel": 0
+ }, 
+ {
+  "description": "If the account is frozen, entries are allowed for the \"Account Manager\" only.", 
+  "oldfieldtype": "Select", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Frozen", 
+  "oldfieldname": "freeze_account", 
+  "options": "No\nYes", 
+  "fieldname": "freeze_account", 
+  "fieldtype": "Select", 
+  "permlevel": 2
+ }, 
+ {
+  "print_hide": 1, 
+  "oldfieldtype": "Int", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Credit Days", 
+  "oldfieldname": "credit_days", 
+  "fieldname": "credit_days", 
+  "fieldtype": "Int", 
+  "hidden": 1, 
+  "permlevel": 0
+ }, 
+ {
+  "print_hide": 1, 
+  "oldfieldtype": "Currency", 
+  "doctype": "DocField", 
+  "label": "Credit Limit", 
+  "oldfieldname": "credit_limit", 
+  "fieldname": "credit_limit", 
+  "fieldtype": "Currency", 
+  "hidden": 1, 
+  "permlevel": 0
+ }, 
+ {
+  "description": "If this Account represents a Customer, Supplier or Employee, set it here.", 
+  "oldfieldtype": "Select", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Master Type", 
+  "oldfieldname": "master_type", 
+  "options": "\nSupplier\nCustomer\nEmployee", 
+  "fieldname": "master_type", 
+  "fieldtype": "Select", 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Link", 
+  "doctype": "DocField", 
+  "label": "Master Name", 
+  "oldfieldname": "master_name", 
+  "trigger": "Client", 
+  "fieldname": "master_name", 
+  "fieldtype": "Link", 
+  "options": "[Select]", 
+  "permlevel": 0
+ }, 
+ {
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "write": 1, 
+  "cancel": 0, 
+  "role": "Auditor", 
+  "permlevel": 0
+ }, 
+ {
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "write": 0, 
+  "cancel": 0, 
+  "role": "Auditor", 
+  "permlevel": 2
+ }, 
+ {
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "write": 0, 
+  "cancel": 0, 
+  "role": "Auditor", 
+  "permlevel": 1
+ }, 
+ {
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "write": 0, 
+  "cancel": 0, 
+  "role": "Sales User", 
+  "permlevel": 0
+ }, 
+ {
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "write": 0, 
+  "cancel": 0, 
+  "role": "Purchase User", 
+  "permlevel": 0
+ }, 
+ {
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "write": 1, 
+  "cancel": 0, 
+  "role": "Accounts User", 
+  "permlevel": 0
+ }, 
+ {
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "write": 1, 
+  "cancel": 1, 
+  "role": "Accounts Manager", 
+  "permlevel": 0
+ }, 
+ {
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "write": 0, 
+  "cancel": 0, 
+  "role": "Accounts User", 
+  "permlevel": 1
+ }, 
+ {
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "write": 0, 
+  "cancel": 0, 
+  "role": "Accounts Manager", 
+  "permlevel": 1
+ }, 
+ {
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "write": 1, 
+  "cancel": 0, 
+  "role": "Accounts Manager", 
+  "permlevel": 2
+ }, 
+ {
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "write": 0, 
+  "cancel": 0, 
+  "role": "Accounts User", 
+  "permlevel": 2
+ }
 ]
\ No newline at end of file
diff --git a/accounts/doctype/sales_invoice/sales_invoice.js b/accounts/doctype/sales_invoice/sales_invoice.js
index e763440894..4c426f3a03 100644
--- a/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/accounts/doctype/sales_invoice/sales_invoice.js
@@ -498,7 +498,7 @@ cur_frm.cscript.view_ledger_entry = function(){
 
 cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
 	if(cint(wn.boot.notification_settings.sales_invoice)) {
-		cur_frm.email_doc(wn.boot.notification_settings.sales_invoice);
+		cur_frm.email_doc(wn.boot.notification_settings.sales_invoice_message);
 	}
 }
 
diff --git a/accounts/page/accounts_browser/accounts_browser.html b/accounts/page/accounts_browser/accounts_browser.html
index de55f08d91..91a1e26b94 100644
--- a/accounts/page/accounts_browser/accounts_browser.html
+++ b/accounts/page/accounts_browser/accounts_browser.html
@@ -1,12 +1,18 @@
 <div class="layout-wrapper layout-wrapper-background">
 	<div class="appframe-area"></div>
-	<div class="layout-main-section">
+	<div class="layout-main">
 		<div class="tree-area"></div>
-	</div>
-	<div class="layout-side-section">
-		<div class="help">1. To add child nodes, explore tree and click on the node under which you want to add more nodes.<br><br>
-			2. Please do NOT create accounts (ledgers) for Customers and Suppliers. They are created directly from the Customer / Supplier masters.<br>
+		<hr>
+		<div class="well">
+			<h4>Quick Help</h4>
+			<ol>
+			<li>To add child nodes, explore tree and click on the node under which you want to add more nodes.
+			<li>Accounting Entries can be made against leaf nodes, called <b>Ledgers</b>. Entries against <b>Groups</b> are not allowed.
+			<li>Please do NOT create Account (Ledgers) for Customers and Suppliers. They are created directly from the Customer / Supplier masters.
+			<li><b>To create a Bank Account:</b> Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts) and create a new Account Ledger (by clicking on Add Child) of type "Bank or Cash"
+			<li><b>To create a Tax Account:</b> Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties) and create a new Account Ledger (by clicking on Add Child) of type "Tax" and do mention the Tax rate.
+			</ol>
+			<p>Please setup your chart of accounts before you start Accounting Entries</p>
 		</div>
 	</div>
-	<div class="clear"></div>
 </div>
\ No newline at end of file
diff --git a/buying/doctype/purchase_order/purchase_order.js b/buying/doctype/purchase_order/purchase_order.js
index e31cfd77a7..f53f4d279b 100644
--- a/buying/doctype/purchase_order/purchase_order.js
+++ b/buying/doctype/purchase_order/purchase_order.js
@@ -220,6 +220,6 @@ cur_frm.pformat.indent_no = function(doc, cdt, cdn){
 
 cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
 	if(cint(wn.boot.notification_settings.purchase_order)) {
-		cur_frm.email_doc(wn.boot.notification_settings.purchase_order);
+		cur_frm.email_doc(wn.boot.notification_settings.purchase_order_message);
 	}
 }
diff --git a/buying/doctype/supplier/supplier.txt b/buying/doctype/supplier/supplier.txt
index a46927b77e..a8caadb7c8 100644
--- a/buying/doctype/supplier/supplier.txt
+++ b/buying/doctype/supplier/supplier.txt
@@ -2,17 +2,19 @@
  {
   "owner": "Administrator", 
   "docstatus": 0, 
-  "creation": "2012-11-02 17:17:04", 
+  "creation": "2012-12-03 10:31:02", 
   "modified_by": "Administrator", 
-  "modified": "2012-11-30 10:53:32"
+  "modified": "2012-12-03 11:25:12"
  }, 
  {
   "autoname": "naming_series:", 
-  "name": "__common__", 
+  "description": "Supplier of Goods or Services.", 
+  "allow_rename": 1, 
   "search_fields": "supplier_name,supplier_type", 
   "module": "Buying", 
   "doctype": "DocType", 
-  "document_type": "Master"
+  "document_type": "Master", 
+  "name": "__common__"
  }, 
  {
   "name": "__common__", 
@@ -243,6 +245,26 @@
   "fieldtype": "Small Text", 
   "permlevel": 1
  }, 
+ {
+  "amend": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "submit": 0, 
+  "write": 0, 
+  "role": "Purchase Manager", 
+  "cancel": 0, 
+  "permlevel": 1
+ }, 
+ {
+  "amend": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "submit": 0, 
+  "write": 0, 
+  "role": "Purchase Manager", 
+  "cancel": 0, 
+  "permlevel": 0
+ }, 
  {
   "doctype": "DocPerm", 
   "role": "Purchase Master Manager", 
@@ -257,25 +279,5 @@
   "role": "Purchase Master Manager", 
   "cancel": 1, 
   "permlevel": 0
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Purchase Manager", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Purchase Manager", 
-  "cancel": 0, 
-  "permlevel": 0
  }
 ]
\ No newline at end of file
diff --git a/hr/doctype/expense_claim/expense_claim.js b/hr/doctype/expense_claim/expense_claim.js
index d890102474..466a8cf3fe 100644
--- a/hr/doctype/expense_claim/expense_claim.js
+++ b/hr/doctype/expense_claim/expense_claim.js
@@ -247,7 +247,7 @@ cur_frm.cscript.update_voucher = function(doc){
 
 cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
 	if(cint(wn.boot.notification_settings.expense_claim)) {
-		cur_frm.email_doc(wn.boot.notification_settings.expense_claim);
+		cur_frm.email_doc(wn.boot.notification_settings.expense_claim_message);
 	}
 }
 
diff --git a/selling/doctype/customer/customer.txt b/selling/doctype/customer/customer.txt
index 6b174d7f3f..2bc9e89076 100644
--- a/selling/doctype/customer/customer.txt
+++ b/selling/doctype/customer/customer.txt
@@ -2,19 +2,21 @@
  {
   "owner": "Administrator", 
   "docstatus": 0, 
-  "creation": "2012-11-02 17:16:46", 
+  "creation": "2012-12-03 10:31:05", 
   "modified_by": "Administrator", 
-  "modified": "2012-11-30 10:54:38"
+  "modified": "2012-12-03 11:25:29"
  }, 
  {
-  "autoname": "naming_series:", 
-  "name": "__common__", 
-  "default_print_format": "Standard", 
+  "description": "Buyer of Goods and Services.", 
   "allow_print": 0, 
   "search_fields": "customer_name,customer_group,country,territory", 
   "module": "Selling", 
-  "doctype": "DocType", 
-  "document_type": "Master"
+  "document_type": "Master", 
+  "autoname": "naming_series:", 
+  "name": "__common__", 
+  "default_print_format": "Standard", 
+  "allow_rename": 1, 
+  "doctype": "DocType"
  }, 
  {
   "name": "__common__", 
@@ -364,44 +366,54 @@
   "fieldtype": "Small Text", 
   "permlevel": 1
  }, 
+ {
+  "amend": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "submit": 0, 
+  "write": 0, 
+  "cancel": 0, 
+  "role": "Sales Manager", 
+  "permlevel": 1
+ }, 
+ {
+  "amend": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "submit": 0, 
+  "write": 0, 
+  "cancel": 0, 
+  "role": "Sales Manager", 
+  "permlevel": 0
+ }, 
+ {
+  "amend": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "submit": 0, 
+  "write": 0, 
+  "cancel": 0, 
+  "role": "Sales User", 
+  "permlevel": 1
+ }, 
+ {
+  "amend": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "submit": 0, 
+  "write": 0, 
+  "cancel": 0, 
+  "role": "Sales User", 
+  "permlevel": 0
+ }, 
  {
   "amend": 0, 
   "create": 1, 
   "doctype": "DocPerm", 
   "submit": 0, 
   "write": 1, 
-  "role": "Sales Master Manager", 
   "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
   "role": "Sales Master Manager", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Sales Manager", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Sales Manager", 
-  "cancel": 0, 
   "permlevel": 0
  }, 
  {
@@ -410,18 +422,18 @@
   "doctype": "DocPerm", 
   "submit": 0, 
   "write": 0, 
-  "role": "Sales User", 
   "cancel": 0, 
+  "role": "Sales Master Manager", 
   "permlevel": 1
  }, 
  {
   "amend": 0, 
-  "create": 0, 
+  "create": 1, 
   "doctype": "DocPerm", 
   "submit": 0, 
-  "write": 0, 
-  "role": "Sales User", 
+  "write": 1, 
   "cancel": 0, 
+  "role": "Purchase User", 
   "permlevel": 0
  }, 
  {
diff --git a/selling/doctype/sales_order/sales_order.js b/selling/doctype/sales_order/sales_order.js
index 6a3dfc4af8..288c1f427f 100644
--- a/selling/doctype/sales_order/sales_order.js
+++ b/selling/doctype/sales_order/sales_order.js
@@ -369,6 +369,6 @@ cur_frm.fields_dict['territory'].get_query = function(doc,cdt,cdn) {
 
 cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
 	if(cint(wn.boot.notification_settings.sales_order)) {
-		cur_frm.email_doc(wn.boot.notification_settings.sales_order);
+		cur_frm.email_doc(wn.boot.notification_settings.sales_order_message);
 	}
 }
diff --git a/setup/doctype/company/company.txt b/setup/doctype/company/company.txt
index 1502ed420e..056508ac32 100644
--- a/setup/doctype/company/company.txt
+++ b/setup/doctype/company/company.txt
@@ -1,377 +1,307 @@
-# DocType, Company
 [
-
-	# These values are common in all dictionaries
-	{
-		'creation': '2012-05-15 12:15:00',
-		'docstatus': 0,
-		'modified': '2012-08-10 12:15:45',
-		'modified_by': u'Administrator',
-		'owner': u'Administrator'
-	},
-
-	# These values are common for all DocType
-	{
-		'_last_update': u'1323855292',
-		'allow_trash': 1,
-		'autoname': u'field:company_name',
-		'colour': u'White:FFF',
-		'doctype': 'DocType',
-		'document_type': u'Master',
-		'module': u'Setup',
-		'name': '__common__',
-		'section_style': u'Tabbed',
-		'server_code_error': u' ',
-		'show_in_menu': 0,
-		'version': 1
-	},
-
-	# These values are common for all DocField
-	{
-		'doctype': u'DocField',
-		'name': '__common__',
-		'parent': u'Company',
-		'parentfield': u'fields',
-		'parenttype': u'DocType'
-	},
-
-	# These values are common for all DocPerm
-	{
-		'doctype': u'DocPerm',
-		'name': '__common__',
-		'parent': u'Company',
-		'parentfield': u'permissions',
-		'parenttype': u'DocType',
-		'read': 1
-	},
-
-	# DocType, Company
-	{
-		'doctype': 'DocType',
-		'name': u'Company'
-	},
-
-	# DocPerm
-	{
-		'amend': 0,
-		'cancel': 1,
-		'create': 1,
-		'doctype': u'DocPerm',
-		'permlevel': 0,
-		'role': u'System Manager',
-		'submit': 0,
-		'write': 1
-	},
-
-	# DocPerm
-	{
-		'amend': 0,
-		'cancel': 1,
-		'create': 1,
-		'doctype': u'DocPerm',
-		'permlevel': 0,
-		'role': u'System Manager',
-		'submit': 0,
-		'write': 1
-	},
-
-	# DocPerm
-	{
-		'cancel': 0,
-		'doctype': u'DocPerm',
-		'permlevel': 1,
-		'role': u'All'
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'doctype': u'DocField',
-		'fieldname': u'details',
-		'fieldtype': u'Section Break',
-		'label': u'Company Details',
-		'oldfieldtype': u'Section Break',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'doctype': u'DocField',
-		'fieldname': u'company_name',
-		'fieldtype': u'Data',
-		'label': u'Company',
-		'no_copy': 0,
-		'oldfieldname': u'company_name',
-		'oldfieldtype': u'Data',
-		'permlevel': 0,
-		'reqd': 1
-	},
-
-	# DocField
-	{
-		'doctype': u'DocField',
-		'fieldname': u'cb0',
-		'fieldtype': u'Column Break',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'description': u'Please Enter Abbreviation or Short Name properly as it will be added as Suffix to all Account Heads.',
-		'doctype': u'DocField',
-		'fieldname': u'abbr',
-		'fieldtype': u'Data',
-		'label': u'Abbr',
-		'no_copy': 0,
-		'oldfieldname': u'abbr',
-		'oldfieldtype': u'Data',
-		'permlevel': 0,
-		'reqd': 1
-	},
-
-	# DocField
-	{
-		'doctype': u'DocField',
-		'fieldname': u'default_settings',
-		'fieldtype': u'Section Break',
-		'label': u'Default Settings',
-		'oldfieldtype': u'Section Break',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'doctype': u'DocField',
-		'fieldname': u'default_currency',
-		'fieldtype': u'Select',
-		'label': u'Default Currency',
-		'options': u'link:Currency',
-		'permlevel': 0,
-		'reqd': 1
-	},
-
-	# DocField
-	{
-		'depends_on': u'eval:!doc.__islocal',
-		'doctype': u'DocField',
-		'fieldname': u'default_bank_account',
-		'fieldtype': u'Link',
-		'label': u'Default Bank Account',
-		'no_copy': 1,
-		'oldfieldname': u'default_bank_account',
-		'oldfieldtype': u'Link',
-		'options': u'Account',
-		'permlevel': 0,
-		'trigger': u'Client'
-	},
-
-	# DocField
-	{
-		'depends_on': u'eval:!doc.__islocal',
-		'doctype': u'DocField',
-		'fieldname': u'receivables_group',
-		'fieldtype': u'Link',
-		'label': u'Receivables Group',
-		'no_copy': 1,
-		'oldfieldname': u'receivables_group',
-		'oldfieldtype': u'Link',
-		'options': u'Account',
-		'permlevel': 0,
-		'trigger': u'Client'
-	},
-
-	# DocField
-	{
-		'depends_on': u'eval:!doc.__islocal',
-		'doctype': u'DocField',
-		'fieldname': u'payables_group',
-		'fieldtype': u'Link',
-		'label': u'Payables Group',
-		'no_copy': 1,
-		'oldfieldname': u'payables_group',
-		'oldfieldtype': u'Link',
-		'options': u'Account',
-		'permlevel': 0,
-		'trigger': u'Client'
-	},
-
-	# DocField
-	{
-		'doctype': u'DocField',
-		'fieldname': u'column_break0',
-		'fieldtype': u'Column Break',
-		'oldfieldtype': u'Column Break',
-		'permlevel': 0,
-		'width': u'50%'
-	},
-
-	# DocField
-	{
-		'depends_on': u'eval:!doc.__islocal',
-		'doctype': u'DocField',
-		'fieldname': u'credit_days',
-		'fieldtype': u'Int',
-		'label': u'Credit Days',
-		'oldfieldname': u'credit_days',
-		'oldfieldtype': u'Int',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'depends_on': u'eval:!doc.__islocal',
-		'doctype': u'DocField',
-		'fieldname': u'credit_limit',
-		'fieldtype': u'Currency',
-		'label': u'Credit Limit',
-		'oldfieldname': u'credit_limit',
-		'oldfieldtype': u'Currency',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'depends_on': u'eval:!doc.__islocal',
-		'doctype': u'DocField',
-		'fieldname': u'yearly_bgt_flag',
-		'fieldtype': u'Select',
-		'label': u'If Yearly Budget Exceeded',
-		'oldfieldname': u'yearly_bgt_flag',
-		'oldfieldtype': u'Select',
-		'options': u'\nWarn\nIgnore\nStop',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'depends_on': u'eval:!doc.__islocal',
-		'doctype': u'DocField',
-		'fieldname': u'monthly_bgt_flag',
-		'fieldtype': u'Select',
-		'label': u'If Monthly Budget Exceeded',
-		'oldfieldname': u'monthly_bgt_flag',
-		'oldfieldtype': u'Select',
-		'options': u'\nWarn\nIgnore\nStop',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'description': u'For reference only.',
-		'doctype': u'DocField',
-		'fieldname': u'company_info',
-		'fieldtype': u'Section Break',
-		'label': u'Company Info',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'doctype': u'DocField',
-		'fieldname': u'address',
-		'fieldtype': u'Small Text',
-		'label': u'Address',
-		'oldfieldname': u'address',
-		'oldfieldtype': u'Small Text',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'doctype': u'DocField',
-		'fieldname': u'column_break1',
-		'fieldtype': u'Column Break',
-		'oldfieldtype': u'Column Break',
-		'permlevel': 0,
-		'width': u'50%'
-	},
-
-	# DocField
-	{
-		'doctype': u'DocField',
-		'fieldname': u'phone_no',
-		'fieldtype': u'Data',
-		'label': u'Phone No',
-		'oldfieldname': u'phone_no',
-		'oldfieldtype': u'Data',
-		'options': u'Phone',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'doctype': u'DocField',
-		'fieldname': u'fax',
-		'fieldtype': u'Data',
-		'label': u'Fax',
-		'oldfieldname': u'fax',
-		'oldfieldtype': u'Data',
-		'options': u'Phone',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'doctype': u'DocField',
-		'fieldname': u'email',
-		'fieldtype': u'Data',
-		'label': u'Email',
-		'oldfieldname': u'email',
-		'oldfieldtype': u'Data',
-		'options': u'Email',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'doctype': u'DocField',
-		'fieldname': u'website',
-		'fieldtype': u'Data',
-		'label': u'Website',
-		'oldfieldname': u'website',
-		'oldfieldtype': u'Data',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'description': u'Company registration numbers for your reference. Example: VAT Registration Numbers etc.',
-		'doctype': u'DocField',
-		'fieldname': u'registration_info',
-		'fieldtype': u'Section Break',
-		'label': u'Registration Info',
-		'oldfieldtype': u'Section Break',
-		'permlevel': 0,
-		'width': u'50%'
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'description': u'Company registration numbers for your reference. Tax numbers etc.',
-		'doctype': u'DocField',
-		'fieldname': u'registration_details',
-		'fieldtype': u'Code',
-		'label': u'Registration Details',
-		'oldfieldname': u'registration_details',
-		'oldfieldtype': u'Code',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'doctype': u'DocField',
-		'fieldname': u'trash_reason',
-		'fieldtype': u'Small Text',
-		'label': u'Trash Reason',
-		'no_copy': 1,
-		'oldfieldname': u'trash_reason',
-		'oldfieldtype': u'Small Text',
-		'permlevel': 1
-	}
+ {
+  "owner": "Administrator", 
+  "docstatus": 0, 
+  "creation": "2012-08-10 13:00:45", 
+  "modified_by": "Administrator", 
+  "modified": "2012-12-03 11:26:05"
+ }, 
+ {
+  "autoname": "field:company_name", 
+  "description": "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.", 
+  "allow_rename": 1, 
+  "doctype": "DocType", 
+  "module": "Setup", 
+  "document_type": "Master", 
+  "name": "__common__"
+ }, 
+ {
+  "name": "__common__", 
+  "parent": "Company", 
+  "doctype": "DocField", 
+  "parenttype": "DocType", 
+  "parentfield": "fields"
+ }, 
+ {
+  "name": "__common__", 
+  "parent": "Company", 
+  "read": 1, 
+  "doctype": "DocPerm", 
+  "parenttype": "DocType", 
+  "parentfield": "permissions"
+ }, 
+ {
+  "name": "Company", 
+  "doctype": "DocType"
+ }, 
+ {
+  "oldfieldtype": "Section Break", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Company Details", 
+  "fieldname": "details", 
+  "fieldtype": "Section Break", 
+  "permlevel": 0
+ }, 
+ {
+  "no_copy": 0, 
+  "oldfieldtype": "Data", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Company", 
+  "oldfieldname": "company_name", 
+  "fieldname": "company_name", 
+  "fieldtype": "Data", 
+  "reqd": 1, 
+  "permlevel": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "cb0", 
+  "fieldtype": "Column Break", 
+  "permlevel": 0
+ }, 
+ {
+  "description": "Please Enter Abbreviation or Short Name properly as it will be added as Suffix to all Account Heads.", 
+  "no_copy": 0, 
+  "oldfieldtype": "Data", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Abbr", 
+  "oldfieldname": "abbr", 
+  "fieldname": "abbr", 
+  "fieldtype": "Data", 
+  "reqd": 1, 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Section Break", 
+  "doctype": "DocField", 
+  "label": "Default Settings", 
+  "fieldname": "default_settings", 
+  "fieldtype": "Section Break", 
+  "permlevel": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "label": "Default Currency", 
+  "options": "link:Currency", 
+  "fieldname": "default_currency", 
+  "fieldtype": "Select", 
+  "reqd": 1, 
+  "permlevel": 0
+ }, 
+ {
+  "no_copy": 1, 
+  "oldfieldtype": "Link", 
+  "doctype": "DocField", 
+  "label": "Default Bank Account", 
+  "oldfieldname": "default_bank_account", 
+  "trigger": "Client", 
+  "fieldname": "default_bank_account", 
+  "fieldtype": "Link", 
+  "depends_on": "eval:!doc.__islocal", 
+  "options": "Account", 
+  "permlevel": 0
+ }, 
+ {
+  "no_copy": 1, 
+  "oldfieldtype": "Link", 
+  "doctype": "DocField", 
+  "label": "Receivables Group", 
+  "oldfieldname": "receivables_group", 
+  "trigger": "Client", 
+  "fieldname": "receivables_group", 
+  "fieldtype": "Link", 
+  "depends_on": "eval:!doc.__islocal", 
+  "options": "Account", 
+  "permlevel": 0
+ }, 
+ {
+  "no_copy": 1, 
+  "oldfieldtype": "Link", 
+  "doctype": "DocField", 
+  "label": "Payables Group", 
+  "oldfieldname": "payables_group", 
+  "trigger": "Client", 
+  "fieldname": "payables_group", 
+  "fieldtype": "Link", 
+  "depends_on": "eval:!doc.__islocal", 
+  "options": "Account", 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Column Break", 
+  "doctype": "DocField", 
+  "width": "50%", 
+  "fieldname": "column_break0", 
+  "fieldtype": "Column Break", 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Int", 
+  "doctype": "DocField", 
+  "label": "Credit Days", 
+  "oldfieldname": "credit_days", 
+  "fieldname": "credit_days", 
+  "fieldtype": "Int", 
+  "depends_on": "eval:!doc.__islocal", 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Currency", 
+  "doctype": "DocField", 
+  "label": "Credit Limit", 
+  "oldfieldname": "credit_limit", 
+  "fieldname": "credit_limit", 
+  "fieldtype": "Currency", 
+  "depends_on": "eval:!doc.__islocal", 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Select", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "If Yearly Budget Exceeded", 
+  "oldfieldname": "yearly_bgt_flag", 
+  "options": "\nWarn\nIgnore\nStop", 
+  "fieldname": "yearly_bgt_flag", 
+  "fieldtype": "Select", 
+  "depends_on": "eval:!doc.__islocal", 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Select", 
+  "doctype": "DocField", 
+  "label": "If Monthly Budget Exceeded", 
+  "oldfieldname": "monthly_bgt_flag", 
+  "options": "\nWarn\nIgnore\nStop", 
+  "fieldname": "monthly_bgt_flag", 
+  "fieldtype": "Select", 
+  "depends_on": "eval:!doc.__islocal", 
+  "permlevel": 0
+ }, 
+ {
+  "description": "For reference only.", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Company Info", 
+  "fieldname": "company_info", 
+  "fieldtype": "Section Break", 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Small Text", 
+  "doctype": "DocField", 
+  "label": "Address", 
+  "oldfieldname": "address", 
+  "fieldname": "address", 
+  "fieldtype": "Small Text", 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Column Break", 
+  "doctype": "DocField", 
+  "width": "50%", 
+  "fieldname": "column_break1", 
+  "fieldtype": "Column Break", 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Data", 
+  "doctype": "DocField", 
+  "label": "Phone No", 
+  "oldfieldname": "phone_no", 
+  "options": "Phone", 
+  "fieldname": "phone_no", 
+  "fieldtype": "Data", 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Data", 
+  "doctype": "DocField", 
+  "label": "Fax", 
+  "oldfieldname": "fax", 
+  "options": "Phone", 
+  "fieldname": "fax", 
+  "fieldtype": "Data", 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Data", 
+  "doctype": "DocField", 
+  "label": "Email", 
+  "oldfieldname": "email", 
+  "options": "Email", 
+  "fieldname": "email", 
+  "fieldtype": "Data", 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Data", 
+  "doctype": "DocField", 
+  "label": "Website", 
+  "oldfieldname": "website", 
+  "fieldname": "website", 
+  "fieldtype": "Data", 
+  "permlevel": 0
+ }, 
+ {
+  "description": "Company registration numbers for your reference. Example: VAT Registration Numbers etc.", 
+  "oldfieldtype": "Section Break", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Registration Info", 
+  "width": "50%", 
+  "fieldname": "registration_info", 
+  "fieldtype": "Section Break", 
+  "permlevel": 0
+ }, 
+ {
+  "description": "Company registration numbers for your reference. Tax numbers etc.", 
+  "oldfieldtype": "Code", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Registration Details", 
+  "oldfieldname": "registration_details", 
+  "fieldname": "registration_details", 
+  "fieldtype": "Code", 
+  "permlevel": 0
+ }, 
+ {
+  "no_copy": 1, 
+  "oldfieldtype": "Small Text", 
+  "doctype": "DocField", 
+  "label": "Trash Reason", 
+  "oldfieldname": "trash_reason", 
+  "fieldname": "trash_reason", 
+  "fieldtype": "Small Text", 
+  "permlevel": 1
+ }, 
+ {
+  "amend": 0, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "submit": 0, 
+  "write": 1, 
+  "role": "System Manager", 
+  "cancel": 1, 
+  "permlevel": 0
+ }, 
+ {
+  "amend": 0, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "submit": 0, 
+  "write": 1, 
+  "role": "System Manager", 
+  "cancel": 1, 
+  "permlevel": 0
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "All", 
+  "cancel": 0, 
+  "permlevel": 1
+ }
 ]
\ No newline at end of file
diff --git a/stock/doctype/delivery_note/delivery_note.js b/stock/doctype/delivery_note/delivery_note.js
index 62958112a1..5e9ce32b93 100644
--- a/stock/doctype/delivery_note/delivery_note.js
+++ b/stock/doctype/delivery_note/delivery_note.js
@@ -327,6 +327,6 @@ cur_frm.pformat.sales_order_no= function(doc, cdt, cdn){
 
 cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
 	if(cint(wn.boot.notification_settings.delivery_note)) {
-		cur_frm.email_doc(wn.boot.notification_settings.delivery_note);
+		cur_frm.email_doc(wn.boot.notification_settings.delivery_note_message);
 	}
 }
\ No newline at end of file
diff --git a/stock/doctype/item/item.txt b/stock/doctype/item/item.txt
index 54c8ab61dc..bf84627d23 100644
--- a/stock/doctype/item/item.txt
+++ b/stock/doctype/item/item.txt
@@ -1,1016 +1,840 @@
-# DocType, Item
 [
-
-	# These values are common in all dictionaries
-	{
-		u'creation': '2012-10-26 16:49:39',
-		u'docstatus': 0,
-		u'modified': '2012-11-16 16:50:57',
-		u'modified_by': u'Administrator',
-		u'owner': u'Administrator'
-	},
-
-	# These values are common for all DocType
-	{
-		'_last_update': u'1329808172',
-		'allow_attach': 1,
-		'allow_trash': 1,
-		'autoname': u'field:item_code',
-		'colour': u'White:FFF',
-		'default_print_format': u'Standard',
-		u'doctype': u'DocType',
-		'document_type': u'Master',
-		'max_attachments': 1,
-		'module': u'Stock',
-		u'name': u'__common__',
-		'search_fields': u'item_name,description,item_group,customer_code',
-		'section_style': u'Tray',
-		'server_code_error': u' ',
-		'show_in_menu': 0,
-		'subject': u'%(item_name)s',
-		'tag_fields': u'item_group',
-		'version': 1
-	},
-
-	# These values are common for all DocField
-	{
-		u'doctype': u'DocField',
-		u'name': u'__common__',
-		'parent': u'Item',
-		'parentfield': u'fields',
-		'parenttype': u'DocType'
-	},
-
-	# These values are common for all DocPerm
-	{
-		u'doctype': u'DocPerm',
-		u'name': u'__common__',
-		'parent': u'Item',
-		'parentfield': u'permissions',
-		'parenttype': u'DocType',
-		'read': 1
-	},
-
-	# DocType, Item
-	{
-		u'doctype': u'DocType',
-		u'name': u'Item'
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'item',
-		'fieldtype': u'Section Break',
-		'label': u'Item',
-		'no_copy': 0,
-		'oldfieldtype': u'Section Break',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'trash_reason',
-		'fieldtype': u'Small Text',
-		'label': u'Trash Reason',
-		'oldfieldname': u'trash_reason',
-		'oldfieldtype': u'Small Text',
-		'permlevel': 1
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'description': u'Item will be saved by this name in the data base.',
-		u'doctype': u'DocField',
-		'fieldname': u'item_code',
-		'fieldtype': u'Data',
-		'in_filter': 0,
-		'label': u'Item Code',
-		'oldfieldname': u'item_code',
-		'oldfieldtype': u'Data',
-		'permlevel': 0,
-		'reqd': 1,
-		'search_index': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'item_name',
-		'fieldtype': u'Data',
-		'in_filter': 1,
-		'label': u'Item Name',
-		'oldfieldname': u'item_name',
-		'oldfieldtype': u'Data',
-		'permlevel': 0,
-		'reqd': 1,
-		'search_index': 1
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'description': u'<a href="#!Sales Browser/Item Group">Manage Item Groups</a>',
-		u'doctype': u'DocField',
-		'fieldname': u'item_group',
-		'fieldtype': u'Link',
-		'in_filter': 1,
-		'label': u'Item Group',
-		'oldfieldname': u'item_group',
-		'oldfieldtype': u'Link',
-		'options': u'Item Group',
-		'permlevel': 0,
-		'reqd': 1
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'brand',
-		'fieldtype': u'Link',
-		'hidden': 0,
-		'label': u'Brand',
-		'oldfieldname': u'brand',
-		'oldfieldtype': u'Link',
-		'options': u'Brand',
-		'permlevel': 0,
-		'print_hide': 1,
-		'reqd': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'barcode',
-		'fieldtype': u'Data',
-		'label': u'Barcode',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'column_break0',
-		'fieldtype': u'Column Break',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'description',
-		'fieldtype': u'Text',
-		'in_filter': 0,
-		'label': u'Description',
-		'oldfieldname': u'description',
-		'oldfieldtype': u'Text',
-		'permlevel': 0,
-		'reqd': 1,
-		'search_index': 0,
-		'width': u'300px'
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'description_html',
-		'fieldtype': u'Text',
-		'label': u'Description HTML',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'description': u'Generates HTML to include image (1st attachment) in the description',
-		u'doctype': u'DocField',
-		'fieldname': u'add_image',
-		'fieldtype': u'Button',
-		'label': u'Add Image',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'inventory',
-		'fieldtype': u'Section Break',
-		'label': u'Inventory',
-		'oldfieldtype': u'Section Break',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'default': u'Yes',
-		'description': u'Select "Yes" if you are maintaining stock of this item in your Inventory.',
-		u'doctype': u'DocField',
-		'fieldname': u'is_stock_item',
-		'fieldtype': u'Select',
-		'label': u'Is Stock Item',
-		'oldfieldname': u'is_stock_item',
-		'oldfieldtype': u'Select',
-		'options': u'\nYes\nNo',
-		'permlevel': 0,
-		'reqd': 1
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'description': u'Mandatory if Stock Item is "Yes"',
-		u'doctype': u'DocField',
-		'fieldname': u'default_warehouse',
-		'fieldtype': u'Link',
-		'label': u'Default Reserved Warehouse',
-		'oldfieldname': u'default_warehouse',
-		'oldfieldtype': u'Link',
-		'options': u'Warehouse',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'description': u'Enter unit of measurement in which stock of this item is maintained in your warehouse.',
-		u'doctype': u'DocField',
-		'fieldname': u'stock_uom',
-		'fieldtype': u'Link',
-		'label': u'Default UoM',
-		'oldfieldname': u'stock_uom',
-		'oldfieldtype': u'Link',
-		'options': u'UOM',
-		'permlevel': 0,
-		'reqd': 1
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'description': u'Percentage variation in quantity to be allowed while receiving or delivering this item.',
-		u'doctype': u'DocField',
-		'fieldname': u'tolerance',
-		'fieldtype': u'Currency',
-		'label': u'Allowance Percent',
-		'oldfieldname': u'tolerance',
-		'oldfieldtype': u'Currency',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'description': u'The system will generate a Purchase Request automatically when stock quantity goes below re-order level in warehouse of type "Stores" or "Reserved Warehouse".',
-		u'doctype': u'DocField',
-		'fieldname': u're_order_level',
-		'fieldtype': u'Currency',
-		'label': u'Re-Order Level',
-		'oldfieldname': u're_order_level',
-		'oldfieldtype': u'Currency',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'description': u'The quantity for the Purchase Request when the stock goes below re-order level.',
-		u'doctype': u'DocField',
-		'fieldname': u're_order_qty',
-		'fieldtype': u'Currency',
-		'label': u'Re-Order Qty',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'description': u'Send an email to users of role "Material Manager" and "Purchase Manager" when re-order level is crossed.',
-		u'doctype': u'DocField',
-		'fieldname': u'email_notify',
-		'fieldtype': u'Check',
-		'label': u'Notify by Email on Re-order',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'valuation_method',
-		'fieldtype': u'Select',
-		'label': u'Valuation Method',
-		'options': u'\nFIFO\nMoving Average',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'default': u'0.00',
-		'description': u'You can enter the minimum quantity of this item to be ordered.',
-		u'doctype': u'DocField',
-		'fieldname': u'min_order_qty',
-		'fieldtype': u'Currency',
-		'hidden': 0,
-		'label': u'Minimum Order Qty',
-		'oldfieldname': u'min_order_qty',
-		'oldfieldtype': u'Currency',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'column_break1',
-		'fieldtype': u'Column Break',
-		'oldfieldtype': u'Column Break',
-		'permlevel': 0,
-		'width': u'50%'
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'default': u'No',
-		'description': u'Select "Yes" if this item is used for some internal purpose in your company.',
-		u'doctype': u'DocField',
-		'fieldname': u'is_asset_item',
-		'fieldtype': u'Select',
-		'label': u'Is Asset Item',
-		'oldfieldname': u'is_asset_item',
-		'oldfieldtype': u'Select',
-		'options': u'\nYes\nNo',
-		'permlevel': 0,
-		'reqd': 1
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'default': u'No',
-		u'doctype': u'DocField',
-		'fieldname': u'has_batch_no',
-		'fieldtype': u'Select',
-		'label': u'Has Batch No',
-		'oldfieldname': u'has_batch_no',
-		'oldfieldtype': u'Select',
-		'options': u'\nYes\nNo',
-		'permlevel': 0,
-		'reqd': 1
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'default': u'No',
-		'description': u'Selecting "Yes" will give a unique identity to each entity of this item which can be viewed in the Serial No master.',
-		u'doctype': u'DocField',
-		'fieldname': u'has_serial_no',
-		'fieldtype': u'Select',
-		'in_filter': 1,
-		'label': u'Has Serial No',
-		'oldfieldname': u'has_serial_no',
-		'oldfieldtype': u'Select',
-		'options': u'\nYes\nNo',
-		'permlevel': 0,
-		'reqd': 1
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'warranty_period',
-		'fieldtype': u'Data',
-		'label': u'Warranty Period (in days)',
-		'oldfieldname': u'warranty_period',
-		'oldfieldtype': u'Data',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'end_of_life',
-		'fieldtype': u'Date',
-		'label': u'End of Life',
-		'oldfieldname': u'end_of_life',
-		'oldfieldtype': u'Date',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'description': u'Net Weight of each Item',
-		u'doctype': u'DocField',
-		'fieldname': u'net_weight',
-		'fieldtype': u'Float',
-		'label': u'Net Weight',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'weight_uom',
-		'fieldtype': u'Link',
-		'label': u'Weight UOM',
-		'options': u'UOM',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		u'doctype': u'DocField',
-		'fieldname': u'purchase_details',
-		'fieldtype': u'Section Break',
-		'label': u'Purchase Details',
-		'oldfieldtype': u'Section Break',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'default': u'Yes',
-		'description': u'Selecting "Yes" will allow this item to appear in Purchase Order , Purchase Receipt.',
-		u'doctype': u'DocField',
-		'fieldname': u'is_purchase_item',
-		'fieldtype': u'Select',
-		'label': u'Is Purchase Item',
-		'oldfieldname': u'is_purchase_item',
-		'oldfieldtype': u'Select',
-		'options': u'\nYes\nNo',
-		'permlevel': 0,
-		'reqd': 1
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'description': u'Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Purchase Request when you select this item.',
-		u'doctype': u'DocField',
-		'fieldname': u'lead_time_days',
-		'fieldtype': u'Int',
-		'label': u'Lead Time Days',
-		'no_copy': 1,
-		'oldfieldname': u'lead_time_days',
-		'oldfieldtype': u'Int',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'description': u'Default Purchase Account in which cost of the item will be debited.',
-		u'doctype': u'DocField',
-		'fieldname': u'purchase_account',
-		'fieldtype': u'Link',
-		'label': u'Default Expense Account',
-		'oldfieldname': u'purchase_account',
-		'oldfieldtype': u'Link',
-		'options': u'Account',
-		'permlevel': 0,
-		'trigger': u'Client'
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'description': u'Default Cost Center for tracking expense for this item.',
-		u'doctype': u'DocField',
-		'fieldname': u'cost_center',
-		'fieldtype': u'Link',
-		'label': u'Default Cost Center',
-		'oldfieldname': u'cost_center',
-		'oldfieldtype': u'Link',
-		'options': u'Cost Center',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'description': u'Buying Cost will be updated from Purchase Orders and Purchase Receipts. <br>The buying cost will calculated by moving average method.',
-		u'doctype': u'DocField',
-		'fieldname': u'buying_cost',
-		'fieldtype': u'Currency',
-		'label': u'Buying Cost',
-		'no_copy': 1,
-		'oldfieldname': u'buying_cost',
-		'oldfieldtype': u'Currency',
-		'permlevel': 1
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		u'doctype': u'DocField',
-		'fieldname': u'last_purchase_rate',
-		'fieldtype': u'Currency',
-		'label': u'Last Purchase Rate',
-		'no_copy': 1,
-		'oldfieldname': u'last_purchase_rate',
-		'oldfieldtype': u'Currency',
-		'permlevel': 1
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'standard_rate',
-		'fieldtype': u'Currency',
-		'label': u'Standard Rate',
-		'oldfieldname': u'standard_rate',
-		'oldfieldtype': u'Currency',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'column_break2',
-		'fieldtype': u'Column Break',
-		'oldfieldtype': u'Column Break',
-		'permlevel': 0,
-		'width': u'50%'
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'uom_conversion_details',
-		'fieldtype': u'Table',
-		'label': u'UOM Conversion Details',
-		'oldfieldname': u'uom_conversion_details',
-		'oldfieldtype': u'Table',
-		'options': u'UOM Conversion Detail',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'manufacturer',
-		'fieldtype': u'Data',
-		'label': u'Manufacturer',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'manufacturer_part_no',
-		'fieldtype': u'Data',
-		'label': u'Manufacturer Part Number',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'item_supplier_details',
-		'fieldtype': u'Table',
-		'label': u'Item Supplier Details',
-		'options': u'Item Supplier',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'sales_details',
-		'fieldtype': u'Section Break',
-		'label': u'Sales Details',
-		'oldfieldtype': u'Section Break',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'default': u'Yes',
-		'description': u'Selecting "Yes" will allow this item to figure in Sales Order, Delivery Note',
-		u'doctype': u'DocField',
-		'fieldname': u'is_sales_item',
-		'fieldtype': u'Select',
-		'in_filter': 1,
-		'label': u'Is Sales Item',
-		'oldfieldname': u'is_sales_item',
-		'oldfieldtype': u'Select',
-		'options': u'\nYes\nNo',
-		'permlevel': 0,
-		'reqd': 1
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'default': u'No',
-		'description': u'Select "Yes" if this item represents some work like training, designing, consulting etc.',
-		u'doctype': u'DocField',
-		'fieldname': u'is_service_item',
-		'fieldtype': u'Select',
-		'in_filter': 1,
-		'label': u'Is Service Item',
-		'oldfieldname': u'is_service_item',
-		'oldfieldtype': u'Select',
-		'options': u'\nYes\nNo',
-		'permlevel': 0,
-		'reqd': 1
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'default': u'No',
-		'description': u'Select "Yes" if this item is to be sent to a customer or received from a supplier as a sample. Delivery notes and Purchase Receipts will update stock levels but there will be no invoice against this item.',
-		u'doctype': u'DocField',
-		'fieldname': u'is_sample_item',
-		'fieldtype': u'Select',
-		'label': u'Allow Samples',
-		'oldfieldname': u'is_sample_item',
-		'oldfieldtype': u'Select',
-		'options': u'\nYes\nNo',
-		'permlevel': 0,
-		'reqd': 1
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'max_discount',
-		'fieldtype': u'Currency',
-		'label': u'Max Discount (%)',
-		'oldfieldname': u'max_discount',
-		'oldfieldtype': u'Currency',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'default_income_account',
-		'fieldtype': u'Link',
-		'label': u'Default Income Account',
-		'options': u'Account',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'default_sales_cost_center',
-		'fieldtype': u'Link',
-		'label': u'Cost Center',
-		'options': u'Cost Center',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'sales_rate',
-		'fieldtype': u'Currency',
-		'hidden': 1,
-		'label': u'Sales Rate',
-		'oldfieldname': u'sales_rate',
-		'oldfieldtype': u'Currency',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'column_break3',
-		'fieldtype': u'Column Break',
-		'oldfieldtype': u'Column Break',
-		'permlevel': 0,
-		'width': u'50%'
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'description': u'Create a price list from Price List master and enter standard ref rates against each of them. On selection of a price list in Quotation, Sales Order or Delivery Note, corresponding ref rate will be fetched for this item.',
-		u'doctype': u'DocField',
-		'fieldname': u'ref_rate_details',
-		'fieldtype': u'Table',
-		'label': u'Item Prices',
-		'oldfieldname': u'ref_rate_details',
-		'oldfieldtype': u'Table',
-		'options': u'Item Price',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'description': u'For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes',
-		u'doctype': u'DocField',
-		'fieldname': u'item_customer_details',
-		'fieldtype': u'Table',
-		'label': u'Customer Codes',
-		'options': u'Item Customer Detail',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'item_tax_section_break',
-		'fieldtype': u'Section Break',
-		'label': u'Item Tax',
-		'oldfieldtype': u'Section Break',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'item_tax',
-		'fieldtype': u'Table',
-		'label': u'Item Tax1',
-		'oldfieldname': u'item_tax',
-		'oldfieldtype': u'Table',
-		'options': u'Item Tax',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'inspection_criteria',
-		'fieldtype': u'Section Break',
-		'label': u'Inspection Criteria',
-		'oldfieldtype': u'Section Break',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'default': u'No',
-		u'doctype': u'DocField',
-		'fieldname': u'inspection_required',
-		'fieldtype': u'Select',
-		'label': u'Inspection Required',
-		'no_copy': 0,
-		'oldfieldname': u'inspection_required',
-		'oldfieldtype': u'Select',
-		'options': u'\nYes\nNo',
-		'permlevel': 0,
-		'reqd': 1
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'item_specification_details',
-		'fieldtype': u'Table',
-		'label': u'Item Quality Inspection Parameter',
-		'oldfieldname': u'item_specification_details',
-		'oldfieldtype': u'Table',
-		'options': u'Item Quality Inspection Parameter',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'manufacturing',
-		'fieldtype': u'Section Break',
-		'label': u'Manufacturing',
-		'oldfieldtype': u'Section Break',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'default': u'No',
-		'description': u'Selecting "Yes" will allow you to create Bill of Material showing raw material and operational costs incurred to manufacture this item.',
-		u'doctype': u'DocField',
-		'fieldname': u'is_manufactured_item',
-		'fieldtype': u'Select',
-		'label': u'Allow Bill of Materials',
-		'oldfieldname': u'is_manufactured_item',
-		'oldfieldtype': u'Select',
-		'options': u'\nYes\nNo',
-		'permlevel': 0,
-		'reqd': 1
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		u'doctype': u'DocField',
-		'fieldname': u'default_bom',
-		'fieldtype': u'Link',
-		'label': u'Default BOM',
-		'no_copy': 1,
-		'oldfieldname': u'default_bom',
-		'oldfieldtype': u'Link',
-		'options': u'BOM',
-		'permlevel': 1
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'default': u'No',
-		'description': u'Selecting "Yes" will allow you to make a Production Order for this item.',
-		u'doctype': u'DocField',
-		'fieldname': u'is_pro_applicable',
-		'fieldtype': u'Select',
-		'label': u'Allow Production Order',
-		'oldfieldname': u'is_pro_applicable',
-		'oldfieldtype': u'Select',
-		'options': u'\nYes\nNo',
-		'permlevel': 0,
-		'reqd': 1
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'default': u'No',
-		'description': u'Select "Yes" if you supply raw materials to your supplier to manufacture this item.',
-		u'doctype': u'DocField',
-		'fieldname': u'is_sub_contracted_item',
-		'fieldtype': u'Select',
-		'label': u'Is Sub Contracted Item',
-		'oldfieldname': u'is_sub_contracted_item',
-		'oldfieldtype': u'Select',
-		'options': u'\nYes\nNo',
-		'permlevel': 0,
-		'reqd': 1
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'file_list',
-		'fieldtype': u'Text',
-		'hidden': 1,
-		'label': u'File List',
-		'no_copy': 1,
-		'permlevel': 0,
-		'print_hide': 1
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'customer_code',
-		'fieldtype': u'Data',
-		'hidden': 1,
-		'in_filter': 1,
-		'label': u'Customer Code',
-		'no_copy': 1,
-		'permlevel': 0,
-		'print_hide': 1
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'website_section',
-		'fieldtype': u'Section Break',
-		'label': u'Website',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'show_in_website',
-		'fieldtype': u'Check',
-		'label': u'Show in Website',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'description': u'website page link',
-		u'doctype': u'DocField',
-		'fieldname': u'page_name',
-		'fieldtype': u'Data',
-		'label': u'Page Name',
-		'permlevel': 1
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'website_image',
-		'fieldtype': u'Select',
-		'label': u'Image',
-		'options': u'attach_files:',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'web_short_description',
-		'fieldtype': u'Text',
-		'label': u'Short Description',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'web_long_description',
-		'fieldtype': u'Code',
-		'label': u'Long Description',
-		'options': u'Markdown',
-		'permlevel': 0
-	},
-
-	# DocPerm
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		u'doctype': u'DocPerm',
-		'permlevel': 1,
-		'role': u'Material Manager',
-		'submit': 0,
-		'write': 0
-	},
-
-	# DocPerm
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		u'doctype': u'DocPerm',
-		'permlevel': 0,
-		'role': u'Material Manager',
-		'submit': 0,
-		'write': 0
-	},
-
-	# DocPerm
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		u'doctype': u'DocPerm',
-		'permlevel': 1,
-		'role': u'Material User',
-		'submit': 0,
-		'write': 0
-	},
-
-	# DocPerm
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		u'doctype': u'DocPerm',
-		'permlevel': 0,
-		'role': u'Material User',
-		'submit': 0,
-		'write': 0
-	},
-
-	# DocPerm
-	{
-		'cancel': 1,
-		'create': 1,
-		u'doctype': u'DocPerm',
-		'permlevel': 0,
-		'role': u'Material Master Manager',
-		'write': 1
-	},
-
-	# DocPerm
-	{
-		'create': 0,
-		u'doctype': u'DocPerm',
-		'permlevel': 1,
-		'role': u'Material Master Manager',
-		'write': 0
-	},
-
-	# DocPerm
-	{
-		'cancel': 1,
-		'create': 1,
-		u'doctype': u'DocPerm',
-		'permlevel': 0,
-		'role': u'System Manager',
-		'write': 1
-	},
-
-	# DocPerm
-	{
-		u'doctype': u'DocPerm',
-		'permlevel': 1,
-		'role': u'System Manager'
-	}
+ {
+  "owner": "Administrator", 
+  "docstatus": 0, 
+  "creation": "2012-10-26 16:49:39", 
+  "modified_by": "Administrator", 
+  "modified": "2012-12-03 11:24:59"
+ }, 
+ {
+  "allow_attach": 1, 
+  "search_fields": "item_name,description,item_group,customer_code", 
+  "module": "Stock", 
+  "document_type": "Master", 
+  "description": "A Product or a Service that is bought, sold or kept in stock.", 
+  "autoname": "field:item_code", 
+  "name": "__common__", 
+  "default_print_format": "Standard", 
+  "allow_rename": 1, 
+  "doctype": "DocType", 
+  "max_attachments": 1
+ }, 
+ {
+  "name": "__common__", 
+  "parent": "Item", 
+  "doctype": "DocField", 
+  "parenttype": "DocType", 
+  "parentfield": "fields"
+ }, 
+ {
+  "name": "__common__", 
+  "parent": "Item", 
+  "read": 1, 
+  "doctype": "DocPerm", 
+  "parenttype": "DocType", 
+  "parentfield": "permissions"
+ }, 
+ {
+  "name": "Item", 
+  "doctype": "DocType"
+ }, 
+ {
+  "no_copy": 0, 
+  "oldfieldtype": "Section Break", 
+  "doctype": "DocField", 
+  "label": "Item", 
+  "fieldname": "item", 
+  "fieldtype": "Section Break", 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Small Text", 
+  "doctype": "DocField", 
+  "label": "Trash Reason", 
+  "oldfieldname": "trash_reason", 
+  "fieldname": "trash_reason", 
+  "fieldtype": "Small Text", 
+  "permlevel": 1
+ }, 
+ {
+  "description": "Item will be saved by this name in the data base.", 
+  "oldfieldtype": "Data", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Item Code", 
+  "oldfieldname": "item_code", 
+  "fieldname": "item_code", 
+  "fieldtype": "Data", 
+  "search_index": 0, 
+  "reqd": 1, 
+  "in_filter": 0, 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Data", 
+  "doctype": "DocField", 
+  "label": "Item Name", 
+  "oldfieldname": "item_name", 
+  "fieldname": "item_name", 
+  "fieldtype": "Data", 
+  "search_index": 1, 
+  "reqd": 1, 
+  "permlevel": 0, 
+  "in_filter": 1
+ }, 
+ {
+  "description": "<a href=\"#!Sales Browser/Item Group\">Manage Item Groups</a>", 
+  "oldfieldtype": "Link", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Item Group", 
+  "oldfieldname": "item_group", 
+  "permlevel": 0, 
+  "fieldname": "item_group", 
+  "fieldtype": "Link", 
+  "reqd": 1, 
+  "in_filter": 1, 
+  "options": "Item Group"
+ }, 
+ {
+  "print_hide": 1, 
+  "oldfieldtype": "Link", 
+  "doctype": "DocField", 
+  "label": "Brand", 
+  "oldfieldname": "brand", 
+  "options": "Brand", 
+  "fieldname": "brand", 
+  "fieldtype": "Link", 
+  "reqd": 0, 
+  "hidden": 0, 
+  "permlevel": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "label": "Barcode", 
+  "fieldname": "barcode", 
+  "fieldtype": "Data", 
+  "permlevel": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "column_break0", 
+  "fieldtype": "Column Break", 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Text", 
+  "doctype": "DocField", 
+  "label": "Description", 
+  "oldfieldname": "description", 
+  "width": "300px", 
+  "fieldname": "description", 
+  "fieldtype": "Text", 
+  "search_index": 0, 
+  "reqd": 1, 
+  "permlevel": 0, 
+  "in_filter": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "label": "Description HTML", 
+  "fieldname": "description_html", 
+  "fieldtype": "Text", 
+  "permlevel": 0
+ }, 
+ {
+  "description": "Generates HTML to include image (1st attachment) in the description", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Add Image", 
+  "fieldname": "add_image", 
+  "fieldtype": "Button", 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Section Break", 
+  "doctype": "DocField", 
+  "label": "Inventory", 
+  "fieldname": "inventory", 
+  "fieldtype": "Section Break", 
+  "permlevel": 0
+ }, 
+ {
+  "description": "Select \"Yes\" if you are maintaining stock of this item in your Inventory.", 
+  "default": "Yes", 
+  "oldfieldtype": "Select", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Is Stock Item", 
+  "oldfieldname": "is_stock_item", 
+  "permlevel": 0, 
+  "fieldname": "is_stock_item", 
+  "fieldtype": "Select", 
+  "reqd": 1, 
+  "options": "\nYes\nNo"
+ }, 
+ {
+  "description": "Mandatory if Stock Item is \"Yes\"", 
+  "oldfieldtype": "Link", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Default Reserved Warehouse", 
+  "oldfieldname": "default_warehouse", 
+  "options": "Warehouse", 
+  "fieldname": "default_warehouse", 
+  "fieldtype": "Link", 
+  "permlevel": 0
+ }, 
+ {
+  "description": "Enter unit of measurement in which stock of this item is maintained in your warehouse.", 
+  "oldfieldtype": "Link", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Default UoM", 
+  "oldfieldname": "stock_uom", 
+  "options": "UOM", 
+  "fieldname": "stock_uom", 
+  "fieldtype": "Link", 
+  "reqd": 1, 
+  "permlevel": 0
+ }, 
+ {
+  "description": "Percentage variation in quantity to be allowed while receiving or delivering this item.", 
+  "oldfieldtype": "Currency", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Allowance Percent", 
+  "oldfieldname": "tolerance", 
+  "fieldname": "tolerance", 
+  "fieldtype": "Currency", 
+  "permlevel": 0
+ }, 
+ {
+  "description": "The system will generate a Purchase Request automatically when stock quantity goes below re-order level in warehouse of type \"Stores\" or \"Reserved Warehouse\".", 
+  "oldfieldtype": "Currency", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Re-Order Level", 
+  "oldfieldname": "re_order_level", 
+  "fieldname": "re_order_level", 
+  "fieldtype": "Currency", 
+  "permlevel": 0
+ }, 
+ {
+  "description": "The quantity for the Purchase Request when the stock goes below re-order level.", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Re-Order Qty", 
+  "fieldname": "re_order_qty", 
+  "fieldtype": "Currency", 
+  "permlevel": 0
+ }, 
+ {
+  "description": "Send an email to users of role \"Material Manager\" and \"Purchase Manager\" when re-order level is crossed.", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Notify by Email on Re-order", 
+  "fieldname": "email_notify", 
+  "fieldtype": "Check", 
+  "permlevel": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "label": "Valuation Method", 
+  "options": "\nFIFO\nMoving Average", 
+  "fieldname": "valuation_method", 
+  "fieldtype": "Select", 
+  "permlevel": 0
+ }, 
+ {
+  "description": "You can enter the minimum quantity of this item to be ordered.", 
+  "default": "0.00", 
+  "oldfieldtype": "Currency", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Minimum Order Qty", 
+  "oldfieldname": "min_order_qty", 
+  "fieldname": "min_order_qty", 
+  "fieldtype": "Currency", 
+  "hidden": 0, 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Column Break", 
+  "doctype": "DocField", 
+  "width": "50%", 
+  "fieldname": "column_break1", 
+  "fieldtype": "Column Break", 
+  "permlevel": 0
+ }, 
+ {
+  "description": "Select \"Yes\" if this item is used for some internal purpose in your company.", 
+  "default": "No", 
+  "oldfieldtype": "Select", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Is Asset Item", 
+  "oldfieldname": "is_asset_item", 
+  "permlevel": 0, 
+  "fieldname": "is_asset_item", 
+  "fieldtype": "Select", 
+  "reqd": 1, 
+  "options": "\nYes\nNo"
+ }, 
+ {
+  "default": "No", 
+  "oldfieldtype": "Select", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Has Batch No", 
+  "oldfieldname": "has_batch_no", 
+  "options": "\nYes\nNo", 
+  "fieldname": "has_batch_no", 
+  "fieldtype": "Select", 
+  "reqd": 1, 
+  "permlevel": 0
+ }, 
+ {
+  "description": "Selecting \"Yes\" will give a unique identity to each entity of this item which can be viewed in the Serial No master.", 
+  "default": "No", 
+  "oldfieldtype": "Select", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Has Serial No", 
+  "oldfieldname": "has_serial_no", 
+  "permlevel": 0, 
+  "fieldname": "has_serial_no", 
+  "fieldtype": "Select", 
+  "reqd": 1, 
+  "in_filter": 1, 
+  "options": "\nYes\nNo"
+ }, 
+ {
+  "oldfieldtype": "Data", 
+  "doctype": "DocField", 
+  "label": "Warranty Period (in days)", 
+  "oldfieldname": "warranty_period", 
+  "fieldname": "warranty_period", 
+  "fieldtype": "Data", 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Date", 
+  "doctype": "DocField", 
+  "label": "End of Life", 
+  "oldfieldname": "end_of_life", 
+  "fieldname": "end_of_life", 
+  "fieldtype": "Date", 
+  "permlevel": 0
+ }, 
+ {
+  "description": "Net Weight of each Item", 
+  "doctype": "DocField", 
+  "label": "Net Weight", 
+  "fieldname": "net_weight", 
+  "fieldtype": "Float", 
+  "permlevel": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "label": "Weight UOM", 
+  "options": "UOM", 
+  "fieldname": "weight_uom", 
+  "fieldtype": "Link", 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Section Break", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Purchase Details", 
+  "fieldname": "purchase_details", 
+  "fieldtype": "Section Break", 
+  "permlevel": 0
+ }, 
+ {
+  "description": "Selecting \"Yes\" will allow this item to appear in Purchase Order , Purchase Receipt.", 
+  "default": "Yes", 
+  "oldfieldtype": "Select", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Is Purchase Item", 
+  "oldfieldname": "is_purchase_item", 
+  "permlevel": 0, 
+  "fieldname": "is_purchase_item", 
+  "fieldtype": "Select", 
+  "reqd": 1, 
+  "options": "\nYes\nNo"
+ }, 
+ {
+  "description": "Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Purchase Request when you select this item.", 
+  "no_copy": 1, 
+  "oldfieldtype": "Int", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Lead Time Days", 
+  "oldfieldname": "lead_time_days", 
+  "fieldname": "lead_time_days", 
+  "fieldtype": "Int", 
+  "permlevel": 0
+ }, 
+ {
+  "description": "Default Purchase Account in which cost of the item will be debited.", 
+  "oldfieldtype": "Link", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Default Expense Account", 
+  "oldfieldname": "purchase_account", 
+  "trigger": "Client", 
+  "fieldname": "purchase_account", 
+  "fieldtype": "Link", 
+  "options": "Account", 
+  "permlevel": 0
+ }, 
+ {
+  "description": "Default Cost Center for tracking expense for this item.", 
+  "oldfieldtype": "Link", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Default Cost Center", 
+  "oldfieldname": "cost_center", 
+  "options": "Cost Center", 
+  "fieldname": "cost_center", 
+  "fieldtype": "Link", 
+  "permlevel": 0
+ }, 
+ {
+  "description": "Buying Cost will be updated from Purchase Orders and Purchase Receipts. <br>The buying cost will calculated by moving average method.", 
+  "no_copy": 1, 
+  "oldfieldtype": "Currency", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Buying Cost", 
+  "oldfieldname": "buying_cost", 
+  "fieldname": "buying_cost", 
+  "fieldtype": "Currency", 
+  "permlevel": 1
+ }, 
+ {
+  "no_copy": 1, 
+  "oldfieldtype": "Currency", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Last Purchase Rate", 
+  "oldfieldname": "last_purchase_rate", 
+  "fieldname": "last_purchase_rate", 
+  "fieldtype": "Currency", 
+  "permlevel": 1
+ }, 
+ {
+  "oldfieldtype": "Currency", 
+  "doctype": "DocField", 
+  "label": "Standard Rate", 
+  "oldfieldname": "standard_rate", 
+  "fieldname": "standard_rate", 
+  "fieldtype": "Currency", 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Column Break", 
+  "doctype": "DocField", 
+  "width": "50%", 
+  "fieldname": "column_break2", 
+  "fieldtype": "Column Break", 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Table", 
+  "doctype": "DocField", 
+  "label": "UOM Conversion Details", 
+  "oldfieldname": "uom_conversion_details", 
+  "options": "UOM Conversion Detail", 
+  "fieldname": "uom_conversion_details", 
+  "fieldtype": "Table", 
+  "permlevel": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "label": "Manufacturer", 
+  "fieldname": "manufacturer", 
+  "fieldtype": "Data", 
+  "permlevel": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "label": "Manufacturer Part Number", 
+  "fieldname": "manufacturer_part_no", 
+  "fieldtype": "Data", 
+  "permlevel": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "label": "Item Supplier Details", 
+  "options": "Item Supplier", 
+  "fieldname": "item_supplier_details", 
+  "fieldtype": "Table", 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Section Break", 
+  "doctype": "DocField", 
+  "label": "Sales Details", 
+  "fieldname": "sales_details", 
+  "fieldtype": "Section Break", 
+  "permlevel": 0
+ }, 
+ {
+  "description": "Selecting \"Yes\" will allow this item to figure in Sales Order, Delivery Note", 
+  "default": "Yes", 
+  "oldfieldtype": "Select", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Is Sales Item", 
+  "oldfieldname": "is_sales_item", 
+  "permlevel": 0, 
+  "fieldname": "is_sales_item", 
+  "fieldtype": "Select", 
+  "reqd": 1, 
+  "in_filter": 1, 
+  "options": "\nYes\nNo"
+ }, 
+ {
+  "description": "Select \"Yes\" if this item represents some work like training, designing, consulting etc.", 
+  "default": "No", 
+  "oldfieldtype": "Select", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Is Service Item", 
+  "oldfieldname": "is_service_item", 
+  "permlevel": 0, 
+  "fieldname": "is_service_item", 
+  "fieldtype": "Select", 
+  "reqd": 1, 
+  "in_filter": 1, 
+  "options": "\nYes\nNo"
+ }, 
+ {
+  "description": "Select \"Yes\" if this item is to be sent to a customer or received from a supplier as a sample. Delivery notes and Purchase Receipts will update stock levels but there will be no invoice against this item.", 
+  "default": "No", 
+  "oldfieldtype": "Select", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Allow Samples", 
+  "oldfieldname": "is_sample_item", 
+  "permlevel": 0, 
+  "fieldname": "is_sample_item", 
+  "fieldtype": "Select", 
+  "reqd": 1, 
+  "options": "\nYes\nNo"
+ }, 
+ {
+  "oldfieldtype": "Currency", 
+  "doctype": "DocField", 
+  "label": "Max Discount (%)", 
+  "oldfieldname": "max_discount", 
+  "fieldname": "max_discount", 
+  "fieldtype": "Currency", 
+  "permlevel": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "label": "Default Income Account", 
+  "options": "Account", 
+  "fieldname": "default_income_account", 
+  "fieldtype": "Link", 
+  "permlevel": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "label": "Cost Center", 
+  "options": "Cost Center", 
+  "fieldname": "default_sales_cost_center", 
+  "fieldtype": "Link", 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Currency", 
+  "doctype": "DocField", 
+  "label": "Sales Rate", 
+  "oldfieldname": "sales_rate", 
+  "fieldname": "sales_rate", 
+  "fieldtype": "Currency", 
+  "hidden": 1, 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Column Break", 
+  "doctype": "DocField", 
+  "width": "50%", 
+  "fieldname": "column_break3", 
+  "fieldtype": "Column Break", 
+  "permlevel": 0
+ }, 
+ {
+  "description": "Create a price list from Price List master and enter standard ref rates against each of them. On selection of a price list in Quotation, Sales Order or Delivery Note, corresponding ref rate will be fetched for this item.", 
+  "oldfieldtype": "Table", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Item Prices", 
+  "oldfieldname": "ref_rate_details", 
+  "options": "Item Price", 
+  "fieldname": "ref_rate_details", 
+  "fieldtype": "Table", 
+  "permlevel": 0
+ }, 
+ {
+  "description": "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes", 
+  "doctype": "DocField", 
+  "label": "Customer Codes", 
+  "options": "Item Customer Detail", 
+  "fieldname": "item_customer_details", 
+  "fieldtype": "Table", 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Section Break", 
+  "doctype": "DocField", 
+  "label": "Item Tax", 
+  "fieldname": "item_tax_section_break", 
+  "fieldtype": "Section Break", 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Table", 
+  "doctype": "DocField", 
+  "label": "Item Tax1", 
+  "oldfieldname": "item_tax", 
+  "options": "Item Tax", 
+  "fieldname": "item_tax", 
+  "fieldtype": "Table", 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Section Break", 
+  "doctype": "DocField", 
+  "label": "Inspection Criteria", 
+  "fieldname": "inspection_criteria", 
+  "fieldtype": "Section Break", 
+  "permlevel": 0
+ }, 
+ {
+  "default": "No", 
+  "oldfieldtype": "Select", 
+  "doctype": "DocField", 
+  "label": "Inspection Required", 
+  "oldfieldname": "inspection_required", 
+  "no_copy": 0, 
+  "options": "\nYes\nNo", 
+  "fieldname": "inspection_required", 
+  "fieldtype": "Select", 
+  "reqd": 1, 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Table", 
+  "doctype": "DocField", 
+  "label": "Item Quality Inspection Parameter", 
+  "oldfieldname": "item_specification_details", 
+  "options": "Item Quality Inspection Parameter", 
+  "fieldname": "item_specification_details", 
+  "fieldtype": "Table", 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Section Break", 
+  "doctype": "DocField", 
+  "label": "Manufacturing", 
+  "fieldname": "manufacturing", 
+  "fieldtype": "Section Break", 
+  "permlevel": 0
+ }, 
+ {
+  "description": "Selecting \"Yes\" will allow you to create Bill of Material showing raw material and operational costs incurred to manufacture this item.", 
+  "default": "No", 
+  "oldfieldtype": "Select", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Allow Bill of Materials", 
+  "oldfieldname": "is_manufactured_item", 
+  "permlevel": 0, 
+  "fieldname": "is_manufactured_item", 
+  "fieldtype": "Select", 
+  "reqd": 1, 
+  "options": "\nYes\nNo"
+ }, 
+ {
+  "no_copy": 1, 
+  "oldfieldtype": "Link", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Default BOM", 
+  "oldfieldname": "default_bom", 
+  "options": "BOM", 
+  "fieldname": "default_bom", 
+  "fieldtype": "Link", 
+  "permlevel": 1
+ }, 
+ {
+  "description": "Selecting \"Yes\" will allow you to make a Production Order for this item.", 
+  "default": "No", 
+  "oldfieldtype": "Select", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Allow Production Order", 
+  "oldfieldname": "is_pro_applicable", 
+  "permlevel": 0, 
+  "fieldname": "is_pro_applicable", 
+  "fieldtype": "Select", 
+  "reqd": 1, 
+  "options": "\nYes\nNo"
+ }, 
+ {
+  "description": "Select \"Yes\" if you supply raw materials to your supplier to manufacture this item.", 
+  "default": "No", 
+  "oldfieldtype": "Select", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Is Sub Contracted Item", 
+  "oldfieldname": "is_sub_contracted_item", 
+  "permlevel": 0, 
+  "fieldname": "is_sub_contracted_item", 
+  "fieldtype": "Select", 
+  "reqd": 1, 
+  "options": "\nYes\nNo"
+ }, 
+ {
+  "print_hide": 1, 
+  "no_copy": 1, 
+  "doctype": "DocField", 
+  "label": "File List", 
+  "fieldname": "file_list", 
+  "fieldtype": "Text", 
+  "hidden": 1, 
+  "permlevel": 0
+ }, 
+ {
+  "print_hide": 1, 
+  "no_copy": 1, 
+  "doctype": "DocField", 
+  "label": "Customer Code", 
+  "fieldname": "customer_code", 
+  "fieldtype": "Data", 
+  "hidden": 1, 
+  "permlevel": 0, 
+  "in_filter": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "label": "Website", 
+  "fieldname": "website_section", 
+  "fieldtype": "Section Break", 
+  "permlevel": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "label": "Show in Website", 
+  "fieldname": "show_in_website", 
+  "fieldtype": "Check", 
+  "permlevel": 0
+ }, 
+ {
+  "description": "website page link", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Page Name", 
+  "fieldname": "page_name", 
+  "fieldtype": "Data", 
+  "permlevel": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "label": "Image", 
+  "options": "attach_files:", 
+  "fieldname": "website_image", 
+  "fieldtype": "Select", 
+  "permlevel": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "label": "Short Description", 
+  "fieldname": "web_short_description", 
+  "fieldtype": "Text", 
+  "permlevel": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "label": "Long Description", 
+  "options": "Markdown", 
+  "fieldname": "web_long_description", 
+  "fieldtype": "Code", 
+  "permlevel": 0
+ }, 
+ {
+  "amend": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "submit": 0, 
+  "write": 0, 
+  "cancel": 0, 
+  "role": "Material Manager", 
+  "permlevel": 1
+ }, 
+ {
+  "amend": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "submit": 0, 
+  "write": 0, 
+  "cancel": 0, 
+  "role": "Material Manager", 
+  "permlevel": 0
+ }, 
+ {
+  "amend": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "submit": 0, 
+  "write": 0, 
+  "cancel": 0, 
+  "role": "Material User", 
+  "permlevel": 1
+ }, 
+ {
+  "amend": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "submit": 0, 
+  "write": 0, 
+  "cancel": 0, 
+  "role": "Material User", 
+  "permlevel": 0
+ }, 
+ {
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "write": 1, 
+  "role": "Material Master Manager", 
+  "cancel": 1, 
+  "permlevel": 0
+ }, 
+ {
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "write": 0, 
+  "role": "Material Master Manager", 
+  "permlevel": 1
+ }, 
+ {
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "write": 1, 
+  "role": "System Manager", 
+  "cancel": 1, 
+  "permlevel": 0
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "System Manager", 
+  "permlevel": 1
+ }
 ]
\ No newline at end of file
diff --git a/stock/doctype/purchase_receipt/purchase_receipt.js b/stock/doctype/purchase_receipt/purchase_receipt.js
index 98df864754..3f59d0afe7 100644
--- a/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/stock/doctype/purchase_receipt/purchase_receipt.js
@@ -299,6 +299,6 @@ cur_frm.pformat.purchase_order_no = function(doc, cdt, cdn){
 
 cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
 	if(cint(wn.boot.notification_settings.purchase_receipt)) {
-		cur_frm.email_doc(wn.boot.notification_settings.purchase_receipt);
+		cur_frm.email_doc(wn.boot.notification_settings.purchase_receipt_message);
 	}
 }
diff --git a/stock/doctype/warehouse/warehouse.txt b/stock/doctype/warehouse/warehouse.txt
index c51cfa8955..428910b382 100644
--- a/stock/doctype/warehouse/warehouse.txt
+++ b/stock/doctype/warehouse/warehouse.txt
@@ -1,314 +1,296 @@
-# DocType, Warehouse
 [
-
-	# These values are common in all dictionaries
-	{
-		u'creation': '2012-10-10 12:07:10',
-		u'docstatus': 0,
-		u'modified': '2012-10-25 15:03:49',
-		u'modified_by': u'Administrator',
-		u'owner': u'Administrator'
-	},
-
-	# These values are common for all DocType
-	{
-		'_last_update': u'1319016431',
-		'allow_trash': 1,
-		'autoname': u'field:warehouse_name',
-		'colour': u'White:FFF',
-		'default_print_format': u'Standard',
-		'description': u'A logical Warehouse against which stock entries are made.\n\nThere are two main Warehouse Types that are significant in ERPNext.\n\n1. **Stores:** These are where your incoming **Items** are kept before they are consumed or sold. You can have as many \u201cStores\u201d type **Warehouses** as you wish. Stores type warehouses are significant because if you set an Item for automatic re-order, ERPNext will check its quantities in all \u201cStores\u201d type **Warehouses** when deciding whether to re-order or not.\n\n2. **Asset**: **Items** marked as type \u201cFixed Asset\u201d are maintained in Asset Type **Warehouses**. This helps you separate them for the **Items** that are consumed as a part of your regular operations or \u201cCost of Goods Sold\u201d.\n',
-		u'doctype': u'DocType',
-		'document_type': u'Master',
-		'module': u'Stock',
-		u'name': u'__common__',
-		'search_fields': u'warehouse_type',
-		'section_style': u'Tabbed',
-		'server_code_error': u' ',
-		'show_in_menu': 0,
-		'version': 1
-	},
-
-	# These values are common for all DocField
-	{
-		u'doctype': u'DocField',
-		u'name': u'__common__',
-		'parent': u'Warehouse',
-		'parentfield': u'fields',
-		'parenttype': u'DocType'
-	},
-
-	# These values are common for all DocPerm
-	{
-		u'doctype': u'DocPerm',
-		u'name': u'__common__',
-		'parent': u'Warehouse',
-		'parentfield': u'permissions',
-		'parenttype': u'DocType',
-		'read': 1
-	},
-
-	# DocType, Warehouse
-	{
-		u'doctype': u'DocType',
-		u'name': u'Warehouse'
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'warehouse_detail',
-		'fieldtype': u'Section Break',
-		'label': u'Warehouse Detail',
-		'oldfieldtype': u'Section Break',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'warehouse_name',
-		'fieldtype': u'Data',
-		'label': u'Warehouse Name',
-		'oldfieldname': u'warehouse_name',
-		'oldfieldtype': u'Data',
-		'permlevel': 0,
-		'reqd': 1
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		u'doctype': u'DocField',
-		'fieldname': u'warehouse_type',
-		'fieldtype': u'Link',
-		'label': u'Warehouse Type',
-		'oldfieldname': u'warehouse_type',
-		'oldfieldtype': u'Link',
-		'options': u'Warehouse Type',
-		'permlevel': 0,
-		'reqd': 1
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		u'doctype': u'DocField',
-		'fieldname': u'company',
-		'fieldtype': u'Link',
-		'in_filter': 1,
-		'label': u'Company',
-		'oldfieldname': u'company',
-		'oldfieldtype': u'Link',
-		'options': u'Company',
-		'permlevel': 0,
-		'search_index': 1
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'description': u'For Reference Only.',
-		u'doctype': u'DocField',
-		'fieldname': u'warehouse_contact_info',
-		'fieldtype': u'Section Break',
-		'label': u'Warehouse Contact Info',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'email_id',
-		'fieldtype': u'Data',
-		'hidden': 1,
-		'label': u'Email Id',
-		'oldfieldname': u'email_id',
-		'oldfieldtype': u'Data',
-		'permlevel': 0,
-		'print_hide': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'phone_no',
-		'fieldtype': u'Data',
-		'label': u'Phone No',
-		'oldfieldname': u'phone_no',
-		'oldfieldtype': u'Int',
-		'options': u'Phone',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'mobile_no',
-		'fieldtype': u'Data',
-		'label': u'Mobile No',
-		'oldfieldname': u'mobile_no',
-		'oldfieldtype': u'Int',
-		'options': u'Phone',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'column_break0',
-		'fieldtype': u'Column Break',
-		'oldfieldtype': u'Column Break',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'address_line_1',
-		'fieldtype': u'Data',
-		'label': u'Address Line 1',
-		'oldfieldname': u'address_line_1',
-		'oldfieldtype': u'Data',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'address_line_2',
-		'fieldtype': u'Data',
-		'label': u'Address Line 2',
-		'oldfieldname': u'address_line_2',
-		'oldfieldtype': u'Data',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'city',
-		'fieldtype': u'Data',
-		'label': u'City',
-		'oldfieldname': u'city',
-		'oldfieldtype': u'Data',
-		'permlevel': 0,
-		'reqd': 0
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		u'doctype': u'DocField',
-		'fieldname': u'state',
-		'fieldtype': u'Data',
-		'label': u'State',
-		'oldfieldname': u'state',
-		'oldfieldtype': u'Select',
-		'options': u'Suggest',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'pin',
-		'fieldtype': u'Int',
-		'label': u'PIN',
-		'oldfieldname': u'pin',
-		'oldfieldtype': u'Int',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'colour': u'White:FFF',
-		'description': u'This feature is for merging duplicate warehouses. It will replace all the links of this warehouse by "Merge With" warehouse. After merging you can delete this warehouse, as stock level for this warehouse will be zero.',
-		u'doctype': u'DocField',
-		'fieldname': u'merge_warehouses_section',
-		'fieldtype': u'Section Break',
-		'label': u'Merge Warehouses',
-		'permlevel': 2
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'merge_with',
-		'fieldtype': u'Link',
-		'label': u'Merge With',
-		'options': u'Warehouse',
-		'permlevel': 2
-	},
-
-	# DocField
-	{
-		u'doctype': u'DocField',
-		'fieldname': u'merge',
-		'fieldtype': u'Button',
-		'label': u'Merge',
-		'permlevel': 2
-	},
-
-	# DocPerm
-	{
-		'amend': 0,
-		'cancel': 1,
-		'create': 1,
-		u'doctype': u'DocPerm',
-		'permlevel': 0,
-		'role': u'Material Master Manager',
-		'submit': 0,
-		'write': 1
-	},
-
-	# DocPerm
-	{
-		'cancel': 1,
-		'create': 1,
-		u'doctype': u'DocPerm',
-		'permlevel': 0,
-		'role': u'System Manager',
-		'write': 1
-	},
-
-	# DocPerm
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		u'doctype': u'DocPerm',
-		'permlevel': 0,
-		'role': u'Material Manager',
-		'submit': 0,
-		'write': 0
-	},
-
-	# DocPerm
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		u'doctype': u'DocPerm',
-		'permlevel': 0,
-		'role': u'Material User',
-		'submit': 0,
-		'write': 0
-	},
-
-	# DocPerm
-	{
-		u'doctype': u'DocPerm',
-		'permlevel': 1,
-		'role': u'All'
-	},
-
-	# DocPerm
-	{
-		'create': 0,
-		u'doctype': u'DocPerm',
-		'permlevel': 2,
-		'role': u'System Manager',
-		'write': 1
-	}
+ {
+  "owner": "Administrator", 
+  "docstatus": 0, 
+  "creation": "2012-10-26 14:47:52", 
+  "modified_by": "Administrator", 
+  "modified": "2012-12-03 11:24:31"
+ }, 
+ {
+  "autoname": "field:warehouse_name", 
+  "description": "A logical Warehouse against which stock entries are made.", 
+  "default_print_format": "Standard", 
+  "allow_rename": 1, 
+  "search_fields": "warehouse_type", 
+  "module": "Stock", 
+  "doctype": "DocType", 
+  "document_type": "Master", 
+  "name": "__common__"
+ }, 
+ {
+  "name": "__common__", 
+  "parent": "Warehouse", 
+  "doctype": "DocField", 
+  "parenttype": "DocType", 
+  "parentfield": "fields"
+ }, 
+ {
+  "name": "__common__", 
+  "parent": "Warehouse", 
+  "read": 1, 
+  "doctype": "DocPerm", 
+  "parenttype": "DocType", 
+  "parentfield": "permissions"
+ }, 
+ {
+  "name": "Warehouse", 
+  "doctype": "DocType"
+ }, 
+ {
+  "oldfieldtype": "Section Break", 
+  "doctype": "DocField", 
+  "label": "Warehouse Detail", 
+  "fieldname": "warehouse_detail", 
+  "fieldtype": "Section Break", 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Data", 
+  "doctype": "DocField", 
+  "label": "Warehouse Name", 
+  "oldfieldname": "warehouse_name", 
+  "fieldname": "warehouse_name", 
+  "fieldtype": "Data", 
+  "reqd": 1, 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Link", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Warehouse Type", 
+  "oldfieldname": "warehouse_type", 
+  "options": "Warehouse Type", 
+  "fieldname": "warehouse_type", 
+  "fieldtype": "Link", 
+  "reqd": 1, 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Link", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Company", 
+  "oldfieldname": "company", 
+  "options": "Company", 
+  "fieldname": "company", 
+  "fieldtype": "Link", 
+  "search_index": 1, 
+  "permlevel": 0, 
+  "in_filter": 1
+ }, 
+ {
+  "description": "For Reference Only.", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Warehouse Contact Info", 
+  "fieldname": "warehouse_contact_info", 
+  "fieldtype": "Section Break", 
+  "permlevel": 0
+ }, 
+ {
+  "print_hide": 0, 
+  "oldfieldtype": "Data", 
+  "doctype": "DocField", 
+  "label": "Email Id", 
+  "oldfieldname": "email_id", 
+  "fieldname": "email_id", 
+  "fieldtype": "Data", 
+  "hidden": 1, 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Int", 
+  "doctype": "DocField", 
+  "label": "Phone No", 
+  "oldfieldname": "phone_no", 
+  "options": "Phone", 
+  "fieldname": "phone_no", 
+  "fieldtype": "Data", 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Int", 
+  "doctype": "DocField", 
+  "label": "Mobile No", 
+  "oldfieldname": "mobile_no", 
+  "options": "Phone", 
+  "fieldname": "mobile_no", 
+  "fieldtype": "Data", 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Column Break", 
+  "doctype": "DocField", 
+  "fieldname": "column_break0", 
+  "fieldtype": "Column Break", 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Data", 
+  "doctype": "DocField", 
+  "label": "Address Line 1", 
+  "oldfieldname": "address_line_1", 
+  "fieldname": "address_line_1", 
+  "fieldtype": "Data", 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Data", 
+  "doctype": "DocField", 
+  "label": "Address Line 2", 
+  "oldfieldname": "address_line_2", 
+  "fieldname": "address_line_2", 
+  "fieldtype": "Data", 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Data", 
+  "doctype": "DocField", 
+  "label": "City", 
+  "oldfieldname": "city", 
+  "fieldname": "city", 
+  "fieldtype": "Data", 
+  "reqd": 0, 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Select", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "State", 
+  "oldfieldname": "state", 
+  "options": "Suggest", 
+  "fieldname": "state", 
+  "fieldtype": "Data", 
+  "permlevel": 0
+ }, 
+ {
+  "oldfieldtype": "Int", 
+  "doctype": "DocField", 
+  "label": "PIN", 
+  "oldfieldname": "pin", 
+  "fieldname": "pin", 
+  "fieldtype": "Int", 
+  "permlevel": 0
+ }, 
+ {
+  "description": "This feature is for merging duplicate warehouses. It will replace all the links of this warehouse by \"Merge With\" warehouse. After merging you can delete this warehouse, as stock level for this warehouse will be zero.", 
+  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Merge Warehouses", 
+  "fieldname": "merge_warehouses_section", 
+  "fieldtype": "Section Break", 
+  "permlevel": 2
+ }, 
+ {
+  "doctype": "DocField", 
+  "label": "Merge With", 
+  "options": "Warehouse", 
+  "fieldname": "merge_with", 
+  "fieldtype": "Link", 
+  "permlevel": 2
+ }, 
+ {
+  "doctype": "DocField", 
+  "label": "Merge", 
+  "fieldname": "merge", 
+  "fieldtype": "Button", 
+  "permlevel": 2
+ }, 
+ {
+  "amend": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "submit": 0, 
+  "write": 0, 
+  "cancel": 0, 
+  "role": "Material User", 
+  "permlevel": 2
+ }, 
+ {
+  "amend": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "submit": 0, 
+  "write": 0, 
+  "cancel": 0, 
+  "role": "Material User", 
+  "permlevel": 0
+ }, 
+ {
+  "amend": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "submit": 0, 
+  "write": 0, 
+  "cancel": 0, 
+  "role": "Material User", 
+  "permlevel": 1
+ }, 
+ {
+  "amend": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "submit": 0, 
+  "write": 0, 
+  "cancel": 0, 
+  "role": "Material Manager", 
+  "permlevel": 2
+ }, 
+ {
+  "amend": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "submit": 0, 
+  "write": 0, 
+  "cancel": 0, 
+  "role": "Material Manager", 
+  "permlevel": 0
+ }, 
+ {
+  "amend": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "submit": 0, 
+  "write": 0, 
+  "cancel": 0, 
+  "role": "Material Manager", 
+  "permlevel": 1
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "All", 
+  "permlevel": 1
+ }, 
+ {
+  "amend": 0, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "submit": 0, 
+  "write": 1, 
+  "cancel": 1, 
+  "role": "Material Master Manager", 
+  "permlevel": 0
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "Material Master Manager", 
+  "permlevel": 1
+ }, 
+ {
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "write": 1, 
+  "role": "System Manager", 
+  "cancel": 1, 
+  "permlevel": 0
+ }, 
+ {
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "write": 1, 
+  "role": "System Manager", 
+  "permlevel": 2
+ }
 ]
\ No newline at end of file
diff --git a/utilities/page/messages/messages.py b/utilities/page/messages/messages.py
index 638ecf5a06..a7c7acb6d5 100644
--- a/utilities/page/messages/messages.py
+++ b/utilities/page/messages/messages.py
@@ -24,13 +24,13 @@ def get_list(arg=None):
 	webnotes.form_dict['limit_page_length'] = int(webnotes.form_dict['limit_page_length'])
 	webnotes.form_dict['user'] = webnotes.session['user']
 
+	# set all messages as read
+	webnotes.conn.sql("""UPDATE `tabComment`
+	set docstatus = 1 where comment_doctype in ('My Company', 'Message')
+	and comment_docname = %s
+	""", webnotes.user.name)
+
 	if webnotes.form_dict['contact'] == webnotes.session['user']:
-		# set all messages as read
-		webnotes.conn.sql("""UPDATE `tabComment`
-		set docstatus = 1 where comment_doctype in ('My Company', 'Message')
-		and comment_docname = %s
-		""", webnotes.user.name)
-				
 		# return messages
 		return webnotes.conn.sql("""select * from `tabComment` 
 		where (owner=%(contact)s