diff --git a/accounts/doctype/account/account.txt b/accounts/doctype/account/account.txt
index f97f9c1..7fc9838 100644
--- a/accounts/doctype/account/account.txt
+++ b/accounts/doctype/account/account.txt
@@ -1,350 +1,312 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-19 10:23:33", 
   "docstatus": 0, 
-  "creation": "2013-01-17 12:30:10", 
+  "modified": "2013-01-22 15:05:18", 
   "modified_by": "Administrator", 
-  "modified": "2013-01-17 13:16:31"
+  "owner": "Administrator"
  }, 
  {
-  "in_create": 1, 
-  "allow_rename": 1, 
-  "name": "__common__", 
-  "module": "Accounts", 
-  "doctype": "DocType", 
   "allow_copy": 1, 
-  "search_fields": "debit_or_credit, group_or_ledger", 
+  "allow_rename": 1, 
+  "description": "Heads (or groups) against which Accounting Entries are made and balances are maintained.", 
+  "doctype": "DocType", 
   "document_type": "Master", 
-  "description": "Heads (or groups) against which Accounting Entries are made and balances are maintained."
+  "in_create": 1, 
+  "module": "Accounts", 
+  "name": "__common__", 
+  "search_fields": "debit_or_credit, group_or_ledger"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Account", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Account", 
-  "read": 1, 
-  "submit": 0, 
-  "doctype": "DocPerm", 
+  "parentfield": "fields", 
+  "parenttype": "DocType"
+ }, 
+ {
   "amend": 0, 
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Account", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
+  "read": 1, 
+  "report": 1, 
+  "submit": 0
  }, 
  {
-  "name": "Account", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Account"
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Account Details", 
   "fieldname": "properties", 
   "fieldtype": "Section Break", 
+  "label": "Account Details", 
+  "oldfieldtype": "Section Break", 
   "permlevel": 0
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break0", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "permlevel": 0, 
+  "width": "50%"
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Account Name", 
-  "oldfieldname": "account_name", 
   "fieldname": "account_name", 
   "fieldtype": "Data", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Account Name", 
+  "no_copy": 1, 
+  "oldfieldname": "account_name", 
+  "oldfieldtype": "Data", 
+  "permlevel": 0, 
+  "read_only": 1, 
   "reqd": 1, 
-  "permlevel": 1, 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Int", 
   "doctype": "DocField", 
-  "label": "Level", 
-  "oldfieldname": "level", 
   "fieldname": "level", 
   "fieldtype": "Int", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Level", 
+  "oldfieldname": "level", 
+  "oldfieldtype": "Int", 
+  "permlevel": 0, 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
   "default": "Ledger", 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Group or Ledger", 
-  "oldfieldname": "group_or_ledger", 
-  "options": "\nLedger\nGroup", 
   "fieldname": "group_or_ledger", 
   "fieldtype": "Select", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Group or Ledger", 
+  "oldfieldname": "group_or_ledger", 
+  "oldfieldtype": "Select", 
+  "options": "\nLedger\nGroup", 
+  "permlevel": 0, 
+  "read_only": 1, 
   "reqd": 1, 
-  "permlevel": 1, 
-  "in_filter": 1
+  "search_index": 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
+  "in_filter": 1, 
+  "label": "Debit or Credit", 
+  "oldfieldname": "debit_or_credit", 
+  "oldfieldtype": "Data", 
+  "permlevel": 0, 
+  "read_only": 1, 
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Is PL Account", 
-  "oldfieldname": "is_pl_account", 
-  "permlevel": 1, 
   "fieldname": "is_pl_account", 
   "fieldtype": "Select", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Is PL Account", 
+  "oldfieldname": "is_pl_account", 
+  "oldfieldtype": "Select", 
   "options": "Yes\nNo", 
-  "in_filter": 1
+  "permlevel": 0, 
+  "read_only": 1, 
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Company", 
-  "oldfieldname": "company", 
-  "permlevel": 1, 
   "fieldname": "company", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Company", 
+  "oldfieldname": "company", 
+  "oldfieldtype": "Link", 
   "options": "Company", 
-  "in_filter": 1
+  "permlevel": 0, 
+  "read_only": 1, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "permlevel": 0, 
+  "width": "50%"
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Parent Account", 
-  "oldfieldname": "parent_account", 
-  "permlevel": 0, 
   "fieldname": "parent_account", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "options": "Account"
+  "label": "Parent Account", 
+  "oldfieldname": "parent_account", 
+  "oldfieldtype": "Link", 
+  "options": "Account", 
+  "permlevel": 0, 
+  "search_index": 1
  }, 
  {
   "description": "Setting Account Type helps in selecting this Account in transactions.", 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Account Type", 
-  "oldfieldname": "account_type", 
-  "permlevel": 0, 
   "fieldname": "account_type", 
   "fieldtype": "Select", 
-  "search_index": 0, 
+  "in_filter": 1, 
+  "label": "Account Type", 
+  "oldfieldname": "account_type", 
+  "oldfieldtype": "Select", 
   "options": "\nFixed Asset Account\nBank or Cash\nExpense Account\nTax\nIncome Account\nChargeable", 
-  "in_filter": 1
+  "permlevel": 0, 
+  "search_index": 0
  }, 
  {
   "description": "Rate at which this tax is applied", 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Rate", 
-  "oldfieldname": "tax_rate", 
   "fieldname": "tax_rate", 
   "fieldtype": "Currency", 
-  "reqd": 0, 
   "hidden": 0, 
-  "permlevel": 0
+  "label": "Rate", 
+  "oldfieldname": "tax_rate", 
+  "oldfieldtype": "Currency", 
+  "permlevel": 0, 
+  "reqd": 0
  }, 
  {
   "description": "If the account is frozen, entries are allowed for the \"Account Manager\" only.", 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Frozen", 
-  "oldfieldname": "freeze_account", 
-  "permlevel": 2, 
   "fieldname": "freeze_account", 
   "fieldtype": "Select", 
-  "options": "No\nYes"
+  "label": "Frozen", 
+  "oldfieldname": "freeze_account", 
+  "oldfieldtype": "Select", 
+  "options": "No\nYes", 
+  "permlevel": 2
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Int", 
   "doctype": "DocField", 
-  "label": "Credit Days", 
-  "oldfieldname": "credit_days", 
   "fieldname": "credit_days", 
   "fieldtype": "Int", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Credit Days", 
+  "oldfieldname": "credit_days", 
+  "oldfieldtype": "Int", 
+  "permlevel": 0, 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Credit Limit", 
-  "oldfieldname": "credit_limit", 
   "fieldname": "credit_limit", 
   "fieldtype": "Currency", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Credit Limit", 
+  "oldfieldname": "credit_limit", 
+  "oldfieldtype": "Currency", 
+  "permlevel": 0, 
+  "print_hide": 1
  }, 
  {
   "description": "If this Account represents a Customer, Supplier or Employee, set it here.", 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Master Type", 
-  "oldfieldname": "master_type", 
-  "permlevel": 0, 
   "fieldname": "master_type", 
   "fieldtype": "Select", 
-  "options": "\nSupplier\nCustomer\nEmployee"
+  "label": "Master Type", 
+  "oldfieldname": "master_type", 
+  "oldfieldtype": "Select", 
+  "options": "\nSupplier\nCustomer\nEmployee", 
+  "permlevel": 0
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Master Name", 
-  "oldfieldname": "master_name", 
-  "permlevel": 0, 
   "fieldname": "master_name", 
   "fieldtype": "Link", 
-  "options": "[Select]"
+  "label": "Master Name", 
+  "oldfieldname": "master_name", 
+  "oldfieldtype": "Link", 
+  "options": "[Select]", 
+  "permlevel": 0
  }, 
  {
-  "read_only": 1, 
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Lft", 
   "fieldname": "lft", 
   "fieldtype": "Int", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Lft", 
+  "permlevel": 0, 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "read_only": 1, 
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Rgt", 
   "fieldname": "rgt", 
   "fieldtype": "Int", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Rgt", 
+  "permlevel": 0, 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "read_only": 1, 
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Old Parent", 
   "fieldname": "old_parent", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Old Parent", 
+  "permlevel": 0, 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "report": 1, 
-  "role": "Auditor", 
   "cancel": 0, 
-  "permlevel": 0
- }, 
- {
   "create": 0, 
   "doctype": "DocPerm", 
-  "write": 0, 
+  "permlevel": 0, 
   "role": "Auditor", 
-  "cancel": 0, 
-  "permlevel": 2
+  "write": 1
  }, 
  {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "role": "Auditor", 
   "cancel": 0, 
-  "permlevel": 1
- }, 
- {
   "create": 0, 
   "doctype": "DocPerm", 
-  "write": 0, 
-  "report": 1, 
+  "permlevel": 0, 
   "role": "Sales User", 
-  "cancel": 0, 
-  "permlevel": 0
+  "write": 0
  }, 
  {
+  "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "write": 0, 
-  "report": 1, 
+  "permlevel": 0, 
   "role": "Purchase User", 
-  "cancel": 0, 
-  "permlevel": 0
+  "write": 0
  }, 
  {
+  "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "report": 1, 
+  "permlevel": 0, 
   "role": "Accounts User", 
-  "cancel": 0, 
-  "permlevel": 0
+  "write": 1
  }, 
  {
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "report": 1, 
+  "permlevel": 0, 
   "role": "Accounts Manager", 
-  "cancel": 1, 
-  "permlevel": 0
+  "write": 1
  }, 
  {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "role": "Accounts User", 
   "cancel": 0, 
-  "permlevel": 1
- }, 
- {
   "create": 0, 
   "doctype": "DocPerm", 
-  "write": 0, 
+  "permlevel": 2, 
   "role": "Accounts Manager", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "Accounts Manager", 
-  "cancel": 0, 
-  "permlevel": 2
- }, 
- {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "role": "Accounts User", 
-  "cancel": 0, 
-  "permlevel": 2
+  "write": 1
  }
 ]
\ No newline at end of file
diff --git a/accounts/doctype/bank_reconciliation/bank_reconciliation.txt b/accounts/doctype/bank_reconciliation/bank_reconciliation.txt
index f04cd0a..ac5456d 100644
--- a/accounts/doctype/bank_reconciliation/bank_reconciliation.txt
+++ b/accounts/doctype/bank_reconciliation/bank_reconciliation.txt
@@ -1,113 +1,103 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:05", 
   "docstatus": 0, 
-  "creation": "2012-07-03 13:30:49", 
+  "modified": "2013-01-22 14:55:57", 
   "modified_by": "Administrator", 
-  "modified": "2013-01-10 12:15:49"
+  "owner": "Administrator"
  }, 
  {
-  "allow_print": 1, 
-  "module": "Accounts", 
-  "read_only": 1, 
+  "allow_copy": 1, 
   "allow_email": 1, 
-  "hide_heading": 1, 
-  "issingle": 1, 
-  "name": "__common__", 
+  "allow_print": 1, 
   "doctype": "DocType", 
+  "hide_heading": 1, 
   "hide_toolbar": 1, 
-  "allow_copy": 1
+  "issingle": 1, 
+  "module": "Accounts", 
+  "name": "__common__", 
+  "read_only": 1
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Bank Reconciliation", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
   "amend": 0, 
+  "cancel": 0, 
+  "create": 1, 
+  "doctype": "DocPerm", 
   "name": "__common__", 
   "parent": "Bank Reconciliation", 
-  "read": 1, 
-  "submit": 0, 
-  "doctype": "DocPerm", 
-  "cancel": 0, 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
+  "permlevel": 0, 
+  "read": 1, 
+  "report": 1, 
+  "role": "Accounts User", 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "name": "Bank Reconciliation", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Bank Reconciliation"
  }, 
  {
   "description": "Select account head of the bank where cheque was deposited.", 
   "doctype": "DocField", 
-  "label": "Bank Account", 
-  "options": "Account", 
   "fieldname": "bank_account", 
   "fieldtype": "Link", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Bank Account", 
+  "options": "Account", 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "From Date", 
   "fieldname": "from_date", 
   "fieldtype": "Date", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "From Date", 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "To Date", 
   "fieldname": "to_date", 
   "fieldtype": "Date", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "To Date", 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Get Non Reconciled Entries", 
-  "options": "get_details", 
   "fieldname": "get_non_reconciled_entries", 
   "fieldtype": "Button", 
-  "permlevel": 0
+  "label": "Get Non Reconciled Entries", 
+  "options": "get_details"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Entries", 
-  "options": "Bank Reconciliation Detail", 
   "fieldname": "entries", 
   "fieldtype": "Table", 
-  "permlevel": 0
+  "label": "Entries", 
+  "options": "Bank Reconciliation Detail"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Update Clearance Date", 
-  "options": "update_details", 
   "fieldname": "update_clearance_date", 
   "fieldtype": "Button", 
-  "permlevel": 0
+  "label": "Update Clearance Date", 
+  "options": "update_details"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Total Amount", 
   "fieldname": "total_amount", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Total Amount", 
+  "read_only": 1
  }, 
  {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "Accounts User", 
-  "permlevel": 0
- }, 
- {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "role": "All", 
-  "permlevel": 1
+  "doctype": "DocPerm"
  }
 ]
\ No newline at end of file
diff --git a/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt b/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
index cc3bb68..781a4c8 100644
--- a/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
+++ b/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
@@ -1,106 +1,101 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:05", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:35:41", 
+  "modified": "2013-01-22 14:16:42", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:35:41"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Tray", 
-  "istable": 1, 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "module": "Accounts", 
   "doctype": "DocType", 
-  "version": 5, 
-  "show_in_menu": 0
+  "istable": 1, 
+  "module": "Accounts", 
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
-  "parent": "Bank Reconciliation Detail", 
   "no_copy": 0, 
-  "search_index": 0, 
-  "doctype": "DocField", 
+  "parent": "Bank Reconciliation Detail", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
-  "name": "Bank Reconciliation Detail", 
-  "doctype": "DocType"
- }, 
- {
-  "oldfieldtype": "Link", 
-  "doctype": "DocField", 
-  "label": "Voucher ID", 
-  "oldfieldname": "voucher_id", 
   "permlevel": 0, 
+  "search_index": 0
+ }, 
+ {
+  "doctype": "DocType", 
+  "name": "Bank Reconciliation Detail"
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "voucher_id", 
   "fieldtype": "Link", 
+  "label": "Voucher ID", 
+  "oldfieldname": "voucher_id", 
+  "oldfieldtype": "Link", 
   "options": "Journal Voucher"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Against Account", 
-  "oldfieldname": "against_account", 
   "fieldname": "against_account", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Against Account", 
+  "oldfieldname": "against_account", 
+  "oldfieldtype": "Data", 
+  "read_only": 1
  }, 
  {
   "description": "The date at which current entry will get or has actually executed.", 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Posting Date", 
-  "oldfieldname": "posting_date", 
   "fieldname": "posting_date", 
   "fieldtype": "Date", 
-  "permlevel": 1
+  "label": "Posting Date", 
+  "oldfieldname": "posting_date", 
+  "oldfieldtype": "Date", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Cheque Number", 
-  "oldfieldname": "cheque_number", 
   "fieldname": "cheque_number", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Cheque Number", 
+  "oldfieldname": "cheque_number", 
+  "oldfieldtype": "Data", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Cheque Date", 
-  "oldfieldname": "cheque_date", 
   "fieldname": "cheque_date", 
   "fieldtype": "Date", 
-  "permlevel": 1
+  "label": "Cheque Date", 
+  "oldfieldname": "cheque_date", 
+  "oldfieldtype": "Date", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Debit", 
-  "oldfieldname": "debit", 
   "fieldname": "debit", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Debit", 
+  "oldfieldname": "debit", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Credit", 
-  "oldfieldname": "credit", 
   "fieldname": "credit", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Credit", 
+  "oldfieldname": "credit", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Clearance Date", 
-  "oldfieldname": "clearance_date", 
   "fieldname": "clearance_date", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "Clearance Date", 
+  "oldfieldname": "clearance_date", 
+  "oldfieldtype": "Date"
  }
 ]
\ No newline at end of file
diff --git a/accounts/doctype/budget_detail/budget_detail.txt b/accounts/doctype/budget_detail/budget_detail.txt
index 7e28e81..6d0f31b 100644
--- a/accounts/doctype/budget_detail/budget_detail.txt
+++ b/accounts/doctype/budget_detail/budget_detail.txt
@@ -1,77 +1,70 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:05", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:35:41", 
+  "modified": "2013-01-22 14:18:30", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:35:41"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Tray", 
-  "istable": 1, 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "module": "Accounts", 
-  "doctype": "DocType", 
-  "version": 6, 
   "autoname": "CBD/.######", 
-  "show_in_menu": 0
+  "doctype": "DocType", 
+  "istable": 1, 
+  "module": "Accounts", 
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Budget Detail", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
-  "name": "Budget Detail", 
-  "doctype": "DocType"
- }, 
- {
-  "search_index": 1, 
-  "doctype": "DocField", 
-  "label": "Account", 
-  "oldfieldname": "account", 
-  "trigger": "Client", 
-  "fieldname": "account", 
-  "fieldtype": "Link", 
-  "oldfieldtype": "Link", 
-  "reqd": 1, 
-  "options": "Account", 
-  "permlevel": 0, 
-  "in_filter": 1
- }, 
- {
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Budget Allocated", 
-  "oldfieldname": "budget_allocated", 
-  "fieldname": "budget_allocated", 
-  "fieldtype": "Currency", 
-  "reqd": 1, 
   "permlevel": 0
  }, 
  {
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Actual", 
-  "oldfieldname": "actual", 
-  "fieldname": "actual", 
-  "fieldtype": "Currency", 
-  "permlevel": 1
+  "doctype": "DocType", 
+  "name": "Budget Detail"
  }, 
  {
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "Fiscal Year", 
-  "oldfieldname": "fiscal_year", 
-  "options": "link:Fiscal Year", 
+  "fieldname": "account", 
+  "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Account", 
+  "oldfieldname": "account", 
+  "oldfieldtype": "Link", 
+  "options": "Account", 
+  "reqd": 1, 
+  "search_index": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "budget_allocated", 
+  "fieldtype": "Currency", 
+  "label": "Budget Allocated", 
+  "oldfieldname": "budget_allocated", 
+  "oldfieldtype": "Currency", 
+  "reqd": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "actual", 
+  "fieldtype": "Currency", 
+  "label": "Actual", 
+  "oldfieldname": "actual", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "fiscal_year", 
   "fieldtype": "Select", 
+  "in_filter": 1, 
+  "label": "Fiscal Year", 
+  "oldfieldname": "fiscal_year", 
   "oldfieldtype": "Select", 
+  "options": "link:Fiscal Year", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 1
  }
 ]
\ No newline at end of file
diff --git a/accounts/doctype/budget_distribution/budget_distribution.txt b/accounts/doctype/budget_distribution/budget_distribution.txt
index c2105c6..d2b9cbe 100644
--- a/accounts/doctype/budget_distribution/budget_distribution.txt
+++ b/accounts/doctype/budget_distribution/budget_distribution.txt
@@ -1,131 +1,105 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:05", 
   "docstatus": 0, 
-  "creation": "2012-07-03 13:30:50", 
+  "modified": "2013-01-22 14:55:58", 
   "modified_by": "Administrator", 
-  "modified": "2012-07-11 14:37:30"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
-  "description": "**Budget Distribution** helps you distribute your budget across months if you have seasonality in your business.\n\nTo distribute a budget using this distribution, set this **Budget Distribution** in the **Cost Center**", 
-  "module": "Accounts", 
-  "allow_trash": 1, 
   "autoname": "field:distribution_id", 
-  "show_in_menu": 0, 
-  "name": "__common__", 
-  "colour": "White:FFF", 
+  "description": "**Budget Distribution** helps you distribute your budget across months if you have seasonality in your business.\n\nTo distribute a budget using this distribution, set this **Budget Distribution** in the **Cost Center**", 
   "doctype": "DocType", 
-  "server_code_error": " ", 
-  "name_case": "Title Case", 
-  "version": 1
+  "module": "Accounts", 
+  "name": "__common__", 
+  "name_case": "Title Case"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Budget Distribution", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Budget Distribution", 
-  "read": 1, 
-  "doctype": "DocPerm", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Budget Distribution", 
-  "doctype": "DocType"
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "cancel": 1, 
-  "role": "System Manager", 
-  "report": 1, 
   "permlevel": 0
  }, 
  {
-  "write": 1, 
-  "role": "System Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "System Manager", 
-  "permlevel": 2, 
-  "doctype": "DocPerm"
- }, 
- {
-  "amend": 0, 
-  "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 1, 
+  "name": "__common__", 
+  "parent": "Budget Distribution", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
+  "read": 1, 
   "report": 1, 
-  "role": "Accounts Manager", 
-  "cancel": 1, 
-  "permlevel": 0
+  "submit": 0
  }, 
  {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 1, 
-  "role": "Accounts Manager", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "role": "Accounts Manager", 
-  "permlevel": 2, 
-  "doctype": "DocPerm"
+  "doctype": "DocType", 
+  "name": "Budget Distribution"
  }, 
  {
   "description": "Name of the Budget Distribution", 
-  "oldfieldtype": "Data", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Distribution Name", 
-  "oldfieldname": "distribution_id", 
   "fieldname": "distribution_id", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Distribution Name", 
+  "oldfieldname": "distribution_id", 
+  "oldfieldtype": "Data", 
+  "reqd": 1
  }, 
  {
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "Fiscal Year", 
-  "oldfieldname": "fiscal_year", 
-  "options": "link:Fiscal Year", 
   "fieldname": "fiscal_year", 
   "fieldtype": "Select", 
+  "in_filter": 1, 
+  "label": "Fiscal Year", 
+  "oldfieldname": "fiscal_year", 
   "oldfieldtype": "Select", 
-  "permlevel": 0, 
-  "in_filter": 1
+  "options": "link:Fiscal Year", 
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "Budget Distribution Details", 
-  "oldfieldname": "budget_distribution_details", 
-  "options": "Budget Distribution Detail", 
   "fieldname": "budget_distribution_details", 
   "fieldtype": "Table", 
-  "permlevel": 0
+  "label": "Budget Distribution Details", 
+  "oldfieldname": "budget_distribution_details", 
+  "oldfieldtype": "Table", 
+  "options": "Budget Distribution Detail"
  }, 
  {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Trash Reason", 
-  "oldfieldname": "trash_reason", 
   "fieldname": "trash_reason", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Trash Reason", 
+  "oldfieldname": "trash_reason", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1
+ }, 
+ {
+  "cancel": 1, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "permlevel": 0, 
+  "role": "System Manager", 
+  "write": 1
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "permlevel": 2, 
+  "role": "System Manager"
+ }, 
+ {
+  "amend": 0, 
+  "cancel": 1, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "permlevel": 0, 
+  "role": "Accounts Manager", 
+  "write": 1
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "permlevel": 2, 
+  "role": "Accounts Manager"
  }
 ]
\ No newline at end of file
diff --git a/accounts/doctype/budget_distribution_detail/budget_distribution_detail.txt b/accounts/doctype/budget_distribution_detail/budget_distribution_detail.txt
index 5c7d099..0f11876 100644
--- a/accounts/doctype/budget_distribution_detail/budget_distribution_detail.txt
+++ b/accounts/doctype/budget_distribution_detail/budget_distribution_detail.txt
@@ -1,51 +1,46 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:05", 
   "docstatus": 0, 
-  "creation": "2012-07-03 13:30:47", 
+  "modified": "2013-01-22 14:41:34", 
   "modified_by": "Administrator", 
-  "modified": "2012-07-11 14:32:16"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Tray", 
+  "autoname": "BDD/.#####", 
+  "doctype": "DocType", 
   "istable": 1, 
   "module": "Accounts", 
-  "server_code_error": " ", 
-  "doctype": "DocType", 
-  "autoname": "BDD/.#####", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "show_in_menu": 0, 
-  "version": 1
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Budget Distribution Detail", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "name": "Budget Distribution Detail", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Budget Distribution Detail"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Month", 
-  "oldfieldname": "month", 
   "fieldname": "month", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 2
+  "label": "Month", 
+  "oldfieldname": "month", 
+  "oldfieldtype": "Data", 
+  "read_only": 1, 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "percentage_allocation", 
+  "fieldtype": "Float", 
   "label": "Percentage Allocation", 
   "oldfieldname": "percentage_allocation", 
-  "fieldname": "percentage_allocation", 
-  "fieldtype": "Currency", 
-  "permlevel": 0
+  "oldfieldtype": "Currency"
  }
 ]
\ No newline at end of file
diff --git a/accounts/doctype/c_form/c_form.txt b/accounts/doctype/c_form/c_form.txt
index 2cf43a3..60e69db 100644
--- a/accounts/doctype/c_form/c_form.txt
+++ b/accounts/doctype/c_form/c_form.txt
@@ -1,195 +1,184 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-19 10:23:34", 
   "docstatus": 0, 
-  "creation": "2012-07-03 13:29:54", 
+  "modified": "2013-01-22 14:55:58", 
   "modified_by": "Administrator", 
-  "modified": "2013-01-18 12:57:44"
+  "owner": "Administrator"
  }, 
  {
-  "autoname": "naming_series:", 
   "allow_attach": 1, 
-  "is_submittable": 1, 
+  "autoname": "naming_series:", 
   "doctype": "DocType", 
-  "module": "Accounts", 
+  "is_submittable": 1, 
   "max_attachments": 3, 
+  "module": "Accounts", 
   "name": "__common__"
  }, 
  {
-  "read_only": 0, 
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "C-Form", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "name": "__common__", 
-  "parent": "C-Form", 
-  "read": 1, 
-  "submit": 0, 
+  "create": 1, 
   "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "C-Form", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
+  "permlevel": 0, 
+  "read": 1, 
   "report": 1, 
-  "parentfield": "permissions"
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "name": "C-Form", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "C-Form"
  }, 
  {
-  "print_width": "50%", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break0", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "print_width": "50%", 
+  "read_only": 0, 
+  "width": "50%"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Series", 
-  "options": "\nC-FORM/", 
   "fieldname": "naming_series", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Series", 
+  "options": "\nC-FORM/", 
+  "read_only": 0, 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "C-Form No", 
   "fieldname": "c_form_no", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "C-Form No", 
+  "read_only": 0, 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Received Date", 
   "fieldname": "received_date", 
   "fieldtype": "Date", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Received Date", 
+  "read_only": 0, 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Customer", 
-  "options": "Customer", 
   "fieldname": "customer", 
   "fieldtype": "Link", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Customer", 
+  "options": "Customer", 
+  "read_only": 0, 
+  "reqd": 1
  }, 
  {
-  "print_width": "50%", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "print_width": "50%", 
+  "read_only": 0, 
+  "width": "50%"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Company", 
-  "options": "link:Company", 
   "fieldname": "company", 
   "fieldtype": "Select", 
-  "permlevel": 0
+  "label": "Company", 
+  "options": "link:Company", 
+  "read_only": 0
  }, 
  {
   "doctype": "DocField", 
-  "label": "Fiscal Year", 
-  "options": "link:Fiscal Year", 
   "fieldname": "fiscal_year", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Fiscal Year", 
+  "options": "link:Fiscal Year", 
+  "read_only": 0, 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Quarter", 
-  "options": "\nI\nII\nIII\nIV", 
   "fieldname": "quarter", 
   "fieldtype": "Select", 
-  "permlevel": 0
+  "label": "Quarter", 
+  "options": "\nI\nII\nIII\nIV", 
+  "read_only": 0
  }, 
  {
   "doctype": "DocField", 
-  "label": "Total Amount", 
   "fieldname": "total_amount", 
   "fieldtype": "Currency", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Total Amount", 
+  "read_only": 0, 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "State", 
-  "options": "link:State\ncountry='India'", 
   "fieldname": "state", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "State", 
+  "options": "link:State\ncountry='India'", 
+  "read_only": 0, 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "section_break0", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "read_only": 0
  }, 
  {
   "doctype": "DocField", 
-  "label": "Invoice Details", 
-  "options": "C-Form Invoice Detail", 
   "fieldname": "invoice_details", 
   "fieldtype": "Table", 
-  "permlevel": 0
+  "label": "Invoice Details", 
+  "options": "C-Form Invoice Detail", 
+  "read_only": 0
  }, 
  {
-  "print_hide": 0, 
   "doctype": "DocField", 
-  "label": "Total Invoiced Amount", 
   "fieldname": "total_invoiced_amount", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Total Invoiced Amount", 
+  "print_hide": 0, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "File List", 
   "fieldname": "file_list", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "File List", 
+  "print_hide": 1, 
+  "read_only": 0
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Amended From", 
-  "options": "Sales Invoice", 
   "fieldname": "amended_from", 
   "fieldtype": "Link", 
-  "permlevel": 1
+  "label": "Amended From", 
+  "no_copy": 1, 
+  "options": "Sales Invoice", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "Accounts User", 
-  "permlevel": 0
+  "role": "Accounts User"
  }, 
  {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "Accounts Manager", 
-  "permlevel": 0
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "role": "All", 
-  "cancel": 0, 
-  "permlevel": 1
+  "role": "Accounts Manager"
  }
 ]
\ No newline at end of file
diff --git a/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.txt b/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.txt
index d61d32c..6eb7b6d 100644
--- a/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.txt
+++ b/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.txt
@@ -1,72 +1,68 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:06", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:35:41", 
+  "modified": "2013-01-22 14:18:52", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:35:41"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
-  "istable": 1, 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "module": "Accounts", 
   "doctype": "DocType", 
-  "version": 5, 
-  "show_in_menu": 0
+  "istable": 1, 
+  "module": "Accounts", 
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "C-Form Invoice Detail", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
-  "name": "C-Form Invoice Detail", 
-  "doctype": "DocType"
- }, 
- {
-  "doctype": "DocField", 
-  "label": "Invoice No", 
-  "width": "160px", 
-  "options": "Sales Invoice", 
-  "fieldname": "invoice_no", 
-  "fieldtype": "Link", 
   "permlevel": 0
  }, 
  {
+  "doctype": "DocType", 
+  "name": "C-Form Invoice Detail"
+ }, 
+ {
   "doctype": "DocField", 
-  "label": "Invoice Date", 
-  "width": "120px", 
+  "fieldname": "invoice_no", 
+  "fieldtype": "Link", 
+  "label": "Invoice No", 
+  "options": "Sales Invoice", 
+  "width": "160px"
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "invoice_date", 
   "fieldtype": "Date", 
-  "permlevel": 1
+  "label": "Invoice Date", 
+  "read_only": 1, 
+  "width": "120px"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Territory", 
-  "width": "120px", 
-  "options": "Territory", 
   "fieldname": "territory", 
   "fieldtype": "Link", 
-  "permlevel": 1
+  "label": "Territory", 
+  "options": "Territory", 
+  "read_only": 1, 
+  "width": "120px"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Net Total", 
-  "width": "120px", 
   "fieldname": "net_total", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Net Total", 
+  "read_only": 1, 
+  "width": "120px"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Grand Total", 
-  "width": "120px", 
   "fieldname": "grand_total", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Grand Total", 
+  "read_only": 1, 
+  "width": "120px"
  }
 ]
\ No newline at end of file
diff --git a/accounts/doctype/cost_center/cost_center.txt b/accounts/doctype/cost_center/cost_center.txt
index 4b5c6c6..00902d6 100644
--- a/accounts/doctype/cost_center/cost_center.txt
+++ b/accounts/doctype/cost_center/cost_center.txt
@@ -1,264 +1,213 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:06", 
   "docstatus": 0, 
-  "creation": "2012-07-12 23:29:41", 
+  "modified": "2013-01-22 14:55:59", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-06 12:12:46"
+  "owner": "Administrator"
  }, 
  {
+  "allow_copy": 1, 
+  "allow_rename": 1, 
+  "autoname": "field:cost_center_name", 
   "description": "Track separate Income and Expense for product verticals or divisions.", 
-  "search_fields": "name,parent_cost_center", 
-  "module": "Accounts", 
+  "doctype": "DocType", 
   "document_type": "Master", 
   "in_create": 1, 
-  "autoname": "field:cost_center_name", 
+  "module": "Accounts", 
   "name": "__common__", 
-  "allow_rename": 1, 
-  "doctype": "DocType", 
-  "allow_copy": 1
- }, 
- {
-  "name": "__common__", 
-  "parent": "Cost Center", 
-  "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
-  "name": "__common__", 
-  "parent": "Cost Center", 
-  "read": 1, 
-  "doctype": "DocPerm", 
-  "parenttype": "DocType", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Cost Center", 
-  "doctype": "DocType"
+  "search_fields": "name,parent_cost_center"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Cost Center Details", 
-  "fieldname": "sb0", 
-  "fieldtype": "Section Break", 
+  "name": "__common__", 
+  "parent": "Cost Center", 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
   "permlevel": 0
  }, 
  {
-  "oldfieldtype": "Small Text", 
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Cost Center", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
+  "permlevel": 0, 
+  "read": 1, 
+  "report": 1, 
+  "submit": 0
+ }, 
+ {
+  "doctype": "DocType", 
+  "name": "Cost Center"
+ }, 
+ {
   "doctype": "DocField", 
-  "label": "Trash Reason", 
-  "oldfieldname": "trash_reason", 
+  "fieldname": "sb0", 
+  "fieldtype": "Section Break", 
+  "label": "Cost Center Details"
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "trash_reason", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Trash Reason", 
+  "oldfieldname": "trash_reason", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Cost Center Name", 
-  "oldfieldname": "cost_center_name", 
   "fieldname": "cost_center_name", 
   "fieldtype": "Data", 
-  "search_index": 0, 
+  "in_filter": 0, 
+  "label": "Cost Center Name", 
+  "no_copy": 1, 
+  "oldfieldname": "cost_center_name", 
+  "oldfieldtype": "Data", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 0
+  "search_index": 0
  }, 
  {
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Parent Cost Center", 
-  "oldfieldname": "parent_cost_center", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "parent_cost_center", 
   "fieldtype": "Link", 
-  "reqd": 1, 
-  "options": "Cost Center"
+  "label": "Parent Cost Center", 
+  "oldfieldname": "parent_cost_center", 
+  "oldfieldtype": "Link", 
+  "options": "Cost Center", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Company", 
-  "oldfieldname": "company_name", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "company_name", 
   "fieldtype": "Link", 
-  "reqd": 1, 
-  "options": "Company"
+  "label": "Company", 
+  "oldfieldname": "company_name", 
+  "oldfieldtype": "Link", 
+  "options": "Company", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Data", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Company Abbr", 
-  "oldfieldname": "company_abbr", 
   "fieldname": "company_abbr", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Company Abbr", 
+  "oldfieldname": "company_abbr", 
+  "oldfieldtype": "Data", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "cb0", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Group or Ledger", 
-  "oldfieldname": "group_or_ledger", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "group_or_ledger", 
   "fieldtype": "Select", 
-  "reqd": 1, 
   "hidden": 0, 
+  "label": "Group or Ledger", 
+  "no_copy": 1, 
+  "oldfieldname": "group_or_ledger", 
+  "oldfieldtype": "Select", 
   "options": "\nGroup\nLedger", 
-  "report_hide": 1
+  "print_hide": 1, 
+  "report_hide": 1, 
+  "reqd": 1
  }, 
  {
   "description": "Define Budget for this Cost Center. To set budget action, see <a href=\"#!List/Company\">Company Master</a>", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Budget", 
   "fieldname": "sb1", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Budget"
  }, 
  {
   "description": "Select Budget Distribution, if you want to track based on seasonality.", 
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Distribution Id", 
-  "oldfieldname": "distribution_id", 
-  "permlevel": 0, 
   "fieldname": "distribution_id", 
   "fieldtype": "Link", 
+  "label": "Distribution Id", 
+  "oldfieldname": "distribution_id", 
+  "oldfieldtype": "Link", 
   "options": "Budget Distribution"
  }, 
  {
   "description": "Add rows to set annual budgets on Accounts.", 
-  "oldfieldtype": "Table", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Budget Details", 
-  "oldfieldname": "budget_details", 
-  "permlevel": 0, 
   "fieldname": "budget_details", 
   "fieldtype": "Table", 
+  "label": "Budget Details", 
+  "oldfieldname": "budget_details", 
+  "oldfieldtype": "Table", 
   "options": "Budget Detail"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Int", 
   "doctype": "DocField", 
-  "label": "lft", 
-  "oldfieldname": "lft", 
   "fieldname": "lft", 
   "fieldtype": "Int", 
-  "search_index": 1, 
   "hidden": 1, 
-  "permlevel": 0, 
+  "in_filter": 1, 
+  "label": "lft", 
+  "no_copy": 1, 
+  "oldfieldname": "lft", 
+  "oldfieldtype": "Int", 
+  "print_hide": 1, 
   "report_hide": 1, 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Int", 
   "doctype": "DocField", 
-  "label": "rgt", 
-  "oldfieldname": "rgt", 
   "fieldname": "rgt", 
   "fieldtype": "Int", 
-  "search_index": 1, 
-  "reqd": 0, 
   "hidden": 1, 
-  "permlevel": 0, 
+  "in_filter": 1, 
+  "label": "rgt", 
+  "no_copy": 1, 
+  "oldfieldname": "rgt", 
+  "oldfieldtype": "Int", 
+  "print_hide": 1, 
   "report_hide": 1, 
-  "in_filter": 1
+  "reqd": 0, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "old_parent", 
-  "oldfieldname": "old_parent", 
-  "options": "Cost Center", 
   "fieldname": "old_parent", 
   "fieldtype": "Link", 
   "hidden": 1, 
-  "permlevel": 0, 
+  "label": "old_parent", 
+  "no_copy": 1, 
+  "oldfieldname": "old_parent", 
+  "oldfieldtype": "Data", 
+  "options": "Cost Center", 
+  "print_hide": 1, 
   "report_hide": 1
  }, 
  {
   "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Accounts Manager", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "amend": 0, 
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 1, 
-  "report": 1, 
   "role": "Accounts Manager", 
+  "write": 1
+ }, 
+ {
+  "amend": 0, 
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "role": "Accounts User", 
+  "write": 0
+ }, 
+ {
   "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Accounts User", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "report": 1, 
-  "role": "Accounts User", 
-  "cancel": 0, 
-  "permlevel": 0
- }, 
- {
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "cancel": 1, 
   "role": "System Manager", 
-  "report": 1, 
-  "permlevel": 0
- }, 
- {
-  "role": "All", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
+  "write": 1
  }
 ]
\ No newline at end of file
diff --git a/accounts/doctype/fiscal_year/fiscal_year.txt b/accounts/doctype/fiscal_year/fiscal_year.txt
index 51f3221..18f20dd 100644
--- a/accounts/doctype/fiscal_year/fiscal_year.txt
+++ b/accounts/doctype/fiscal_year/fiscal_year.txt
@@ -1,110 +1,95 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:06", 
   "docstatus": 0, 
-  "creation": "2012-07-03 13:30:47", 
+  "modified": "2013-01-22 14:46:59", 
   "modified_by": "Administrator", 
-  "modified": "2012-07-11 14:56:41"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Tabbed", 
-  "description": "**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.", 
-  "module": "Accounts", 
-  "server_code_error": " ", 
-  "allow_trash": 1, 
   "autoname": "field:year", 
-  "document_type": "Master", 
-  "_last_update": "1322549700", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
+  "description": "**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.", 
   "doctype": "DocType", 
-  "show_in_menu": 0, 
-  "version": 1
+  "document_type": "Master", 
+  "module": "Accounts", 
+  "name": "__common__"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Fiscal Year", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
-  "report": 1, 
   "name": "__common__", 
   "parent": "Fiscal Year", 
-  "read": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "role": "System Manager", 
-  "cancel": 1, 
-  "permlevel": 0, 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Fiscal Year", 
-  "doctype": "DocType"
+  "permlevel": 0
  }, 
  {
   "amend": 0, 
+  "cancel": 1, 
+  "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 0
+  "name": "__common__", 
+  "parent": "Fiscal Year", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
+  "permlevel": 0, 
+  "read": 1, 
+  "report": 1, 
+  "role": "System Manager", 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "doctype": "DocPerm"
+  "doctype": "DocType", 
+  "name": "Fiscal Year"
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Fiscal Year Details", 
   "fieldname": "year_details", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Fiscal Year Details", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Trash Reason", 
-  "oldfieldname": "trash_reason", 
   "fieldname": "trash_reason", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Trash Reason", 
+  "oldfieldname": "trash_reason", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1
  }, 
  {
   "description": "For e.g. 2012, 2012-13", 
-  "oldfieldtype": "Data", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Year Name", 
-  "oldfieldname": "year", 
   "fieldname": "year", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Year Name", 
+  "oldfieldname": "year", 
+  "oldfieldtype": "Data", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Year Start Date", 
-  "oldfieldname": "year_start_date", 
   "fieldname": "year_start_date", 
   "fieldtype": "Date", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Year Start Date", 
+  "oldfieldname": "year_start_date", 
+  "oldfieldtype": "Date", 
+  "reqd": 1
  }, 
  {
-  "description": "Entries are not allowed against this Fiscal Year if the year is closed.", 
   "default": "No", 
-  "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
+  "description": "Entries are not allowed against this Fiscal Year if the year is closed.", 
   "doctype": "DocField", 
-  "label": "Year Closed", 
-  "oldfieldname": "is_fiscal_year_closed", 
-  "permlevel": 0, 
   "fieldname": "is_fiscal_year_closed", 
   "fieldtype": "Select", 
-  "reqd": 0, 
-  "options": "\nNo\nYes"
+  "label": "Year Closed", 
+  "oldfieldname": "is_fiscal_year_closed", 
+  "oldfieldtype": "Select", 
+  "options": "\nNo\nYes", 
+  "reqd": 0
+ }, 
+ {
+  "doctype": "DocPerm"
  }
 ]
\ No newline at end of file
diff --git a/accounts/doctype/journal_voucher/journal_voucher.txt b/accounts/doctype/journal_voucher/journal_voucher.txt
index 09c6148..d1ee1db 100644
--- a/accounts/doctype/journal_voucher/journal_voucher.txt
+++ b/accounts/doctype/journal_voucher/journal_voucher.txt
@@ -1,524 +1,462 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-19 10:23:34", 
   "docstatus": 0, 
-  "creation": "2013-01-18 10:46:42", 
+  "modified": "2013-01-22 14:56:03", 
   "modified_by": "Administrator", 
-  "modified": "2013-01-18 17:44:58"
+  "owner": "Administrator"
  }, 
  {
   "autoname": "naming_series:", 
-  "name": "__common__", 
-  "is_submittable": 1, 
-  "search_fields": "voucher_type,posting_date, due_date, cheque_no", 
-  "module": "Accounts", 
   "doctype": "DocType", 
-  "read_only_onload": 1
+  "is_submittable": 1, 
+  "module": "Accounts", 
+  "name": "__common__", 
+  "read_only_onload": 1, 
+  "search_fields": "voucher_type,posting_date, due_date, cheque_no"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Journal Voucher", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Journal Voucher", 
-  "read": 1, 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
   "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Journal Voucher", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "report": 1, 
-  "parentfield": "permissions"
+  "permlevel": 0, 
+  "read": 1, 
+  "report": 1
  }, 
  {
-  "name": "Journal Voucher", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Journal Voucher"
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break0", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
   "description": "To manage multiple series please go to Setup > Manage Series", 
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Series", 
-  "oldfieldname": "naming_series", 
-  "permlevel": 0, 
   "fieldname": "naming_series", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "options": "JV"
+  "label": "Series", 
+  "no_copy": 1, 
+  "oldfieldname": "naming_series", 
+  "oldfieldtype": "Select", 
+  "options": "JV", 
+  "print_hide": 1, 
+  "reqd": 1
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Voucher Type", 
-  "oldfieldname": "voucher_type", 
-  "options": "\nJournal Entry\nBank Voucher\nCash Voucher\nCredit Card Voucher\nDebit Note\nCredit Note\nContra Voucher\nExcise Voucher\nWrite Off Voucher", 
   "fieldname": "voucher_type", 
   "fieldtype": "Select", 
-  "search_index": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Voucher Type", 
+  "oldfieldname": "voucher_type", 
+  "oldfieldtype": "Select", 
+  "options": "\nJournal Entry\nBank Voucher\nCash Voucher\nCredit Card Voucher\nDebit Note\nCredit Note\nContra Voucher\nExcise Voucher\nWrite Off Voucher", 
+  "print_hide": 0, 
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
   "description": "The date at which current entry will get or has actually executed.", 
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Posting Date", 
-  "oldfieldname": "posting_date", 
   "fieldname": "posting_date", 
   "fieldtype": "Date", 
-  "search_index": 1, 
-  "reqd": 1, 
   "in_filter": 1, 
-  "permlevel": 0
+  "label": "Posting Date", 
+  "no_copy": 1, 
+  "oldfieldname": "posting_date", 
+  "oldfieldtype": "Date", 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Journal Entries", 
-  "options": "Simple", 
   "fieldname": "2_add_edit_gl_entries", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Journal Entries", 
+  "oldfieldtype": "Section Break", 
+  "options": "Simple"
  }, 
  {
-  "print_hide": 0, 
   "allow_on_submit": 1, 
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "Entries", 
-  "oldfieldname": "entries", 
-  "options": "Journal Voucher Detail", 
   "fieldname": "entries", 
   "fieldtype": "Table", 
-  "permlevel": 0
+  "label": "Entries", 
+  "oldfieldname": "entries", 
+  "oldfieldtype": "Table", 
+  "options": "Journal Voucher Detail", 
+  "print_hide": 0
  }, 
  {
   "doctype": "DocField", 
-  "options": "Simple", 
   "fieldname": "section_break99", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "options": "Simple"
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Total Debit", 
-  "oldfieldname": "total_debit", 
   "fieldname": "total_debit", 
   "fieldtype": "Currency", 
-  "permlevel": 1, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Total Debit", 
+  "no_copy": 1, 
+  "oldfieldname": "total_debit", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Total Credit", 
-  "oldfieldname": "total_credit", 
   "fieldname": "total_credit", 
   "fieldtype": "Currency", 
-  "permlevel": 1, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Total Credit", 
+  "no_copy": 1, 
+  "oldfieldname": "total_credit", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "column_break99", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Difference", 
-  "oldfieldname": "difference", 
   "fieldname": "difference", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Difference", 
+  "no_copy": 1, 
+  "oldfieldname": "difference", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Make Difference Entry", 
   "fieldname": "get_balance", 
   "fieldtype": "Button", 
-  "permlevel": 0
+  "label": "Make Difference Entry", 
+  "oldfieldtype": "Button"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Reference", 
   "fieldname": "reference", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Reference"
  }, 
  {
   "description": "eg. Cheque Number", 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Reference Number", 
-  "oldfieldname": "cheque_no", 
   "fieldname": "cheque_no", 
   "fieldtype": "Data", 
-  "search_index": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Reference Number", 
+  "no_copy": 1, 
+  "oldfieldname": "cheque_no", 
+  "oldfieldtype": "Data", 
+  "search_index": 1
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Reference Date", 
-  "oldfieldname": "cheque_date", 
   "fieldname": "cheque_date", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "Reference Date", 
+  "no_copy": 1, 
+  "oldfieldname": "cheque_date", 
+  "oldfieldtype": "Date"
  }, 
  {
-  "print_hide": 0, 
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Clearance Date", 
-  "oldfieldname": "clearance_date", 
   "fieldname": "clearance_date", 
   "fieldtype": "Date", 
-  "search_index": 1, 
-  "permlevel": 1, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Clearance Date", 
+  "no_copy": 1, 
+  "oldfieldname": "clearance_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 0, 
+  "read_only": 1, 
+  "search_index": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "column_break98", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "User Remark", 
-  "oldfieldname": "user_remark", 
   "fieldname": "user_remark", 
   "fieldtype": "Small Text", 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "User Remark", 
+  "no_copy": 1, 
+  "oldfieldname": "user_remark", 
+  "oldfieldtype": "Small Text"
  }, 
  {
   "description": "User Remark will be added to Auto Remark", 
-  "no_copy": 1, 
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Remark", 
-  "oldfieldname": "remark", 
   "fieldname": "remark", 
   "fieldtype": "Small Text", 
-  "reqd": 0, 
-  "permlevel": 1
+  "label": "Remark", 
+  "no_copy": 1, 
+  "oldfieldname": "remark", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1, 
+  "reqd": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Bill No", 
-  "oldfieldname": "bill_no", 
   "fieldname": "bill_no", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Bill No", 
+  "oldfieldname": "bill_no", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Bill Date", 
-  "oldfieldname": "bill_date", 
   "fieldname": "bill_date", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "Bill Date", 
+  "oldfieldname": "bill_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Due Date", 
-  "oldfieldname": "due_date", 
   "fieldname": "due_date", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "Due Date", 
+  "oldfieldname": "due_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 0
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "More Info", 
   "fieldname": "addtional_info", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "More Info", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break2", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
   "default": "No", 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Is Opening", 
-  "oldfieldname": "is_opening", 
-  "permlevel": 0, 
   "fieldname": "is_opening", 
   "fieldtype": "Select", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Is Opening", 
+  "oldfieldname": "is_opening", 
+  "oldfieldtype": "Select", 
   "options": "No\nYes", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "For opening invoice entry, this date will reflect in the period-wise aging report.", 
-  "no_copy": 0, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Aging Date", 
-  "oldfieldname": "aging_date", 
   "fieldname": "aging_date", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "Aging Date", 
+  "no_copy": 0, 
+  "oldfieldname": "aging_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "default": "Accounts Receivable", 
   "depends_on": "eval:doc.voucher_type == 'Write Off Voucher'", 
   "doctype": "DocField", 
-  "label": "Write Off Based On", 
-  "options": "Accounts Receivable\nAccounts Payable", 
   "fieldname": "write_off_based_on", 
   "fieldtype": "Select", 
-  "permlevel": 0, 
+  "label": "Write Off Based On", 
+  "options": "Accounts Receivable\nAccounts Payable", 
+  "print_hide": 1, 
   "report_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "depends_on": "eval:doc.voucher_type == 'Write Off Voucher'", 
   "doctype": "DocField", 
-  "label": "Write Off Amount <=", 
   "fieldname": "write_off_amount", 
   "fieldtype": "Currency", 
-  "permlevel": 0, 
+  "label": "Write Off Amount <=", 
+  "print_hide": 1, 
   "report_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "depends_on": "eval:doc.voucher_type == 'Write Off Voucher'", 
   "doctype": "DocField", 
-  "label": "Get Outstanding Invoices", 
-  "options": "get_outstanding_invoices", 
   "fieldname": "get_outstanding_invoices", 
   "fieldtype": "Button", 
-  "permlevel": 0
+  "label": "Get Outstanding Invoices", 
+  "options": "get_outstanding_invoices", 
+  "print_hide": 1
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break3", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
-  "print_hide": 0, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Pay To / Recd From", 
   "fieldname": "pay_to_recd_from", 
   "fieldtype": "Data", 
   "hidden": 0, 
-  "permlevel": 0, 
+  "label": "Pay To / Recd From", 
+  "no_copy": 1, 
+  "print_hide": 0, 
   "report_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Total Amount", 
   "fieldname": "total_amount", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1, 
+  "label": "Total Amount", 
+  "no_copy": 1, 
+  "print_hide": 1, 
+  "read_only": 1, 
   "report_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Total Amount in Words", 
   "fieldname": "total_amount_in_words", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1, 
+  "label": "Total Amount in Words", 
+  "no_copy": 1, 
+  "print_hide": 1, 
+  "read_only": 1, 
   "report_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Fiscal Year", 
-  "oldfieldname": "fiscal_year", 
-  "permlevel": 0, 
   "fieldname": "fiscal_year", 
   "fieldtype": "Select", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Fiscal Year", 
+  "oldfieldname": "fiscal_year", 
+  "oldfieldtype": "Select", 
   "options": "link:Fiscal Year", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Company", 
-  "oldfieldname": "company", 
-  "permlevel": 0, 
   "fieldname": "company", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Company", 
+  "oldfieldname": "company", 
+  "oldfieldtype": "Link", 
   "options": "Company", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Select Print Heading", 
-  "oldfieldname": "select_print_heading", 
-  "permlevel": 0, 
   "fieldname": "select_print_heading", 
   "fieldtype": "Link", 
+  "label": "Select Print Heading", 
+  "no_copy": 1, 
+  "oldfieldname": "select_print_heading", 
+  "oldfieldtype": "Link", 
   "options": "Print Heading", 
+  "print_hide": 1, 
   "report_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Amended From", 
-  "oldfieldname": "amended_from", 
-  "options": "Journal Voucher", 
   "fieldname": "amended_from", 
   "fieldtype": "Link", 
-  "permlevel": 1
+  "label": "Amended From", 
+  "no_copy": 1, 
+  "oldfieldname": "amended_from", 
+  "oldfieldtype": "Link", 
+  "options": "Journal Voucher", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "The date at which current entry is corrected in the system.", 
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Amendment Date", 
-  "oldfieldname": "amendment_date", 
   "fieldname": "amendment_date", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "Amendment Date", 
+  "no_copy": 1, 
+  "oldfieldname": "amendment_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Cancel Reason", 
-  "oldfieldname": "cancel_reason", 
   "fieldname": "cancel_reason", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Cancel Reason", 
+  "no_copy": 1, 
+  "oldfieldname": "cancel_reason", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
   "amend": 1, 
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
+  "role": "Accounts User", 
   "submit": 1, 
-  "write": 1, 
-  "cancel": 1, 
-  "role": "Accounts User", 
-  "permlevel": 0
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "cancel": 0, 
-  "role": "Accounts User", 
-  "permlevel": 1
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "cancel": 0, 
-  "role": "Accounts Manager", 
-  "permlevel": 1
+  "write": 1
  }, 
  {
   "amend": 1, 
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "cancel": 1, 
   "role": "Accounts Manager", 
-  "permlevel": 0
+  "submit": 1, 
+  "write": 1
  }, 
  {
   "amend": 0, 
+  "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "cancel": 0, 
   "role": "Auditor", 
-  "permlevel": 0
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
   "submit": 0, 
-  "write": 0, 
-  "cancel": 0, 
-  "role": "Auditor", 
-  "permlevel": 1
+  "write": 0
  }
 ]
\ No newline at end of file
diff --git a/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt b/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt
index 7bf9e36..50d862c 100644
--- a/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt
+++ b/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt
@@ -1,158 +1,140 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:06", 
   "docstatus": 0, 
-  "creation": "2012-05-03 18:41:39", 
+  "modified": "2013-01-22 14:47:01", 
   "modified_by": "Administrator", 
-  "modified": "2012-10-02 16:47:37"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Tray", 
+  "autoname": "JVD.######", 
+  "doctype": "DocType", 
   "istable": 1, 
   "module": "Accounts", 
-  "server_code_error": " ", 
-  "doctype": "DocType", 
-  "autoname": "JVD.######", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "show_in_menu": 0, 
-  "version": 1
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Journal Voucher Detail", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "name": "Journal Voucher Detail", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Journal Voucher Detail"
  }, 
  {
-  "permlevel": 0, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Account", 
-  "oldfieldname": "account", 
-  "width": "250px", 
-  "trigger": "Client", 
   "fieldname": "account", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Account", 
+  "oldfieldname": "account", 
+  "oldfieldtype": "Link", 
   "options": "Account", 
-  "in_filter": 1
+  "reqd": 1, 
+  "search_index": 1, 
+  "width": "250px"
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Debit", 
-  "oldfieldname": "debit", 
-  "trigger": "Client", 
   "fieldname": "debit", 
   "fieldtype": "Currency", 
-  "permlevel": 0
+  "label": "Debit", 
+  "oldfieldname": "debit", 
+  "oldfieldtype": "Currency"
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Credit", 
-  "oldfieldname": "credit", 
-  "trigger": "Client", 
   "fieldname": "credit", 
   "fieldtype": "Currency", 
-  "permlevel": 0
+  "label": "Credit", 
+  "oldfieldname": "credit", 
+  "oldfieldtype": "Currency"
  }, 
  {
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "Cost Center", 
-  "oldfieldname": "cost_center", 
-  "width": "180px", 
-  "options": "Cost Center", 
   "fieldname": "cost_center", 
   "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Cost Center", 
+  "oldfieldname": "cost_center", 
   "oldfieldtype": "Link", 
-  "permlevel": 0, 
-  "in_filter": 1
+  "options": "Cost Center", 
+  "search_index": 0, 
+  "width": "180px"
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Account Balance", 
-  "oldfieldname": "balance", 
   "fieldname": "balance", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Account Balance", 
+  "no_copy": 1, 
+  "oldfieldname": "balance", 
+  "oldfieldtype": "Data", 
+  "read_only": 1
  }, 
  {
-  "print_hide": 0, 
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Against Purchase Invoice", 
-  "oldfieldname": "against_voucher", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "against_voucher", 
   "fieldtype": "Link", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Against Purchase Invoice", 
+  "no_copy": 1, 
+  "oldfieldname": "against_voucher", 
+  "oldfieldtype": "Link", 
   "options": "Purchase Invoice", 
-  "in_filter": 1
+  "print_hide": 0, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 0, 
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Against Sales Invoice", 
-  "oldfieldname": "against_invoice", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "against_invoice", 
   "fieldtype": "Link", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Against Sales Invoice", 
+  "no_copy": 1, 
+  "oldfieldname": "against_invoice", 
+  "oldfieldtype": "Link", 
   "options": "Sales Invoice", 
-  "in_filter": 1
+  "print_hide": 0, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 0, 
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Against Journal Voucher", 
-  "oldfieldname": "against_jv", 
-  "options": "Journal Voucher", 
   "fieldname": "against_jv", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Against Journal Voucher", 
+  "no_copy": 1, 
+  "oldfieldname": "against_jv", 
+  "oldfieldtype": "Link", 
+  "options": "Journal Voucher", 
+  "print_hide": 0, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Is Advance", 
-  "oldfieldname": "is_advance", 
-  "permlevel": 0, 
   "fieldname": "is_advance", 
   "fieldtype": "Select", 
-  "options": "No\nYes"
+  "label": "Is Advance", 
+  "no_copy": 1, 
+  "oldfieldname": "is_advance", 
+  "oldfieldtype": "Select", 
+  "options": "No\nYes", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Text", 
   "doctype": "DocField", 
-  "label": "Against Account", 
-  "oldfieldname": "against_account", 
   "fieldname": "against_account", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Against Account", 
+  "no_copy": 1, 
+  "oldfieldname": "against_account", 
+  "oldfieldtype": "Text", 
+  "print_hide": 1
  }
 ]
\ No newline at end of file
diff --git a/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.txt b/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.txt
index d144254..5a83314 100644
--- a/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.txt
+++ b/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.txt
@@ -1,209 +1,180 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-21 18:19:17", 
   "docstatus": 0, 
-  "creation": "2013-01-16 14:48:54", 
+  "modified": "2013-01-22 14:56:41", 
   "modified_by": "Administrator", 
-  "modified": "2013-01-21 11:52:11"
+  "owner": "Administrator"
  }, 
  {
-  "issingle": 1, 
-  "name": "__common__", 
   "doctype": "DocType", 
-  "module": "Accounts", 
   "document_type": "Other", 
-  "hide_toolbar": 1
+  "hide_toolbar": 1, 
+  "issingle": 1, 
+  "module": "Accounts", 
+  "name": "__common__"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Payment to Invoice Matching Tool", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Payment to Invoice Matching Tool", 
-  "read": 1, 
-  "submit": 0, 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
+  "create": 1, 
   "doctype": "DocPerm", 
-  "report": 0, 
+  "name": "__common__", 
+  "parent": "Payment to Invoice Matching Tool", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
+  "permlevel": 0, 
+  "read": 1, 
+  "report": 1, 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "name": "Payment to Invoice Matching Tool", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Payment to Invoice Matching Tool"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Account", 
-  "options": "Account", 
   "fieldname": "account", 
   "fieldtype": "Link", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Account", 
+  "options": "Account", 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Voucher Type", 
-  "options": "Sales Invoice\nPurchase Invoice\nJournal Voucher", 
   "fieldname": "voucher_type", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Voucher Type", 
+  "options": "Sales Invoice\nPurchase Invoice\nJournal Voucher", 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Voucher No", 
-  "options": "[Select]", 
   "fieldname": "voucher_no", 
   "fieldtype": "Link", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Voucher No", 
+  "options": "[Select]", 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Pull Payment Entries", 
-  "options": "get_payment_entries", 
   "fieldname": "pull_payment_entries", 
   "fieldtype": "Button", 
-  "permlevel": 0
+  "label": "Pull Payment Entries", 
+  "options": "get_payment_entries"
  }, 
  {
-  "print_width": "50%", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "print_width": "50%", 
+  "width": "50%"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Total Amount", 
   "fieldname": "total_amount", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Total Amount", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Outstanding Amount", 
   "fieldname": "pending_amt_to_reconcile", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Outstanding Amount", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Payment Entries", 
   "fieldname": "payment_entries", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Payment Entries"
  }, 
  {
   "description": "Update allocated amount in the above table and then click \"Allocate\" button", 
   "doctype": "DocField", 
-  "label": "Payment Entries", 
-  "options": "Payment to Invoice Matching Tool Detail", 
   "fieldname": "ir_payment_details", 
   "fieldtype": "Table", 
-  "permlevel": 0
+  "label": "Payment Entries", 
+  "options": "Payment to Invoice Matching Tool Detail"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Allocate", 
-  "options": "reconcile", 
   "fieldname": "reconcile", 
   "fieldtype": "Button", 
-  "permlevel": 0
+  "label": "Allocate", 
+  "options": "reconcile"
  }, 
  {
   "doctype": "DocField", 
-  "options": "Simple", 
   "fieldname": "section_break0", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "options": "Simple"
  }, 
  {
-  "print_width": "50%", 
   "doctype": "DocField", 
-  "label": "Filter By Date", 
-  "width": "50%", 
   "fieldname": "column_break2", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "label": "Filter By Date", 
+  "print_width": "50%", 
+  "width": "50%"
  }, 
  {
   "doctype": "DocField", 
-  "label": "From Date", 
   "fieldname": "from_date", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "From Date"
  }, 
  {
   "doctype": "DocField", 
-  "label": "To Date", 
   "fieldname": "to_date", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "To Date"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Help HTML", 
-  "options": "Click \"Pull Payment Entries\" to refresh the table with filters.", 
   "fieldname": "help_html", 
   "fieldtype": "HTML", 
-  "permlevel": 0
+  "label": "Help HTML", 
+  "options": "Click \"Pull Payment Entries\" to refresh the table with filters."
  }, 
  {
-  "print_width": "50%", 
   "doctype": "DocField", 
-  "label": "Filter By Amount", 
-  "width": "50%", 
   "fieldname": "column_break3", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "label": "Filter By Amount", 
+  "print_width": "50%", 
+  "width": "50%"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Amount >=", 
   "fieldname": "amt_greater_than", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Amount >="
  }, 
  {
   "doctype": "DocField", 
-  "label": "Amount <=", 
   "fieldname": "amt_less_than", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Amount <="
  }, 
  {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "System Manager", 
-  "permlevel": 0
+  "role": "System Manager"
  }, 
  {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "Accounts Manager", 
-  "permlevel": 0
+  "role": "Accounts Manager"
  }, 
  {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "Accounts User", 
-  "permlevel": 0
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "role": "All", 
-  "cancel": 0, 
-  "permlevel": 1
+  "role": "Accounts User"
  }
 ]
\ No newline at end of file
diff --git a/accounts/doctype/payment_to_invoice_matching_tool_detail/payment_to_invoice_matching_tool_detail.txt b/accounts/doctype/payment_to_invoice_matching_tool_detail/payment_to_invoice_matching_tool_detail.txt
index 81bc59e..562febe 100644
--- a/accounts/doctype/payment_to_invoice_matching_tool_detail/payment_to_invoice_matching_tool_detail.txt
+++ b/accounts/doctype/payment_to_invoice_matching_tool_detail/payment_to_invoice_matching_tool_detail.txt
@@ -1,92 +1,92 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:07", 
   "docstatus": 0, 
-  "creation": "2012-07-03 13:30:47", 
+  "modified": "2013-01-22 14:47:04", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-31 10:24:49"
+  "owner": "Administrator"
  }, 
  {
-  "istable": 1, 
-  "name": "__common__", 
   "doctype": "DocType", 
-  "module": "Accounts"
+  "istable": 1, 
+  "module": "Accounts", 
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Payment to Invoice Matching Tool Detail", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
-  "name": "Payment to Invoice Matching Tool Detail", 
-  "doctype": "DocType"
- }, 
- {
-  "print_width": "140px", 
-  "permlevel": 1, 
-  "doctype": "DocField", 
-  "label": "Voucher No", 
-  "width": "140px", 
-  "fieldname": "voucher_no", 
-  "fieldtype": "Link", 
-  "reqd": 0, 
-  "options": "Journal Voucher"
- }, 
- {
-  "doctype": "DocField", 
-  "label": "Unmatched Amount", 
-  "fieldname": "amt_due", 
-  "fieldtype": "Currency", 
-  "permlevel": 1
- }, 
- {
-  "doctype": "DocField", 
-  "label": "Allocated Amount", 
-  "fieldname": "amt_to_be_reconciled", 
-  "fieldtype": "Currency", 
-  "reqd": 1, 
   "permlevel": 0
  }, 
  {
+  "doctype": "DocType", 
+  "name": "Payment to Invoice Matching Tool Detail"
+ }, 
+ {
   "doctype": "DocField", 
-  "label": "Posting Date", 
+  "fieldname": "voucher_no", 
+  "fieldtype": "Link", 
+  "label": "Voucher No", 
+  "options": "Journal Voucher", 
+  "print_width": "140px", 
+  "read_only": 1, 
+  "reqd": 0, 
+  "width": "140px"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "amt_due", 
+  "fieldtype": "Currency", 
+  "label": "Unmatched Amount", 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "amt_to_be_reconciled", 
+  "fieldtype": "Currency", 
+  "label": "Allocated Amount", 
+  "reqd": 1
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "posting_date", 
   "fieldtype": "Date", 
-  "permlevel": 1
+  "label": "Posting Date", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Total Amount", 
   "fieldname": "total_amt", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Total Amount", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Against Account", 
   "fieldname": "against_account", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Against Account", 
+  "read_only": 1
  }, 
  {
-  "print_width": "200px", 
   "doctype": "DocField", 
-  "label": "Remarks", 
-  "width": "200px", 
   "fieldname": "remarks", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Remarks", 
+  "print_width": "200px", 
+  "read_only": 1, 
+  "width": "200px"
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Voucher Detail No", 
   "fieldname": "voucher_detail_no", 
   "fieldtype": "Data", 
-  "reqd": 0, 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Voucher Detail No", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "reqd": 0
  }
 ]
\ No newline at end of file
diff --git a/accounts/doctype/period_closing_voucher/period_closing_voucher.txt b/accounts/doctype/period_closing_voucher/period_closing_voucher.txt
index 9261d8e..d7ac07a 100644
--- a/accounts/doctype/period_closing_voucher/period_closing_voucher.txt
+++ b/accounts/doctype/period_closing_voucher/period_closing_voucher.txt
@@ -1,223 +1,160 @@
 [
  {
-  "owner": "jai@webnotestech.com", 
+  "creation": "2013-01-10 16:34:07", 
   "docstatus": 0, 
-  "creation": "2012-06-11 12:09:52", 
+  "modified": "2013-01-22 14:47:50", 
   "modified_by": "Administrator", 
-  "modified": "2012-07-10 14:21:21"
+  "owner": "jai@webnotestech.com"
  }, 
  {
-  "section_style": "Simple", 
-  "is_submittable": 1, 
-  "search_fields": "posting_date, fiscal_year", 
-  "module": "Accounts", 
-  "server_code_error": " ", 
   "autoname": "PCE/.###", 
-  "_last_update": "1311621379", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
   "doctype": "DocType", 
-  "show_in_menu": 0, 
-  "version": 1
+  "is_submittable": 1, 
+  "module": "Accounts", 
+  "name": "__common__", 
+  "search_fields": "posting_date, fiscal_year"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Period Closing Voucher", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Period Closing Voucher", 
-  "read": 1, 
-  "doctype": "DocPerm", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Period Closing Voucher", 
-  "doctype": "DocType"
- }, 
- {
-  "role": "System Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "Accounts Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "System Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "Accounts Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "System Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "Accounts Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "System Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "Accounts Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
+  "permlevel": 0
  }, 
  {
   "amend": 1, 
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
+  "name": "__common__", 
+  "parent": "Period Closing Voucher", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
+  "permlevel": 0, 
+  "read": 1, 
   "report": 1, 
-  "role": "System Manager", 
-  "cancel": 1, 
-  "permlevel": 0
+  "submit": 1, 
+  "write": 1
  }, 
  {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "cancel": 1, 
-  "role": "Accounts Manager", 
-  "report": 1, 
-  "permlevel": 0
+  "doctype": "DocType", 
+  "name": "Period Closing Voucher"
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break0", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Transaction Date", 
-  "oldfieldname": "transaction_date", 
   "fieldname": "transaction_date", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "Transaction Date", 
+  "oldfieldname": "transaction_date", 
+  "oldfieldtype": "Date"
  }, 
  {
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Posting Date", 
-  "oldfieldname": "posting_date", 
   "fieldname": "posting_date", 
   "fieldtype": "Date", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Posting Date", 
+  "oldfieldname": "posting_date", 
+  "oldfieldtype": "Date", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Closing Fiscal Year", 
-  "oldfieldname": "fiscal_year", 
-  "options": "link:Fiscal Year", 
   "fieldname": "fiscal_year", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Closing Fiscal Year", 
+  "oldfieldname": "fiscal_year", 
+  "oldfieldtype": "Select", 
+  "options": "link:Fiscal Year", 
+  "reqd": 1
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Amended From", 
-  "oldfieldname": "amended_from", 
   "fieldname": "amended_from", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Amended From", 
+  "no_copy": 1, 
+  "oldfieldname": "amended_from", 
+  "oldfieldtype": "Data", 
+  "read_only": 1
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Amendment Date", 
-  "oldfieldname": "amendment_date", 
   "fieldname": "amendment_date", 
   "fieldtype": "Date", 
-  "permlevel": 1
+  "label": "Amendment Date", 
+  "no_copy": 1, 
+  "oldfieldname": "amendment_date", 
+  "oldfieldtype": "Date", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Company", 
-  "oldfieldname": "company", 
-  "options": "link:Company", 
   "fieldname": "company", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Company", 
+  "oldfieldname": "company", 
+  "oldfieldtype": "Select", 
+  "options": "link:Company", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break"
  }, 
  {
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Closing Account Head", 
-  "oldfieldname": "closing_account_head", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "closing_account_head", 
   "fieldtype": "Link", 
-  "reqd": 1, 
-  "options": "Account"
+  "label": "Closing Account Head", 
+  "oldfieldname": "closing_account_head", 
+  "oldfieldtype": "Link", 
+  "options": "Account", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "HTML", 
   "doctype": "DocField", 
-  "label": "CoA Help", 
-  "options": "<a href=\"#!Accounts Browser/Account\">To manage Account Head, click here</a>", 
   "fieldname": "coa_help", 
   "fieldtype": "HTML", 
-  "permlevel": 0
+  "label": "CoA Help", 
+  "oldfieldtype": "HTML", 
+  "options": "<a href=\"#!Accounts Browser/Account\">To manage Account Head, click here</a>"
  }, 
  {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Remarks", 
-  "oldfieldname": "remarks", 
   "fieldname": "remarks", 
   "fieldtype": "Small Text", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Remarks", 
+  "oldfieldname": "remarks", 
+  "oldfieldtype": "Small Text", 
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "Cancel Reason", 
-  "oldfieldname": "cancel_reason", 
   "fieldname": "cancel_reason", 
   "fieldtype": "Small Text", 
-  "oldfieldtype": "Small Text", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Cancel Reason", 
+  "oldfieldname": "cancel_reason", 
+  "oldfieldtype": "Small Text", 
+  "print_hide": 1, 
+  "search_index": 0
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "System Manager"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "Accounts Manager"
  }
 ]
\ No newline at end of file
diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.txt b/accounts/doctype/purchase_invoice/purchase_invoice.txt
index 1952fa2..444d1a4 100755
--- a/accounts/doctype/purchase_invoice/purchase_invoice.txt
+++ b/accounts/doctype/purchase_invoice/purchase_invoice.txt
@@ -1,897 +1,797 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-21 18:19:17", 
   "docstatus": 0, 
-  "creation": "2013-01-18 12:46:57", 
+  "modified": "2013-01-22 14:56:42", 
   "modified_by": "Administrator", 
-  "modified": "2013-01-18 13:25:16"
+  "owner": "Administrator"
  }, 
  {
-  "is_submittable": 1, 
   "allow_attach": 1, 
   "autoname": "naming_series:", 
-  "module": "Accounts", 
   "doctype": "DocType", 
+  "is_submittable": 1, 
+  "module": "Accounts", 
+  "name": "__common__", 
   "read_only_onload": 1, 
-  "search_fields": "posting_date, credit_to, fiscal_year, bill_no, grand_total, outstanding_amount", 
-  "name": "__common__"
+  "search_fields": "posting_date, credit_to, fiscal_year, bill_no, grand_total, outstanding_amount"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Purchase Invoice", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
-  "name": "__common__", 
-  "parent": "Purchase Invoice", 
-  "read": 1, 
-  "doctype": "DocPerm", 
-  "parenttype": "DocType", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Purchase Invoice", 
-  "doctype": "DocType"
- }, 
- {
-  "oldfieldtype": "Column Break", 
-  "doctype": "DocField", 
-  "width": "50%", 
-  "fieldname": "column_break0", 
-  "fieldtype": "Column Break", 
   "permlevel": 0
  }, 
  {
-  "print_hide": 1, 
-  "description": "To manage multiple series please go to Setup > Manage Series", 
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
-  "doctype": "DocField", 
-  "label": "Series", 
-  "oldfieldname": "naming_series", 
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Purchase Invoice", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
   "permlevel": 0, 
+  "read": 1, 
+  "report": 1
+ }, 
+ {
+  "doctype": "DocType", 
+  "name": "Purchase Invoice"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "column_break0", 
+  "fieldtype": "Column Break", 
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
+ }, 
+ {
+  "description": "To manage multiple series please go to Setup > Manage Series", 
+  "doctype": "DocField", 
   "fieldname": "naming_series", 
   "fieldtype": "Select", 
-  "reqd": 1, 
+  "label": "Series", 
+  "no_copy": 1, 
+  "oldfieldname": "naming_series", 
+  "oldfieldtype": "Select", 
   "options": "BILL\nBILLJ", 
-  "report_hide": 0
+  "print_hide": 1, 
+  "report_hide": 0, 
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "The account to which you will pay (have paid) the money to.", 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Credit To", 
-  "oldfieldname": "credit_to", 
-  "permlevel": 0, 
   "fieldname": "credit_to", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Credit To", 
+  "oldfieldname": "credit_to", 
+  "oldfieldtype": "Link", 
   "options": "Account", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Name", 
-  "oldfieldname": "supplier_name", 
   "fieldname": "supplier_name", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Name", 
+  "oldfieldname": "supplier_name", 
+  "oldfieldtype": "Data", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Address", 
   "fieldname": "address_display", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Address", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Contact", 
   "fieldname": "contact_display", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Contact", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Mobile No", 
   "fieldname": "contact_mobile", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Mobile No", 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Contact Email", 
   "fieldname": "contact_email", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Contact Email", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
+  "oldfieldtype": "Column Break", 
   "reqd": 0, 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
-  "description": "The date at which current entry will get or has actually executed.", 
-  "no_copy": 0, 
-  "oldfieldtype": "Date", 
-  "doctype": "DocField", 
-  "label": "Posting Date", 
-  "oldfieldname": "posting_date", 
   "default": "Today", 
+  "description": "The date at which current entry will get or has actually executed.", 
+  "doctype": "DocField", 
   "fieldname": "posting_date", 
   "fieldtype": "Date", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Posting Date", 
+  "no_copy": 0, 
+  "oldfieldname": "posting_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "If not applicable please enter: NA", 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Bill No", 
-  "oldfieldname": "bill_no", 
   "fieldname": "bill_no", 
   "fieldtype": "Data", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Bill No", 
+  "oldfieldname": "bill_no", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Bill Date", 
-  "oldfieldname": "bill_date", 
   "fieldname": "bill_date", 
   "fieldtype": "Date", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Bill Date", 
+  "oldfieldname": "bill_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
   "reqd": 0, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Items", 
   "fieldname": "items", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Items", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "oldfieldtype": "Table", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Entries", 
-  "oldfieldname": "entries", 
-  "permlevel": 0, 
   "fieldname": "entries", 
   "fieldtype": "Table", 
+  "label": "Entries", 
+  "oldfieldname": "entries", 
+  "oldfieldtype": "Table", 
   "options": "Purchase Invoice Item"
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "section_break0", 
-  "fieldtype": "Section Break", 
-  "permlevel": 0
+  "fieldtype": "Section Break"
  }, 
  {
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Recalculate", 
   "fieldname": "recalculate", 
   "fieldtype": "Button", 
-  "permlevel": 0
+  "label": "Recalculate", 
+  "oldfieldtype": "Button"
  }, 
  {
   "doctype": "DocField", 
-  "permlevel": 0, 
   "fieldname": "section_break_17", 
   "fieldtype": "Section Break", 
   "options": "Simple"
  }, 
  {
-  "print_hide": 1, 
   "description": "Select Items from Purchase Order", 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Purchase Order", 
-  "oldfieldname": "purchase_order_main", 
-  "permlevel": 0, 
   "fieldname": "purchase_order_main", 
   "fieldtype": "Link", 
-  "options": "Purchase Order"
+  "label": "Purchase Order", 
+  "oldfieldname": "purchase_order_main", 
+  "oldfieldtype": "Link", 
+  "options": "Purchase Order", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "Select Items from Purchase Receipt", 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Purchase Receipt", 
-  "oldfieldname": "purchase_receipt_main", 
-  "permlevel": 0, 
   "fieldname": "purchase_receipt_main", 
   "fieldtype": "Link", 
-  "options": "Purchase Receipt"
+  "label": "Purchase Receipt", 
+  "oldfieldname": "purchase_receipt_main", 
+  "oldfieldtype": "Link", 
+  "options": "Purchase Receipt", 
+  "print_hide": 1
  }, 
  {
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Get Items", 
-  "permlevel": 0, 
   "fieldname": "get_items", 
   "fieldtype": "Button", 
+  "label": "Get Items", 
+  "oldfieldtype": "Button", 
   "options": "pull_details"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Currency & Price List", 
   "fieldname": "currency_price_list", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Currency & Price List"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Currency", 
-  "oldfieldname": "currency", 
-  "permlevel": 0, 
   "fieldname": "currency", 
   "fieldtype": "Select", 
-  "options": "link:Currency"
+  "label": "Currency", 
+  "oldfieldname": "currency", 
+  "oldfieldtype": "Select", 
+  "options": "link:Currency", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "description": "The rate at which Bill Currency is converted into company's base currency", 
   "default": "1", 
-  "oldfieldtype": "Currency", 
+  "description": "The rate at which Bill Currency is converted into company's base currency", 
   "doctype": "DocField", 
-  "label": "Exchange Rate", 
-  "oldfieldname": "conversion_rate", 
   "fieldname": "conversion_rate", 
   "fieldtype": "Float", 
-  "permlevel": 0
+  "label": "Exchange Rate", 
+  "oldfieldname": "conversion_rate", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "column_break2", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
-  "print_hide": 1, 
   "description": "Consider this Price List for fetching rate. (only which have \"For Buying\" as checked)", 
   "doctype": "DocField", 
-  "label": "Price List", 
-  "permlevel": 0, 
   "fieldname": "price_list_name", 
   "fieldtype": "Link", 
-  "options": "Price List"
+  "label": "Price List", 
+  "options": "Price List", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "depends_on": "price_list_name", 
   "doctype": "DocField", 
-  "label": "Price List Currency", 
-  "permlevel": 0, 
   "fieldname": "price_list_currency", 
   "fieldtype": "Link", 
-  "options": "Currency"
+  "label": "Price List Currency", 
+  "options": "Currency", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "depends_on": "price_list_name", 
   "doctype": "DocField", 
-  "label": "Price List Exchange Rate", 
   "fieldname": "plc_conversion_rate", 
   "fieldtype": "Float", 
-  "permlevel": 0
+  "label": "Price List Exchange Rate", 
+  "print_hide": 1
  }, 
  {
   "description": "Add / Edit Taxes and Charges", 
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Taxes", 
   "fieldname": "taxes", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Taxes", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Purchase Taxes and Charges", 
-  "oldfieldname": "purchase_other_charges", 
-  "permlevel": 0, 
   "fieldname": "purchase_other_charges", 
   "fieldtype": "Link", 
-  "options": "Purchase Taxes and Charges Master"
+  "label": "Purchase Taxes and Charges", 
+  "oldfieldname": "purchase_other_charges", 
+  "oldfieldtype": "Link", 
+  "options": "Purchase Taxes and Charges Master", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Get Tax Detail", 
-  "permlevel": 0, 
   "fieldname": "get_tax_detail", 
   "fieldtype": "Button", 
-  "options": "get_purchase_tax_details"
+  "label": "Get Tax Detail", 
+  "oldfieldtype": "Button", 
+  "options": "get_purchase_tax_details", 
+  "print_hide": 1
  }, 
  {
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "Purchase Taxes and Charges", 
-  "oldfieldname": "purchase_tax_details", 
-  "permlevel": 0, 
   "fieldname": "purchase_tax_details", 
   "fieldtype": "Table", 
+  "label": "Purchase Taxes and Charges", 
+  "oldfieldname": "purchase_tax_details", 
+  "oldfieldtype": "Table", 
   "options": "Purchase Taxes and Charges"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Calculate Tax", 
   "fieldname": "calculate_tax", 
   "fieldtype": "Button", 
-  "permlevel": 0
+  "label": "Calculate Tax", 
+  "oldfieldtype": "Button", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "HTML", 
   "doctype": "DocField", 
-  "label": "Tax Calculation", 
   "fieldname": "tax_calculation", 
   "fieldtype": "HTML", 
-  "permlevel": 0
+  "label": "Tax Calculation", 
+  "oldfieldtype": "HTML", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Total Tax", 
-  "oldfieldname": "total_tax", 
   "fieldname": "total_tax", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Total Tax", 
+  "oldfieldname": "total_tax", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Contact Info", 
   "fieldname": "contact_section", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Contact Info"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Supplier", 
-  "oldfieldname": "supplier", 
-  "permlevel": 0, 
   "fieldname": "supplier", 
   "fieldtype": "Link", 
   "hidden": 0, 
-  "options": "Supplier"
+  "label": "Supplier", 
+  "oldfieldname": "supplier", 
+  "oldfieldtype": "Link", 
+  "options": "Supplier", 
+  "print_hide": 1
  }, 
  {
   "depends_on": "eval:doc.supplier", 
   "doctype": "DocField", 
-  "label": "Supplier Address", 
-  "permlevel": 0, 
   "fieldname": "supplier_address", 
   "fieldtype": "Link", 
+  "label": "Supplier Address", 
   "options": "Address"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "col_break23", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
   "depends_on": "eval:doc.supplier", 
   "doctype": "DocField", 
-  "label": "Contact Person", 
-  "permlevel": 0, 
   "fieldname": "contact_person", 
   "fieldtype": "Link", 
-  "options": "Contact"
+  "label": "Contact Person", 
+  "options": "Contact", 
+  "print_hide": 1
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Totals", 
   "fieldname": "totals", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Totals", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Net Total (Import)", 
-  "oldfieldname": "net_total_import", 
   "fieldname": "net_total_import", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Net Total (Import)", 
+  "oldfieldname": "net_total_import", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Taxes and Charges Added (Import)", 
-  "oldfieldname": "other_charges_added_import", 
   "fieldname": "other_charges_added_import", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Taxes and Charges Added (Import)", 
+  "oldfieldname": "other_charges_added_import", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Taxes and Charges Deducted (Import)", 
-  "oldfieldname": "other_charges_deducted_import", 
   "fieldname": "other_charges_deducted_import", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Taxes and Charges Deducted (Import)", 
+  "oldfieldname": "other_charges_deducted_import", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Grand Total (Import)", 
-  "oldfieldname": "grand_total_import", 
   "fieldname": "grand_total_import", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Grand Total (Import)", 
+  "oldfieldname": "grand_total_import", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "In Words (Import)", 
-  "oldfieldname": "in_words_import", 
   "fieldname": "in_words_import", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "In Words (Import)", 
+  "oldfieldname": "in_words_import", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Total Amount To Pay", 
-  "oldfieldname": "total_amount_to_pay", 
   "fieldname": "total_amount_to_pay", 
   "fieldtype": "Currency", 
   "hidden": 0, 
-  "permlevel": 1
+  "label": "Total Amount To Pay", 
+  "no_copy": 1, 
+  "oldfieldname": "total_amount_to_pay", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Total Advance", 
-  "oldfieldname": "total_advance", 
   "fieldname": "total_advance", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Total Advance", 
+  "no_copy": 1, 
+  "oldfieldname": "total_advance", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Outstanding Amount", 
-  "oldfieldname": "outstanding_amount", 
   "fieldname": "outstanding_amount", 
   "fieldtype": "Currency", 
-  "search_index": 1, 
-  "permlevel": 1, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Outstanding Amount", 
+  "no_copy": 1, 
+  "oldfieldname": "outstanding_amount", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break8", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "print_hide": 1, 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
   "description": "Will be calculated automatically when you enter the details", 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Net Total", 
-  "oldfieldname": "net_total", 
   "fieldname": "net_total", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Net Total", 
+  "oldfieldname": "net_total", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Taxes and Charges Added", 
-  "oldfieldname": "other_charges_added", 
   "fieldname": "other_charges_added", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Taxes and Charges Added", 
+  "oldfieldname": "other_charges_added", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Taxes and Charges Deducted", 
-  "oldfieldname": "other_charges_deducted", 
   "fieldname": "other_charges_deducted", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Taxes and Charges Deducted", 
+  "oldfieldname": "other_charges_deducted", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Grand Total", 
-  "oldfieldname": "grand_total", 
   "fieldname": "grand_total", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Grand Total", 
+  "oldfieldname": "grand_total", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "In Words will be visible once you save the Purchase Invoice.", 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "In Words", 
-  "oldfieldname": "in_words", 
   "fieldname": "in_words", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "In Words", 
+  "oldfieldname": "in_words", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Write Off Amount", 
   "fieldname": "write_off_amount", 
   "fieldtype": "Currency", 
-  "permlevel": 0
+  "label": "Write Off Amount", 
+  "no_copy": 1, 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "depends_on": "eval:flt(doc.write_off_amount)!=0", 
   "doctype": "DocField", 
-  "label": "Write Off Account", 
-  "permlevel": 0, 
   "fieldname": "write_off_account", 
   "fieldtype": "Link", 
-  "options": "Account"
+  "label": "Write Off Account", 
+  "no_copy": 1, 
+  "options": "Account", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "depends_on": "eval:flt(doc.write_off_amount)!=0", 
   "doctype": "DocField", 
-  "label": "Write Off Cost Center", 
-  "permlevel": 0, 
   "fieldname": "write_off_cost_center", 
   "fieldtype": "Link", 
-  "options": "Account"
+  "label": "Write Off Cost Center", 
+  "no_copy": 1, 
+  "options": "Account", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Against Expense Account", 
-  "oldfieldname": "against_expense_account", 
   "fieldname": "against_expense_account", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
-  "permlevel": 0, 
+  "label": "Against Expense Account", 
+  "no_copy": 1, 
+  "oldfieldname": "against_expense_account", 
+  "oldfieldtype": "Small Text", 
+  "print_hide": 1, 
   "report_hide": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Advances", 
   "fieldname": "advances", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Advances", 
+  "oldfieldtype": "Section Break", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Get Advances Paid", 
-  "permlevel": 0, 
   "fieldname": "get_advances_paid", 
   "fieldtype": "Button", 
-  "options": "get_advances"
+  "label": "Get Advances Paid", 
+  "oldfieldtype": "Button", 
+  "options": "get_advances", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "Purchase Invoice Advances", 
-  "oldfieldname": "advance_allocation_details", 
-  "permlevel": 0, 
   "fieldname": "advance_allocation_details", 
   "fieldtype": "Table", 
-  "options": "Purchase Invoice Advance"
+  "label": "Purchase Invoice Advances", 
+  "no_copy": 1, 
+  "oldfieldname": "advance_allocation_details", 
+  "oldfieldtype": "Table", 
+  "options": "Purchase Invoice Advance", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "More Info", 
   "fieldname": "more_info", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "More Info", 
+  "oldfieldtype": "Section Break", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "default": "No", 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Is Opening", 
-  "oldfieldname": "is_opening", 
-  "options": "No\nYes", 
   "fieldname": "is_opening", 
   "fieldtype": "Select", 
-  "search_index": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Is Opening", 
+  "oldfieldname": "is_opening", 
+  "oldfieldtype": "Select", 
+  "options": "No\nYes", 
+  "print_hide": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Aging Date", 
-  "oldfieldname": "aging_date", 
   "fieldname": "aging_date", 
   "fieldtype": "Date", 
-  "search_index": 0, 
-  "permlevel": 0
+  "label": "Aging Date", 
+  "oldfieldname": "aging_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
+  "search_index": 0
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Amended From", 
-  "oldfieldname": "amended_from", 
-  "permlevel": 1, 
   "fieldname": "amended_from", 
   "fieldtype": "Link", 
-  "options": "Purchase Invoice"
+  "label": "Amended From", 
+  "no_copy": 1, 
+  "oldfieldname": "amended_from", 
+  "oldfieldtype": "Link", 
+  "options": "Purchase Invoice", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Select Print Heading", 
-  "oldfieldname": "select_print_heading", 
-  "options": "Print Heading", 
   "fieldname": "select_print_heading", 
   "fieldtype": "Link", 
-  "permlevel": 0, 
+  "label": "Select Print Heading", 
+  "no_copy": 1, 
+  "oldfieldname": "select_print_heading", 
+  "oldfieldtype": "Link", 
+  "options": "Print Heading", 
+  "print_hide": 1, 
   "report_hide": 1
  }, 
  {
-  "print_hide": 0, 
-  "no_copy": 0, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Due Date", 
-  "oldfieldname": "due_date", 
   "fieldname": "due_date", 
   "fieldtype": "Date", 
-  "search_index": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Due Date", 
+  "no_copy": 0, 
+  "oldfieldname": "due_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 0, 
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Mode of Payment", 
-  "oldfieldname": "mode_of_payment", 
-  "permlevel": 0, 
   "fieldname": "mode_of_payment", 
   "fieldtype": "Select", 
+  "label": "Mode of Payment", 
+  "oldfieldname": "mode_of_payment", 
+  "oldfieldtype": "Select", 
   "options": "link:Mode of Payment"
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "column_break_63", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Company", 
-  "oldfieldname": "company", 
-  "permlevel": 0, 
   "fieldname": "company", 
   "fieldtype": "Link", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Company", 
+  "oldfieldname": "company", 
+  "oldfieldtype": "Link", 
   "options": "Company", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Fiscal Year", 
-  "oldfieldname": "fiscal_year", 
-  "permlevel": 0, 
   "fieldname": "fiscal_year", 
   "fieldtype": "Select", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Fiscal Year", 
+  "oldfieldname": "fiscal_year", 
+  "oldfieldtype": "Select", 
   "options": "link:Fiscal Year", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
+  "depends_on": "eval:!doc.__islocal", 
   "doctype": "DocField", 
-  "label": "Cancel Reason", 
-  "oldfieldname": "cancel_reason", 
   "fieldname": "cancel_reason", 
   "fieldtype": "Data", 
-  "depends_on": "eval:!doc.__islocal", 
-  "permlevel": 1
+  "label": "Cancel Reason", 
+  "no_copy": 1, 
+  "oldfieldname": "cancel_reason", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Text", 
   "doctype": "DocField", 
-  "label": "Remarks", 
-  "oldfieldname": "remarks", 
   "fieldname": "remarks", 
   "fieldtype": "Small Text", 
-  "reqd": 0, 
-  "permlevel": 0
+  "label": "Remarks", 
+  "no_copy": 1, 
+  "oldfieldname": "remarks", 
+  "oldfieldtype": "Text", 
+  "print_hide": 1, 
+  "reqd": 0
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "File List", 
   "fieldname": "file_list", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "File List", 
+  "no_copy": 1, 
+  "print_hide": 1
  }, 
  {
   "amend": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "report": 1, 
-  "role": "Accounts User", 
   "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Purchase User", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "amend": 0, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 1, 
-  "report": 1, 
-  "role": "Purchase User", 
-  "cancel": 0, 
-  "permlevel": 0
+  "role": "Accounts User", 
+  "submit": 1, 
+  "write": 1
  }, 
  {
   "amend": 0, 
+  "cancel": 0, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "role": "Purchase User", 
+  "submit": 0, 
+  "write": 1
+ }, 
+ {
+  "amend": 0, 
+  "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "cancel": 0, 
+  "match": "supplier", 
   "role": "Supplier", 
-  "report": 1, 
-  "permlevel": 0, 
-  "match": "supplier"
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
   "submit": 0, 
-  "write": 0, 
-  "role": "Accounts Manager", 
-  "cancel": 0, 
-  "permlevel": 1
+  "write": 0
  }, 
  {
   "amend": 1, 
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "report": 1, 
   "role": "Accounts Manager", 
-  "cancel": 1, 
-  "permlevel": 0
+  "submit": 1, 
+  "write": 1
  }, 
  {
   "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Accounts User", 
   "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "amend": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
   "role": "Auditor", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
   "submit": 0, 
-  "write": 0, 
-  "report": 1, 
-  "role": "Auditor", 
-  "cancel": 0, 
-  "permlevel": 0
+  "write": 0
  }
 ]
\ No newline at end of file
diff --git a/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.txt b/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.txt
index 105124c..6da6a28 100644
--- a/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.txt
+++ b/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.txt
@@ -1,82 +1,80 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:08", 
   "docstatus": 0, 
-  "creation": "2012-07-03 13:29:54", 
+  "modified": "2013-01-22 14:47:52", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-04 17:19:38"
+  "owner": "Administrator"
  }, 
  {
-  "istable": 1, 
-  "name": "__common__", 
   "doctype": "DocType", 
-  "module": "Accounts"
+  "istable": 1, 
+  "module": "Accounts", 
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
-  "parent": "Purchase Invoice Advance", 
   "no_copy": 1, 
-  "doctype": "DocField", 
+  "parent": "Purchase Invoice Advance", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
-  "name": "Purchase Invoice Advance", 
-  "doctype": "DocType"
- }, 
- {
-  "oldfieldtype": "Link", 
-  "doctype": "DocField", 
-  "label": "Journal Voucher", 
-  "oldfieldname": "journal_voucher", 
-  "width": "180px", 
-  "options": "Journal Voucher", 
-  "fieldname": "journal_voucher", 
-  "fieldtype": "Link", 
-  "permlevel": 1
- }, 
- {
-  "print_hide": 1, 
-  "oldfieldtype": "Date", 
-  "doctype": "DocField", 
-  "label": "Journal Voucher Detail No", 
-  "oldfieldname": "jv_detail_no", 
-  "width": "80px", 
-  "fieldname": "jv_detail_no", 
-  "fieldtype": "Date", 
-  "hidden": 1, 
-  "permlevel": 1
- }, 
- {
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Advance Amount", 
-  "oldfieldname": "advance_amount", 
-  "width": "100px", 
-  "fieldname": "advance_amount", 
-  "fieldtype": "Currency", 
-  "permlevel": 1
- }, 
- {
-  "oldfieldtype": "Currency", 
-  "colour": "White:FFF", 
-  "doctype": "DocField", 
-  "label": "Allocated Amount", 
-  "oldfieldname": "allocated_amount", 
-  "width": "100px", 
-  "trigger": "Client", 
-  "fieldname": "allocated_amount", 
-  "fieldtype": "Currency", 
   "permlevel": 0
  }, 
  {
-  "oldfieldtype": "Small Text", 
+  "doctype": "DocType", 
+  "name": "Purchase Invoice Advance"
+ }, 
+ {
   "doctype": "DocField", 
-  "label": "Remarks", 
-  "oldfieldname": "remarks", 
-  "width": "150px", 
+  "fieldname": "journal_voucher", 
+  "fieldtype": "Link", 
+  "label": "Journal Voucher", 
+  "oldfieldname": "journal_voucher", 
+  "oldfieldtype": "Link", 
+  "options": "Journal Voucher", 
+  "read_only": 1, 
+  "width": "180px"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "jv_detail_no", 
+  "fieldtype": "Date", 
+  "hidden": 1, 
+  "label": "Journal Voucher Detail No", 
+  "oldfieldname": "jv_detail_no", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "width": "80px"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "advance_amount", 
+  "fieldtype": "Currency", 
+  "label": "Advance Amount", 
+  "oldfieldname": "advance_amount", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1, 
+  "width": "100px"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "allocated_amount", 
+  "fieldtype": "Currency", 
+  "label": "Allocated Amount", 
+  "oldfieldname": "allocated_amount", 
+  "oldfieldtype": "Currency", 
+  "width": "100px"
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "remarks", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Remarks", 
+  "oldfieldname": "remarks", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1, 
+  "width": "150px"
  }
 ]
\ No newline at end of file
diff --git a/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt b/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
index 93668b6..e17fbf0 100755
--- a/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
+++ b/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
@@ -1,289 +1,275 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:08", 
   "docstatus": 0, 
-  "creation": "2012-12-19 22:38:53", 
+  "modified": "2013-01-22 14:47:52", 
   "modified_by": "Administrator", 
-  "modified": "2013-01-04 13:15:09"
+  "owner": "Administrator"
  }, 
  {
-  "istable": 1, 
   "autoname": "EVD.######", 
-  "name": "__common__", 
   "doctype": "DocType", 
-  "module": "Accounts"
+  "istable": 1, 
+  "module": "Accounts", 
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Purchase Invoice Item", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "name": "Purchase Invoice Item", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Purchase Invoice Item"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Item", 
-  "oldfieldname": "item_code", 
-  "permlevel": 0, 
   "fieldname": "item_code", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 0, 
+  "in_filter": 1, 
+  "label": "Item", 
+  "oldfieldname": "item_code", 
+  "oldfieldtype": "Link", 
   "options": "Item", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "reqd": 0, 
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Item Name", 
-  "oldfieldname": "item_name", 
   "fieldname": "item_name", 
   "fieldtype": "Data", 
-  "search_index": 0, 
+  "in_filter": 0, 
+  "label": "Item Name", 
+  "oldfieldname": "item_name", 
+  "oldfieldtype": "Data", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 0
+  "search_index": 0
  }, 
  {
-  "print_width": "300px", 
-  "oldfieldtype": "Text", 
   "doctype": "DocField", 
-  "label": "Description", 
-  "oldfieldname": "description", 
-  "width": "300px", 
   "fieldname": "description", 
   "fieldtype": "Text", 
-  "permlevel": 0
+  "label": "Description", 
+  "oldfieldname": "description", 
+  "oldfieldtype": "Text", 
+  "print_width": "300px", 
+  "width": "300px"
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "qty", 
+  "fieldtype": "Float", 
   "label": "Qty", 
   "oldfieldname": "qty", 
-  "fieldname": "qty", 
-  "fieldtype": "Currency", 
-  "reqd": 1, 
-  "permlevel": 0
+  "oldfieldtype": "Currency", 
+  "print_hide": 0, 
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "UOM", 
-  "options": "UOM", 
   "fieldname": "uom", 
   "fieldtype": "Link", 
-  "permlevel": 0
+  "label": "UOM", 
+  "options": "UOM", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Ref Rate ", 
   "fieldname": "import_ref_rate", 
   "fieldtype": "Currency", 
-  "permlevel": 0
+  "label": "Ref Rate ", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 0, 
   "doctype": "DocField", 
-  "label": "Discount %", 
   "fieldname": "discount_rate", 
-  "fieldtype": "Currency", 
-  "permlevel": 0
+  "fieldtype": "Float", 
+  "label": "Discount %", 
+  "print_hide": 0
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Rate ", 
-  "oldfieldname": "import_rate", 
   "fieldname": "import_rate", 
   "fieldtype": "Currency", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Rate ", 
+  "oldfieldname": "import_rate", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 0, 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Amount", 
-  "oldfieldname": "import_amount", 
   "fieldname": "import_amount", 
   "fieldtype": "Currency", 
-  "reqd": 1, 
-  "permlevel": 1
+  "label": "Amount", 
+  "oldfieldname": "import_amount", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1, 
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Ref Rate *", 
   "fieldname": "purchase_ref_rate", 
   "fieldtype": "Currency", 
-  "permlevel": 0
+  "label": "Ref Rate *", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Rate *(Default Curr.)", 
-  "oldfieldname": "rate", 
   "fieldname": "rate", 
   "fieldtype": "Currency", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Rate *(Default Curr.)", 
+  "oldfieldname": "rate", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Amount (Default Curr.)", 
-  "oldfieldname": "amount", 
   "fieldname": "amount", 
   "fieldtype": "Currency", 
-  "reqd": 1, 
-  "permlevel": 1
+  "label": "Amount (Default Curr.)", 
+  "oldfieldname": "amount", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
-  "print_width": "120px", 
-  "permlevel": 0, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Expense Head", 
-  "oldfieldname": "expense_head", 
-  "width": "120px", 
   "fieldname": "expense_head", 
   "fieldtype": "Link", 
-  "reqd": 1, 
-  "options": "Account"
- }, 
- {
+  "label": "Expense Head", 
+  "oldfieldname": "expense_head", 
+  "oldfieldtype": "Link", 
+  "options": "Account", 
   "print_hide": 1, 
   "print_width": "120px", 
-  "oldfieldtype": "Link", 
+  "reqd": 1, 
+  "width": "120px"
+ }, 
+ {
   "doctype": "DocField", 
-  "label": "Cost Center", 
-  "oldfieldname": "cost_center", 
-  "width": "120px", 
-  "options": "Cost Center", 
   "fieldname": "cost_center", 
   "fieldtype": "Link", 
-  "permlevel": 0
+  "label": "Cost Center", 
+  "oldfieldname": "cost_center", 
+  "oldfieldtype": "Link", 
+  "options": "Cost Center", 
+  "print_hide": 1, 
+  "print_width": "120px", 
+  "width": "120px"
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Project Name", 
-  "options": "Project", 
   "fieldname": "project_name", 
   "fieldtype": "Link", 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Project Name", 
+  "options": "Project", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Brand", 
-  "oldfieldname": "brand", 
   "fieldname": "brand", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Brand", 
+  "oldfieldname": "brand", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Item Group", 
-  "oldfieldname": "item_group", 
-  "permlevel": 1, 
   "fieldname": "item_group", 
   "fieldtype": "Link", 
-  "search_index": 1, 
   "hidden": 1, 
+  "in_filter": 1, 
+  "label": "Item Group", 
+  "oldfieldname": "item_group", 
+  "oldfieldtype": "Link", 
   "options": "Item Group", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "read_only": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Pur Order", 
-  "oldfieldname": "purchase_order", 
-  "options": "Purchase Order", 
   "fieldname": "purchase_order", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "permlevel": 1, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Pur Order", 
+  "oldfieldname": "purchase_order", 
+  "oldfieldtype": "Link", 
+  "options": "Purchase Order", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Purchase Order Item", 
-  "oldfieldname": "po_detail", 
   "fieldname": "po_detail", 
   "fieldtype": "Data", 
-  "search_index": 1, 
   "hidden": 1, 
-  "permlevel": 1, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Purchase Order Item", 
+  "oldfieldname": "po_detail", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Pur Receipt", 
-  "oldfieldname": "purchase_receipt", 
-  "options": "Purchase Receipt", 
   "fieldname": "purchase_receipt", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "permlevel": 1, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Pur Receipt", 
+  "oldfieldname": "purchase_receipt", 
+  "oldfieldtype": "Link", 
+  "options": "Purchase Receipt", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "PR Detail", 
-  "oldfieldname": "pr_detail", 
   "fieldname": "pr_detail", 
   "fieldtype": "Data", 
-  "search_index": 1, 
   "hidden": 1, 
-  "permlevel": 1, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "PR Detail", 
+  "oldfieldname": "pr_detail", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges", 
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Item Tax Rate", 
-  "oldfieldname": "item_tax_rate", 
   "fieldname": "item_tax_rate", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
-  "permlevel": 1, 
+  "label": "Item Tax Rate", 
+  "oldfieldname": "item_tax_rate", 
+  "oldfieldtype": "Small Text", 
+  "print_hide": 1, 
+  "read_only": 1, 
   "report_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Page Break", 
   "fieldname": "page_break", 
   "fieldtype": "Check", 
-  "permlevel": 0, 
+  "label": "Page Break", 
+  "no_copy": 1, 
+  "print_hide": 1, 
   "report_hide": 1
  }
 ]
\ No newline at end of file
diff --git a/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.txt b/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.txt
index 52f837e..50711eb 100644
--- a/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.txt
+++ b/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.txt
@@ -1,202 +1,175 @@
 [
  {
-  "owner": "wasim@webnotestech.com", 
+  "creation": "2013-01-10 16:34:08", 
   "docstatus": 0, 
-  "creation": "2012-09-18 11:20:24", 
+  "modified": "2013-01-22 14:47:56", 
   "modified_by": "Administrator", 
-  "modified": "2012-09-28 12:27:43"
+  "owner": "wasim@webnotestech.com"
  }, 
  {
-  "section_style": "Tray", 
+  "autoname": "PVTD.######", 
+  "doctype": "DocType", 
+  "hide_heading": 1, 
   "istable": 1, 
   "module": "Accounts", 
-  "doctype": "DocType", 
-  "server_code_error": " ", 
-  "hide_heading": 1, 
-  "autoname": "PVTD.######", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "_last_update": "1322549700", 
-  "show_in_menu": 0, 
-  "version": 1
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Purchase Taxes and Charges", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "name": "Purchase Taxes and Charges", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Purchase Taxes and Charges"
  }, 
  {
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Type", 
-  "oldfieldname": "charge_type", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "charge_type", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "options": "\nActual\nOn Net Total\nOn Previous Row Amount\nOn Previous Row Total"
+  "label": "Type", 
+  "oldfieldname": "charge_type", 
+  "oldfieldtype": "Select", 
+  "options": "\nActual\nOn Net Total\nOn Previous Row Amount\nOn Previous Row Total", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Account Head", 
-  "oldfieldname": "account_head", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "account_head", 
   "fieldtype": "Link", 
-  "reqd": 1, 
-  "options": "Account"
+  "label": "Account Head", 
+  "oldfieldname": "account_head", 
+  "oldfieldtype": "Link", 
+  "options": "Account", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Cost Center", 
-  "oldfieldname": "cost_center", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "cost_center", 
   "fieldtype": "Link", 
+  "label": "Cost Center", 
+  "oldfieldname": "cost_center", 
+  "oldfieldtype": "Link", 
   "options": "Cost Center"
  }, 
  {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Description", 
-  "oldfieldname": "description", 
-  "width": "300px", 
   "fieldname": "description", 
   "fieldtype": "Small Text", 
+  "label": "Description", 
+  "oldfieldname": "description", 
+  "oldfieldtype": "Small Text", 
   "reqd": 1, 
-  "permlevel": 0
+  "width": "300px"
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Rate", 
-  "oldfieldname": "rate", 
-  "trigger": "Client", 
   "fieldname": "rate", 
   "fieldtype": "Currency", 
-  "reqd": 0, 
-  "permlevel": 0
+  "label": "Rate", 
+  "oldfieldname": "rate", 
+  "oldfieldtype": "Currency", 
+  "reqd": 0
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Amount", 
-  "oldfieldname": "tax_amount", 
-  "trigger": "Client", 
   "fieldname": "tax_amount", 
   "fieldtype": "Currency", 
-  "reqd": 0, 
-  "permlevel": 0
+  "label": "Amount", 
+  "oldfieldname": "tax_amount", 
+  "oldfieldtype": "Currency", 
+  "reqd": 0
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Total", 
-  "oldfieldname": "total", 
   "fieldname": "total", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Total", 
+  "oldfieldname": "total", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Enter Row", 
-  "oldfieldname": "row_id", 
-  "trigger": "Client", 
   "fieldname": "row_id", 
   "fieldtype": "Data", 
   "hidden": 0, 
-  "permlevel": 0
+  "label": "Enter Row", 
+  "oldfieldname": "row_id", 
+  "oldfieldtype": "Data"
  }, 
  {
   "default": "Valuation and Total", 
-  "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Consider Tax or Charge for", 
-  "oldfieldname": "category", 
-  "options": "Valuation and Total\nValuation\nTotal", 
   "fieldname": "category", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Consider Tax or Charge for", 
+  "oldfieldname": "category", 
+  "oldfieldtype": "Select", 
+  "options": "Valuation and Total\nValuation\nTotal", 
+  "reqd": 1
  }, 
  {
   "default": "Add", 
-  "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Add or Deduct", 
-  "oldfieldname": "add_deduct_tax", 
-  "trigger": "Client", 
   "fieldname": "add_deduct_tax", 
   "fieldtype": "Select", 
-  "reqd": 1, 
+  "label": "Add or Deduct", 
+  "oldfieldname": "add_deduct_tax", 
+  "oldfieldtype": "Select", 
   "options": "Add\nDeduct", 
-  "permlevel": 0
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Small Text", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Item Wise Tax Detail ", 
-  "oldfieldname": "item_wise_tax_detail", 
   "fieldname": "item_wise_tax_detail", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Item Wise Tax Detail ", 
+  "oldfieldname": "item_wise_tax_detail", 
+  "oldfieldtype": "Small Text", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "Parenttype", 
-  "oldfieldname": "parenttype", 
   "fieldname": "parenttype", 
   "fieldtype": "Data", 
-  "oldfieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Parenttype", 
+  "oldfieldname": "parenttype", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "search_index": 0
  }, 
  {
-  "print_hide": 1, 
   "description": "Cheating Field\nPlease do not delete ", 
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Total +Tax", 
-  "oldfieldname": "total_tax_amount", 
   "fieldname": "total_tax_amount", 
   "fieldtype": "Currency", 
   "hidden": 1, 
-  "permlevel": 0, 
+  "label": "Total +Tax", 
+  "no_copy": 1, 
+  "oldfieldname": "total_tax_amount", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
   "report_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "Cheating Field\nPlease do not delete ", 
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Tax Amount", 
-  "oldfieldname": "total_amount", 
   "fieldname": "total_amount", 
   "fieldtype": "Currency", 
   "hidden": 1, 
-  "permlevel": 0, 
+  "label": "Tax Amount", 
+  "no_copy": 1, 
+  "oldfieldname": "total_amount", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
   "report_hide": 1
  }
 ]
\ No newline at end of file
diff --git a/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt b/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt
index 6285602..8751a6f 100644
--- a/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt
+++ b/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt
@@ -1,91 +1,52 @@
 [
  {
-  "owner": "wasim@webnotestech.com", 
+  "creation": "2013-01-10 16:34:08", 
   "docstatus": 0, 
-  "creation": "2012-05-15 12:14:32", 
+  "modified": "2013-01-22 14:57:21", 
   "modified_by": "Administrator", 
-  "modified": "2012-08-17 09:57:04"
+  "owner": "wasim@webnotestech.com"
  }, 
  {
-  "section_style": "Simple", 
-  "description": "Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like \"Shipping\", \"Insurance\", \"Handling\" etc.\n\n#### Note\n\nThe tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.\n\n#### Description of Columns\n\n1. Calculation Type: \n    - This can be on **Net Total** (that is the sum of basic amount).\n    - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.\n    - **Actual** (as mentioned).\n2. Account Head: The Account ledger under which this tax will be booked\n3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.\n4. Description: Description of the tax (that will be printed in invoices / quotes).\n5. Rate: Tax rate.\n6. Amount: Tax amount.\n7. Total: Cumulative total to this point.\n8. Enter Row: If based on \"Previous Row Total\" you can select the row number which will be taken as a base for this calculation (default is the previous row).\n9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.\n10. Add or Deduct: Whether you want to add or deduct the tax.", 
-  "module": "Accounts", 
-  "server_code_error": " ", 
-  "allow_trash": 1, 
   "autoname": "field:title", 
-  "document_type": "Master", 
-  "_last_update": "1325570646", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
+  "description": "Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like \"Shipping\", \"Insurance\", \"Handling\" etc.\n\n#### Note\n\nThe tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.\n\n#### Description of Columns\n\n1. Calculation Type: \n    - This can be on **Net Total** (that is the sum of basic amount).\n    - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.\n    - **Actual** (as mentioned).\n2. Account Head: The Account ledger under which this tax will be booked\n3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.\n4. Description: Description of the tax (that will be printed in invoices / quotes).\n5. Rate: Tax rate.\n6. Amount: Tax amount.\n7. Total: Cumulative total to this point.\n8. Enter Row: If based on \"Previous Row Total\" you can select the row number which will be taken as a base for this calculation (default is the previous row).\n9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.\n10. Add or Deduct: Whether you want to add or deduct the tax.", 
   "doctype": "DocType", 
-  "show_in_menu": 0, 
-  "version": 1
+  "document_type": "Master", 
+  "module": "Accounts", 
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Purchase Taxes and Charges Master", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Purchase Taxes and Charges Master", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
   "permlevel": 0, 
-  "parentfield": "fields"
- }, 
- {
-  "name": "__common__", 
-  "parent": "Purchase Taxes and Charges Master", 
   "read": 1, 
-  "doctype": "DocPerm", 
-  "parenttype": "DocType", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Purchase Taxes and Charges Master", 
-  "doctype": "DocType"
- }, 
- {
-  "role": "All", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
   "report": 1, 
-  "role": "Purchase Manager", 
-  "cancel": 0, 
-  "permlevel": 0
+  "submit": 0
  }, 
  {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "cancel": 1, 
-  "role": "System Manager", 
-  "report": 1, 
-  "permlevel": 0
+  "doctype": "DocType", 
+  "name": "Purchase Taxes and Charges Master"
  }, 
  {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 1, 
-  "cancel": 1, 
-  "role": "Purchase Master Manager", 
-  "report": 1, 
-  "permlevel": 0
- }, 
- {
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "Title", 
-  "oldfieldname": "title", 
   "fieldname": "title", 
   "fieldtype": "Data", 
+  "in_filter": 1, 
+  "label": "Title", 
+  "oldfieldname": "title", 
   "oldfieldtype": "Data", 
   "reqd": 1, 
-  "in_filter": 1
+  "search_index": 0
  }, 
  {
   "doctype": "DocField", 
@@ -95,29 +56,42 @@
  }, 
  {
   "doctype": "DocField", 
-  "label": "Company", 
   "fieldname": "company", 
   "fieldtype": "Link", 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Company", 
   "options": "Company", 
-  "in_filter": 1
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "Purchase Taxes and Charges", 
-  "oldfieldname": "purchase_tax_details", 
   "fieldname": "purchase_tax_details", 
   "fieldtype": "Table", 
+  "label": "Purchase Taxes and Charges", 
+  "oldfieldname": "purchase_tax_details", 
+  "oldfieldtype": "Table", 
   "options": "Purchase Taxes and Charges"
  }, 
  {
-  "doctype": "DocField", 
-  "label": "Company", 
-  "fieldname": "company", 
-  "fieldtype": "Link", 
-  "reqd": 1, 
-  "options": "Company", 
-  "in_filter": 1
+  "amend": 0, 
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "role": "Purchase Manager", 
+  "write": 0
+ }, 
+ {
+  "cancel": 1, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "role": "System Manager", 
+  "write": 1
+ }, 
+ {
+  "cancel": 1, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "role": "Purchase Master Manager", 
+  "write": 1
  }
 ]
\ No newline at end of file
diff --git a/accounts/doctype/sales_invoice/sales_invoice.txt b/accounts/doctype/sales_invoice/sales_invoice.txt
index 1c9e2e7..dade4f5 100644
--- a/accounts/doctype/sales_invoice/sales_invoice.txt
+++ b/accounts/doctype/sales_invoice/sales_invoice.txt
@@ -1,1407 +1,1196 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:08", 
   "docstatus": 0, 
-  "creation": "2012-09-10 12:22:26", 
+  "modified": "2013-01-22 15:03:42", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-03 17:10:41"
+  "owner": "Administrator"
  }, 
  {
-  "is_submittable": 1, 
   "allow_attach": 1, 
   "autoname": "naming_series:", 
-  "module": "Accounts", 
   "doctype": "DocType", 
+  "is_submittable": 1, 
+  "module": "Accounts", 
+  "name": "__common__", 
   "read_only_onload": 1, 
-  "search_fields": "posting_date, due_date, debit_to, fiscal_year, grand_total, outstanding_amount", 
-  "name": "__common__"
+  "search_fields": "posting_date, due_date, debit_to, fiscal_year, grand_total, outstanding_amount"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Sales Invoice", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Sales Invoice", 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
   "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Sales Invoice", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
+  "permlevel": 0, 
+  "read": 1, 
+  "report": 1
  }, 
  {
-  "name": "Sales Invoice", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Sales Invoice"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Basic Info", 
   "fieldname": "basic_info", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Basic Info", 
+  "oldfieldtype": "Section Break", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break0", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "print_hide": 0, 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
   "description": "To manage multiple series please go to Setup > Manage Series", 
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Series", 
-  "oldfieldname": "naming_series", 
-  "permlevel": 0, 
   "fieldname": "naming_series", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "options": "INV\nINV/10-11/"
+  "label": "Series", 
+  "no_copy": 1, 
+  "oldfieldname": "naming_series", 
+  "oldfieldtype": "Select", 
+  "options": "INV\nINV/10-11/", 
+  "print_hide": 1, 
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Check", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Is POS", 
-  "oldfieldname": "is_pos", 
   "fieldname": "is_pos", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "Is POS", 
+  "oldfieldname": "is_pos", 
+  "oldfieldtype": "Check", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "default": "1", 
-  "oldfieldtype": "Check", 
+  "depends_on": "eval:doc.is_pos==1", 
   "doctype": "DocField", 
-  "label": "Update Stock", 
-  "oldfieldname": "update_stock", 
   "fieldname": "update_stock", 
   "fieldtype": "Check", 
-  "depends_on": "eval:doc.is_pos==1", 
-  "permlevel": 0
+  "label": "Update Stock", 
+  "oldfieldname": "update_stock", 
+  "oldfieldtype": "Check", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "The account to which you will pay (have paid) the money to.", 
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Debit To", 
-  "oldfieldname": "debit_to", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "debit_to", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Debit To", 
+  "oldfieldname": "debit_to", 
+  "oldfieldtype": "Link", 
   "options": "Account", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 0, 
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Customer", 
-  "oldfieldname": "customer", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "customer", 
   "fieldtype": "Link", 
   "hidden": 0, 
-  "options": "Customer"
+  "label": "Customer", 
+  "no_copy": 0, 
+  "oldfieldname": "customer", 
+  "oldfieldtype": "Link", 
+  "options": "Customer", 
+  "print_hide": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Name", 
-  "oldfieldname": "customer_name", 
   "fieldname": "customer_name", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Name", 
+  "oldfieldname": "customer_name", 
+  "oldfieldtype": "Data", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Address", 
   "fieldname": "address_display", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Address", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Contact", 
   "fieldname": "contact_display", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Contact", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Mobile No", 
   "fieldname": "contact_mobile", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Mobile No", 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Contact Email", 
   "fieldname": "contact_email", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Contact Email", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Column Break", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break"
  }, 
  {
-  "print_hide": 0, 
-  "description": "The date at which current entry will get or has actually executed.", 
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
-  "colour": "White:FFF", 
-  "doctype": "DocField", 
-  "label": "Posting Date", 
-  "oldfieldname": "posting_date", 
   "default": "Today", 
+  "description": "The date at which current entry will get or has actually executed.", 
+  "doctype": "DocField", 
   "fieldname": "posting_date", 
   "fieldtype": "Date", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Posting Date", 
+  "no_copy": 1, 
+  "oldfieldname": "posting_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 0, 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "description": "Enter the date by which payments from customer is expected against this invoice.", 
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
-  "colour": "White:FFF", 
-  "doctype": "DocField", 
-  "label": "Due Date", 
-  "oldfieldname": "due_date", 
   "default": "Today", 
+  "description": "Enter the date by which payments from customer is expected against this invoice.", 
+  "doctype": "DocField", 
   "fieldname": "due_date", 
   "fieldtype": "Date", 
-  "search_index": 0, 
+  "in_filter": 1, 
+  "label": "Due Date", 
+  "no_copy": 1, 
+  "oldfieldname": "due_date", 
+  "oldfieldtype": "Date", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 0
  }, 
  {
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Mode of Payment", 
-  "oldfieldname": "mode_of_payment", 
-  "permlevel": 0, 
   "fieldname": "mode_of_payment", 
   "fieldtype": "Select", 
+  "label": "Mode of Payment", 
+  "oldfieldname": "mode_of_payment", 
+  "oldfieldtype": "Select", 
   "options": "link:Mode of Payment"
  }, 
  {
-  "oldfieldtype": "Section Break", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Items", 
   "fieldname": "items", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Items", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "oldfieldtype": "Table", 
-  "colour": "White:FFF", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Entries", 
-  "oldfieldname": "entries", 
-  "permlevel": 0, 
   "fieldname": "entries", 
   "fieldtype": "Table", 
+  "label": "Entries", 
+  "oldfieldname": "entries", 
+  "oldfieldtype": "Table", 
   "options": "Sales Invoice Item"
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Sales BOM Help", 
   "fieldname": "sales_bom_help", 
   "fieldtype": "HTML", 
-  "permlevel": 0
+  "label": "Sales BOM Help", 
+  "print_hide": 1
  }, 
  {
   "doctype": "DocField", 
-  "permlevel": 0, 
   "fieldname": "section_break0", 
   "fieldtype": "Section Break", 
   "options": "Simple"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "col_break26", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "print_hide": 0, 
   "description": "Will be calculated automatically when you enter the details", 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Net Total*", 
-  "oldfieldname": "net_total", 
   "fieldname": "net_total", 
   "fieldtype": "Currency", 
-  "reqd": 1, 
-  "permlevel": 1
+  "label": "Net Total*", 
+  "oldfieldname": "net_total", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 0, 
+  "read_only": 1, 
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Button", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Re-Calculate Values", 
-  "trigger": "Client", 
   "fieldname": "recalculate_values", 
   "fieldtype": "Button", 
-  "permlevel": 0
+  "label": "Re-Calculate Values", 
+  "oldfieldtype": "Button", 
+  "print_hide": 1
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "col_break25", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
   "description": "Select Items from Sales Order", 
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Sales Order", 
-  "oldfieldname": "sales_order_main", 
-  "permlevel": 0, 
   "fieldname": "sales_order_main", 
   "fieldtype": "Link", 
-  "options": "Sales Order"
+  "label": "Sales Order", 
+  "oldfieldname": "sales_order_main", 
+  "oldfieldtype": "Link", 
+  "options": "Sales Order", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "Select Items from Delivery Note", 
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Delivery Note", 
-  "oldfieldname": "delivery_note_main", 
-  "permlevel": 0, 
   "fieldname": "delivery_note_main", 
   "fieldtype": "Link", 
-  "options": "Delivery Note"
+  "label": "Delivery Note", 
+  "oldfieldname": "delivery_note_main", 
+  "oldfieldtype": "Link", 
+  "options": "Delivery Note", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Get Items", 
-  "trigger": "Client", 
   "fieldname": "get_items", 
   "fieldtype": "Button", 
-  "permlevel": 0
+  "label": "Get Items", 
+  "oldfieldtype": "Button", 
+  "print_hide": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Price List and Currency", 
   "fieldname": "currency_section", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Price List and Currency"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "col_break27", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Price List", 
-  "oldfieldname": "price_list_name", 
-  "permlevel": 0, 
   "fieldname": "price_list_name", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "options": "link:Price List"
+  "label": "Price List", 
+  "oldfieldname": "price_list_name", 
+  "oldfieldtype": "Select", 
+  "options": "link:Price List", 
+  "print_hide": 1, 
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "Select the currency in which price list is maintained", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Price List Currency", 
-  "permlevel": 0, 
   "fieldname": "price_list_currency", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "options": "link:Currency"
+  "label": "Price List Currency", 
+  "options": "link:Currency", 
+  "print_hide": 1, 
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "Rate at which Price list currency is converted to customer's base currency", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Price List Currency Conversion Rate", 
   "fieldname": "plc_conversion_rate", 
   "fieldtype": "Float", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Price List Currency Conversion Rate", 
+  "print_hide": 1, 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break2", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Currency", 
-  "oldfieldname": "currency", 
-  "permlevel": 0, 
   "fieldname": "currency", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "options": "link:Currency"
+  "label": "Currency", 
+  "oldfieldname": "currency", 
+  "oldfieldtype": "Select", 
+  "options": "link:Currency", 
+  "print_hide": 1, 
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
-  "description": "Rate at which Customer Currency is converted to customer's base currency", 
   "default": "1.00", 
-  "oldfieldtype": "Currency", 
-  "colour": "White:FFF", 
+  "description": "Rate at which Customer Currency is converted to customer's base currency", 
   "doctype": "DocField", 
-  "label": "Conversion Rate", 
-  "oldfieldname": "conversion_rate", 
   "fieldname": "conversion_rate", 
   "fieldtype": "Float", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Conversion Rate", 
+  "oldfieldname": "conversion_rate", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Taxes and Charges", 
   "fieldname": "taxes", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Taxes and Charges", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Taxes and Charges", 
-  "oldfieldname": "charge", 
-  "permlevel": 0, 
   "fieldname": "charge", 
   "fieldtype": "Link", 
-  "options": "Sales Taxes and Charges Master"
+  "label": "Taxes and Charges", 
+  "oldfieldname": "charge", 
+  "oldfieldtype": "Link", 
+  "options": "Sales Taxes and Charges Master", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Get Taxes and Charges", 
-  "trigger": "Client", 
   "fieldname": "get_charges", 
   "fieldtype": "Button", 
-  "permlevel": 0
+  "label": "Get Taxes and Charges", 
+  "oldfieldtype": "Button", 
+  "print_hide": 1
  }, 
  {
-  "oldfieldtype": "Table", 
-  "colour": "White:FFF", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Taxes and Charges1", 
-  "oldfieldname": "other_charges", 
-  "permlevel": 0, 
   "fieldname": "other_charges", 
   "fieldtype": "Table", 
+  "label": "Taxes and Charges1", 
+  "oldfieldname": "other_charges", 
+  "oldfieldtype": "Table", 
   "options": "Sales Taxes and Charges"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Calculate Taxes and Charges", 
-  "trigger": "Client", 
   "fieldname": "calculate_charges", 
   "fieldtype": "Button", 
-  "permlevel": 0
+  "label": "Calculate Taxes and Charges", 
+  "oldfieldtype": "Button", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Total Taxes and Charges", 
-  "oldfieldname": "other_charges_total", 
   "fieldname": "other_charges_total", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Total Taxes and Charges", 
+  "oldfieldname": "other_charges_total", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "HTML", 
   "doctype": "DocField", 
-  "label": "Taxes and Charges Calculation", 
   "fieldname": "other_charges_calculation", 
   "fieldtype": "HTML", 
-  "permlevel": 0
+  "label": "Taxes and Charges Calculation", 
+  "oldfieldtype": "HTML", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Section Break", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Totals", 
   "fieldname": "totals", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Totals", 
+  "oldfieldtype": "Section Break", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Column Break", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break5", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "print_hide": 1, 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Grand Total", 
-  "oldfieldname": "grand_total", 
   "fieldname": "grand_total", 
   "fieldtype": "Currency", 
-  "search_index": 0, 
+  "in_filter": 1, 
+  "label": "Grand Total", 
+  "oldfieldname": "grand_total", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
   "reqd": 1, 
-  "permlevel": 1, 
-  "in_filter": 1
+  "search_index": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Rounded Total", 
-  "oldfieldname": "rounded_total", 
   "fieldname": "rounded_total", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Rounded Total", 
+  "oldfieldname": "rounded_total", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "In Words will be visible once you save the Sales Invoice.", 
-  "oldfieldtype": "Data", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "In Words", 
-  "oldfieldname": "in_words", 
   "fieldname": "in_words", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "In Words", 
+  "oldfieldname": "in_words", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Total Advance", 
-  "oldfieldname": "total_advance", 
   "fieldname": "total_advance", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Total Advance", 
+  "oldfieldname": "total_advance", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Outstanding Amount", 
-  "oldfieldname": "outstanding_amount", 
   "fieldname": "outstanding_amount", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Outstanding Amount", 
+  "no_copy": 1, 
+  "oldfieldname": "outstanding_amount", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Column Break", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break6", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "print_hide": 1, 
+  "width": "50%"
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Grand Total (Export)", 
-  "oldfieldname": "grand_total_export", 
   "fieldname": "grand_total_export", 
   "fieldtype": "Currency", 
-  "reqd": 1, 
-  "permlevel": 1
+  "label": "Grand Total (Export)", 
+  "oldfieldname": "grand_total_export", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 0, 
+  "read_only": 1, 
+  "reqd": 1
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Rounded Total (Export)", 
-  "oldfieldname": "rounded_total_export", 
   "fieldname": "rounded_total_export", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Rounded Total (Export)", 
+  "oldfieldname": "rounded_total_export", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 0, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Data", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "In Words (Export)", 
-  "oldfieldname": "in_words_export", 
   "fieldname": "in_words_export", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "In Words (Export)", 
+  "oldfieldname": "in_words_export", 
+  "oldfieldtype": "Data", 
+  "print_hide": 0, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Gross Profit", 
-  "oldfieldname": "gross_profit", 
   "fieldname": "gross_profit", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Gross Profit", 
+  "oldfieldname": "gross_profit", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Gross Profit (%)", 
-  "oldfieldname": "gross_profit_percent", 
   "fieldname": "gross_profit_percent", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Gross Profit (%)", 
+  "oldfieldname": "gross_profit_percent", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Payments", 
   "fieldname": "payments_section", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Payments"
  }, 
  {
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break3", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Paid Amount", 
-  "oldfieldname": "paid_amount", 
-  "trigger": "Client", 
   "fieldname": "paid_amount", 
   "fieldtype": "Currency", 
-  "permlevel": 0
+  "label": "Paid Amount", 
+  "oldfieldname": "paid_amount", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Cash/Bank Account", 
-  "oldfieldname": "cash_bank_account", 
-  "permlevel": 0, 
   "fieldname": "cash_bank_account", 
   "fieldtype": "Link", 
-  "options": "Account"
+  "label": "Cash/Bank Account", 
+  "oldfieldname": "cash_bank_account", 
+  "oldfieldtype": "Link", 
+  "options": "Account", 
+  "print_hide": 1
  }, 
  {
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break4", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Write Off Outstanding Amount", 
   "fieldname": "write_off_outstanding_amount_automatically", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "Write Off Outstanding Amount", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Write Off Amount", 
   "fieldname": "write_off_amount", 
   "fieldtype": "Currency", 
-  "permlevel": 0
+  "label": "Write Off Amount", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Write Off Account", 
-  "permlevel": 0, 
   "fieldname": "write_off_account", 
   "fieldtype": "Link", 
-  "options": "Account"
+  "label": "Write Off Account", 
+  "options": "Account", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Write Off Cost Center", 
-  "permlevel": 0, 
   "fieldname": "write_off_cost_center", 
   "fieldtype": "Link", 
-  "options": "Cost Center"
+  "label": "Write Off Cost Center", 
+  "options": "Cost Center", 
+  "print_hide": 1
  }, 
  {
-  "oldfieldtype": "Section Break", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Terms and Conditions", 
   "fieldname": "terms_section_break", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Terms and Conditions", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Select Terms and Conditions", 
-  "oldfieldname": "tc_name", 
-  "permlevel": 0, 
   "fieldname": "tc_name", 
   "fieldtype": "Link", 
-  "options": "Terms and Conditions"
+  "label": "Select Terms and Conditions", 
+  "oldfieldname": "tc_name", 
+  "oldfieldtype": "Link", 
+  "options": "Terms and Conditions", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Button", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Get Terms and Conditions", 
-  "permlevel": 0, 
-  "trigger": "Server", 
   "fieldname": "get_terms", 
   "fieldtype": "Button", 
-  "options": "get_tc_details"
+  "label": "Get Terms and Conditions", 
+  "oldfieldtype": "Button", 
+  "options": "get_tc_details", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "HTML", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Terms and Conditions HTML", 
-  "permlevel": 0, 
   "fieldname": "terms_html", 
   "fieldtype": "HTML", 
-  "options": "You can add Terms and Notes that will be printed in the Transaction"
+  "label": "Terms and Conditions HTML", 
+  "oldfieldtype": "HTML", 
+  "options": "You can add Terms and Notes that will be printed in the Transaction", 
+  "print_hide": 1
  }, 
  {
-  "oldfieldtype": "Text Editor", 
   "doctype": "DocField", 
-  "label": "Terms and Conditions Details", 
-  "oldfieldname": "terms", 
   "fieldname": "terms", 
   "fieldtype": "Text Editor", 
-  "permlevel": 0
+  "label": "Terms and Conditions Details", 
+  "oldfieldname": "terms", 
+  "oldfieldtype": "Text Editor"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Contact Info", 
   "fieldname": "contact_section", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Contact Info"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "col_break23", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Customer Address", 
-  "permlevel": 0, 
   "fieldname": "customer_address", 
   "fieldtype": "Link", 
-  "options": "Address"
+  "label": "Customer Address", 
+  "options": "Address", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Contact Person", 
-  "permlevel": 0, 
   "fieldname": "contact_person", 
   "fieldtype": "Link", 
-  "options": "Contact"
+  "label": "Contact Person", 
+  "options": "Contact", 
+  "print_hide": 1
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "col_break24", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "Territory", 
-  "permlevel": 0, 
   "fieldname": "territory", 
   "fieldtype": "Link", 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Territory", 
   "options": "Territory", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 0
  }, 
  {
-  "print_hide": 1, 
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "Customer Group", 
-  "permlevel": 0, 
   "fieldname": "customer_group", 
   "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Customer Group", 
   "options": "Customer Group", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "search_index": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Section Break", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "More Info", 
   "fieldname": "more_info", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "More Info", 
+  "oldfieldtype": "Section Break", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Column Break", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break7", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "print_hide": 1, 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
   "default": "No", 
-  "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Is Opening", 
-  "oldfieldname": "is_opening", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "is_opening", 
   "fieldtype": "Select", 
-  "search_index": 0, 
+  "in_filter": 1, 
+  "label": "Is Opening", 
+  "oldfieldname": "is_opening", 
+  "oldfieldtype": "Select", 
   "options": "No\nYes", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "search_index": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Aging Date", 
-  "oldfieldname": "aging_date", 
   "fieldname": "aging_date", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "Aging Date", 
+  "oldfieldname": "aging_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Time", 
   "doctype": "DocField", 
-  "label": "Posting Time", 
-  "oldfieldname": "posting_time", 
   "fieldname": "posting_time", 
   "fieldtype": "Time", 
-  "permlevel": 0
+  "label": "Posting Time", 
+  "no_copy": 1, 
+  "oldfieldname": "posting_time", 
+  "oldfieldtype": "Time", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Letter Head", 
-  "oldfieldname": "letter_head", 
-  "permlevel": 0, 
   "fieldname": "letter_head", 
   "fieldtype": "Select", 
-  "options": "link:Letter Head"
+  "label": "Letter Head", 
+  "oldfieldname": "letter_head", 
+  "oldfieldtype": "Select", 
+  "options": "link:Letter Head", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "C-Form Applicable", 
-  "permlevel": 0, 
   "fieldname": "c_form_applicable", 
   "fieldtype": "Select", 
+  "label": "C-Form Applicable", 
+  "no_copy": 1, 
   "options": "No\nYes", 
+  "print_hide": 1, 
   "report_hide": 0
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "C-Form No", 
-  "permlevel": 1, 
   "fieldname": "c_form_no", 
   "fieldtype": "Link", 
-  "options": "C-Form"
+  "label": "C-Form No", 
+  "no_copy": 1, 
+  "options": "C-Form", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
+  "depends_on": "eval:doc.source == 'Campaign'", 
   "doctype": "DocField", 
-  "label": "Campaign", 
-  "oldfieldname": "campaign", 
-  "permlevel": 0, 
   "fieldname": "campaign", 
   "fieldtype": "Link", 
-  "depends_on": "eval:doc.source == 'Campaign'", 
-  "options": "Campaign"
+  "label": "Campaign", 
+  "oldfieldname": "campaign", 
+  "oldfieldtype": "Link", 
+  "options": "Campaign", 
+  "print_hide": 1
  }, 
  {
   "description": "Track this Sales Invoice against any Project", 
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Project Name", 
-  "oldfieldname": "project_name", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "project_name", 
   "fieldtype": "Link", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Project Name", 
+  "oldfieldname": "project_name", 
+  "oldfieldtype": "Link", 
   "options": "Project", 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Select Print Heading", 
-  "oldfieldname": "select_print_heading", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "select_print_heading", 
   "fieldtype": "Link", 
+  "label": "Select Print Heading", 
+  "no_copy": 1, 
+  "oldfieldname": "select_print_heading", 
+  "oldfieldtype": "Link", 
   "options": "Print Heading", 
+  "print_hide": 1, 
   "report_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Column Break", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "fieldname": "column_break8", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Source", 
-  "oldfieldname": "source", 
-  "permlevel": 0, 
   "fieldname": "source", 
   "fieldtype": "Select", 
-  "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign"
+  "label": "Source", 
+  "oldfieldname": "source", 
+  "oldfieldtype": "Select", 
+  "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Company", 
-  "oldfieldname": "company", 
-  "options": "Company", 
   "fieldname": "company", 
   "fieldtype": "Link", 
-  "search_index": 0, 
+  "in_filter": 1, 
+  "label": "Company", 
+  "oldfieldname": "company", 
+  "oldfieldtype": "Link", 
+  "options": "Company", 
+  "print_hide": 1, 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 0
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 0, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Fiscal Year", 
-  "oldfieldname": "fiscal_year", 
-  "permlevel": 0, 
   "fieldname": "fiscal_year", 
   "fieldtype": "Select", 
-  "search_index": 0, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Fiscal Year", 
+  "no_copy": 0, 
+  "oldfieldname": "fiscal_year", 
+  "oldfieldtype": "Select", 
   "options": "link:Fiscal Year", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 0
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Amended From", 
-  "oldfieldname": "amended_from", 
-  "permlevel": 1, 
   "fieldname": "amended_from", 
   "fieldtype": "Link", 
-  "options": "Sales Invoice"
+  "label": "Amended From", 
+  "no_copy": 1, 
+  "oldfieldname": "amended_from", 
+  "oldfieldtype": "Link", 
+  "options": "Sales Invoice", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "The date at which current entry is corrected in the system.", 
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Amendment Date", 
-  "oldfieldname": "amendment_date", 
   "fieldname": "amendment_date", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "Amendment Date", 
+  "no_copy": 1, 
+  "oldfieldname": "amendment_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Data", 
-  "colour": "White:FFF", 
+  "depends_on": "eval:!doc.__islocal", 
   "doctype": "DocField", 
-  "label": "Cancel Reason", 
-  "oldfieldname": "cancel_reason", 
   "fieldname": "cancel_reason", 
   "fieldtype": "Data", 
-  "depends_on": "eval:!doc.__islocal", 
-  "permlevel": 1
+  "label": "Cancel Reason", 
+  "oldfieldname": "cancel_reason", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Text", 
   "doctype": "DocField", 
-  "label": "Remarks", 
-  "oldfieldname": "remarks", 
   "fieldname": "remarks", 
   "fieldtype": "Small Text", 
-  "reqd": 0, 
-  "permlevel": 0
+  "label": "Remarks", 
+  "no_copy": 1, 
+  "oldfieldname": "remarks", 
+  "oldfieldtype": "Text", 
+  "print_hide": 1, 
+  "reqd": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Section Break", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Advances", 
   "fieldname": "advances", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Advances", 
+  "oldfieldtype": "Section Break", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Get Advances Received", 
-  "permlevel": 0, 
   "fieldname": "get_advances_received", 
   "fieldtype": "Button", 
-  "options": "get_advances"
+  "label": "Get Advances Received", 
+  "oldfieldtype": "Button", 
+  "options": "get_advances", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "Sales Invoice Advance", 
-  "oldfieldname": "advance_adjustment_details", 
-  "permlevel": 0, 
   "fieldname": "advance_adjustment_details", 
   "fieldtype": "Table", 
-  "options": "Sales Invoice Advance"
+  "label": "Sales Invoice Advance", 
+  "oldfieldname": "advance_adjustment_details", 
+  "oldfieldtype": "Table", 
+  "options": "Sales Invoice Advance", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Packing List", 
   "fieldname": "packing_list", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Packing List", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Packing Details", 
-  "permlevel": 0, 
   "fieldname": "packing_details", 
   "fieldtype": "Table", 
-  "options": "Delivery Note Packing Item"
+  "label": "Packing Details", 
+  "options": "Delivery Note Packing Item", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Sales Team", 
   "fieldname": "sales_team_section_break", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Sales Team", 
+  "oldfieldtype": "Section Break", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Column Break", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break9", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "print_hide": 1, 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Sales Partner", 
-  "oldfieldname": "sales_partner", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "sales_partner", 
   "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Sales Partner", 
+  "oldfieldname": "sales_partner", 
+  "oldfieldtype": "Link", 
   "options": "Sales Partner", 
-  "in_filter": 1
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Column Break", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break10", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "print_hide": 1, 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "commission_rate", 
+  "fieldtype": "Float", 
   "label": "Commission Rate (%)", 
   "oldfieldname": "commission_rate", 
-  "trigger": "Client", 
-  "fieldname": "commission_rate", 
-  "fieldtype": "Currency", 
-  "permlevel": 0
+  "oldfieldtype": "Currency", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Total Commission", 
-  "oldfieldname": "total_commission", 
-  "trigger": "Client", 
   "fieldname": "total_commission", 
   "fieldtype": "Currency", 
-  "permlevel": 0
+  "label": "Total Commission", 
+  "oldfieldname": "total_commission", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "options": "Simple", 
   "fieldname": "section_break2", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "options": "Simple", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "Sales Team1", 
-  "oldfieldname": "sales_team", 
-  "permlevel": 0, 
   "fieldname": "sales_team", 
   "fieldtype": "Table", 
-  "options": "Sales Team"
+  "label": "Sales Team1", 
+  "oldfieldname": "sales_team", 
+  "oldfieldtype": "Table", 
+  "options": "Sales Team", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "depends_on": "eval:doc.docstatus<2", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Recurring Invoice", 
   "fieldname": "recurring_invoice", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Recurring Invoice", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break11", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "print_hide": 1, 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
-  "description": "Check if recurring invoice, uncheck to stop recurring or put proper End Date", 
-  "no_copy": 1, 
-  "depends_on": "eval:doc.docstatus<2", 
-  "colour": "White:FFF", 
   "allow_on_submit": 1, 
+  "depends_on": "eval:doc.docstatus<2", 
+  "description": "Check if recurring invoice, uncheck to stop recurring or put proper End Date", 
   "doctype": "DocField", 
-  "label": "Convert into Recurring Invoice", 
-  "trigger": "Client", 
   "fieldname": "convert_into_recurring_invoice", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "Convert into Recurring Invoice", 
+  "no_copy": 1, 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "description": "Select the period when the invoice will be generated automatically", 
-  "no_copy": 1, 
-  "depends_on": "eval:doc.convert_into_recurring_invoice==1", 
-  "colour": "White:FFF", 
   "allow_on_submit": 1, 
+  "depends_on": "eval:doc.convert_into_recurring_invoice==1", 
+  "description": "Select the period when the invoice will be generated automatically", 
   "doctype": "DocField", 
-  "label": "Recurring Type", 
-  "options": "Monthly\nQuarterly\nHalf-yearly\nYearly", 
   "fieldname": "recurring_type", 
   "fieldtype": "Select", 
-  "permlevel": 0
+  "label": "Recurring Type", 
+  "no_copy": 1, 
+  "options": "Monthly\nQuarterly\nHalf-yearly\nYearly", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "description": "The day of the month on which auto invoice will be generated e.g. 05, 28 etc ", 
-  "no_copy": 1, 
-  "depends_on": "eval:doc.convert_into_recurring_invoice==1", 
   "allow_on_submit": 1, 
+  "depends_on": "eval:doc.convert_into_recurring_invoice==1", 
+  "description": "The day of the month on which auto invoice will be generated e.g. 05, 28 etc ", 
   "doctype": "DocField", 
-  "label": "Repeat on Day of Month", 
   "fieldname": "repeat_on_day_of_month", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Repeat on Day of Month", 
+  "no_copy": 1, 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "description": "Start date of current invoice's period", 
-  "no_copy": 1, 
-  "depends_on": "eval:doc.convert_into_recurring_invoice==1", 
-  "colour": "White:FFF", 
   "allow_on_submit": 1, 
+  "depends_on": "eval:doc.convert_into_recurring_invoice==1", 
+  "description": "Start date of current invoice's period", 
   "doctype": "DocField", 
-  "label": "Invoice Period From Date", 
   "fieldname": "invoice_period_from_date", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "Invoice Period From Date", 
+  "no_copy": 1, 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "description": "End date of current invoice's period", 
-  "no_copy": 1, 
-  "depends_on": "eval:doc.convert_into_recurring_invoice==1", 
-  "colour": "White:FFF", 
   "allow_on_submit": 1, 
+  "depends_on": "eval:doc.convert_into_recurring_invoice==1", 
+  "description": "End date of current invoice's period", 
   "doctype": "DocField", 
-  "label": "Invoice Period To Date", 
   "fieldname": "invoice_period_to_date", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "Invoice Period To Date", 
+  "no_copy": 1, 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 0, 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break12", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "no_copy": 0, 
+  "print_hide": 1, 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
-  "description": "Enter email id separated by commas, invoice will be mailed automatically on particular date", 
-  "no_copy": 1, 
-  "depends_on": "eval:doc.convert_into_recurring_invoice==1", 
   "allow_on_submit": 1, 
+  "depends_on": "eval:doc.convert_into_recurring_invoice==1", 
+  "description": "Enter email id separated by commas, invoice will be mailed automatically on particular date", 
   "doctype": "DocField", 
-  "label": "Notification Email Address", 
   "fieldname": "notification_email_address", 
   "fieldtype": "Small Text", 
-  "permlevel": 0
+  "label": "Notification Email Address", 
+  "no_copy": 1, 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "description": "The unique id for tracking all recurring invoices.\u00a0It is generated on submit.", 
-  "no_copy": 1, 
   "depends_on": "eval:doc.convert_into_recurring_invoice==1", 
-  "colour": "White:FFF", 
+  "description": "The unique id for tracking all recurring invoices.\u00a0It is generated on submit.", 
   "doctype": "DocField", 
-  "label": "Recurring Id", 
   "fieldname": "recurring_id", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Recurring Id", 
+  "no_copy": 1, 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "description": "The date on which next invoice will be generated. It is generated on submit.\n", 
-  "no_copy": 1, 
   "depends_on": "eval:doc.convert_into_recurring_invoice==1", 
-  "colour": "White:FFF", 
+  "description": "The date on which next invoice will be generated. It is generated on submit.\n", 
   "doctype": "DocField", 
-  "label": "Next Date", 
   "fieldname": "next_date", 
   "fieldtype": "Date", 
-  "permlevel": 1
+  "label": "Next Date", 
+  "no_copy": 1, 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "description": "The date on which recurring invoice will be stop", 
-  "no_copy": 1, 
-  "depends_on": "eval:doc.convert_into_recurring_invoice==1", 
   "allow_on_submit": 1, 
+  "depends_on": "eval:doc.convert_into_recurring_invoice==1", 
+  "description": "The date on which recurring invoice will be stop", 
   "doctype": "DocField", 
-  "label": "End Date", 
   "fieldname": "end_date", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "End Date", 
+  "no_copy": 1, 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Against Income Account", 
-  "oldfieldname": "against_income_account", 
   "fieldname": "against_income_account", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
-  "permlevel": 0, 
+  "label": "Against Income Account", 
+  "no_copy": 1, 
+  "oldfieldname": "against_income_account", 
+  "oldfieldtype": "Small Text", 
+  "print_hide": 1, 
   "report_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "File List", 
   "fieldname": "file_list", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 0
- }, 
- {
-  "role": "Material Manager", 
-  "permlevel": 0, 
-  "doctype": "DocPerm"
+  "label": "File List", 
+  "no_copy": 1, 
+  "print_hide": 1
  }, 
  {
   "amend": 1, 
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "read": 1, 
   "role": "Accounts User", 
-  "report": 1, 
-  "permlevel": 0, 
-  "cancel": 1
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "read": 1, 
-  "role": "Accounts User", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "read": 1, 
-  "doctype": "DocPerm", 
-  "role": "Customer", 
-  "report": 1, 
-  "permlevel": 0, 
-  "match": "customer"
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "read": 1, 
-  "role": "Accounts Manager", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "amend": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
   "submit": 1, 
-  "write": 1, 
-  "read": 1, 
-  "role": "Accounts Manager", 
-  "report": 1, 
-  "permlevel": 0, 
-  "cancel": 1
+  "write": 1
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "match": "customer", 
+  "role": "Customer"
  }
 ]
\ No newline at end of file
diff --git a/accounts/doctype/sales_invoice_advance/sales_invoice_advance.txt b/accounts/doctype/sales_invoice_advance/sales_invoice_advance.txt
index bb17796..dc035b5 100644
--- a/accounts/doctype/sales_invoice_advance/sales_invoice_advance.txt
+++ b/accounts/doctype/sales_invoice_advance/sales_invoice_advance.txt
@@ -1,86 +1,80 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:09", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:35:40", 
+  "modified": "2013-01-22 14:48:41", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:35:40"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Tray", 
+  "doctype": "DocType", 
   "istable": 1, 
-  "name": "__common__", 
-  "colour": "White:FFF", 
   "module": "Accounts", 
-  "show_in_menu": 0, 
-  "version": 24, 
-  "server_code_error": " ", 
-  "doctype": "DocType"
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
-  "parent": "Sales Invoice Advance", 
   "no_copy": 1, 
-  "doctype": "DocField", 
+  "parent": "Sales Invoice Advance", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
-  "name": "Sales Invoice Advance", 
-  "doctype": "DocType"
- }, 
- {
-  "permlevel": 1, 
-  "oldfieldtype": "Link", 
-  "doctype": "DocField", 
-  "label": "Journal Voucher", 
-  "oldfieldname": "journal_voucher", 
-  "width": "250px", 
-  "fieldname": "journal_voucher", 
-  "fieldtype": "Link", 
-  "options": "Journal Voucher"
- }, 
- {
-  "print_hide": 1, 
-  "oldfieldtype": "Data", 
-  "doctype": "DocField", 
-  "label": "Journal Voucher Detail No", 
-  "oldfieldname": "jv_detail_no", 
-  "width": "120px", 
-  "fieldname": "jv_detail_no", 
-  "fieldtype": "Data", 
-  "hidden": 1, 
-  "permlevel": 1
- }, 
- {
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Advance amount", 
-  "oldfieldname": "advance_amount", 
-  "width": "120px", 
-  "fieldname": "advance_amount", 
-  "fieldtype": "Currency", 
-  "permlevel": 1
- }, 
- {
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Allocated amount", 
-  "oldfieldname": "allocated_amount", 
-  "width": "120px", 
-  "trigger": "Client", 
-  "fieldname": "allocated_amount", 
-  "fieldtype": "Currency", 
   "permlevel": 0
  }, 
  {
-  "oldfieldtype": "Small Text", 
+  "doctype": "DocType", 
+  "name": "Sales Invoice Advance"
+ }, 
+ {
   "doctype": "DocField", 
-  "label": "Remarks", 
-  "oldfieldname": "remarks", 
-  "width": "150px", 
+  "fieldname": "journal_voucher", 
+  "fieldtype": "Link", 
+  "label": "Journal Voucher", 
+  "oldfieldname": "journal_voucher", 
+  "oldfieldtype": "Link", 
+  "options": "Journal Voucher", 
+  "read_only": 1, 
+  "width": "250px"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "jv_detail_no", 
+  "fieldtype": "Data", 
+  "hidden": 1, 
+  "label": "Journal Voucher Detail No", 
+  "oldfieldname": "jv_detail_no", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "width": "120px"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "advance_amount", 
+  "fieldtype": "Currency", 
+  "label": "Advance amount", 
+  "oldfieldname": "advance_amount", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1, 
+  "width": "120px"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "allocated_amount", 
+  "fieldtype": "Currency", 
+  "label": "Allocated amount", 
+  "oldfieldname": "allocated_amount", 
+  "oldfieldtype": "Currency", 
+  "width": "120px"
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "remarks", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Remarks", 
+  "oldfieldname": "remarks", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1, 
+  "width": "150px"
  }
 ]
\ No newline at end of file
diff --git a/accounts/doctype/sales_invoice_item/sales_invoice_item.txt b/accounts/doctype/sales_invoice_item/sales_invoice_item.txt
index 19a627a..9bf9598 100644
--- a/accounts/doctype/sales_invoice_item/sales_invoice_item.txt
+++ b/accounts/doctype/sales_invoice_item/sales_invoice_item.txt
@@ -1,385 +1,350 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:09", 
   "docstatus": 0, 
-  "creation": "2012-06-08 16:07:55", 
+  "modified": "2013-01-22 15:01:34", 
   "modified_by": "Administrator", 
-  "modified": "2012-07-09 11:00:18"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Tray", 
+  "autoname": "INVD.######", 
+  "doctype": "DocType", 
   "istable": 1, 
   "module": "Accounts", 
-  "server_code_error": " ", 
-  "doctype": "DocType", 
-  "autoname": "INVD.######", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "show_in_menu": 0, 
-  "version": 1
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Sales Invoice Item", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
-  "name": "Sales Invoice Item", 
-  "doctype": "DocType"
- }, 
- {
-  "print_hide": 1, 
-  "doctype": "DocField", 
-  "label": "Barcode", 
-  "fieldname": "barcode", 
-  "fieldtype": "Data", 
   "permlevel": 0
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Link", 
-  "doctype": "DocField", 
-  "label": "Item", 
-  "oldfieldname": "item_code", 
-  "permlevel": 0, 
-  "trigger": "Client", 
-  "fieldname": "item_code", 
-  "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 0, 
-  "options": "Item", 
-  "in_filter": 1
+  "doctype": "DocType", 
+  "name": "Sales Invoice Item"
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Customer's Item Code", 
+  "fieldname": "barcode", 
+  "fieldtype": "Data", 
+  "label": "Barcode", 
+  "print_hide": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "item_code", 
+  "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Item", 
+  "oldfieldname": "item_code", 
+  "oldfieldtype": "Link", 
+  "options": "Item", 
+  "print_hide": 0, 
+  "reqd": 0, 
+  "search_index": 1
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "customer_item_code", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Customer's Item Code", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "Item Name", 
-  "oldfieldname": "item_name", 
   "fieldname": "item_name", 
   "fieldtype": "Data", 
+  "in_filter": 0, 
+  "label": "Item Name", 
+  "oldfieldname": "item_name", 
   "oldfieldtype": "Data", 
+  "print_hide": 1, 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 0
+  "search_index": 0
  }, 
  {
-  "oldfieldtype": "Text", 
   "doctype": "DocField", 
-  "label": "Description", 
-  "oldfieldname": "description", 
-  "width": "200px", 
   "fieldname": "description", 
   "fieldtype": "Text", 
+  "label": "Description", 
+  "oldfieldname": "description", 
+  "oldfieldtype": "Text", 
   "reqd": 1, 
-  "permlevel": 0
+  "width": "200px"
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "qty", 
+  "fieldtype": "Float", 
   "label": "Qty", 
   "oldfieldname": "qty", 
-  "trigger": "Client", 
-  "fieldname": "qty", 
-  "fieldtype": "Currency", 
-  "reqd": 0, 
-  "permlevel": 0
+  "oldfieldtype": "Currency", 
+  "reqd": 0
  }, 
  {
   "doctype": "DocField", 
-  "label": "UOM", 
   "fieldname": "stock_uom", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "UOM", 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Price List Rate", 
-  "oldfieldname": "ref_rate", 
-  "trigger": "Client", 
   "fieldname": "ref_rate", 
   "fieldtype": "Currency", 
-  "reqd": 0, 
-  "permlevel": 0
+  "label": "Price List Rate", 
+  "oldfieldname": "ref_rate", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "reqd": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Float", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Discount (%)", 
-  "oldfieldname": "adj_rate", 
-  "trigger": "Client", 
   "fieldname": "adj_rate", 
   "fieldtype": "Float", 
-  "permlevel": 0
+  "label": "Discount (%)", 
+  "oldfieldname": "adj_rate", 
+  "oldfieldtype": "Float", 
+  "print_hide": 1
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Basic Rate", 
-  "oldfieldname": "export_rate", 
-  "trigger": "Client", 
   "fieldname": "export_rate", 
   "fieldtype": "Currency", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Basic Rate", 
+  "oldfieldname": "export_rate", 
+  "oldfieldtype": "Currency", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Amount", 
-  "oldfieldname": "export_amount", 
   "fieldname": "export_amount", 
   "fieldtype": "Currency", 
-  "reqd": 1, 
-  "permlevel": 1
+  "label": "Amount", 
+  "oldfieldname": "export_amount", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1, 
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Price List Rate*", 
-  "oldfieldname": "base_ref_rate", 
   "fieldname": "base_ref_rate", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Price List Rate*", 
+  "oldfieldname": "base_ref_rate", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Basic Rate*", 
-  "oldfieldname": "basic_rate", 
-  "trigger": "Client", 
   "fieldname": "basic_rate", 
   "fieldtype": "Currency", 
-  "search_index": 0, 
+  "in_filter": 0, 
+  "label": "Basic Rate*", 
+  "oldfieldname": "basic_rate", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 0
+  "search_index": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Amount*", 
-  "oldfieldname": "amount", 
   "fieldname": "amount", 
   "fieldtype": "Currency", 
-  "reqd": 1, 
-  "permlevel": 1
+  "label": "Amount*", 
+  "oldfieldname": "amount", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Warehouse", 
-  "oldfieldname": "warehouse", 
-  "permlevel": 0, 
   "fieldname": "warehouse", 
   "fieldtype": "Link", 
   "hidden": 0, 
-  "options": "Warehouse"
+  "label": "Warehouse", 
+  "oldfieldname": "warehouse", 
+  "oldfieldtype": "Link", 
+  "options": "Warehouse", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "permlevel": 0, 
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Income Account", 
-  "oldfieldname": "income_account", 
-  "width": "120px", 
-  "trigger": "Client", 
   "fieldname": "income_account", 
   "fieldtype": "Link", 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Income Account", 
+  "oldfieldname": "income_account", 
+  "oldfieldtype": "Link", 
   "options": "Account", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "reqd": 1, 
+  "width": "120px"
  }, 
  {
-  "print_hide": 1, 
-  "permlevel": 0, 
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Cost Center", 
-  "oldfieldname": "cost_center", 
-  "width": "120px", 
-  "trigger": "Client", 
   "fieldname": "cost_center", 
   "fieldtype": "Link", 
-  "reqd": 0, 
+  "in_filter": 1, 
+  "label": "Cost Center", 
+  "oldfieldname": "cost_center", 
+  "oldfieldtype": "Link", 
   "options": "Cost Center", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "reqd": 0, 
+  "width": "120px"
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Serial No", 
-  "oldfieldname": "serial_no", 
   "fieldname": "serial_no", 
   "fieldtype": "Small Text", 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Serial No", 
+  "oldfieldname": "serial_no", 
+  "oldfieldtype": "Small Text", 
+  "print_hide": 0
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Batch No", 
-  "options": "Batch", 
   "fieldname": "batch_no", 
   "fieldtype": "Link", 
-  "permlevel": 0
+  "label": "Batch No", 
+  "options": "Batch", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Item Group", 
-  "oldfieldname": "item_group", 
-  "options": "Item Group", 
   "fieldname": "item_group", 
   "fieldtype": "Link", 
   "hidden": 1, 
-  "permlevel": 1, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Item Group", 
+  "oldfieldname": "item_group", 
+  "oldfieldtype": "Link", 
+  "options": "Item Group", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Brand Name", 
-  "oldfieldname": "brand", 
   "fieldname": "brand", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Brand Name", 
+  "oldfieldname": "brand", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "actual_qty", 
+  "fieldtype": "Float", 
   "label": "Available Qty at Warehouse", 
   "oldfieldname": "actual_qty", 
-  "fieldname": "actual_qty", 
-  "fieldtype": "Currency", 
-  "permlevel": 1
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "delivered_qty", 
+  "fieldtype": "Float", 
   "label": "Delivered Qty", 
   "oldfieldname": "delivered_qty", 
-  "fieldname": "delivered_qty", 
-  "fieldtype": "Currency", 
-  "permlevel": 1
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "Sales Order", 
-  "oldfieldname": "sales_order", 
-  "trigger": "Client", 
   "fieldname": "sales_order", 
   "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Sales Order", 
+  "oldfieldname": "sales_order", 
   "oldfieldtype": "Link", 
   "options": "Sales Order", 
-  "permlevel": 1, 
-  "in_filter": 1
+  "print_hide": 1, 
+  "read_only": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "SO Detail ", 
-  "oldfieldname": "so_detail", 
   "fieldname": "so_detail", 
   "fieldtype": "Data", 
-  "oldfieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "SO Detail ", 
+  "oldfieldname": "so_detail", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "Delivery Note", 
-  "oldfieldname": "delivery_note", 
-  "trigger": "Client", 
   "fieldname": "delivery_note", 
   "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Delivery Note", 
+  "oldfieldname": "delivery_note", 
   "oldfieldtype": "Link", 
   "options": "Delivery Note", 
-  "permlevel": 1, 
-  "in_filter": 1
+  "print_hide": 1, 
+  "read_only": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "DN Detail", 
-  "oldfieldname": "dn_detail", 
   "fieldname": "dn_detail", 
   "fieldtype": "Data", 
-  "oldfieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "DN Detail", 
+  "oldfieldname": "dn_detail", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Item Tax Rate", 
-  "oldfieldname": "item_tax_rate", 
   "fieldname": "item_tax_rate", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Item Tax Rate", 
+  "oldfieldname": "item_tax_rate", 
+  "oldfieldtype": "Small Text", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Check", 
   "doctype": "DocField", 
-  "label": "Clear Pending", 
-  "oldfieldname": "clear_pending", 
   "fieldname": "clear_pending", 
   "fieldtype": "Check", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Clear Pending", 
+  "no_copy": 1, 
+  "oldfieldname": "clear_pending", 
+  "oldfieldtype": "Check", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Page Break", 
   "fieldname": "page_break", 
   "fieldtype": "Check", 
-  "permlevel": 0, 
+  "label": "Page Break", 
+  "no_copy": 1, 
+  "print_hide": 1, 
   "report_hide": 1
  }
 ]
\ No newline at end of file
diff --git a/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.txt b/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.txt
index 04b0794..293a5a8 100644
--- a/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.txt
+++ b/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.txt
@@ -1,188 +1,165 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:09", 
   "docstatus": 0, 
-  "creation": "2012-07-04 16:40:13", 
+  "modified": "2013-01-22 14:48:42", 
   "modified_by": "Administrator", 
-  "modified": "2012-07-12 13:50:43"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Tray", 
+  "autoname": "INVTD.######", 
+  "doctype": "DocType", 
+  "hide_heading": 1, 
   "istable": 1, 
   "module": "Accounts", 
-  "doctype": "DocType", 
-  "autoname": "INVTD.######", 
-  "show_in_menu": 0, 
-  "hide_heading": 1, 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "server_code_error": " ", 
-  "version": 1
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Sales Taxes and Charges", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
-  "name": "Sales Taxes and Charges", 
-  "doctype": "DocType"
- }, 
- {
-  "oldfieldtype": "Select", 
-  "doctype": "DocField", 
-  "label": "Type", 
-  "oldfieldname": "charge_type", 
-  "permlevel": 0, 
-  "trigger": "Client", 
-  "fieldname": "charge_type", 
-  "fieldtype": "Select", 
-  "reqd": 1, 
-  "options": "\nActual\nOn Net Total\nOn Previous Row Amount\nOn Previous Row Total"
- }, 
- {
-  "search_index": 1, 
-  "doctype": "DocField", 
-  "label": "Account Head", 
-  "oldfieldname": "account_head", 
-  "trigger": "Client", 
-  "fieldname": "account_head", 
-  "fieldtype": "Link", 
-  "oldfieldtype": "Link", 
-  "reqd": 1, 
-  "options": "Account", 
   "permlevel": 0
  }, 
  {
-  "oldfieldtype": "Link", 
+  "doctype": "DocType", 
+  "name": "Sales Taxes and Charges"
+ }, 
+ {
   "doctype": "DocField", 
-  "label": "Cost Center", 
-  "oldfieldname": "cost_center_other_charges", 
-  "permlevel": 0, 
+  "fieldname": "charge_type", 
+  "fieldtype": "Select", 
+  "label": "Type", 
+  "oldfieldname": "charge_type", 
+  "oldfieldtype": "Select", 
+  "options": "\nActual\nOn Net Total\nOn Previous Row Amount\nOn Previous Row Total", 
+  "reqd": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "account_head", 
+  "fieldtype": "Link", 
+  "label": "Account Head", 
+  "oldfieldname": "account_head", 
+  "oldfieldtype": "Link", 
+  "options": "Account", 
+  "reqd": 1, 
+  "search_index": 1
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "cost_center_other_charges", 
   "fieldtype": "Link", 
+  "label": "Cost Center", 
+  "oldfieldname": "cost_center_other_charges", 
+  "oldfieldtype": "Link", 
   "options": "Cost Center"
  }, 
  {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Description", 
-  "oldfieldname": "description", 
-  "width": "300px", 
   "fieldname": "description", 
   "fieldtype": "Small Text", 
+  "label": "Description", 
+  "oldfieldname": "description", 
+  "oldfieldtype": "Small Text", 
   "reqd": 1, 
-  "permlevel": 0
+  "width": "300px"
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Rate", 
-  "oldfieldname": "rate", 
-  "trigger": "Client", 
   "fieldname": "rate", 
   "fieldtype": "Currency", 
-  "reqd": 0, 
-  "permlevel": 0
+  "label": "Rate", 
+  "oldfieldname": "rate", 
+  "oldfieldtype": "Currency", 
+  "reqd": 0
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Amount", 
-  "oldfieldname": "tax_amount", 
-  "trigger": "Client", 
   "fieldname": "tax_amount", 
   "fieldtype": "Currency", 
-  "reqd": 0, 
-  "permlevel": 0
+  "label": "Amount", 
+  "oldfieldname": "tax_amount", 
+  "oldfieldtype": "Currency", 
+  "reqd": 0
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Total", 
-  "oldfieldname": "total", 
   "fieldname": "total", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Total", 
+  "oldfieldname": "total", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Enter Row", 
-  "oldfieldname": "row_id", 
-  "trigger": "Client", 
   "fieldname": "row_id", 
   "fieldtype": "Data", 
   "hidden": 0, 
-  "permlevel": 0
+  "label": "Enter Row", 
+  "oldfieldname": "row_id", 
+  "oldfieldtype": "Data"
  }, 
  {
-  "oldfieldtype": "Small Text", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Item Wise Tax Detail ", 
-  "oldfieldname": "item_wise_tax_detail", 
   "fieldname": "item_wise_tax_detail", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Item Wise Tax Detail ", 
+  "oldfieldname": "item_wise_tax_detail", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "Parenttype", 
-  "oldfieldname": "parenttype", 
   "fieldname": "parenttype", 
   "fieldtype": "Data", 
-  "oldfieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Parenttype", 
+  "oldfieldname": "parenttype", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "Cheating Field\nPlease do not delete ", 
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Total Tax Amount", 
-  "oldfieldname": "total_tax_amount", 
   "fieldname": "total_tax_amount", 
   "fieldtype": "Currency", 
   "hidden": 1, 
-  "permlevel": 0, 
+  "label": "Total Tax Amount", 
+  "no_copy": 1, 
+  "oldfieldname": "total_tax_amount", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
   "report_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "Cheating Field\nPlease do not delete ", 
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Total Amount", 
-  "oldfieldname": "total_amount", 
   "fieldname": "total_amount", 
   "fieldtype": "Currency", 
   "hidden": 1, 
-  "permlevel": 0, 
+  "label": "Total Amount", 
+  "no_copy": 1, 
+  "oldfieldname": "total_amount", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
   "report_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "description": "If checked, the tax amount will be considered as already included in the Print Rate / Print Amount", 
-  "no_copy": 1, 
   "allow_on_submit": 0, 
+  "description": "If checked, the tax amount will be considered as already included in the Print Rate / Print Amount", 
   "doctype": "DocField", 
-  "label": "Is this Tax included in Basic Rate?", 
-  "width": "150px", 
   "fieldname": "included_in_print_rate", 
   "fieldtype": "Check", 
-  "no_column": 0, 
-  "permlevel": 0, 
-  "report_hide": 1
+  "label": "Is this Tax included in Basic Rate?", 
+  "no_copy": 1, 
+  "print_hide": 1, 
+  "report_hide": 1, 
+  "width": "150px"
  }
 ]
\ No newline at end of file
diff --git a/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.txt b/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.txt
index a2e44b4..8759cb7 100644
--- a/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.txt
+++ b/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.txt
@@ -1,118 +1,52 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:09", 
   "docstatus": 0, 
-  "creation": "2012-07-03 13:30:46", 
+  "modified": "2013-01-22 14:57:23", 
   "modified_by": "Administrator", 
-  "modified": "2012-07-12 13:43:32"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Tabbed", 
-  "description": "Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like \"Shipping\", \"Insurance\", \"Handling\" etc.\n\n#### Note\n\nThe tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.\n\n#### Description of Columns\n\n1. Calculation Type: \n    - This can be on **Net Total** (that is the sum of basic amount).\n    - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.\n    - **Actual** (as mentioned).\n2. Account Head: The Account ledger under which this tax will be booked\n3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.\n4. Description: Description of the tax (that will be printed in invoices / quotes).\n5. Rate: Tax rate.\n6. Amount: Tax amount.\n7. Total: Cumulative total to this point.\n8. Enter Row: If based on \"Previous Row Total\" you can select the row number which will be taken as a base for this calculation (default is the previous row).\n9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.", 
-  "module": "Accounts", 
-  "server_code_error": " ", 
-  "allow_trash": 1, 
   "autoname": "field:title", 
-  "document_type": "Master", 
-  "_last_update": "1322549700", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
+  "description": "Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like \"Shipping\", \"Insurance\", \"Handling\" etc.\n\n#### Note\n\nThe tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.\n\n#### Description of Columns\n\n1. Calculation Type: \n    - This can be on **Net Total** (that is the sum of basic amount).\n    - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.\n    - **Actual** (as mentioned).\n2. Account Head: The Account ledger under which this tax will be booked\n3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.\n4. Description: Description of the tax (that will be printed in invoices / quotes).\n5. Rate: Tax rate.\n6. Amount: Tax amount.\n7. Total: Cumulative total to this point.\n8. Enter Row: If based on \"Previous Row Total\" you can select the row number which will be taken as a base for this calculation (default is the previous row).\n9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.", 
   "doctype": "DocType", 
-  "show_in_menu": 0, 
-  "version": 1
+  "document_type": "Master", 
+  "module": "Accounts", 
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Sales Taxes and Charges Master", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Sales Taxes and Charges Master", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
   "permlevel": 0, 
-  "parentfield": "fields"
- }, 
- {
-  "name": "__common__", 
-  "parent": "Sales Taxes and Charges Master", 
   "read": 1, 
-  "doctype": "DocPerm", 
-  "parenttype": "DocType", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Sales Taxes and Charges Master", 
-  "doctype": "DocType"
- }, 
- {
-  "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 User", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
   "report": 1, 
-  "role": "Sales User", 
-  "cancel": 0, 
-  "permlevel": 0
+  "submit": 0
  }, 
  {
-  "amend": 0, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 1, 
-  "report": 1, 
-  "role": "Accounts Manager", 
-  "cancel": 1, 
-  "permlevel": 0
+  "doctype": "DocType", 
+  "name": "Sales Taxes and Charges Master"
  }, 
  {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "cancel": 1, 
-  "role": "System Manager", 
-  "report": 1, 
-  "permlevel": 0
- }, 
- {
-  "amend": 0, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 1, 
-  "report": 1, 
-  "role": "Sales Master Manager", 
-  "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "Title", 
-  "oldfieldname": "title", 
   "fieldname": "title", 
   "fieldtype": "Data", 
+  "in_filter": 1, 
+  "label": "Title", 
+  "oldfieldname": "title", 
   "oldfieldtype": "Data", 
   "reqd": 1, 
-  "in_filter": 1
+  "search_index": 0
  }, 
  {
   "doctype": "DocField", 
@@ -122,25 +56,55 @@
  }, 
  {
   "description": "* Will be calculated in the transaction.", 
-  "oldfieldtype": "Table", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Sales Taxes and Charges Master", 
-  "oldfieldname": "other_charges", 
   "fieldname": "other_charges", 
   "fieldtype": "Table", 
+  "label": "Sales Taxes and Charges Master", 
+  "oldfieldname": "other_charges", 
+  "oldfieldtype": "Table", 
   "options": "Sales Taxes and Charges"
  }, 
  {
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "Company", 
-  "oldfieldname": "company", 
   "fieldname": "company", 
   "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Company", 
+  "oldfieldname": "company", 
   "oldfieldtype": "Link", 
-  "reqd": 1, 
   "options": "Company", 
-  "in_filter": 1
+  "reqd": 1, 
+  "search_index": 0
+ }, 
+ {
+  "amend": 0, 
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "role": "Sales User", 
+  "write": 0
+ }, 
+ {
+  "amend": 0, 
+  "cancel": 1, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "role": "Accounts Manager", 
+  "write": 1
+ }, 
+ {
+  "cancel": 1, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "role": "System Manager", 
+  "write": 1
+ }, 
+ {
+  "amend": 0, 
+  "cancel": 1, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "role": "Sales Master Manager", 
+  "write": 1
  }
 ]
\ No newline at end of file
diff --git a/buying/doctype/purchase_order/purchase_order.txt b/buying/doctype/purchase_order/purchase_order.txt
index 3c75008..0bb0b2b 100644
--- a/buying/doctype/purchase_order/purchase_order.txt
+++ b/buying/doctype/purchase_order/purchase_order.txt
@@ -1,925 +1,844 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-21 18:19:18", 
   "docstatus": 0, 
-  "creation": "2013-01-18 12:46:59", 
+  "modified": "2013-01-22 14:56:42", 
   "modified_by": "Administrator", 
-  "modified": "2013-01-18 13:24:20"
+  "owner": "Administrator"
  }, 
  {
-  "document_type": "Transaction", 
-  "is_submittable": 1, 
   "allow_attach": 1, 
   "autoname": "naming_series:", 
-  "module": "Buying", 
   "doctype": "DocType", 
+  "document_type": "Transaction", 
+  "is_submittable": 1, 
+  "module": "Buying", 
+  "name": "__common__", 
   "read_only_onload": 1, 
-  "search_fields": "status, transaction_date, supplier,grand_total", 
-  "name": "__common__"
+  "search_fields": "status, transaction_date, supplier,grand_total"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Purchase Order", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
-  "name": "__common__", 
-  "parent": "Purchase Order", 
-  "read": 1, 
-  "doctype": "DocPerm", 
-  "parenttype": "DocType", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Purchase Order", 
-  "doctype": "DocType"
- }, 
- {
-  "print_hide": 1, 
-  "description": "To manage multiple series please go to Setup > Manage Series", 
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
-  "doctype": "DocField", 
-  "label": "Series", 
-  "oldfieldname": "naming_series", 
-  "options": "\nPO", 
-  "fieldname": "naming_series", 
-  "fieldtype": "Select", 
-  "reqd": 1, 
   "permlevel": 0
  }, 
  {
-  "print_hide": 1, 
-  "description": "Supplier (vendor) name as entered in supplier master", 
-  "oldfieldtype": "Link", 
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Purchase Order", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
+  "read": 1, 
+  "report": 1
+ }, 
+ {
+  "doctype": "DocType", 
+  "name": "Purchase Order"
+ }, 
+ {
+  "description": "To manage multiple series please go to Setup > Manage Series", 
   "doctype": "DocField", 
-  "label": "Supplier", 
-  "oldfieldname": "supplier", 
-  "permlevel": 0, 
+  "fieldname": "naming_series", 
+  "fieldtype": "Select", 
+  "label": "Series", 
+  "no_copy": 1, 
+  "oldfieldname": "naming_series", 
+  "oldfieldtype": "Select", 
+  "options": "\nPO", 
+  "print_hide": 1, 
+  "reqd": 1
+ }, 
+ {
+  "description": "Supplier (vendor) name as entered in supplier master", 
+  "doctype": "DocField", 
   "fieldname": "supplier", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Supplier", 
+  "oldfieldname": "supplier", 
+  "oldfieldtype": "Link", 
   "options": "Supplier", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Name", 
   "fieldname": "supplier_name", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Name", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Address", 
   "fieldname": "address_display", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Address", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Contact", 
   "fieldname": "contact_display", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Contact", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Mobile No", 
   "fieldname": "contact_mobile", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Mobile No", 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Contact Email", 
   "fieldname": "contact_email", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Contact Email", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 0, 
-  "print_width": "50%", 
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "print_hide": 0, 
+  "print_width": "50%", 
+  "width": "50%"
  }, 
  {
   "description": "The date at which current entry is made in system.", 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Purchase Order Date", 
-  "oldfieldname": "transaction_date", 
   "fieldname": "transaction_date", 
   "fieldtype": "Date", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Purchase Order Date", 
+  "oldfieldname": "transaction_date", 
+  "oldfieldtype": "Date", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Items", 
   "fieldname": "items", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Items", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "no_copy": 0, 
-  "oldfieldtype": "Table", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Purchase Order Items", 
-  "oldfieldname": "po_details", 
-  "permlevel": 0, 
   "fieldname": "po_details", 
   "fieldtype": "Table", 
+  "label": "Purchase Order Items", 
+  "no_copy": 0, 
+  "oldfieldname": "po_details", 
+  "oldfieldtype": "Table", 
   "options": "Purchase Order Item"
  }, 
  {
   "doctype": "DocField", 
-  "permlevel": 0, 
   "fieldname": "sb_last_purchase", 
   "fieldtype": "Section Break", 
   "options": "Simple"
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Get Last Purchase Rate", 
   "fieldname": "get_last_purchase_rate", 
   "fieldtype": "Button", 
-  "permlevel": 0
+  "label": "Get Last Purchase Rate", 
+  "oldfieldtype": "Button", 
+  "print_hide": 0
  }, 
  {
-  "print_width": "50%", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break2", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "print_width": "50%", 
+  "width": "50%"
  }, 
  {
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Re-Calculate Values", 
   "fieldname": "recalculate_values", 
   "fieldtype": "Button", 
-  "permlevel": 0
+  "label": "Re-Calculate Values", 
+  "oldfieldtype": "Button"
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "section_break0", 
-  "fieldtype": "Section Break", 
-  "permlevel": 0
+  "fieldtype": "Section Break"
  }, 
  {
-  "print_hide": 1, 
   "description": "You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.", 
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Select Purchase Request", 
-  "oldfieldname": "indent_no", 
-  "options": "Purchase Request", 
   "fieldname": "indent_no", 
   "fieldtype": "Link", 
   "hidden": 0, 
-  "permlevel": 0
+  "label": "Select Purchase Request", 
+  "no_copy": 1, 
+  "oldfieldname": "indent_no", 
+  "oldfieldtype": "Link", 
+  "options": "Purchase Request", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 0, 
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Get Items", 
-  "permlevel": 0, 
   "fieldname": "get_items", 
   "fieldtype": "Button", 
   "hidden": 0, 
-  "options": "get_indent_details"
+  "label": "Get Items", 
+  "no_copy": 0, 
+  "oldfieldtype": "Button", 
+  "options": "get_indent_details", 
+  "print_hide": 1
  }, 
  {
-  "print_width": "50%", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break3", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "print_width": "50%", 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
   "description": "You can make a purchase order from multiple Supplier Quotations. Select Supplier Quotations one by one and click on the button below.", 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Select Supplier Quotation", 
-  "permlevel": 0, 
   "fieldname": "supplier_quotation", 
   "fieldtype": "Link", 
-  "options": "Supplier Quotation"
+  "label": "Select Supplier Quotation", 
+  "no_copy": 1, 
+  "options": "Supplier Quotation", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Get Items", 
-  "permlevel": 0, 
   "fieldname": "get_supplier_quotation_items", 
   "fieldtype": "Button", 
-  "options": "get_supplier_quotation_items"
+  "label": "Get Items", 
+  "options": "get_supplier_quotation_items", 
+  "print_hide": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Currency & Price List", 
   "fieldname": "price_list_and_currency", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Currency & Price List"
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "cb_currency", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
-  "print_hide": 1, 
   "description": "Supplier's currency", 
-  "no_copy": 0, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Currency", 
-  "oldfieldname": "currency", 
-  "options": "link:Currency", 
   "fieldname": "currency", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Currency", 
+  "no_copy": 0, 
+  "oldfieldname": "currency", 
+  "oldfieldtype": "Select", 
+  "options": "link:Currency", 
+  "print_hide": 1, 
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
-  "description": "Rate at which supplier's currency is converted to company's base currency", 
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Exchange Rate", 
-  "oldfieldname": "conversion_rate", 
   "default": "1", 
+  "description": "Rate at which supplier's currency is converted to company's base currency", 
+  "doctype": "DocField", 
   "fieldname": "conversion_rate", 
   "fieldtype": "Float", 
-  "reqd": 1, 
   "hidden": 0, 
-  "permlevel": 0
+  "label": "Exchange Rate", 
+  "no_copy": 1, 
+  "oldfieldname": "conversion_rate", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "cb_price_list", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
-  "print_hide": 1, 
   "description": "Consider this Price List for fetching rate. (only which have \"For Buying\" as checked)", 
   "doctype": "DocField", 
-  "label": "Price List", 
-  "permlevel": 0, 
   "fieldname": "price_list_name", 
   "fieldtype": "Link", 
-  "options": "Price List"
+  "label": "Price List", 
+  "options": "Price List", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "depends_on": "price_list_name", 
   "doctype": "DocField", 
-  "label": "Price List Currency", 
-  "permlevel": 0, 
   "fieldname": "price_list_currency", 
   "fieldtype": "Link", 
-  "options": "Currency"
+  "label": "Price List Currency", 
+  "options": "Currency", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "depends_on": "price_list_name", 
   "doctype": "DocField", 
-  "label": "Price List Exchange Rate", 
   "fieldname": "plc_conversion_rate", 
   "fieldtype": "Float", 
-  "permlevel": 0
+  "label": "Price List Exchange Rate", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Taxes", 
   "fieldname": "taxes", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Taxes", 
+  "oldfieldtype": "Section Break", 
+  "print_hide": 0
  }, 
  {
-  "print_hide": 1, 
   "description": "If you have created a standard template in Purchase Taxes and Charges Master, select one and click on the button below.", 
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Purchase Taxes and Charges", 
-  "oldfieldname": "purchase_other_charges", 
-  "permlevel": 0, 
   "fieldname": "purchase_other_charges", 
   "fieldtype": "Link", 
-  "options": "Purchase Taxes and Charges Master"
+  "label": "Purchase Taxes and Charges", 
+  "no_copy": 1, 
+  "oldfieldname": "purchase_other_charges", 
+  "oldfieldtype": "Link", 
+  "options": "Purchase Taxes and Charges Master", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Get Tax Detail", 
-  "permlevel": 0, 
   "fieldname": "get_tax_detail", 
   "fieldtype": "Button", 
-  "options": "get_purchase_tax_details"
+  "label": "Get Tax Detail", 
+  "oldfieldtype": "Button", 
+  "options": "get_purchase_tax_details", 
+  "print_hide": 1
  }, 
  {
-  "no_copy": 0, 
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "Purchase Taxes and Charges", 
-  "oldfieldname": "purchase_tax_details", 
-  "permlevel": 0, 
   "fieldname": "purchase_tax_details", 
   "fieldtype": "Table", 
+  "label": "Purchase Taxes and Charges", 
+  "no_copy": 0, 
+  "oldfieldname": "purchase_tax_details", 
+  "oldfieldtype": "Table", 
   "options": "Purchase Taxes and Charges"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Calculate Tax", 
   "fieldname": "calculate_tax", 
   "fieldtype": "Button", 
-  "permlevel": 0
+  "label": "Calculate Tax", 
+  "oldfieldtype": "Button", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "HTML", 
   "doctype": "DocField", 
-  "label": "Tax Calculation", 
   "fieldname": "tax_calculation", 
   "fieldtype": "HTML", 
-  "permlevel": 0
+  "label": "Tax Calculation", 
+  "no_copy": 1, 
+  "oldfieldtype": "HTML", 
+  "print_hide": 1
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Totals", 
   "fieldname": "totals", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Totals", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 0, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Net Total (Import)", 
-  "oldfieldname": "net_total_import", 
   "fieldname": "net_total_import", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Net Total (Import)", 
+  "no_copy": 0, 
+  "oldfieldname": "net_total_import", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 0, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Taxes and Charges Added (Import)", 
-  "oldfieldname": "other_charges_added_import", 
   "fieldname": "other_charges_added_import", 
   "fieldtype": "Currency", 
-  "permlevel": 1, 
+  "label": "Taxes and Charges Added (Import)", 
+  "no_copy": 0, 
+  "oldfieldname": "other_charges_added_import", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
   "report_hide": 0
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 0, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Taxes and Charges Deducted (Import)", 
-  "oldfieldname": "other_charges_deducted_import", 
   "fieldname": "other_charges_deducted_import", 
   "fieldtype": "Currency", 
-  "permlevel": 1, 
+  "label": "Taxes and Charges Deducted (Import)", 
+  "no_copy": 0, 
+  "oldfieldname": "other_charges_deducted_import", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
   "report_hide": 0
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 0, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Grand Total (Import)", 
-  "oldfieldname": "grand_total_import", 
   "fieldname": "grand_total_import", 
   "fieldtype": "Currency", 
-  "permlevel": 1, 
+  "label": "Grand Total (Import)", 
+  "no_copy": 0, 
+  "oldfieldname": "grand_total_import", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
   "report_hide": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "In Words(Import)", 
-  "oldfieldname": "in_words_import", 
   "fieldname": "in_words_import", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "In Words(Import)", 
+  "oldfieldname": "in_words_import", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
   "fieldname": "column_break4", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "print_hide": 0
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Net Total*", 
-  "oldfieldname": "net_total", 
   "fieldname": "net_total", 
   "fieldtype": "Currency", 
-  "reqd": 0, 
-  "permlevel": 1
+  "label": "Net Total*", 
+  "no_copy": 1, 
+  "oldfieldname": "net_total", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "reqd": 0
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 0, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Taxes and Charges Added", 
-  "oldfieldname": "other_charges_added", 
   "fieldname": "other_charges_added", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Taxes and Charges Added", 
+  "no_copy": 0, 
+  "oldfieldname": "other_charges_added", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 0, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Taxes and Charges Deducted", 
-  "oldfieldname": "other_charges_deducted", 
   "fieldname": "other_charges_deducted", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Taxes and Charges Deducted", 
+  "no_copy": 0, 
+  "oldfieldname": "other_charges_deducted", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Total Tax*", 
-  "oldfieldname": "total_tax", 
   "fieldname": "total_tax", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Total Tax*", 
+  "no_copy": 1, 
+  "oldfieldname": "total_tax", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Grand Total", 
-  "oldfieldname": "grand_total", 
   "fieldname": "grand_total", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Grand Total", 
+  "no_copy": 1, 
+  "oldfieldname": "grand_total", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Rounded Total", 
-  "oldfieldname": "rounded_total", 
   "fieldname": "rounded_total", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Rounded Total", 
+  "oldfieldname": "rounded_total", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "In Words will be visible once you save the Purchase Order.", 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "In Words", 
-  "oldfieldname": "in_words", 
   "fieldname": "in_words", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "In Words", 
+  "oldfieldname": "in_words", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Terms and Conditions", 
   "fieldname": "terms_section_break", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Terms and Conditions", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Select Terms and Conditions", 
-  "oldfieldname": "tc_name", 
-  "permlevel": 0, 
   "fieldname": "tc_name", 
   "fieldtype": "Link", 
-  "options": "Terms and Conditions"
+  "label": "Select Terms and Conditions", 
+  "oldfieldname": "tc_name", 
+  "oldfieldtype": "Link", 
+  "options": "Terms and Conditions", 
+  "print_hide": 1
  }, 
  {
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Get Terms and Conditions", 
-  "permlevel": 0, 
   "fieldname": "get_terms", 
   "fieldtype": "Button", 
+  "label": "Get Terms and Conditions", 
+  "oldfieldtype": "Button", 
   "options": "get_tc_details"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "HTML", 
   "doctype": "DocField", 
-  "label": "Terms and Conditions HTML", 
-  "permlevel": 0, 
   "fieldname": "terms_html", 
   "fieldtype": "HTML", 
-  "options": "You can add Terms and Notes that will be printed in the Transaction"
+  "label": "Terms and Conditions HTML", 
+  "oldfieldtype": "HTML", 
+  "options": "You can add Terms and Notes that will be printed in the Transaction", 
+  "print_hide": 1
  }, 
  {
-  "oldfieldtype": "Text Editor", 
   "doctype": "DocField", 
-  "label": "Terms and Conditions1", 
-  "oldfieldname": "terms", 
   "fieldname": "terms", 
   "fieldtype": "Text Editor", 
-  "permlevel": 0
+  "label": "Terms and Conditions1", 
+  "oldfieldname": "terms", 
+  "oldfieldtype": "Text Editor"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Contact Info", 
   "fieldname": "contact_section", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Contact Info"
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Supplier Address", 
-  "permlevel": 0, 
   "fieldname": "supplier_address", 
   "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Supplier Address", 
   "options": "Address", 
-  "in_filter": 1
+  "print_hide": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "cb_contact", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Contact Person", 
-  "permlevel": 0, 
   "fieldname": "contact_person", 
   "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Contact Person", 
   "options": "Contact", 
-  "in_filter": 1
+  "print_hide": 1
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "More Info", 
   "fieldname": "more_info", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "More Info", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Status", 
-  "oldfieldname": "status", 
-  "permlevel": 1, 
   "fieldname": "status", 
   "fieldtype": "Select", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Status", 
+  "no_copy": 1, 
+  "oldfieldname": "status", 
+  "oldfieldtype": "Select", 
   "options": "\nDraft\nSubmitted\nStopped\nCancelled", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "read_only": 1, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
   "default": "No", 
   "doctype": "DocField", 
-  "label": "Is Subcontracted", 
-  "permlevel": 0, 
   "fieldname": "is_subcontracted", 
   "fieldtype": "Select", 
-  "options": "\nYes\nNo"
+  "label": "Is Subcontracted", 
+  "options": "\nYes\nNo", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Ref SQ", 
-  "oldfieldname": "ref_sq", 
   "fieldname": "ref_sq", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Ref SQ", 
+  "no_copy": 1, 
+  "oldfieldname": "ref_sq", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Select", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Letter Head", 
-  "oldfieldname": "letter_head", 
-  "permlevel": 0, 
   "fieldname": "letter_head", 
   "fieldtype": "Select", 
-  "options": "link:Letter Head"
+  "label": "Letter Head", 
+  "oldfieldname": "letter_head", 
+  "oldfieldtype": "Select", 
+  "options": "link:Letter Head", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Amended From", 
-  "oldfieldname": "amended_from", 
   "fieldname": "amended_from", 
   "fieldtype": "Data", 
   "hidden": 0, 
-  "permlevel": 1, 
+  "label": "Amended From", 
+  "no_copy": 1, 
+  "oldfieldname": "amended_from", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1, 
   "report_hide": 0
  }, 
  {
-  "print_hide": 1, 
   "description": "The date at which current entry is corrected in the system.", 
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Amendment Date", 
-  "oldfieldname": "amendment_date", 
   "fieldname": "amendment_date", 
   "fieldtype": "Date", 
   "hidden": 0, 
-  "permlevel": 0
+  "label": "Amendment Date", 
+  "no_copy": 1, 
+  "oldfieldname": "amendment_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "Select the relevant company name if you have multiple companies", 
-  "no_copy": 0, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Company", 
-  "oldfieldname": "company", 
-  "permlevel": 0, 
   "fieldname": "company", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Company", 
+  "no_copy": 0, 
+  "oldfieldname": "company", 
+  "oldfieldtype": "Link", 
   "options": "Company", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 0, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Fiscal Year", 
-  "oldfieldname": "fiscal_year", 
-  "permlevel": 0, 
   "fieldname": "fiscal_year", 
   "fieldtype": "Select", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Fiscal Year", 
+  "no_copy": 0, 
+  "oldfieldname": "fiscal_year", 
+  "oldfieldtype": "Select", 
   "options": "link:Fiscal Year", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Select Print Heading", 
-  "oldfieldname": "select_print_heading", 
-  "options": "Print Heading", 
   "fieldname": "select_print_heading", 
   "fieldtype": "Link", 
-  "permlevel": 0, 
+  "label": "Select Print Heading", 
+  "no_copy": 1, 
+  "oldfieldname": "select_print_heading", 
+  "oldfieldtype": "Link", 
+  "options": "Print Heading", 
+  "print_hide": 1, 
   "report_hide": 1
  }, 
  {
-  "oldfieldtype": "Text", 
   "doctype": "DocField", 
-  "label": "Instructions", 
-  "oldfieldname": "instructions", 
   "fieldname": "instructions", 
   "fieldtype": "Text", 
-  "permlevel": 0
+  "label": "Instructions", 
+  "oldfieldname": "instructions", 
+  "oldfieldtype": "Text"
  }, 
  {
-  "print_hide": 1, 
-  "print_width": "50%", 
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break5", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "print_hide": 1, 
+  "print_width": "50%", 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
+  "depends_on": "eval:!doc.__islocal", 
   "description": "% of materials received against this Purchase Order", 
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "% Received", 
-  "oldfieldname": "per_received", 
   "fieldname": "per_received", 
-  "fieldtype": "Currency", 
-  "depends_on": "eval:!doc.__islocal", 
-  "permlevel": 1
- }, 
- {
-  "print_hide": 1, 
-  "description": "% of materials billed against this Purchase Order.", 
+  "fieldtype": "Float", 
+  "label": "% Received", 
   "no_copy": 1, 
+  "oldfieldname": "per_received", 
   "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "% Billed", 
-  "oldfieldname": "per_billed", 
-  "fieldname": "per_billed", 
-  "fieldtype": "Currency", 
-  "depends_on": "eval:!doc.__islocal", 
-  "permlevel": 1
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 0, 
-  "no_copy": 1, 
-  "oldfieldtype": "Text", 
+  "depends_on": "eval:!doc.__islocal", 
+  "description": "% of materials billed against this Purchase Order.", 
   "doctype": "DocField", 
-  "label": "Payment Terms", 
-  "oldfieldname": "payment_terms", 
+  "fieldname": "per_billed", 
+  "fieldtype": "Float", 
+  "label": "% Billed", 
+  "no_copy": 1, 
+  "oldfieldname": "per_billed", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "payment_terms", 
   "fieldtype": "Text", 
-  "permlevel": 0
+  "label": "Payment Terms", 
+  "no_copy": 1, 
+  "oldfieldname": "payment_terms", 
+  "oldfieldtype": "Text", 
+  "print_hide": 0
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Text", 
   "doctype": "DocField", 
-  "label": "Remarks", 
-  "oldfieldname": "remarks", 
   "fieldname": "remarks", 
   "fieldtype": "Text", 
-  "permlevel": 0
+  "label": "Remarks", 
+  "no_copy": 1, 
+  "oldfieldname": "remarks", 
+  "oldfieldtype": "Text", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
+  "depends_on": "eval:!doc.__islocal", 
   "doctype": "DocField", 
-  "label": "Cancel Reason", 
-  "oldfieldname": "cancel_reason", 
   "fieldname": "cancel_reason", 
   "fieldtype": "Data", 
-  "depends_on": "eval:!doc.__islocal", 
   "hidden": 0, 
-  "permlevel": 1
+  "label": "Cancel Reason", 
+  "no_copy": 1, 
+  "oldfieldname": "cancel_reason", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "Required raw materials issued to the supplier for producing a sub - contracted item.", 
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Raw Material Details", 
   "fieldname": "raw_material_details", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Raw Material Details", 
+  "oldfieldtype": "Section Break", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 0, 
-  "oldfieldtype": "Table", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Purchase Order Items Supplied", 
-  "oldfieldname": "po_raw_material_details", 
-  "permlevel": 1, 
   "fieldname": "po_raw_material_details", 
   "fieldtype": "Table", 
-  "options": "Purchase Order Item Supplied"
+  "label": "Purchase Order Items Supplied", 
+  "no_copy": 0, 
+  "oldfieldname": "po_raw_material_details", 
+  "oldfieldtype": "Table", 
+  "options": "Purchase Order Item Supplied", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "File List", 
   "fieldname": "file_list", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "File List", 
+  "no_copy": 1, 
+  "print_hide": 1
  }, 
  {
   "amend": 1, 
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "report": 1, 
-  "role": "Purchase User", 
-  "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "role": "All", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "doctype": "DocPerm", 
-  "role": "Supplier", 
-  "report": 1, 
   "permlevel": 0, 
-  "match": "supplier"
+  "role": "Purchase User", 
+  "submit": 1, 
+  "write": 1
  }, 
  {
-  "write": 1, 
-  "role": "All", 
-  "permlevel": 2, 
-  "doctype": "DocPerm"
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
   "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Purchase Manager", 
-  "cancel": 0, 
-  "permlevel": 1
+  "match": "supplier", 
+  "permlevel": 0, 
+  "role": "Supplier"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "permlevel": 2, 
+  "role": "All", 
+  "write": 1
  }, 
  {
   "amend": 1, 
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "report": 1, 
+  "permlevel": 0, 
   "role": "Purchase Manager", 
-  "cancel": 1, 
-  "permlevel": 0
+  "submit": 1, 
+  "write": 1
  }, 
  {
   "amend": 0, 
+  "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
+  "permlevel": 0, 
   "role": "Material User", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
   "submit": 0, 
-  "write": 0, 
-  "report": 1, 
-  "role": "Material User", 
-  "cancel": 0, 
-  "permlevel": 0
+  "write": 0
  }
 ]
\ No newline at end of file
diff --git a/buying/doctype/purchase_order_item/purchase_order_item.txt b/buying/doctype/purchase_order_item/purchase_order_item.txt
index cbe2cde..6e93ee6 100755
--- a/buying/doctype/purchase_order_item/purchase_order_item.txt
+++ b/buying/doctype/purchase_order_item/purchase_order_item.txt
@@ -1,408 +1,394 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:10", 
   "docstatus": 0, 
-  "creation": "2012-12-19 22:38:55", 
+  "modified": "2013-01-22 15:02:01", 
   "modified_by": "Administrator", 
-  "modified": "2013-01-04 13:13:47"
+  "owner": "Administrator"
  }, 
  {
-  "istable": 1, 
   "autoname": "POD/.#####", 
-  "name": "__common__", 
   "doctype": "DocType", 
-  "module": "Buying"
+  "istable": 1, 
+  "module": "Buying", 
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Purchase Order Item", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "name": "Purchase Order Item", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Purchase Order Item"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Reqd By Date", 
-  "oldfieldname": "schedule_date", 
   "fieldname": "schedule_date", 
   "fieldtype": "Date", 
-  "search_index": 1, 
-  "reqd": 1, 
   "hidden": 0, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Reqd By Date", 
+  "no_copy": 1, 
+  "oldfieldname": "schedule_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Item Code", 
-  "oldfieldname": "item_code", 
-  "permlevel": 0, 
   "fieldname": "item_code", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Item Code", 
+  "oldfieldname": "item_code", 
+  "oldfieldtype": "Link", 
   "options": "Item", 
-  "in_filter": 1
+  "print_hide": 0, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "If Supplier Part Number exists for given Item, it gets stored here", 
   "doctype": "DocField", 
-  "label": "Supplier Part Number", 
   "fieldname": "supplier_part_no", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Supplier Part Number", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Item Name", 
-  "oldfieldname": "item_name", 
   "fieldname": "item_name", 
   "fieldtype": "Data", 
-  "search_index": 1, 
-  "reqd": 1, 
   "hidden": 0, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Item Name", 
+  "oldfieldname": "item_name", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "print_width": "300px", 
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Description", 
-  "oldfieldname": "description", 
-  "width": "300px", 
   "fieldname": "description", 
   "fieldtype": "Small Text", 
+  "label": "Description", 
+  "oldfieldname": "description", 
+  "oldfieldtype": "Small Text", 
+  "print_width": "300px", 
   "reqd": 1, 
-  "permlevel": 0
+  "width": "300px"
  }, 
  {
-  "print_width": "60px", 
   "default": "0.00", 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "qty", 
+  "fieldtype": "Float", 
   "label": "Quantity", 
   "oldfieldname": "qty", 
-  "width": "60px", 
-  "fieldname": "qty", 
-  "fieldtype": "Currency", 
+  "oldfieldtype": "Currency", 
+  "print_width": "60px", 
   "reqd": 1, 
-  "permlevel": 0
+  "width": "60px"
  }, 
  {
-  "print_hide": 0, 
-  "print_width": "100px", 
-  "permlevel": 0, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "UOM", 
-  "oldfieldname": "uom", 
-  "width": "100px", 
   "fieldname": "uom", 
   "fieldtype": "Link", 
+  "label": "UOM", 
+  "oldfieldname": "uom", 
+  "oldfieldtype": "Link", 
+  "options": "UOM", 
+  "print_hide": 0, 
+  "print_width": "100px", 
   "reqd": 1, 
-  "options": "UOM"
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Ref Rate ", 
   "fieldname": "import_ref_rate", 
   "fieldtype": "Currency", 
-  "permlevel": 0
+  "label": "Ref Rate ", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 0, 
   "doctype": "DocField", 
-  "label": "Discount %", 
   "fieldname": "discount_rate", 
-  "fieldtype": "Currency", 
-  "permlevel": 0
+  "fieldtype": "Float", 
+  "label": "Discount %", 
+  "print_hide": 0
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Rate ", 
-  "oldfieldname": "import_rate", 
   "fieldname": "import_rate", 
   "fieldtype": "Currency", 
   "hidden": 0, 
-  "permlevel": 0
+  "label": "Rate ", 
+  "oldfieldname": "import_rate", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 0
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Amount", 
-  "oldfieldname": "import_amount", 
   "fieldname": "import_amount", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Amount", 
+  "oldfieldname": "import_amount", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Ref Rate *", 
   "fieldname": "purchase_ref_rate", 
   "fieldtype": "Currency", 
-  "permlevel": 0
+  "label": "Ref Rate *", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "print_width": "100px", 
   "default": "0.00", 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Rate (Default Curr.) *", 
-  "oldfieldname": "purchase_rate", 
-  "width": "100px", 
   "fieldname": "purchase_rate", 
   "fieldtype": "Currency", 
+  "label": "Rate (Default Curr.) *", 
+  "oldfieldname": "purchase_rate", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "print_width": "100px", 
   "reqd": 1, 
-  "permlevel": 0
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
   "default": "0.00", 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Amount  (Default Curr.)", 
-  "oldfieldname": "amount", 
   "fieldname": "amount", 
   "fieldtype": "Currency", 
-  "reqd": 1, 
-  "permlevel": 1
+  "label": "Amount  (Default Curr.)", 
+  "oldfieldname": "amount", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Warehouse", 
-  "oldfieldname": "warehouse", 
-  "options": "Warehouse", 
   "fieldname": "warehouse", 
   "fieldtype": "Link", 
-  "reqd": 0, 
   "hidden": 0, 
-  "permlevel": 0
+  "label": "Warehouse", 
+  "oldfieldname": "warehouse", 
+  "oldfieldtype": "Link", 
+  "options": "Warehouse", 
+  "print_hide": 1, 
+  "reqd": 0
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Project Name", 
-  "options": "Project", 
   "fieldname": "project_name", 
   "fieldtype": "Link", 
-  "permlevel": 0, 
-  "report_hide": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Project Name", 
+  "options": "Project", 
+  "print_hide": 1, 
+  "report_hide": 0
  }, 
  {
-  "print_hide": 1, 
-  "print_width": "100px", 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "conversion_factor", 
+  "fieldtype": "Float", 
+  "hidden": 0, 
   "label": "UOM Conversion Factor", 
   "oldfieldname": "conversion_factor", 
-  "width": "100px", 
-  "fieldname": "conversion_factor", 
-  "fieldtype": "Currency", 
-  "reqd": 1, 
-  "hidden": 0, 
-  "permlevel": 0
- }, 
- {
+  "oldfieldtype": "Currency", 
   "print_hide": 1, 
   "print_width": "100px", 
-  "oldfieldtype": "Data", 
-  "doctype": "DocField", 
-  "label": "Stock UOM", 
-  "oldfieldname": "stock_uom", 
-  "width": "100px", 
-  "fieldname": "stock_uom", 
-  "fieldtype": "Data", 
   "reqd": 1, 
-  "hidden": 0, 
-  "permlevel": 1
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 0, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Prevdoc DocType", 
-  "oldfieldname": "prevdoc_doctype", 
+  "fieldname": "stock_uom", 
+  "fieldtype": "Data", 
+  "hidden": 0, 
+  "label": "Stock UOM", 
+  "oldfieldname": "stock_uom", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "print_width": "100px", 
+  "read_only": 1, 
+  "reqd": 1, 
+  "width": "100px"
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "prevdoc_doctype", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Prevdoc DocType", 
+  "no_copy": 0, 
+  "oldfieldname": "prevdoc_doctype", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "permlevel": 1, 
-  "print_width": "120px", 
-  "no_copy": 0, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Purchase Requisition No", 
-  "oldfieldname": "prevdoc_docname", 
-  "width": "120px", 
   "fieldname": "prevdoc_docname", 
   "fieldtype": "Link", 
-  "search_index": 1, 
   "hidden": 0, 
+  "in_filter": 1, 
+  "label": "Purchase Requisition No", 
+  "no_copy": 0, 
+  "oldfieldname": "prevdoc_docname", 
+  "oldfieldtype": "Link", 
   "options": "Purchase Request", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "print_width": "120px", 
+  "read_only": 1, 
+  "search_index": 1, 
+  "width": "120px"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Purchase Request Date", 
-  "oldfieldname": "prevdoc_date", 
   "fieldname": "prevdoc_date", 
   "fieldtype": "Date", 
-  "search_index": 0, 
   "hidden": 1, 
-  "permlevel": 1, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Purchase Request Date", 
+  "oldfieldname": "prevdoc_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "search_index": 0
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 0, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Purchase Request Detail No", 
-  "oldfieldname": "prevdoc_detail_docname", 
   "fieldname": "prevdoc_detail_docname", 
   "fieldtype": "Data", 
-  "search_index": 1, 
   "hidden": 1, 
-  "permlevel": 1, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Purchase Request Detail No", 
+  "no_copy": 0, 
+  "oldfieldname": "prevdoc_detail_docname", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "search_index": 1
  }, 
  {
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "Supplier Quotation", 
-  "options": "Supplier Quotation", 
   "fieldname": "supplier_quotation", 
   "fieldtype": "Link", 
   "hidden": 1, 
-  "permlevel": 1, 
-  "in_filter": 0
+  "in_filter": 0, 
+  "label": "Supplier Quotation", 
+  "options": "Supplier Quotation", 
+  "read_only": 1, 
+  "search_index": 0
  }, 
  {
   "doctype": "DocField", 
-  "label": "Supplier Quotation Item", 
-  "options": "Supplier Quotation Item", 
   "fieldname": "supplier_quotation_item", 
   "fieldtype": "Link", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Supplier Quotation Item", 
+  "options": "Supplier Quotation Item", 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Brand", 
-  "oldfieldname": "brand", 
-  "options": "Brand", 
   "fieldname": "brand", 
   "fieldtype": "Link", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Brand", 
+  "oldfieldname": "brand", 
+  "oldfieldtype": "Link", 
+  "options": "Brand", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Item Group", 
-  "oldfieldname": "item_group", 
-  "permlevel": 1, 
   "fieldname": "item_group", 
   "fieldtype": "Link", 
-  "search_index": 0, 
   "hidden": 1, 
+  "in_filter": 1, 
+  "label": "Item Group", 
+  "oldfieldname": "item_group", 
+  "oldfieldtype": "Link", 
   "options": "Item Group", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "read_only": 1, 
+  "search_index": 0
  }, 
  {
+  "doctype": "DocField", 
+  "fieldname": "stock_qty", 
+  "fieldtype": "Float", 
+  "hidden": 0, 
+  "label": "Stock Qty", 
+  "no_copy": 1, 
+  "oldfieldname": "stock_qty", 
+  "oldfieldtype": "Currency", 
   "print_hide": 1, 
   "print_width": "100px", 
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Stock Qty", 
-  "oldfieldname": "stock_qty", 
-  "width": "100px", 
-  "fieldname": "stock_qty", 
-  "fieldtype": "Currency", 
-  "hidden": 0, 
-  "permlevel": 1
+  "read_only": 1, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Received Qty", 
-  "oldfieldname": "received_qty", 
   "fieldname": "received_qty", 
-  "fieldtype": "Currency", 
+  "fieldtype": "Float", 
   "hidden": 0, 
-  "permlevel": 1
- }, 
- {
-  "print_hide": 1, 
-  "default": "0.00", 
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Billed Quantity", 
-  "oldfieldname": "billed_qty", 
+  "label": "Received Qty", 
   "no_copy": 1, 
-  "fieldname": "billed_qty", 
-  "fieldtype": "Currency", 
-  "hidden": 0, 
-  "permlevel": 1
+  "oldfieldname": "received_qty", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "description": "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges", 
-  "oldfieldtype": "Small Text", 
+  "default": "0.00", 
   "doctype": "DocField", 
-  "label": "Item Tax Rate", 
-  "oldfieldname": "item_tax_rate", 
+  "fieldname": "billed_qty", 
+  "fieldtype": "Float", 
+  "hidden": 0, 
+  "label": "Billed Quantity", 
+  "no_copy": 1, 
+  "oldfieldname": "billed_qty", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
+ }, 
+ {
+  "description": "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges", 
+  "doctype": "DocField", 
   "fieldname": "item_tax_rate", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
-  "permlevel": 1, 
+  "label": "Item Tax Rate", 
+  "oldfieldname": "item_tax_rate", 
+  "oldfieldtype": "Small Text", 
+  "print_hide": 1, 
+  "read_only": 1, 
   "report_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Check", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Page Break", 
-  "oldfieldname": "page_break", 
   "fieldname": "page_break", 
   "fieldtype": "Check", 
   "hidden": 0, 
-  "permlevel": 0
+  "label": "Page Break", 
+  "no_copy": 1, 
+  "oldfieldname": "page_break", 
+  "oldfieldtype": "Check", 
+  "print_hide": 1
  }
 ]
\ No newline at end of file
diff --git a/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.txt b/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.txt
index f9cbd04..742dbb8 100644
--- a/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.txt
+++ b/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.txt
@@ -1,117 +1,112 @@
 [
  {
-  "owner": "dhanalekshmi@webnotestech.com", 
+  "creation": "2013-01-10 16:34:10", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:35:50", 
+  "modified": "2013-01-22 14:47:54", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:35:50"
+  "owner": "dhanalekshmi@webnotestech.com"
  }, 
  {
-  "section_style": "Simple", 
+  "doctype": "DocType", 
+  "hide_toolbar": 1, 
   "istable": 1, 
   "module": "Buying", 
-  "server_code_error": " ", 
-  "doctype": "DocType", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "show_in_menu": 0, 
-  "version": 1, 
-  "hide_toolbar": 1
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Purchase Order Item Supplied", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
-  "name": "Purchase Order Item Supplied", 
-  "doctype": "DocType"
- }, 
- {
-  "search_index": 0, 
-  "doctype": "DocField", 
-  "label": "Reference Name", 
-  "oldfieldname": "reference_name", 
-  "fieldname": "reference_name", 
-  "fieldtype": "Data", 
-  "oldfieldtype": "Data", 
-  "hidden": 0, 
-  "permlevel": 1, 
-  "in_filter": 0
- }, 
- {
-  "oldfieldtype": "Data", 
-  "doctype": "DocField", 
-  "label": "BOM Detail No", 
-  "oldfieldname": "bom_detail_no", 
-  "fieldname": "bom_detail_no", 
-  "fieldtype": "Data", 
-  "permlevel": 1
- }, 
- {
-  "oldfieldtype": "Data", 
-  "doctype": "DocField", 
-  "label": "Item Code", 
-  "oldfieldname": "main_item_code", 
-  "fieldname": "main_item_code", 
-  "fieldtype": "Data", 
-  "permlevel": 1
- }, 
- {
-  "oldfieldtype": "Data", 
-  "doctype": "DocField", 
-  "label": "Raw Material Item Code", 
-  "oldfieldname": "rm_item_code", 
-  "fieldname": "rm_item_code", 
-  "fieldtype": "Data", 
-  "permlevel": 1
- }, 
- {
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Required Qty", 
-  "oldfieldname": "required_qty", 
-  "fieldname": "required_qty", 
-  "fieldtype": "Currency", 
-  "permlevel": 1
- }, 
- {
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Rate", 
-  "oldfieldname": "rate", 
-  "fieldname": "rate", 
-  "fieldtype": "Currency", 
   "permlevel": 0
  }, 
  {
-  "oldfieldtype": "Currency", 
+  "doctype": "DocType", 
+  "name": "Purchase Order Item Supplied"
+ }, 
+ {
   "doctype": "DocField", 
-  "label": "Amount", 
-  "oldfieldname": "amount", 
+  "fieldname": "reference_name", 
+  "fieldtype": "Data", 
+  "hidden": 0, 
+  "in_filter": 0, 
+  "label": "Reference Name", 
+  "oldfieldname": "reference_name", 
+  "oldfieldtype": "Data", 
+  "read_only": 1, 
+  "search_index": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "bom_detail_no", 
+  "fieldtype": "Data", 
+  "label": "BOM Detail No", 
+  "oldfieldname": "bom_detail_no", 
+  "oldfieldtype": "Data", 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "main_item_code", 
+  "fieldtype": "Data", 
+  "label": "Item Code", 
+  "oldfieldname": "main_item_code", 
+  "oldfieldtype": "Data", 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "rm_item_code", 
+  "fieldtype": "Data", 
+  "label": "Raw Material Item Code", 
+  "oldfieldname": "rm_item_code", 
+  "oldfieldtype": "Data", 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "required_qty", 
+  "fieldtype": "Float", 
+  "label": "Required Qty", 
+  "oldfieldname": "required_qty", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "rate", 
+  "fieldtype": "Currency", 
+  "label": "Rate", 
+  "oldfieldname": "rate", 
+  "oldfieldtype": "Currency"
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "amount", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Amount", 
+  "oldfieldname": "amount", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "conversion_factor", 
+  "fieldtype": "Float", 
+  "hidden": 1, 
   "label": "Conversion Factor", 
   "oldfieldname": "conversion_factor", 
-  "fieldname": "conversion_factor", 
-  "fieldtype": "Currency", 
-  "hidden": 1, 
-  "permlevel": 1
+  "oldfieldtype": "Currency", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Stock Uom", 
-  "oldfieldname": "stock_uom", 
   "fieldname": "stock_uom", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Stock Uom", 
+  "oldfieldname": "stock_uom", 
+  "oldfieldtype": "Data", 
+  "read_only": 1
  }
 ]
\ No newline at end of file
diff --git a/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.txt b/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.txt
index 5b5729c..7c36bba 100644
--- a/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.txt
+++ b/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.txt
@@ -1,146 +1,139 @@
 [
  {
-  "owner": "wasim@webnotestech.com", 
+  "creation": "2013-01-10 16:34:10", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:35:50", 
+  "modified": "2013-01-22 14:47:55", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:35:50"
+  "owner": "wasim@webnotestech.com"
  }, 
  {
-  "section_style": "Simple", 
+  "doctype": "DocType", 
+  "hide_toolbar": 0, 
   "istable": 1, 
   "module": "Buying", 
-  "server_code_error": " ", 
-  "doctype": "DocType", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "show_in_menu": 0, 
-  "version": 17, 
-  "hide_toolbar": 0
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Purchase Receipt Item Supplied", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "name": "Purchase Receipt Item Supplied", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Purchase Receipt Item Supplied"
  }, 
  {
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "Reference Name", 
-  "oldfieldname": "reference_name", 
   "fieldname": "reference_name", 
   "fieldtype": "Data", 
-  "oldfieldtype": "Data", 
   "hidden": 0, 
-  "permlevel": 1, 
-  "in_filter": 0
+  "in_filter": 0, 
+  "label": "Reference Name", 
+  "oldfieldname": "reference_name", 
+  "oldfieldtype": "Data", 
+  "read_only": 1, 
+  "search_index": 0
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "BOM Detail No", 
-  "oldfieldname": "bom_detail_no", 
   "fieldname": "bom_detail_no", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "BOM Detail No", 
+  "oldfieldname": "bom_detail_no", 
+  "oldfieldtype": "Data", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Item Code", 
-  "oldfieldname": "main_item_code", 
   "fieldname": "main_item_code", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Item Code", 
+  "oldfieldname": "main_item_code", 
+  "oldfieldtype": "Data", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Raw Material Item Code", 
-  "oldfieldname": "rm_item_code", 
   "fieldname": "rm_item_code", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Raw Material Item Code", 
+  "oldfieldname": "rm_item_code", 
+  "oldfieldtype": "Data"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Description", 
-  "oldfieldname": "description", 
-  "width": "300px", 
   "fieldname": "description", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Description", 
+  "oldfieldname": "description", 
+  "oldfieldtype": "Data", 
+  "read_only": 1, 
+  "width": "300px"
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "required_qty", 
+  "fieldtype": "Float", 
   "label": "Required Qty", 
   "oldfieldname": "required_qty", 
-  "fieldname": "required_qty", 
-  "fieldtype": "Currency", 
-  "permlevel": 1
+  "oldfieldtype": "Currency", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "consumed_qty", 
+  "fieldtype": "Float", 
   "label": "Consumed Qty", 
   "oldfieldname": "consumed_qty", 
-  "fieldname": "consumed_qty", 
-  "fieldtype": "Currency", 
-  "reqd": 1, 
-  "permlevel": 0
+  "oldfieldtype": "Currency", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Rate", 
-  "oldfieldname": "rate", 
   "fieldname": "rate", 
   "fieldtype": "Currency", 
-  "permlevel": 0
+  "label": "Rate", 
+  "oldfieldname": "rate", 
+  "oldfieldtype": "Currency"
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "conversion_factor", 
+  "fieldtype": "Float", 
+  "hidden": 1, 
   "label": "Conversion Factor", 
   "oldfieldname": "conversion_factor", 
-  "fieldname": "conversion_factor", 
-  "fieldtype": "Currency", 
-  "hidden": 1, 
-  "permlevel": 1
+  "oldfieldtype": "Currency", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Amount", 
-  "oldfieldname": "amount", 
   "fieldname": "amount", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Amount", 
+  "oldfieldname": "amount", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Stock Uom", 
-  "oldfieldname": "stock_uom", 
   "fieldname": "stock_uom", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Stock Uom", 
+  "oldfieldname": "stock_uom", 
+  "oldfieldtype": "Data", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Current Stock", 
-  "oldfieldname": "current_stock", 
   "fieldname": "current_stock", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Current Stock", 
+  "oldfieldname": "current_stock", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1
  }
 ]
\ No newline at end of file
diff --git a/buying/doctype/purchase_request/purchase_request.txt b/buying/doctype/purchase_request/purchase_request.txt
index acfae49..e6fa16e 100644
--- a/buying/doctype/purchase_request/purchase_request.txt
+++ b/buying/doctype/purchase_request/purchase_request.txt
@@ -1,430 +1,351 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-21 18:19:20", 
   "docstatus": 0, 
-  "creation": "2012-12-03 17:56:31", 
+  "modified": "2013-01-22 14:56:44", 
   "modified_by": "Administrator", 
-  "modified": "2013-01-15 15:34:47"
+  "owner": "Administrator"
  }, 
  {
-  "autoname": "naming_series:", 
   "allow_attach": 1, 
-  "is_submittable": 1, 
   "allow_print": 0, 
-  "search_fields": "status,transaction_date,sales_order_no", 
-  "module": "Buying", 
+  "autoname": "naming_series:", 
   "doctype": "DocType", 
+  "is_submittable": 1, 
+  "module": "Buying", 
+  "name": "__common__", 
   "read_only_onload": 1, 
-  "name": "__common__"
+  "search_fields": "status,transaction_date,sales_order_no"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Purchase Request", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Purchase Request", 
-  "read": 1, 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
+  "amend": 1, 
+  "cancel": 1, 
+  "create": 1, 
   "doctype": "DocPerm", 
-  "report": 1, 
+  "name": "__common__", 
+  "parent": "Purchase Request", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Purchase Request", 
-  "doctype": "DocType"
- }, 
- {
-  "print_hide": 1, 
-  "description": "To manage multiple series please go to Setup > Manage Series", 
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
-  "doctype": "DocField", 
-  "label": "Series", 
-  "oldfieldname": "naming_series", 
   "permlevel": 0, 
+  "read": 1, 
+  "report": 1, 
+  "submit": 1, 
+  "write": 1
+ }, 
+ {
+  "doctype": "DocType", 
+  "name": "Purchase Request"
+ }, 
+ {
+  "description": "To manage multiple series please go to Setup > Manage Series", 
+  "doctype": "DocField", 
   "fieldname": "naming_series", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "options": "IDT"
+  "label": "Series", 
+  "no_copy": 1, 
+  "oldfieldname": "naming_series", 
+  "oldfieldtype": "Select", 
+  "options": "IDT", 
+  "print_hide": 1, 
+  "reqd": 1
  }, 
  {
   "description": "The date at which current entry is made in system.", 
-  "print_width": "100px", 
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Transaction Date", 
-  "oldfieldname": "transaction_date", 
-  "width": "100px", 
   "fieldname": "transaction_date", 
   "fieldtype": "Date", 
-  "search_index": 1, 
-  "reqd": 1, 
   "in_filter": 1, 
-  "permlevel": 0
+  "label": "Transaction Date", 
+  "no_copy": 1, 
+  "oldfieldname": "transaction_date", 
+  "oldfieldtype": "Date", 
+  "print_width": "100px", 
+  "reqd": 1, 
+  "search_index": 1, 
+  "width": "100px"
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Items", 
   "fieldname": "items", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Items", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "no_copy": 0, 
-  "oldfieldtype": "Table", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Purchase Requisition Details", 
-  "oldfieldname": "indent_details", 
-  "options": "Purchase Request Item", 
   "fieldname": "indent_details", 
   "fieldtype": "Table", 
-  "permlevel": 0
+  "label": "Purchase Requisition Details", 
+  "no_copy": 0, 
+  "oldfieldname": "indent_details", 
+  "oldfieldtype": "Table", 
+  "options": "Purchase Request Item"
  }, 
  {
   "doctype": "DocField", 
-  "options": "Simple", 
   "fieldname": "section_break1", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "options": "Simple"
  }, 
  {
-  "print_width": "50%", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break4", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "print_width": "50%", 
+  "width": "50%"
  }, 
  {
-  "permlevel": 0, 
   "description": "One or multiple Sales Order no which generated this Purchase Requisition", 
-  "print_width": "100px", 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Sales Order No", 
-  "oldfieldname": "sales_order_no", 
-  "width": "100px", 
   "fieldname": "sales_order_no", 
   "fieldtype": "Link", 
-  "options": "Sales Order"
+  "label": "Sales Order No", 
+  "no_copy": 1, 
+  "oldfieldname": "sales_order_no", 
+  "oldfieldtype": "Data", 
+  "options": "Sales Order", 
+  "print_width": "100px", 
+  "width": "100px"
  }, 
  {
-  "print_width": "50%", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break5", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "print_width": "50%", 
+  "width": "50%"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Pull Sales Order Items", 
-  "options": "pull_so_details", 
   "fieldname": "pull_sales_order_details", 
   "fieldtype": "Button", 
-  "permlevel": 0
+  "label": "Pull Sales Order Items", 
+  "options": "pull_so_details"
  }, 
  {
-  "description": "Filing in Additional Information about the Purchase Requisition will help you analyze your data better.", 
   "default": "Give additional details about the indent.", 
-  "oldfieldtype": "Section Break", 
+  "description": "Filing in Additional Information about the Purchase Requisition will help you analyze your data better.", 
   "doctype": "DocField", 
-  "label": "More Info", 
   "fieldname": "more_info", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "More Info", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "print_width": "50%", 
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "print_width": "50%", 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
   "description": "Select the relevant company name if you have multiple companies", 
-  "print_width": "150px", 
-  "permlevel": 0, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Company", 
-  "oldfieldname": "company", 
-  "width": "150px", 
   "fieldname": "company", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
   "in_filter": 1, 
-  "options": "Company"
- }, 
- {
+  "label": "Company", 
+  "oldfieldname": "company", 
+  "oldfieldtype": "Link", 
+  "options": "Company", 
   "print_hide": 1, 
   "print_width": "150px", 
-  "permlevel": 0, 
-  "oldfieldtype": "Select", 
+  "reqd": 1, 
+  "search_index": 1, 
+  "width": "150px"
+ }, 
+ {
   "doctype": "DocField", 
-  "label": "Fiscal Year", 
-  "oldfieldname": "fiscal_year", 
-  "width": "150px", 
   "fieldname": "fiscal_year", 
   "fieldtype": "Select", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Fiscal Year", 
+  "oldfieldname": "fiscal_year", 
+  "oldfieldtype": "Select", 
   "options": "link:Fiscal Year", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "print_width": "150px", 
+  "reqd": 1, 
+  "search_index": 1, 
+  "width": "150px"
  }, 
  {
   "description": "Name of the entity who has requested for the Purchase Requisition", 
-  "print_width": "100px", 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Requested By", 
-  "oldfieldname": "requested_by", 
-  "width": "100px", 
   "fieldname": "requested_by", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Requested By", 
+  "no_copy": 1, 
+  "oldfieldname": "requested_by", 
+  "oldfieldtype": "Data", 
+  "print_width": "100px", 
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
   "description": "After cancelling the Purchase Requisition, a dialog box will ask you reason for cancellation which will be reflected in this field", 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Cancel Reason", 
-  "oldfieldname": "cancel_reason", 
   "fieldname": "cancel_reason", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Cancel Reason", 
+  "no_copy": 1, 
+  "oldfieldname": "cancel_reason", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_width": "50%", 
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break2", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "print_width": "50%", 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
   "allow_on_submit": 1, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Letter Head", 
-  "oldfieldname": "letter_head", 
-  "options": "link:Letter Head", 
   "fieldname": "letter_head", 
   "fieldtype": "Select", 
-  "permlevel": 0
+  "label": "Letter Head", 
+  "oldfieldname": "letter_head", 
+  "oldfieldtype": "Select", 
+  "options": "link:Letter Head", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "permlevel": 1, 
-  "print_width": "100px", 
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Status", 
-  "oldfieldname": "status", 
-  "width": "100px", 
   "fieldname": "status", 
   "fieldtype": "Select", 
-  "search_index": 1, 
-  "reqd": 0, 
+  "in_filter": 1, 
+  "label": "Status", 
+  "no_copy": 1, 
+  "oldfieldname": "status", 
+  "oldfieldtype": "Select", 
   "options": "\nDraft\nSubmitted\nStopped\nCancelled", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "print_width": "100px", 
+  "read_only": 1, 
+  "reqd": 0, 
+  "search_index": 1, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
   "description": "% of materials ordered against this Purchase Requisition", 
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "% Ordered", 
-  "oldfieldname": "per_ordered", 
   "fieldname": "per_ordered", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "% Ordered", 
+  "no_copy": 1, 
+  "oldfieldname": "per_ordered", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "print_width": "150px", 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Amended From", 
-  "oldfieldname": "amended_from", 
-  "width": "150px", 
   "fieldname": "amended_from", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Amended From", 
+  "no_copy": 1, 
+  "oldfieldname": "amended_from", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "print_width": "150px", 
+  "read_only": 1, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
   "description": "The date at which current entry is corrected in the system.", 
-  "print_width": "100px", 
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Amendment Date", 
-  "oldfieldname": "amendment_date", 
-  "width": "100px", 
   "fieldname": "amendment_date", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "Amendment Date", 
+  "no_copy": 1, 
+  "oldfieldname": "amendment_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
+  "print_width": "100px", 
+  "width": "100px"
  }, 
  {
-  "print_hide": 0, 
-  "print_width": "150px", 
-  "no_copy": 1, 
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Remarks", 
-  "oldfieldname": "remark", 
-  "width": "150px", 
   "fieldname": "remark", 
   "fieldtype": "Small Text", 
-  "permlevel": 0
+  "label": "Remarks", 
+  "no_copy": 1, 
+  "oldfieldname": "remark", 
+  "oldfieldtype": "Small Text", 
+  "print_hide": 0, 
+  "print_width": "150px", 
+  "width": "150px"
  }, 
  {
   "description": "Add Terms and Conditions for the Purchase Requisition. You can also prepare a Terms and Conditions Master and use the Template", 
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Terms and Conditions", 
   "fieldname": "terms_section_break", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Terms and Conditions", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Select Terms and Conditions", 
-  "oldfieldname": "tc_name", 
-  "options": "Terms and Conditions", 
   "fieldname": "tc_name", 
   "fieldtype": "Link", 
-  "permlevel": 0, 
+  "label": "Select Terms and Conditions", 
+  "oldfieldname": "tc_name", 
+  "oldfieldtype": "Link", 
+  "options": "Terms and Conditions", 
+  "print_hide": 1, 
   "report_hide": 1
  }, 
  {
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Get Terms and Conditions", 
-  "options": "get_tc_details", 
   "fieldname": "get_terms", 
   "fieldtype": "Button", 
-  "permlevel": 0
+  "label": "Get Terms and Conditions", 
+  "oldfieldtype": "Button", 
+  "options": "get_tc_details"
  }, 
  {
-  "oldfieldtype": "Text Editor", 
   "doctype": "DocField", 
-  "label": "Terms and Conditions Content", 
-  "oldfieldname": "terms", 
   "fieldname": "terms", 
   "fieldtype": "Text Editor", 
-  "permlevel": 0
+  "label": "Terms and Conditions Content", 
+  "oldfieldname": "terms", 
+  "oldfieldtype": "Text Editor"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "File List", 
   "fieldname": "file_list", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "File List", 
+  "no_copy": 1, 
+  "print_hide": 1
  }, 
  {
-  "amend": 0, 
-  "create": 0, 
   "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Purchase Manager", 
-  "cancel": 0, 
-  "permlevel": 1
+  "role": "Purchase User"
  }, 
  {
-  "amend": 1, 
-  "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "role": "Purchase Manager", 
-  "cancel": 1, 
-  "permlevel": 0
+  "role": "Purchase Manager"
  }, 
  {
-  "amend": 0, 
-  "create": 0, 
   "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Material Manager", 
-  "cancel": 0, 
-  "permlevel": 1
+  "role": "Material Manager"
  }, 
  {
-  "amend": 1, 
-  "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "role": "Material Manager", 
-  "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Material User", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "amend": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "role": "Material User", 
-  "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "amend": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "role": "Purchase User", 
-  "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "role": "Purchase User", 
-  "cancel": 0, 
-  "permlevel": 1
+  "role": "Material User"
  }
 ]
\ No newline at end of file
diff --git a/buying/doctype/purchase_request_item/purchase_request_item.txt b/buying/doctype/purchase_request_item/purchase_request_item.txt
index b8f1cf6..403c7a2 100644
--- a/buying/doctype/purchase_request_item/purchase_request_item.txt
+++ b/buying/doctype/purchase_request_item/purchase_request_item.txt
@@ -1,222 +1,206 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:11", 
   "docstatus": 0, 
-  "creation": "2012-04-11 13:17:40", 
+  "modified": "2013-01-22 14:47:56", 
   "modified_by": "Administrator", 
-  "modified": "2012-04-12 14:52:49"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Tray", 
+  "autoname": "IDTD/.#####", 
+  "doctype": "DocType", 
   "istable": 1, 
   "module": "Buying", 
-  "server_code_error": " ", 
-  "doctype": "DocType", 
-  "autoname": "IDTD/.#####", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "show_in_menu": 0, 
-  "version": 37
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Purchase Request Item", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "name": "Purchase Request Item", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Purchase Request Item"
  }, 
  {
-  "print_hide": 0, 
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Required Date", 
-  "oldfieldname": "schedule_date", 
-  "width": "100px", 
   "fieldname": "schedule_date", 
   "fieldtype": "Date", 
+  "label": "Required Date", 
+  "no_copy": 1, 
+  "oldfieldname": "schedule_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 0, 
   "reqd": 1, 
-  "permlevel": 0
+  "width": "100px"
  }, 
  {
-  "permlevel": 0, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Item Code", 
-  "oldfieldname": "item_code", 
-  "width": "100px", 
-  "trigger": "Client", 
   "fieldname": "item_code", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Item Code", 
+  "oldfieldname": "item_code", 
+  "oldfieldtype": "Link", 
   "options": "Item", 
-  "in_filter": 1
+  "reqd": 1, 
+  "search_index": 1, 
+  "width": "100px"
  }, 
  {
-  "oldfieldtype": "Text", 
   "doctype": "DocField", 
-  "label": "Description", 
-  "oldfieldname": "description", 
-  "width": "250px", 
   "fieldname": "description", 
   "fieldtype": "Text", 
+  "label": "Description", 
+  "oldfieldname": "description", 
+  "oldfieldtype": "Text", 
   "reqd": 1, 
-  "permlevel": 0
+  "width": "250px"
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Warehouse", 
-  "oldfieldname": "warehouse", 
-  "width": "100px", 
-  "trigger": "Client", 
   "fieldname": "warehouse", 
   "fieldtype": "Link", 
-  "reqd": 0, 
-  "options": "Warehouse", 
-  "permlevel": 0
- }, 
- {
-  "width": "80px", 
-  "default": "0.00", 
-  "oldfieldtype": "Currency", 
-  "colour": "White:FFF", 
-  "doctype": "DocField", 
-  "label": "Quantity", 
-  "oldfieldname": "qty", 
-  "no_copy": 0, 
-  "trigger": "Client", 
-  "fieldname": "qty", 
-  "fieldtype": "Currency", 
-  "reqd": 1, 
-  "permlevel": 0
- }, 
- {
-  "no_copy": 0, 
+  "label": "Warehouse", 
+  "oldfieldname": "warehouse", 
   "oldfieldtype": "Link", 
+  "options": "Warehouse", 
+  "print_hide": 0, 
+  "reqd": 0, 
+  "width": "100px"
+ }, 
+ {
+  "default": "0.00", 
   "doctype": "DocField", 
-  "label": "Stock UOM", 
-  "oldfieldname": "uom", 
-  "width": "70px", 
-  "options": "UOM", 
+  "fieldname": "qty", 
+  "fieldtype": "Float", 
+  "label": "Quantity", 
+  "no_copy": 0, 
+  "oldfieldname": "qty", 
+  "oldfieldtype": "Currency", 
+  "reqd": 1, 
+  "width": "80px"
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "uom", 
   "fieldtype": "Link", 
+  "label": "Stock UOM", 
+  "no_copy": 0, 
+  "oldfieldname": "uom", 
+  "oldfieldtype": "Link", 
+  "options": "UOM", 
+  "read_only": 1, 
   "reqd": 1, 
-  "permlevel": 1
+  "width": "70px"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Lead Time Date", 
-  "oldfieldname": "lead_time_date", 
   "fieldname": "lead_time_date", 
   "fieldtype": "Date", 
-  "permlevel": 1
+  "label": "Lead Time Date", 
+  "no_copy": 1, 
+  "oldfieldname": "lead_time_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Item Name", 
-  "oldfieldname": "item_name", 
-  "width": "100px", 
   "fieldname": "item_name", 
   "fieldtype": "Data", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Item Name", 
+  "oldfieldname": "item_name", 
+  "oldfieldtype": "Data", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 1, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 0, 
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Item Group", 
-  "oldfieldname": "item_group", 
-  "permlevel": 1, 
   "fieldname": "item_group", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 0, 
+  "in_filter": 1, 
+  "label": "Item Group", 
+  "no_copy": 0, 
+  "oldfieldname": "item_group", 
+  "oldfieldtype": "Link", 
   "options": "Item Group", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "read_only": 1, 
+  "reqd": 0, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "permlevel": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Brand", 
-  "oldfieldname": "brand", 
-  "width": "100px", 
   "fieldname": "brand", 
   "fieldtype": "Link", 
-  "options": "Brand"
+  "label": "Brand", 
+  "oldfieldname": "brand", 
+  "oldfieldtype": "Link", 
+  "options": "Brand", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Min Order Qty", 
-  "oldfieldname": "min_order_qty", 
-  "width": "70px", 
   "fieldname": "min_order_qty", 
-  "fieldtype": "Currency", 
+  "fieldtype": "Float", 
+  "label": "Min Order Qty", 
+  "no_copy": 1, 
+  "oldfieldname": "min_order_qty", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
   "reqd": 0, 
-  "permlevel": 1
+  "width": "70px"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Projected Qty", 
-  "oldfieldname": "projected_qty", 
-  "width": "70px", 
   "fieldname": "projected_qty", 
-  "fieldtype": "Currency", 
-  "permlevel": 1
- }, 
- {
+  "fieldtype": "Float", 
+  "label": "Projected Qty", 
   "no_copy": 1, 
+  "oldfieldname": "projected_qty", 
   "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Ordered Qty", 
-  "oldfieldname": "ordered_qty", 
-  "fieldname": "ordered_qty", 
-  "fieldtype": "Currency", 
-  "permlevel": 1
+  "print_hide": 1, 
+  "read_only": 1, 
+  "width": "70px"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Sales Order No", 
-  "permlevel": 1, 
+  "fieldname": "ordered_qty", 
+  "fieldtype": "Float", 
+  "label": "Ordered Qty", 
+  "no_copy": 1, 
+  "oldfieldname": "ordered_qty", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "sales_order_no", 
   "fieldtype": "Link", 
-  "options": "Sales Order"
+  "label": "Sales Order No", 
+  "no_copy": 1, 
+  "options": "Sales Order", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Check", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Page Break", 
-  "oldfieldname": "page_break", 
   "fieldname": "page_break", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "Page Break", 
+  "no_copy": 1, 
+  "oldfieldname": "page_break", 
+  "oldfieldtype": "Check", 
+  "print_hide": 1
  }
 ]
\ No newline at end of file
diff --git a/buying/doctype/quality_inspection/quality_inspection.txt b/buying/doctype/quality_inspection/quality_inspection.txt
index 0a76f27..e8650e0 100644
--- a/buying/doctype/quality_inspection/quality_inspection.txt
+++ b/buying/doctype/quality_inspection/quality_inspection.txt
@@ -1,289 +1,253 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:11", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:35:51", 
+  "modified": "2013-01-22 14:57:21", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:45:50"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
-  "is_submittable": 1, 
-  "doctype": "DocType", 
-  "search_fields": "item_code, report_date, purchase_receipt_no, delivery_note_no", 
-  "module": "Buying", 
-  "server_code_error": " ", 
-  "print_outline": "Yes", 
   "autoname": "QAI/.######", 
+  "doctype": "DocType", 
+  "is_submittable": 1, 
+  "module": "Buying", 
   "name": "__common__", 
-  "colour": "White:FFF", 
-  "_last_update": "1317365120", 
-  "show_in_menu": 0, 
-  "version": 38
+  "search_fields": "item_code, report_date, purchase_receipt_no, delivery_note_no"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Quality Inspection", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Quality Inspection", 
-  "read": 1, 
-  "doctype": "DocPerm", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "role": "Quality Manager", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Quality Inspection", 
-  "doctype": "DocType"
- }, 
- {
-  "permlevel": 1, 
-  "doctype": "DocPerm"
+  "permlevel": 0
  }, 
  {
   "amend": 1, 
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
+  "name": "__common__", 
+  "parent": "Quality Inspection", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
+  "permlevel": 0, 
+  "read": 1, 
   "report": 1, 
-  "cancel": 1, 
-  "permlevel": 0
+  "role": "Quality Manager", 
+  "submit": 1, 
+  "write": 1
  }, 
  {
-  "no_copy": 0, 
-  "oldfieldtype": "Section Break", 
+  "doctype": "DocType", 
+  "name": "Quality Inspection"
+ }, 
+ {
   "doctype": "DocField", 
-  "label": "QA Inspection", 
   "fieldname": "qa_inspection", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "QA Inspection", 
+  "no_copy": 0, 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break0", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Naming Series", 
-  "options": "\nQAI/11-12/", 
   "fieldname": "naming_series", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Naming Series", 
+  "no_copy": 1, 
+  "options": "\nQAI/11-12/", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Inspection Type", 
-  "oldfieldname": "inspection_type", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "inspection_type", 
   "fieldtype": "Select", 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Inspection Type", 
+  "oldfieldname": "inspection_type", 
+  "oldfieldtype": "Select", 
   "options": "\nIncoming\nOutgoing\nIn Process", 
-  "in_filter": 1
+  "reqd": 1
  }, 
  {
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "Report Date", 
-  "oldfieldname": "report_date", 
   "fieldname": "report_date", 
   "fieldtype": "Date", 
+  "in_filter": 1, 
+  "label": "Report Date", 
+  "oldfieldname": "report_date", 
   "oldfieldtype": "Date", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Item Code", 
-  "oldfieldname": "item_code", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "item_code", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
   "hidden": 0, 
+  "in_filter": 1, 
+  "label": "Item Code", 
+  "oldfieldname": "item_code", 
+  "oldfieldtype": "Link", 
   "options": "Item", 
-  "in_filter": 1
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "search_index": 0, 
   "doctype": "DocField", 
+  "fieldname": "sample_size", 
+  "fieldtype": "Float", 
+  "in_filter": 0, 
   "label": "Sample Size", 
   "oldfieldname": "sample_size", 
-  "fieldname": "sample_size", 
-  "fieldtype": "Currency", 
   "oldfieldtype": "Currency", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 0
+  "search_index": 0
  }, 
  {
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "Description", 
-  "oldfieldname": "description", 
-  "width": "300px", 
   "fieldname": "description", 
   "fieldtype": "Small Text", 
+  "in_filter": 1, 
+  "label": "Description", 
+  "oldfieldname": "description", 
   "oldfieldtype": "Small Text", 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 0, 
+  "width": "300px"
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Item Serial No", 
-  "oldfieldname": "item_serial_no", 
-  "options": "Serial No", 
   "fieldname": "item_serial_no", 
   "fieldtype": "Link", 
   "hidden": 0, 
-  "permlevel": 0
+  "label": "Item Serial No", 
+  "oldfieldname": "item_serial_no", 
+  "oldfieldtype": "Link", 
+  "options": "Serial No", 
+  "print_hide": 0
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Batch No", 
-  "oldfieldname": "batch_no", 
-  "options": "Batch", 
   "fieldname": "batch_no", 
   "fieldtype": "Link", 
-  "permlevel": 0
+  "label": "Batch No", 
+  "oldfieldname": "batch_no", 
+  "oldfieldtype": "Link", 
+  "options": "Batch"
  }, 
  {
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Purchase Receipt No", 
-  "oldfieldname": "purchase_receipt_no", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "purchase_receipt_no", 
   "fieldtype": "Link", 
-  "search_index": 1, 
   "hidden": 0, 
+  "in_filter": 1, 
+  "label": "Purchase Receipt No", 
+  "oldfieldname": "purchase_receipt_no", 
+  "oldfieldtype": "Link", 
   "options": "Purchase Receipt", 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Delivery Note No", 
-  "oldfieldname": "delivery_note_no", 
-  "permlevel": 0, 
   "fieldname": "delivery_note_no", 
   "fieldtype": "Link", 
-  "search_index": 1, 
   "hidden": 0, 
+  "in_filter": 1, 
+  "label": "Delivery Note No", 
+  "oldfieldname": "delivery_note_no", 
+  "oldfieldtype": "Link", 
   "options": "Delivery Note", 
-  "in_filter": 1
+  "print_hide": 0, 
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Inspected By", 
-  "oldfieldname": "inspected_by", 
   "fieldname": "inspected_by", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Inspected By", 
+  "oldfieldname": "inspected_by", 
+  "oldfieldtype": "Data", 
+  "reqd": 1
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Text", 
   "doctype": "DocField", 
-  "label": "Remarks", 
-  "oldfieldname": "remarks", 
   "fieldname": "remarks", 
   "fieldtype": "Text", 
-  "permlevel": 0
+  "label": "Remarks", 
+  "no_copy": 1, 
+  "oldfieldname": "remarks", 
+  "oldfieldtype": "Text"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Verified By", 
-  "oldfieldname": "verified_by", 
   "fieldname": "verified_by", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Verified By", 
+  "oldfieldname": "verified_by", 
+  "oldfieldtype": "Data"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Amended From", 
-  "oldfieldname": "amended_from", 
   "fieldname": "amended_from", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Amended From", 
+  "no_copy": 1, 
+  "oldfieldname": "amended_from", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Amendment Date", 
-  "oldfieldname": "amendment_date", 
   "fieldname": "amendment_date", 
   "fieldtype": "Date", 
-  "permlevel": 1
+  "label": "Amendment Date", 
+  "no_copy": 1, 
+  "oldfieldname": "amendment_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Specification Details", 
-  "options": "Simple", 
   "fieldname": "specification_details", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Specification Details", 
+  "oldfieldtype": "Section Break", 
+  "options": "Simple"
  }, 
  {
   "doctype": "DocField", 
-  "options": "get_item_specification_details", 
   "fieldname": "get_specification_details", 
   "fieldtype": "Button", 
   "label": "Get Specification Details", 
-  "permlevel": 0
+  "options": "get_item_specification_details"
  }, 
  {
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "Quality Inspection Readings", 
-  "oldfieldname": "qa_specification_details", 
-  "options": "Quality Inspection Reading", 
   "fieldname": "qa_specification_details", 
   "fieldtype": "Table", 
-  "permlevel": 0
+  "label": "Quality Inspection Readings", 
+  "oldfieldname": "qa_specification_details", 
+  "oldfieldtype": "Table", 
+  "options": "Quality Inspection Reading"
+ }, 
+ {
+  "doctype": "DocPerm"
  }
 ]
\ No newline at end of file
diff --git a/buying/doctype/supplier/supplier.txt b/buying/doctype/supplier/supplier.txt
index b27c297..14bd2bd 100644
--- a/buying/doctype/supplier/supplier.txt
+++ b/buying/doctype/supplier/supplier.txt
@@ -1,249 +1,213 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:11", 
   "docstatus": 0, 
-  "creation": "2012-12-07 15:15:23", 
+  "modified": "2013-01-22 14:57:25", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-27 14:02:18"
+  "owner": "Administrator"
  }, 
  {
-  "document_type": "Master", 
-  "description": "Supplier of Goods or Services.", 
-  "autoname": "naming_series:", 
   "allow_rename": 1, 
-  "module": "Buying", 
+  "autoname": "naming_series:", 
+  "description": "Supplier of Goods or Services.", 
   "doctype": "DocType", 
-  "search_fields": "supplier_name,supplier_type", 
-  "name": "__common__"
+  "document_type": "Master", 
+  "module": "Buying", 
+  "name": "__common__", 
+  "search_fields": "supplier_name,supplier_type"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Supplier", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Supplier", 
-  "read": 1, 
-  "doctype": "DocPerm", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
+  "permlevel": 0
  }, 
  {
-  "name": "Supplier", 
-  "doctype": "DocType"
+  "amend": 0, 
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Supplier", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
+  "permlevel": 0, 
+  "read": 1, 
+  "report": 1, 
+  "submit": 0
+ }, 
+ {
+  "doctype": "DocType", 
+  "name": "Supplier"
  }, 
  {
   "description": "Note: You Can Manage Multiple Address or Contacts via Addresses & Contacts", 
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Basic Info", 
   "fieldname": "basic_info", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Basic Info", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Supplier Name", 
-  "oldfieldname": "supplier_name", 
   "fieldname": "supplier_name", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Supplier Name", 
+  "no_copy": 1, 
+  "oldfieldname": "supplier_name", 
+  "oldfieldtype": "Data", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Supplier Type", 
-  "oldfieldname": "supplier_type", 
-  "permlevel": 0, 
   "fieldname": "supplier_type", 
   "fieldtype": "Link", 
-  "reqd": 1, 
-  "options": "Supplier Type"
+  "label": "Supplier Type", 
+  "oldfieldname": "supplier_type", 
+  "oldfieldtype": "Link", 
+  "options": "Supplier Type", 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break0", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Series", 
-  "oldfieldname": "naming_series", 
-  "permlevel": 0, 
   "fieldname": "naming_series", 
   "fieldtype": "Select", 
+  "label": "Series", 
+  "no_copy": 1, 
+  "oldfieldname": "naming_series", 
+  "oldfieldtype": "Select", 
   "options": "\nSUPP\nSUPP/10-11/"
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "label": "Address & Contacts", 
   "fieldname": "address_contacts", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Address & Contacts", 
+  "oldfieldtype": "Column Break"
  }, 
  {
   "depends_on": "eval:doc.__islocal", 
   "doctype": "DocField", 
-  "label": "Address Desc", 
-  "permlevel": 0, 
   "fieldname": "address_desc", 
   "fieldtype": "HTML", 
+  "label": "Address Desc", 
   "options": "<em>Addresses will appear only when you save the supplier</em>"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Address HTML", 
   "fieldname": "address_html", 
   "fieldtype": "HTML", 
-  "permlevel": 1
+  "label": "Address HTML", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
   "depends_on": "eval:doc.__islocal", 
   "doctype": "DocField", 
-  "label": "Contact Desc", 
-  "permlevel": 0, 
   "fieldname": "contact_desc", 
   "fieldtype": "HTML", 
+  "label": "Contact Desc", 
   "options": "<em>Contact Details will appear only when you save the supplier</em>"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Contact HTML", 
   "fieldname": "contact_html", 
   "fieldtype": "HTML", 
-  "permlevel": 1
+  "label": "Contact HTML", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "communication_history", 
-  "fieldtype": "Section Break", 
-  "permlevel": 0
+  "fieldtype": "Section Break"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Communication HTML", 
   "fieldname": "communication_html", 
   "fieldtype": "HTML", 
-  "permlevel": 0
+  "label": "Communication HTML"
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "More Info", 
   "fieldname": "more_info", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "More Info", 
+  "oldfieldtype": "Section Break"
  }, 
  {
   "description": "Enter the company name under which Account Head will be created for this Supplier", 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Company", 
-  "oldfieldname": "company", 
-  "options": "Company", 
   "fieldname": "company", 
   "fieldtype": "Link", 
-  "search_index": 0, 
+  "in_filter": 1, 
+  "label": "Company", 
+  "oldfieldname": "company", 
+  "oldfieldtype": "Link", 
+  "options": "Company", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 0
  }, 
  {
   "description": "This currency will get fetched in Purchase transactions of this supplier", 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Default Currency", 
-  "permlevel": 0, 
   "fieldname": "default_currency", 
   "fieldtype": "Select", 
+  "label": "Default Currency", 
+  "no_copy": 1, 
   "options": "link:Currency"
  }, 
  {
   "description": "Statutory info and other general information about your Supplier", 
-  "oldfieldtype": "Code", 
   "doctype": "DocField", 
-  "label": "Supplier Details", 
-  "oldfieldname": "supplier_details", 
   "fieldname": "supplier_details", 
   "fieldtype": "Text", 
-  "permlevel": 0
+  "label": "Supplier Details", 
+  "oldfieldname": "supplier_details", 
+  "oldfieldtype": "Code"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break2", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Credit Days", 
   "fieldname": "credit_days", 
   "fieldtype": "Int", 
-  "permlevel": 0
+  "label": "Credit Days"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Website", 
-  "oldfieldname": "website", 
   "fieldname": "website", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Website", 
+  "oldfieldname": "website", 
+  "oldfieldtype": "Data"
  }, 
  {
-  "amend": 0, 
+  "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
   "role": "Purchase Manager", 
-  "cancel": 0, 
-  "permlevel": 1
+  "write": 0
  }, 
  {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "report": 1, 
-  "role": "Purchase Manager", 
-  "cancel": 0, 
-  "permlevel": 0
- }, 
- {
-  "role": "Purchase Master Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "amend": 0, 
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 1, 
-  "report": 1, 
   "role": "Purchase Master Manager", 
-  "cancel": 1, 
-  "permlevel": 0
+  "write": 1
  }
 ]
\ No newline at end of file
diff --git a/buying/doctype/supplier_quotation/supplier_quotation.txt b/buying/doctype/supplier_quotation/supplier_quotation.txt
index 140d5b1..d52fe64 100644
--- a/buying/doctype/supplier_quotation/supplier_quotation.txt
+++ b/buying/doctype/supplier_quotation/supplier_quotation.txt
@@ -1,780 +1,724 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-21 18:19:20", 
   "docstatus": 0, 
-  "creation": "2013-01-18 12:47:01", 
+  "modified": "2013-01-22 14:57:25", 
   "modified_by": "Administrator", 
-  "modified": "2013-01-18 13:25:50"
+  "owner": "Administrator"
  }, 
  {
-  "document_type": "Transaction", 
-  "is_submittable": 1, 
   "allow_attach": 1, 
   "autoname": "naming_series:", 
-  "module": "Buying", 
   "doctype": "DocType", 
+  "document_type": "Transaction", 
+  "is_submittable": 1, 
+  "module": "Buying", 
+  "name": "__common__", 
   "read_only_onload": 1, 
-  "search_fields": "status, transaction_date, supplier,grand_total", 
-  "name": "__common__"
+  "search_fields": "status, transaction_date, supplier,grand_total"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Supplier Quotation", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
-  "name": "__common__", 
-  "parent": "Supplier Quotation", 
-  "read": 1, 
-  "doctype": "DocPerm", 
-  "parenttype": "DocType", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Supplier Quotation", 
-  "doctype": "DocType"
- }, 
- {
-  "print_hide": 1, 
-  "description": "To manage multiple series please go to Setup > Manage Series", 
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
-  "doctype": "DocField", 
-  "label": "Series", 
-  "oldfieldname": "naming_series", 
-  "options": "SQTN", 
-  "fieldname": "naming_series", 
-  "fieldtype": "Select", 
-  "reqd": 1, 
   "permlevel": 0
  }, 
  {
-  "print_hide": 1, 
-  "description": "Supplier (vendor) name as entered in supplier master", 
-  "oldfieldtype": "Link", 
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Supplier Quotation", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
+  "read": 1, 
+  "report": 1
+ }, 
+ {
+  "doctype": "DocType", 
+  "name": "Supplier Quotation"
+ }, 
+ {
+  "description": "To manage multiple series please go to Setup > Manage Series", 
   "doctype": "DocField", 
-  "label": "Supplier", 
-  "oldfieldname": "supplier", 
-  "permlevel": 0, 
+  "fieldname": "naming_series", 
+  "fieldtype": "Select", 
+  "label": "Series", 
+  "no_copy": 1, 
+  "oldfieldname": "naming_series", 
+  "oldfieldtype": "Select", 
+  "options": "SQTN", 
+  "print_hide": 1, 
+  "reqd": 1
+ }, 
+ {
+  "description": "Supplier (vendor) name as entered in supplier master", 
+  "doctype": "DocField", 
   "fieldname": "supplier", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Supplier", 
+  "oldfieldname": "supplier", 
+  "oldfieldtype": "Link", 
   "options": "Supplier", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Name", 
   "fieldname": "supplier_name", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Name", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Address", 
   "fieldname": "address_display", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Address", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Contact", 
   "fieldname": "contact_display", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Contact", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Mobile No", 
   "fieldname": "contact_mobile", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Mobile No", 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Contact Email", 
   "fieldname": "contact_email", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Contact Email", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 0, 
-  "print_width": "50%", 
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "print_hide": 0, 
+  "print_width": "50%", 
+  "width": "50%"
  }, 
  {
   "description": "The date at which current entry is made in system.", 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Quotation Date", 
-  "oldfieldname": "transaction_date", 
   "fieldname": "transaction_date", 
   "fieldtype": "Date", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Quotation Date", 
+  "oldfieldname": "transaction_date", 
+  "oldfieldtype": "Date", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Items", 
   "fieldname": "items", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Items", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "no_copy": 0, 
-  "oldfieldtype": "Table", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Quotation Items", 
-  "oldfieldname": "po_details", 
-  "permlevel": 0, 
   "fieldname": "quotation_items", 
   "fieldtype": "Table", 
+  "label": "Quotation Items", 
+  "no_copy": 0, 
+  "oldfieldname": "po_details", 
+  "oldfieldtype": "Table", 
   "options": "Supplier Quotation Item"
  }, 
  {
   "doctype": "DocField", 
-  "permlevel": 0, 
   "fieldname": "section_break0", 
   "fieldtype": "Section Break", 
   "options": "Simple"
  }, 
  {
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Re-Calculate Values", 
   "fieldname": "recalculate_values", 
   "fieldtype": "Button", 
-  "permlevel": 0
+  "label": "Re-Calculate Values", 
+  "oldfieldtype": "Button"
  }, 
  {
   "doctype": "DocField", 
-  "permlevel": 0, 
   "fieldname": "section_break_14", 
   "fieldtype": "Section Break", 
   "options": "Simple"
  }, 
  {
-  "print_hide": 1, 
   "description": "You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.", 
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Select Purchase Request", 
-  "oldfieldname": "indent_no", 
-  "options": "Purchase Request", 
   "fieldname": "indent_no", 
   "fieldtype": "Link", 
   "hidden": 0, 
-  "permlevel": 0
+  "label": "Select Purchase Request", 
+  "no_copy": 1, 
+  "oldfieldname": "indent_no", 
+  "oldfieldtype": "Link", 
+  "options": "Purchase Request", 
+  "print_hide": 1
  }, 
  {
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Get Items", 
-  "permlevel": 0, 
   "fieldname": "get_items", 
   "fieldtype": "Button", 
   "hidden": 0, 
+  "label": "Get Items", 
+  "oldfieldtype": "Button", 
   "options": "get_indent_details"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Currency & Price List", 
   "fieldname": "currency_price_list", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Currency & Price List"
  }, 
  {
-  "print_hide": 1, 
   "description": "Supplier's currency", 
-  "no_copy": 0, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Currency", 
-  "oldfieldname": "currency", 
-  "options": "link:Currency", 
   "fieldname": "currency", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "permlevel": 0
- }, 
- {
+  "label": "Currency", 
+  "no_copy": 0, 
+  "oldfieldname": "currency", 
+  "oldfieldtype": "Select", 
+  "options": "link:Currency", 
   "print_hide": 1, 
-  "description": "Rate at which supplier's currency is converted to company's base currency", 
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Exchange Rate", 
-  "oldfieldname": "conversion_rate", 
-  "default": "1", 
-  "fieldname": "conversion_rate", 
-  "fieldtype": "Currency", 
-  "reqd": 1, 
-  "hidden": 0, 
-  "permlevel": 0
+  "reqd": 1
  }, 
  {
-  "print_width": "50%", 
+  "default": "1", 
+  "description": "Rate at which supplier's currency is converted to company's base currency", 
   "doctype": "DocField", 
-  "width": "50%", 
+  "fieldname": "conversion_rate", 
+  "fieldtype": "Float", 
+  "hidden": 0, 
+  "label": "Exchange Rate", 
+  "no_copy": 1, 
+  "oldfieldname": "conversion_rate", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "reqd": 1
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "cb_price_list", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "print_width": "50%", 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
   "description": "Consider this Price List for fetching rate. (only which have \"For Buying\" as checked)", 
   "doctype": "DocField", 
-  "label": "Price List", 
-  "permlevel": 0, 
   "fieldname": "price_list_name", 
   "fieldtype": "Link", 
-  "options": "Price List"
+  "label": "Price List", 
+  "options": "Price List", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "depends_on": "price_list_name", 
   "doctype": "DocField", 
-  "label": "Price List Currency", 
-  "permlevel": 0, 
   "fieldname": "price_list_currency", 
   "fieldtype": "Link", 
-  "options": "Currency"
+  "label": "Price List Currency", 
+  "options": "Currency", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "depends_on": "price_list_name", 
   "doctype": "DocField", 
-  "label": "Price List Exchange Rate", 
   "fieldname": "plc_conversion_rate", 
   "fieldtype": "Float", 
-  "permlevel": 0
+  "label": "Price List Exchange Rate", 
+  "print_hide": 1
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Taxes", 
   "fieldname": "taxes", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Taxes", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "print_hide": 1, 
   "description": "If you have created a standard template in Purchase Taxes and Charges Master, select one and click on the button below.", 
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Purchase Taxes and Charges", 
-  "oldfieldname": "purchase_other_charges", 
-  "permlevel": 0, 
   "fieldname": "purchase_other_charges", 
   "fieldtype": "Link", 
-  "options": "Purchase Taxes and Charges Master"
+  "label": "Purchase Taxes and Charges", 
+  "no_copy": 1, 
+  "oldfieldname": "purchase_other_charges", 
+  "oldfieldtype": "Link", 
+  "options": "Purchase Taxes and Charges Master", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Get Tax Detail", 
-  "permlevel": 0, 
   "fieldname": "get_tax_detail", 
   "fieldtype": "Button", 
-  "options": "get_purchase_tax_details"
+  "label": "Get Tax Detail", 
+  "oldfieldtype": "Button", 
+  "options": "get_purchase_tax_details", 
+  "print_hide": 1
  }, 
  {
-  "no_copy": 0, 
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "Purchase Taxes and Charges", 
-  "oldfieldname": "purchase_tax_details", 
-  "permlevel": 0, 
   "fieldname": "purchase_tax_details", 
   "fieldtype": "Table", 
+  "label": "Purchase Taxes and Charges", 
+  "no_copy": 0, 
+  "oldfieldname": "purchase_tax_details", 
+  "oldfieldtype": "Table", 
   "options": "Purchase Taxes and Charges"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Calculate Tax", 
   "fieldname": "calculate_tax", 
   "fieldtype": "Button", 
-  "permlevel": 0
+  "label": "Calculate Tax", 
+  "oldfieldtype": "Button", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "HTML", 
   "doctype": "DocField", 
-  "label": "Tax Calculation", 
   "fieldname": "tax_calculation", 
   "fieldtype": "HTML", 
-  "permlevel": 0
+  "label": "Tax Calculation", 
+  "no_copy": 1, 
+  "oldfieldtype": "HTML", 
+  "print_hide": 1
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Totals", 
   "fieldname": "totals", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Totals", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 0, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Net Total (Import)", 
-  "oldfieldname": "net_total_import", 
   "fieldname": "net_total_import", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Net Total (Import)", 
+  "no_copy": 0, 
+  "oldfieldname": "net_total_import", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 0, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Taxes and Charges Added (Import)", 
-  "oldfieldname": "other_charges_added_import", 
   "fieldname": "other_charges_added_import", 
   "fieldtype": "Currency", 
-  "permlevel": 1, 
+  "label": "Taxes and Charges Added (Import)", 
+  "no_copy": 0, 
+  "oldfieldname": "other_charges_added_import", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
   "report_hide": 0
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 0, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Taxes and Charges Deducted (Import)", 
-  "oldfieldname": "other_charges_deducted_import", 
   "fieldname": "other_charges_deducted_import", 
   "fieldtype": "Currency", 
-  "permlevel": 1, 
+  "label": "Taxes and Charges Deducted (Import)", 
+  "no_copy": 0, 
+  "oldfieldname": "other_charges_deducted_import", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
   "report_hide": 0
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 0, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Grand Total (Import)", 
-  "oldfieldname": "grand_total_import", 
   "fieldname": "grand_total_import", 
   "fieldtype": "Currency", 
-  "permlevel": 1, 
+  "label": "Grand Total (Import)", 
+  "no_copy": 0, 
+  "oldfieldname": "grand_total_import", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
   "report_hide": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "In Words(Import)", 
-  "oldfieldname": "in_words_import", 
   "fieldname": "in_words_import", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "In Words(Import)", 
+  "oldfieldname": "in_words_import", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
   "fieldname": "column_break4", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "print_hide": 0
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Net Total*", 
-  "oldfieldname": "net_total", 
   "fieldname": "net_total", 
   "fieldtype": "Currency", 
-  "reqd": 0, 
-  "permlevel": 1
+  "label": "Net Total*", 
+  "no_copy": 1, 
+  "oldfieldname": "net_total", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "reqd": 0
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 0, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Taxes and Charges Added", 
-  "oldfieldname": "other_charges_added", 
   "fieldname": "other_charges_added", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Taxes and Charges Added", 
+  "no_copy": 0, 
+  "oldfieldname": "other_charges_added", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 0, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Taxes and Charges Deducted", 
-  "oldfieldname": "other_charges_deducted", 
   "fieldname": "other_charges_deducted", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Taxes and Charges Deducted", 
+  "no_copy": 0, 
+  "oldfieldname": "other_charges_deducted", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Total Tax*", 
-  "oldfieldname": "total_tax", 
   "fieldname": "total_tax", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Total Tax*", 
+  "no_copy": 1, 
+  "oldfieldname": "total_tax", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Grand Total", 
-  "oldfieldname": "grand_total", 
   "fieldname": "grand_total", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Grand Total", 
+  "no_copy": 1, 
+  "oldfieldname": "grand_total", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Rounded Total", 
-  "oldfieldname": "rounded_total", 
   "fieldname": "rounded_total", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Rounded Total", 
+  "oldfieldname": "rounded_total", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "In Words will be visible once you save the Purchase Order.", 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "In Words", 
-  "oldfieldname": "in_words", 
   "fieldname": "in_words", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "In Words", 
+  "oldfieldname": "in_words", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Terms and Conditions", 
   "fieldname": "terms_section_break", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Terms and Conditions", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Select", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Letter Head", 
-  "oldfieldname": "letter_head", 
-  "permlevel": 0, 
   "fieldname": "letter_head", 
   "fieldtype": "Select", 
-  "options": "link:Letter Head"
+  "label": "Letter Head", 
+  "oldfieldname": "letter_head", 
+  "oldfieldtype": "Select", 
+  "options": "link:Letter Head", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Select Terms and Conditions", 
-  "oldfieldname": "tc_name", 
-  "permlevel": 0, 
   "fieldname": "tc_name", 
   "fieldtype": "Link", 
-  "options": "Terms and Conditions"
+  "label": "Select Terms and Conditions", 
+  "oldfieldname": "tc_name", 
+  "oldfieldtype": "Link", 
+  "options": "Terms and Conditions", 
+  "print_hide": 1
  }, 
  {
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Get Terms and Conditions", 
-  "permlevel": 0, 
   "fieldname": "get_terms", 
   "fieldtype": "Button", 
+  "label": "Get Terms and Conditions", 
+  "oldfieldtype": "Button", 
   "options": "get_tc_details"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "HTML", 
   "doctype": "DocField", 
-  "label": "Terms and Conditions HTML", 
-  "permlevel": 0, 
   "fieldname": "terms_html", 
   "fieldtype": "HTML", 
-  "options": "You can add Terms and Notes that will be printed in the Transaction"
+  "label": "Terms and Conditions HTML", 
+  "oldfieldtype": "HTML", 
+  "options": "You can add Terms and Notes that will be printed in the Transaction", 
+  "print_hide": 1
  }, 
  {
-  "oldfieldtype": "Text Editor", 
   "doctype": "DocField", 
-  "label": "Terms and Conditions1", 
-  "oldfieldname": "terms", 
   "fieldname": "terms", 
   "fieldtype": "Text Editor", 
-  "permlevel": 0
+  "label": "Terms and Conditions1", 
+  "oldfieldname": "terms", 
+  "oldfieldtype": "Text Editor"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Contact Info", 
   "fieldname": "contact_section", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Contact Info"
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Supplier Address", 
-  "permlevel": 0, 
   "fieldname": "supplier_address", 
   "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Supplier Address", 
   "options": "Address", 
-  "in_filter": 1
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Contact Person", 
-  "permlevel": 0, 
   "fieldname": "contact_person", 
   "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Contact Person", 
   "options": "Contact", 
-  "in_filter": 1
+  "print_hide": 1
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "More Info", 
   "fieldname": "more_info", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "More Info", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Status", 
-  "oldfieldname": "status", 
-  "permlevel": 1, 
   "fieldname": "status", 
   "fieldtype": "Select", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Status", 
+  "no_copy": 1, 
+  "oldfieldname": "status", 
+  "oldfieldtype": "Select", 
   "options": "\nDraft\nSubmitted\nStopped\nCancelled", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "read_only": 1, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
   "default": "No", 
   "doctype": "DocField", 
-  "label": "Is Subcontracted", 
-  "permlevel": 0, 
   "fieldname": "is_subcontracted", 
   "fieldtype": "Select", 
-  "options": "\nYes\nNo"
+  "label": "Is Subcontracted", 
+  "options": "\nYes\nNo", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Amended From", 
-  "oldfieldname": "amended_from", 
   "fieldname": "amended_from", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1, 
+  "label": "Amended From", 
+  "no_copy": 1, 
+  "oldfieldname": "amended_from", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1, 
   "report_hide": 0
  }, 
  {
-  "print_hide": 1, 
   "description": "The date at which current entry is corrected in the system.", 
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Amendment Date", 
-  "oldfieldname": "amendment_date", 
   "fieldname": "amendment_date", 
   "fieldtype": "Date", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Amendment Date", 
+  "no_copy": 1, 
+  "oldfieldname": "amendment_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "Select the relevant company name if you have multiple companies", 
-  "no_copy": 0, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Company", 
-  "oldfieldname": "company", 
-  "permlevel": 0, 
   "fieldname": "company", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Company", 
+  "no_copy": 0, 
+  "oldfieldname": "company", 
+  "oldfieldtype": "Link", 
   "options": "Company", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 0, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Fiscal Year", 
-  "oldfieldname": "fiscal_year", 
-  "permlevel": 0, 
   "fieldname": "fiscal_year", 
   "fieldtype": "Select", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Fiscal Year", 
+  "no_copy": 0, 
+  "oldfieldname": "fiscal_year", 
+  "oldfieldtype": "Select", 
   "options": "link:Fiscal Year", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Select Print Heading", 
-  "oldfieldname": "select_print_heading", 
-  "options": "Print Heading", 
   "fieldname": "select_print_heading", 
   "fieldtype": "Link", 
-  "permlevel": 0, 
+  "label": "Select Print Heading", 
+  "no_copy": 1, 
+  "oldfieldname": "select_print_heading", 
+  "oldfieldtype": "Link", 
+  "options": "Print Heading", 
+  "print_hide": 1, 
   "report_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "print_width": "50%", 
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break5", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "print_hide": 1, 
+  "print_width": "50%", 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
+  "depends_on": "eval:!doc.__islocal", 
   "doctype": "DocField", 
-  "label": "Cancel Reason", 
-  "oldfieldname": "cancel_reason", 
   "fieldname": "cancel_reason", 
   "fieldtype": "Data", 
-  "depends_on": "eval:!doc.__islocal", 
   "hidden": 0, 
-  "permlevel": 1
+  "label": "Cancel Reason", 
+  "no_copy": 1, 
+  "oldfieldname": "cancel_reason", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "File List", 
   "fieldname": "file_list", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "File List", 
+  "no_copy": 1, 
+  "print_hide": 1
  }, 
  {
   "amend": 1, 
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "report": 1, 
+  "permlevel": 0, 
   "role": "Manufacturing Manager", 
-  "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "amend": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
   "submit": 1, 
-  "write": 1, 
-  "report": 1, 
-  "role": "Purchase Manager", 
-  "cancel": 1, 
-  "permlevel": 0
+  "write": 1
  }, 
  {
   "amend": 1, 
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 1, 
-  "report": 1, 
+  "permlevel": 0, 
+  "role": "Purchase Manager", 
+  "submit": 1, 
+  "write": 1
+ }, 
+ {
+  "amend": 1, 
+  "cancel": 0, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "permlevel": 0, 
   "role": "Purchase User", 
-  "cancel": 0, 
-  "permlevel": 0
+  "submit": 0, 
+  "write": 1
  }, 
  {
   "amend": 0, 
+  "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "report": 1, 
+  "permlevel": 0, 
   "role": "Material User", 
-  "cancel": 0, 
-  "permlevel": 0
+  "submit": 0, 
+  "write": 0
  }, 
  {
   "amend": 0, 
+  "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "report": 1, 
+  "permlevel": 0, 
   "role": "Supplier", 
-  "cancel": 0, 
-  "permlevel": 0
+  "submit": 0, 
+  "write": 0
  }, 
  {
   "amend": 0, 
+  "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
+  "permlevel": 2, 
   "role": "All", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
   "submit": 0, 
-  "write": 1, 
-  "role": "All", 
-  "cancel": 0, 
-  "permlevel": 2
+  "write": 1
  }
 ]
\ No newline at end of file
diff --git a/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt b/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
index 40d5607..4424da3 100644
--- a/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
+++ b/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
@@ -1,306 +1,294 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:12", 
   "docstatus": 0, 
-  "creation": "2012-12-19 22:38:54", 
+  "modified": "2013-01-22 14:50:08", 
   "modified_by": "Administrator", 
-  "modified": "2013-01-04 13:14:13"
+  "owner": "Administrator"
  }, 
  {
-  "istable": 1, 
   "autoname": "SQI-.#####", 
-  "name": "__common__", 
   "doctype": "DocType", 
-  "module": "Buying"
+  "istable": 1, 
+  "module": "Buying", 
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Supplier Quotation Item", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "name": "Supplier Quotation Item", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Supplier Quotation Item"
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Item Code", 
-  "oldfieldname": "item_code", 
-  "permlevel": 0, 
   "fieldname": "item_code", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Item Code", 
+  "oldfieldname": "item_code", 
+  "oldfieldtype": "Link", 
   "options": "Item", 
-  "in_filter": 1
+  "print_hide": 0, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "If Supplier Part Number exists for given Item, it gets stored here", 
   "doctype": "DocField", 
-  "label": "Supplier Part Number", 
   "fieldname": "supplier_part_no", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Supplier Part Number", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Item Name", 
-  "oldfieldname": "item_name", 
   "fieldname": "item_name", 
   "fieldtype": "Data", 
-  "search_index": 1, 
-  "reqd": 1, 
   "hidden": 0, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Item Name", 
+  "oldfieldname": "item_name", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "print_width": "300px", 
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Description", 
-  "oldfieldname": "description", 
-  "width": "300px", 
   "fieldname": "description", 
   "fieldtype": "Small Text", 
+  "label": "Description", 
+  "oldfieldname": "description", 
+  "oldfieldtype": "Small Text", 
+  "print_width": "300px", 
   "reqd": 1, 
-  "permlevel": 0
+  "width": "300px"
  }, 
  {
-  "print_width": "60px", 
   "default": "0.00", 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "qty", 
+  "fieldtype": "Float", 
   "label": "Quantity", 
   "oldfieldname": "qty", 
-  "width": "60px", 
-  "fieldname": "qty", 
-  "fieldtype": "Currency", 
+  "oldfieldtype": "Currency", 
+  "print_width": "60px", 
   "reqd": 1, 
-  "permlevel": 0
+  "width": "60px"
  }, 
  {
-  "print_hide": 0, 
-  "print_width": "100px", 
-  "permlevel": 0, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "UOM", 
-  "oldfieldname": "uom", 
-  "width": "100px", 
   "fieldname": "uom", 
   "fieldtype": "Link", 
+  "label": "UOM", 
+  "oldfieldname": "uom", 
+  "oldfieldtype": "Link", 
+  "options": "UOM", 
+  "print_hide": 0, 
+  "print_width": "100px", 
   "reqd": 1, 
-  "options": "UOM"
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Ref Rate ", 
   "fieldname": "import_ref_rate", 
   "fieldtype": "Currency", 
-  "permlevel": 0
+  "label": "Ref Rate ", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 0, 
   "doctype": "DocField", 
-  "label": "Discount %", 
   "fieldname": "discount_rate", 
-  "fieldtype": "Currency", 
-  "permlevel": 0
+  "fieldtype": "Float", 
+  "label": "Discount %", 
+  "print_hide": 0
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Rate ", 
-  "oldfieldname": "import_rate", 
   "fieldname": "import_rate", 
   "fieldtype": "Currency", 
   "hidden": 0, 
-  "permlevel": 0
+  "label": "Rate ", 
+  "oldfieldname": "import_rate", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 0
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Amount", 
-  "oldfieldname": "import_amount", 
   "fieldname": "import_amount", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Amount", 
+  "oldfieldname": "import_amount", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Ref Rate *", 
   "fieldname": "purchase_ref_rate", 
   "fieldtype": "Currency", 
-  "permlevel": 0
+  "label": "Ref Rate *", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "print_width": "100px", 
   "default": "0.00", 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Rate (Default Curr.) *", 
-  "oldfieldname": "purchase_rate", 
-  "width": "100px", 
   "fieldname": "purchase_rate", 
   "fieldtype": "Currency", 
+  "label": "Rate (Default Curr.) *", 
+  "oldfieldname": "purchase_rate", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "print_width": "100px", 
   "reqd": 1, 
-  "permlevel": 0
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
   "default": "0.00", 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Amount  (Default Curr.)", 
-  "oldfieldname": "amount", 
   "fieldname": "amount", 
   "fieldtype": "Currency", 
-  "reqd": 1, 
-  "permlevel": 1
+  "label": "Amount  (Default Curr.)", 
+  "oldfieldname": "amount", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Warehouse", 
-  "oldfieldname": "warehouse", 
-  "options": "Warehouse", 
   "fieldname": "warehouse", 
   "fieldtype": "Link", 
-  "reqd": 0, 
   "hidden": 0, 
-  "permlevel": 0
+  "label": "Warehouse", 
+  "oldfieldname": "warehouse", 
+  "oldfieldtype": "Link", 
+  "options": "Warehouse", 
+  "print_hide": 1, 
+  "reqd": 0
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Project Name", 
-  "options": "Project", 
   "fieldname": "project_name", 
   "fieldtype": "Link", 
-  "permlevel": 0, 
-  "report_hide": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Project Name", 
+  "options": "Project", 
+  "print_hide": 1, 
+  "report_hide": 0
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 0, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Prevdoc DocType", 
-  "oldfieldname": "prevdoc_doctype", 
   "fieldname": "prevdoc_doctype", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Prevdoc DocType", 
+  "no_copy": 0, 
+  "oldfieldname": "prevdoc_doctype", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "permlevel": 1, 
-  "print_width": "120px", 
-  "no_copy": 0, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Purchase Request No", 
-  "oldfieldname": "prevdoc_docname", 
-  "width": "120px", 
   "fieldname": "prevdoc_docname", 
   "fieldtype": "Link", 
-  "search_index": 1, 
   "hidden": 0, 
+  "in_filter": 1, 
+  "label": "Purchase Request No", 
+  "no_copy": 0, 
+  "oldfieldname": "prevdoc_docname", 
+  "oldfieldtype": "Link", 
   "options": "Purchase Request", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "print_width": "120px", 
+  "read_only": 1, 
+  "search_index": 1, 
+  "width": "120px"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Purchase Request Date", 
-  "oldfieldname": "prevdoc_date", 
   "fieldname": "prevdoc_date", 
   "fieldtype": "Date", 
-  "search_index": 0, 
   "hidden": 1, 
-  "permlevel": 1, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Purchase Request Date", 
+  "oldfieldname": "prevdoc_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "search_index": 0
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 0, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Purchase Request Detail No", 
-  "oldfieldname": "prevdoc_detail_docname", 
   "fieldname": "prevdoc_detail_docname", 
   "fieldtype": "Data", 
-  "search_index": 1, 
   "hidden": 1, 
-  "permlevel": 1, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Purchase Request Detail No", 
+  "no_copy": 0, 
+  "oldfieldname": "prevdoc_detail_docname", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Brand", 
-  "oldfieldname": "brand", 
-  "options": "Brand", 
   "fieldname": "brand", 
   "fieldtype": "Link", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Brand", 
+  "oldfieldname": "brand", 
+  "oldfieldtype": "Link", 
+  "options": "Brand", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Item Group", 
-  "oldfieldname": "item_group", 
-  "permlevel": 1, 
   "fieldname": "item_group", 
   "fieldtype": "Link", 
-  "search_index": 0, 
   "hidden": 1, 
+  "in_filter": 1, 
+  "label": "Item Group", 
+  "oldfieldname": "item_group", 
+  "oldfieldtype": "Link", 
   "options": "Item Group", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "read_only": 1, 
+  "search_index": 0
  }, 
  {
-  "print_hide": 1, 
   "description": "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges", 
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Item Tax Rate", 
-  "oldfieldname": "item_tax_rate", 
   "fieldname": "item_tax_rate", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
-  "permlevel": 1, 
+  "label": "Item Tax Rate", 
+  "oldfieldname": "item_tax_rate", 
+  "oldfieldtype": "Small Text", 
+  "print_hide": 1, 
+  "read_only": 1, 
   "report_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Check", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Page Break", 
-  "oldfieldname": "page_break", 
   "fieldname": "page_break", 
   "fieldtype": "Check", 
   "hidden": 0, 
-  "permlevel": 0
+  "label": "Page Break", 
+  "no_copy": 1, 
+  "oldfieldname": "page_break", 
+  "oldfieldtype": "Check", 
+  "print_hide": 1
  }
 ]
\ No newline at end of file
diff --git a/hr/doctype/appraisal/appraisal.txt b/hr/doctype/appraisal/appraisal.txt
index b0b201e..718910d 100644
--- a/hr/doctype/appraisal/appraisal.txt
+++ b/hr/doctype/appraisal/appraisal.txt
@@ -1,296 +1,258 @@
 [
  {
-  "owner": "ashwini@webnotestech.com", 
+  "creation": "2013-01-10 16:34:12", 
   "docstatus": 0, 
-  "creation": "2012-11-16 10:33:39", 
+  "modified": "2013-01-22 14:55:57", 
   "modified_by": "Administrator", 
-  "modified": "2012-11-16 15:22:59"
+  "owner": "ashwini@webnotestech.com"
  }, 
  {
-  "section_style": "Simple", 
-  "is_submittable": 1, 
-  "search_fields": "status, employee, employee_name", 
-  "module": "HR", 
-  "server_code_error": " ", 
   "autoname": "APRSL.#####", 
-  "_last_update": "1316075905", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
   "doctype": "DocType", 
-  "show_in_menu": 0, 
-  "version": 1
+  "is_submittable": 1, 
+  "module": "HR", 
+  "name": "__common__", 
+  "search_fields": "status, employee, employee_name"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Appraisal", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Appraisal", 
-  "read": 1, 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
+  "create": 1, 
   "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Appraisal", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
+  "permlevel": 0, 
+  "read": 1, 
+  "report": 1, 
+  "write": 1
  }, 
  {
-  "name": "Appraisal", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Appraisal"
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Employee Details", 
   "fieldname": "employee_details", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Employee Details", 
+  "oldfieldtype": "Section Break"
  }, 
  {
   "description": "Select template from which you want to get the Goals", 
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Appraisal Template", 
-  "oldfieldname": "kra_template", 
-  "permlevel": 0, 
   "fieldname": "kra_template", 
   "fieldtype": "Link", 
-  "reqd": 1, 
-  "options": "Appraisal Template"
+  "label": "Appraisal Template", 
+  "oldfieldname": "kra_template", 
+  "oldfieldtype": "Link", 
+  "options": "Appraisal Template", 
+  "reqd": 1
  }, 
  {
-  "doctype": "DocField", 
+  "depends_on": "kra_template", 
   "description": "Select the Employee for whom you are creating the Appraisal.", 
-  "search_index": 1, 
-  "colour": "White:FFF", 
-  "oldfieldtype": "Link", 
-  "label": "For Employee", 
-  "oldfieldname": "employee", 
-  "permlevel": 0, 
-  "trigger": "Client", 
+  "doctype": "DocField", 
   "fieldname": "employee", 
   "fieldtype": "Link", 
-  "depends_on": "kra_template", 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "For Employee", 
+  "oldfieldname": "employee", 
+  "oldfieldtype": "Link", 
   "options": "Employee", 
-  "in_filter": 1
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Data", 
+  "depends_on": "kra_template", 
   "doctype": "DocField", 
-  "label": "For Employee Name", 
-  "oldfieldname": "employee_name", 
   "fieldname": "employee_name", 
   "fieldtype": "Data", 
-  "depends_on": "kra_template", 
-  "permlevel": 1, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "For Employee Name", 
+  "oldfieldname": "employee_name", 
+  "oldfieldtype": "Data", 
+  "read_only": 1
  }, 
  {
   "depends_on": "kra_template", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break0", 
   "fieldtype": "Column Break", 
   "oldfieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "permlevel": 1, 
-  "doctype": "DocField", 
-  "no_copy": 1, 
-  "search_index": 1, 
-  "colour": "White:FFF", 
-  "oldfieldtype": "Select", 
-  "label": "Status", 
-  "oldfieldname": "status", 
   "default": "Draft", 
+  "depends_on": "kra_template", 
+  "doctype": "DocField", 
   "fieldname": "status", 
   "fieldtype": "Select", 
-  "depends_on": "kra_template", 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Status", 
+  "no_copy": 1, 
+  "oldfieldname": "status", 
+  "oldfieldtype": "Select", 
   "options": "\nDraft\nSubmitted\nCompleted\nCancelled", 
-  "in_filter": 1
+  "read_only": 1, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Date", 
+  "depends_on": "kra_template", 
   "doctype": "DocField", 
-  "label": "Start Date", 
-  "oldfieldname": "start_date", 
   "fieldname": "start_date", 
   "fieldtype": "Date", 
-  "depends_on": "kra_template", 
-  "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Start Date", 
+  "oldfieldname": "start_date", 
+  "oldfieldtype": "Date", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Date", 
+  "depends_on": "kra_template", 
   "doctype": "DocField", 
-  "label": "End Date", 
-  "oldfieldname": "end_date", 
   "fieldname": "end_date", 
   "fieldtype": "Date", 
-  "depends_on": "kra_template", 
-  "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "End Date", 
+  "oldfieldname": "end_date", 
+  "oldfieldtype": "Date", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Section Break", 
+  "depends_on": "kra_template", 
   "doctype": "DocField", 
-  "label": "Goals", 
-  "options": "Simple", 
   "fieldname": "section_break0", 
   "fieldtype": "Section Break", 
-  "depends_on": "kra_template", 
-  "permlevel": 0
+  "label": "Goals", 
+  "oldfieldtype": "Section Break", 
+  "options": "Simple"
  }, 
  {
-  "oldfieldtype": "Table", 
-  "colour": "White:FFF", 
   "allow_on_submit": 0, 
   "doctype": "DocField", 
-  "label": "Appraisal Goals", 
-  "oldfieldname": "appraisal_details", 
-  "options": "Appraisal Goal", 
   "fieldname": "appraisal_details", 
   "fieldtype": "Table", 
-  "permlevel": 0
+  "label": "Appraisal Goals", 
+  "oldfieldname": "appraisal_details", 
+  "oldfieldtype": "Table", 
+  "options": "Appraisal Goal"
  }, 
  {
-  "oldfieldtype": "Button", 
   "allow_on_submit": 0, 
   "doctype": "DocField", 
-  "label": "Calculate Total Score", 
-  "options": "calculate_total", 
   "fieldname": "calculate_total_score", 
   "fieldtype": "Button", 
-  "permlevel": 0
+  "label": "Calculate Total Score", 
+  "oldfieldtype": "Button", 
+  "options": "calculate_total"
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Total Score (Out of 5)", 
-  "oldfieldname": "total_score", 
   "fieldname": "total_score", 
-  "fieldtype": "Currency", 
-  "permlevel": 1
+  "fieldtype": "Float", 
+  "label": "Total Score (Out of 5)", 
+  "no_copy": 1, 
+  "oldfieldname": "total_score", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1
  }, 
  {
   "depends_on": "kra_template", 
   "doctype": "DocField", 
   "fieldname": "section_break1", 
-  "fieldtype": "Section Break", 
-  "permlevel": 0
+  "fieldtype": "Section Break"
  }, 
  {
   "description": "Any other comments, noteworthy effort that should go in the records.", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Comments", 
   "fieldname": "comments", 
   "fieldtype": "Text", 
-  "permlevel": 0
+  "label": "Comments"
  }, 
  {
   "depends_on": "kra_template", 
   "doctype": "DocField", 
-  "label": "Other Details", 
   "fieldname": "other_details", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Other Details"
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Company", 
-  "oldfieldname": "company", 
-  "options": "link:Company", 
   "fieldname": "company", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Company", 
+  "oldfieldname": "company", 
+  "oldfieldtype": "Link", 
+  "options": "link:Company", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Fiscal Year", 
-  "oldfieldname": "fiscal_year", 
-  "options": "link:Fiscal Year", 
   "fieldname": "fiscal_year", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Fiscal Year", 
+  "oldfieldname": "fiscal_year", 
+  "oldfieldtype": "Select", 
+  "options": "link:Fiscal Year", 
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Amendment Date", 
-  "oldfieldname": "amendment_date", 
-  "width": "160px", 
   "fieldname": "amendment_date", 
   "fieldtype": "Date", 
   "hidden": 1, 
-  "permlevel": 1, 
-  "report_hide": 1
+  "label": "Amendment Date", 
+  "no_copy": 1, 
+  "oldfieldname": "amendment_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "report_hide": 1, 
+  "width": "160px"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Amended From", 
-  "oldfieldname": "amended_from", 
-  "width": "150px", 
   "fieldname": "amended_from", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1, 
-  "report_hide": 1
+  "label": "Amended From", 
+  "no_copy": 1, 
+  "oldfieldname": "amended_from", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "report_hide": 1, 
+  "width": "150px"
  }, 
  {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 1, 
+  "match": "owner", 
   "role": "Employee", 
-  "report": 1, 
-  "permlevel": 0, 
-  "match": "owner"
+  "submit": 0
  }, 
  {
   "amend": 1, 
-  "create": 1, 
+  "cancel": 1, 
   "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "report": 1, 
   "role": "System Manager", 
-  "cancel": 1, 
-  "permlevel": 0
+  "submit": 1
  }, 
  {
   "amend": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "report": 1, 
-  "role": "HR User", 
   "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "role": "All", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
+  "doctype": "DocPerm", 
+  "role": "HR User", 
+  "submit": 1
  }
 ]
\ No newline at end of file
diff --git a/hr/doctype/appraisal_goal/appraisal_goal.txt b/hr/doctype/appraisal_goal/appraisal_goal.txt
index 5fe775e..7df60c1 100644
--- a/hr/doctype/appraisal_goal/appraisal_goal.txt
+++ b/hr/doctype/appraisal_goal/appraisal_goal.txt
@@ -1,81 +1,72 @@
 [
  {
-  "owner": "ashwini@webnotestech.com", 
+  "creation": "2013-01-10 16:34:13", 
   "docstatus": 0, 
-  "creation": "2012-07-03 13:30:40", 
+  "modified": "2013-01-22 14:16:18", 
   "modified_by": "Administrator", 
-  "modified": "2012-11-15 17:50:24"
+  "owner": "ashwini@webnotestech.com"
  }, 
  {
-  "section_style": "Simple", 
-  "istable": 1, 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "module": "HR", 
-  "server_code_error": " ", 
-  "version": 1, 
+  "autoname": "APRSLD.#####", 
   "doctype": "DocType", 
-  "autoname": "APRSLD.#####"
+  "istable": 1, 
+  "module": "HR", 
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Appraisal Goal", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "name": "Appraisal Goal", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Appraisal Goal"
  }, 
  {
   "description": "Key Responsibility Area", 
-  "oldfieldtype": "Small Text", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Goal", 
-  "oldfieldname": "kra", 
-  "width": "240px", 
   "fieldname": "kra", 
   "fieldtype": "Small Text", 
+  "label": "Goal", 
+  "oldfieldname": "kra", 
+  "oldfieldtype": "Small Text", 
   "reqd": 1, 
-  "permlevel": 0
+  "width": "240px"
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "per_weightage", 
+  "fieldtype": "Float", 
   "label": "Weightage (%)", 
   "oldfieldname": "per_weightage", 
-  "width": "70px", 
-  "fieldname": "per_weightage", 
-  "fieldtype": "Currency", 
+  "oldfieldtype": "Currency", 
   "reqd": 1, 
-  "permlevel": 0
+  "width": "70px"
  }, 
  {
-  "permlevel": 0, 
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Score (0-5)", 
-  "oldfieldname": "score", 
-  "width": "70px", 
-  "trigger": "Client", 
   "fieldname": "score", 
-  "fieldtype": "Currency", 
-  "options": "\n0\n1\n2\n3\n4\n5"
+  "fieldtype": "Float", 
+  "label": "Score (0-5)", 
+  "no_copy": 1, 
+  "oldfieldname": "score", 
+  "oldfieldtype": "Select", 
+  "options": "\n0\n1\n2\n3\n4\n5", 
+  "width": "70px"
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Score Earned", 
-  "oldfieldname": "score_earned", 
-  "width": "70px", 
   "fieldname": "score_earned", 
-  "fieldtype": "Currency", 
-  "permlevel": 1
+  "fieldtype": "Float", 
+  "label": "Score Earned", 
+  "no_copy": 1, 
+  "oldfieldname": "score_earned", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1, 
+  "width": "70px"
  }
 ]
\ No newline at end of file
diff --git a/hr/doctype/appraisal_template_goal/appraisal_template_goal.txt b/hr/doctype/appraisal_template_goal/appraisal_template_goal.txt
index e756474..59d0e8d 100644
--- a/hr/doctype/appraisal_template_goal/appraisal_template_goal.txt
+++ b/hr/doctype/appraisal_template_goal/appraisal_template_goal.txt
@@ -1,53 +1,48 @@
 [
  {
-  "owner": "ashwini@webnotestech.com", 
+  "creation": "2013-01-10 16:34:13", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:35:58", 
+  "modified": "2013-01-22 13:35:58", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:35:58"
+  "owner": "ashwini@webnotestech.com"
  }, 
  {
-  "section_style": "Simple", 
-  "istable": 1, 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "module": "HR", 
-  "server_code_error": " ", 
-  "version": 6, 
+  "autoname": "KSHEET.#####", 
   "doctype": "DocType", 
-  "autoname": "KSHEET.#####"
+  "istable": 1, 
+  "module": "HR", 
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Appraisal Template Goal", 
-  "doctype": "DocField", 
-  "reqd": 1, 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
   "permlevel": 0, 
-  "parentfield": "fields"
+  "reqd": 1
  }, 
  {
-  "name": "Appraisal Template Goal", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Appraisal Template Goal"
  }, 
  {
   "description": "Key Performance Area", 
-  "oldfieldtype": "Small Text", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
+  "fieldname": "kra", 
+  "fieldtype": "Small Text", 
   "label": "KRA", 
   "oldfieldname": "kra", 
-  "width": "200px", 
-  "fieldname": "kra", 
-  "fieldtype": "Small Text"
+  "oldfieldtype": "Small Text", 
+  "width": "200px"
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "per_weightage", 
+  "fieldtype": "Float", 
   "label": "Weightage (%)", 
   "oldfieldname": "per_weightage", 
-  "width": "100px", 
-  "fieldname": "per_weightage", 
-  "fieldtype": "Currency"
+  "oldfieldtype": "Currency", 
+  "width": "100px"
  }
 ]
\ No newline at end of file
diff --git a/hr/doctype/attendance/attendance.txt b/hr/doctype/attendance/attendance.txt
index 11dfd09..1a68f81 100644
--- a/hr/doctype/attendance/attendance.txt
+++ b/hr/doctype/attendance/attendance.txt
@@ -1,190 +1,177 @@
 [
  {
-  "owner": "ashwini@webnotestech.com", 
+  "creation": "2013-01-10 16:34:13", 
   "docstatus": 0, 
-  "creation": "2012-12-14 14:27:05", 
+  "modified": "2013-01-22 14:16:20", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-23 09:42:45"
+  "owner": "ashwini@webnotestech.com"
  }, 
  {
+  "autoname": "naming_series:", 
+  "doctype": "DocType", 
   "document_type": "Master", 
   "is_submittable": 1, 
-  "name": "__common__", 
-  "autoname": "naming_series:", 
   "module": "HR", 
-  "doctype": "DocType", 
+  "name": "__common__", 
   "search_fields": "employee, employee_name, att_date, status"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Attendance", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "name": "__common__", 
-  "parent": "Attendance", 
-  "read": 1, 
   "create": 1, 
-  "submit": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
+  "name": "__common__", 
+  "parent": "Attendance", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "report": 1, 
   "permlevel": 0, 
-  "cancel": 1, 
-  "parentfield": "permissions"
+  "read": 1, 
+  "write": 1
  }, 
  {
-  "name": "Attendance", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Attendance"
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Attendance Details", 
-  "permlevel": 0, 
   "fieldname": "attendance_details", 
   "fieldtype": "Section Break", 
+  "label": "Attendance Details", 
+  "oldfieldtype": "Section Break", 
   "options": "Simple"
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Naming Series", 
-  "oldfieldname": "naming_series", 
-  "permlevel": 0, 
   "fieldname": "naming_series", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "options": "ATT"
+  "label": "Naming Series", 
+  "no_copy": 1, 
+  "oldfieldname": "naming_series", 
+  "oldfieldtype": "Select", 
+  "options": "ATT", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Employee", 
-  "oldfieldname": "employee", 
-  "permlevel": 0, 
   "fieldname": "employee", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Employee", 
+  "oldfieldname": "employee", 
+  "oldfieldtype": "Link", 
   "options": "Employee", 
-  "in_filter": 1
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Employee Name", 
-  "oldfieldname": "employee_name", 
   "fieldname": "employee_name", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Employee Name", 
+  "oldfieldname": "employee_name", 
+  "oldfieldtype": "Data"
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Status", 
-  "oldfieldname": "status", 
-  "options": "\nPresent\nAbsent\nHalf Day", 
   "fieldname": "status", 
   "fieldtype": "Select", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Status", 
+  "no_copy": 1, 
+  "oldfieldname": "status", 
+  "oldfieldtype": "Select", 
+  "options": "\nPresent\nAbsent\nHalf Day", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Leave Type", 
-  "oldfieldname": "leave_type", 
-  "permlevel": 0, 
   "fieldname": "leave_type", 
   "fieldtype": "Link", 
   "hidden": 1, 
+  "label": "Leave Type", 
+  "oldfieldname": "leave_type", 
+  "oldfieldtype": "Link", 
   "options": "Leave Type", 
+  "print_hide": 1, 
   "report_hide": 1
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break0", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Attendance Date", 
-  "oldfieldname": "att_date", 
   "fieldname": "att_date", 
   "fieldtype": "Date", 
-  "search_index": 0, 
+  "in_filter": 1, 
+  "label": "Attendance Date", 
+  "oldfieldname": "att_date", 
+  "oldfieldtype": "Date", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 0
  }, 
  {
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Fiscal Year", 
-  "oldfieldname": "fiscal_year", 
-  "permlevel": 0, 
   "fieldname": "fiscal_year", 
   "fieldtype": "Select", 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Fiscal Year", 
+  "oldfieldname": "fiscal_year", 
+  "oldfieldtype": "Select", 
   "options": "link:Fiscal Year", 
-  "in_filter": 1
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Company", 
-  "oldfieldname": "company", 
-  "permlevel": 0, 
   "fieldname": "company", 
   "fieldtype": "Select", 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Company", 
+  "oldfieldname": "company", 
+  "oldfieldtype": "Link", 
   "options": "link:Company", 
-  "in_filter": 1
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
-  "description": "The date at which current entry is corrected in the system.", 
-  "no_copy": 1, 
   "depends_on": "eval:doc.amended_from", 
+  "description": "The date at which current entry is corrected in the system.", 
   "doctype": "DocField", 
-  "label": "Amendment Date", 
   "fieldname": "amendment_date", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "Amendment Date", 
+  "no_copy": 1, 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Amended From", 
-  "permlevel": 1, 
   "fieldname": "amended_from", 
   "fieldtype": "Link", 
-  "options": "Attendance"
+  "label": "Amended From", 
+  "no_copy": 1, 
+  "options": "Attendance", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "role": "System Manager", 
-  "doctype": "DocPerm"
- }, 
- {
+  "cancel": 1, 
+  "doctype": "DocPerm", 
+  "report": 1, 
   "role": "HR User", 
-  "doctype": "DocPerm"
+  "submit": 1
  }, 
  {
-  "role": "HR Manager", 
-  "doctype": "DocPerm"
+  "doctype": "DocPerm", 
+  "match": "owner", 
+  "role": "Employee"
  }
 ]
\ No newline at end of file
diff --git a/hr/doctype/attendance_control_panel/attendance_control_panel.txt b/hr/doctype/attendance_control_panel/attendance_control_panel.txt
index 3b4e3c9..3ccba91 100644
--- a/hr/doctype/attendance_control_panel/attendance_control_panel.txt
+++ b/hr/doctype/attendance_control_panel/attendance_control_panel.txt
@@ -1,174 +1,136 @@
 [
  {
-  "owner": "harshada@webnotestech.com", 
+  "creation": "2013-01-10 16:34:13", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:35:53", 
+  "modified": "2013-01-22 14:55:57", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:35:53"
+  "owner": "harshada@webnotestech.com"
  }, 
  {
-  "section_style": "Simple", 
   "allow_attach": 1, 
-  "module": "HR", 
-  "_last_update": "1294312182", 
   "doctype": "DocType", 
   "issingle": 1, 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "server_code_error": " ", 
   "max_attachments": 1, 
-  "version": 122
+  "module": "HR", 
+  "name": "__common__"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Attendance Control Panel", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Attendance Control Panel", 
-  "read": 1, 
-  "doctype": "DocPerm", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Attendance Control Panel", 
-  "doctype": "DocType"
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "System Manager", 
   "permlevel": 0
  }, 
  {
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "HR User", 
-  "permlevel": 0
+  "name": "__common__", 
+  "parent": "Attendance Control Panel", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
+  "permlevel": 0, 
+  "read": 1, 
+  "report": 1, 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "HR Manager", 
-  "permlevel": 0
- }, 
- {
-  "role": "HR User", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "HR Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
+  "doctype": "DocType", 
+  "name": "Attendance Control Panel"
  }, 
  {
   "description": "Get the template of the Attendance for which you want to import in CSV (Comma seperated values) format.\nFill data in the template. Save the template in CSV format.\nAll attendance dates inbetween 'Attendance From Date' and 'Attendance To Date' will come in the template with employees list.", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Download Template", 
   "fieldname": "download_template", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Download Template"
  }, 
  {
   "description": "Selected Attendance date will comes in the attendance template.", 
-  "oldfieldtype": "Date", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Attendance From Date", 
-  "oldfieldname": "attenadnce_date", 
   "fieldname": "att_fr_date", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "Attendance From Date", 
+  "oldfieldname": "attenadnce_date", 
+  "oldfieldtype": "Date"
  }, 
  {
-  "oldfieldtype": "Button", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Get Template", 
-  "trigger": "Client", 
   "fieldname": "get_template", 
   "fieldtype": "Button", 
-  "permlevel": 0
+  "label": "Get Template", 
+  "oldfieldtype": "Button"
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "column_break0", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
   "description": "All attendance dates inbetween selected Attendance From Date and Attendance To Date will come in the template with employees list.", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Attendance To Date", 
   "fieldname": "att_to_date", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "Attendance To Date"
  }, 
  {
   "description": "To import attendance data, click on \"Add\" button, select the saved CSV file and click on \"Upload\".\nSelect the date format as attendance date format in CSV file.\nClick on \"Import\".", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Upload Attendance Data", 
   "fieldname": "upload_attendance_data", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Upload Attendance Data"
  }, 
  {
   "doctype": "DocField", 
-  "options": "yyyy-mm-dd\nmm/dd/yyyy\nmm/dd/yy\ndd-mm-yyyy\ndd/mm/yyyy", 
   "fieldname": "import_date_format", 
   "fieldtype": "Select", 
   "label": "Import Date Format ", 
-  "permlevel": 0
+  "options": "yyyy-mm-dd\nmm/dd/yyyy\nmm/dd/yy\ndd-mm-yyyy\ndd/mm/yyyy"
  }, 
  {
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Overwrite", 
   "fieldname": "overwrite", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "Overwrite"
  }, 
  {
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Import", 
-  "trigger": "Client", 
   "fieldname": "import", 
   "fieldtype": "Button", 
-  "permlevel": 0
+  "label": "Import"
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "File List", 
   "fieldname": "file_list", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "File List", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Import Log", 
   "fieldname": "import_log", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Import Log"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Import Log1", 
   "fieldname": "import_log1", 
   "fieldtype": "HTML", 
-  "permlevel": 0
+  "label": "Import Log1"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "System Manager"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "HR User"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "HR Manager"
  }
 ]
\ No newline at end of file
diff --git a/hr/doctype/branch/branch.txt b/hr/doctype/branch/branch.txt
index 4683b04..b5eb4a3 100644
--- a/hr/doctype/branch/branch.txt
+++ b/hr/doctype/branch/branch.txt
@@ -1,77 +1,72 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:13", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:35:54", 
+  "modified": "2013-01-22 14:18:28", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:35:54"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
-  "module": "HR", 
-  "doctype": "DocType", 
-  "allow_trash": 1, 
-  "document_type": "Master", 
   "autoname": "field:branch", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "server_code_error": " ", 
-  "show_in_menu": 0, 
-  "version": 11
+  "doctype": "DocType", 
+  "document_type": "Master", 
+  "module": "HR", 
+  "name": "__common__"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Branch", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
-  "report": 1, 
   "name": "__common__", 
   "parent": "Branch", 
-  "read": 1, 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "cancel": 1, 
+  "name": "__common__", 
+  "parent": "Branch", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
   "permlevel": 0, 
-  "parentfield": "permissions"
+  "read": 1, 
+  "report": 1, 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "name": "Branch", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Branch"
  }, 
  {
-  "role": "System Manager", 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "HR User", 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "HR Manager", 
-  "doctype": "DocPerm"
- }, 
- {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Trash Reason", 
-  "oldfieldname": "trash_reason", 
   "fieldname": "trash_reason", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Trash Reason", 
+  "oldfieldname": "trash_reason", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Branch", 
-  "oldfieldname": "branch", 
   "fieldname": "branch", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Branch", 
+  "oldfieldname": "branch", 
+  "oldfieldtype": "Data", 
+  "reqd": 1
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "System Manager"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "HR User"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "HR Manager"
  }
 ]
\ No newline at end of file
diff --git a/hr/doctype/deduction_type/deduction_type.txt b/hr/doctype/deduction_type/deduction_type.txt
index d7c9f7f..4c9ad7a 100644
--- a/hr/doctype/deduction_type/deduction_type.txt
+++ b/hr/doctype/deduction_type/deduction_type.txt
@@ -1,87 +1,81 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:13", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:35:54", 
+  "modified": "2013-01-22 14:25:38", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:35:54"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
-  "module": "HR", 
-  "doctype": "DocType", 
-  "allow_trash": 1, 
-  "document_type": "Master", 
   "autoname": "field:deduction_name", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "server_code_error": " ", 
-  "show_in_menu": 0, 
-  "version": 10
+  "doctype": "DocType", 
+  "document_type": "Master", 
+  "module": "HR", 
+  "name": "__common__"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Deduction Type", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
-  "report": 1, 
   "name": "__common__", 
   "parent": "Deduction Type", 
-  "read": 1, 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "cancel": 1, 
+  "name": "__common__", 
+  "parent": "Deduction Type", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
   "permlevel": 0, 
-  "parentfield": "permissions"
+  "read": 1, 
+  "report": 1, 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "name": "Deduction Type", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Deduction Type"
  }, 
  {
-  "role": "System Manager", 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "HR User", 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "HR Manager", 
-  "doctype": "DocPerm"
- }, 
- {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Trash Reason", 
-  "oldfieldname": "trash_reason", 
   "fieldname": "trash_reason", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Trash Reason", 
+  "oldfieldname": "trash_reason", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Name", 
-  "oldfieldname": "deduction_name", 
   "fieldname": "deduction_name", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Name", 
+  "oldfieldname": "deduction_name", 
+  "oldfieldtype": "Data", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Description", 
-  "oldfieldname": "description", 
-  "width": "300px", 
   "fieldname": "description", 
   "fieldtype": "Small Text", 
-  "permlevel": 0
+  "label": "Description", 
+  "oldfieldname": "description", 
+  "oldfieldtype": "Small Text", 
+  "width": "300px"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "System Manager"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "HR User"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "HR Manager"
  }
 ]
\ No newline at end of file
diff --git a/hr/doctype/department/department.txt b/hr/doctype/department/department.txt
index 192d0d7..a4730cc 100644
--- a/hr/doctype/department/department.txt
+++ b/hr/doctype/department/department.txt
@@ -1,77 +1,72 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:13", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:35:54", 
+  "modified": "2013-01-22 14:46:41", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:35:54"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
-  "module": "HR", 
-  "doctype": "DocType", 
-  "allow_trash": 1, 
-  "document_type": "Master", 
   "autoname": "field:department_name", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "server_code_error": " ", 
-  "show_in_menu": 0, 
-  "version": 7
+  "doctype": "DocType", 
+  "document_type": "Master", 
+  "module": "HR", 
+  "name": "__common__"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Department", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
-  "report": 1, 
   "name": "__common__", 
   "parent": "Department", 
-  "read": 1, 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "cancel": 1, 
+  "name": "__common__", 
+  "parent": "Department", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
   "permlevel": 0, 
-  "parentfield": "permissions"
+  "read": 1, 
+  "report": 1, 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "name": "Department", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Department"
  }, 
  {
-  "role": "System Manager", 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "HR User", 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "HR Manager", 
-  "doctype": "DocPerm"
- }, 
- {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Trash Reason", 
-  "oldfieldname": "trash_reason", 
   "fieldname": "trash_reason", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Trash Reason", 
+  "oldfieldname": "trash_reason", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Department", 
-  "oldfieldname": "department_name", 
   "fieldname": "department_name", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Department", 
+  "oldfieldname": "department_name", 
+  "oldfieldtype": "Data", 
+  "reqd": 1
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "System Manager"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "HR User"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "HR Manager"
  }
 ]
\ No newline at end of file
diff --git a/hr/doctype/designation/designation.txt b/hr/doctype/designation/designation.txt
index 314dc19..0f1fd5b 100644
--- a/hr/doctype/designation/designation.txt
+++ b/hr/doctype/designation/designation.txt
@@ -1,77 +1,72 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:13", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:35:54", 
+  "modified": "2013-01-22 14:46:41", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:35:54"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
-  "module": "HR", 
-  "doctype": "DocType", 
-  "allow_trash": 1, 
-  "document_type": "Master", 
   "autoname": "field:designation_name", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "server_code_error": " ", 
-  "show_in_menu": 0, 
-  "version": 7
+  "doctype": "DocType", 
+  "document_type": "Master", 
+  "module": "HR", 
+  "name": "__common__"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Designation", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
-  "report": 1, 
   "name": "__common__", 
   "parent": "Designation", 
-  "read": 1, 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "cancel": 1, 
+  "name": "__common__", 
+  "parent": "Designation", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
   "permlevel": 0, 
-  "parentfield": "permissions"
+  "read": 1, 
+  "report": 1, 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "name": "Designation", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Designation"
  }, 
  {
-  "role": "System Manager", 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "HR User", 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "HR Manager", 
-  "doctype": "DocPerm"
- }, 
- {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Trash Reason", 
-  "oldfieldname": "trash_reason", 
   "fieldname": "trash_reason", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Trash Reason", 
+  "oldfieldname": "trash_reason", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Designation", 
-  "oldfieldname": "designation_name", 
   "fieldname": "designation_name", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Designation", 
+  "oldfieldname": "designation_name", 
+  "oldfieldtype": "Data", 
+  "reqd": 1
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "System Manager"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "HR User"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "HR Manager"
  }
 ]
\ No newline at end of file
diff --git a/hr/doctype/earning_type/earning_type.txt b/hr/doctype/earning_type/earning_type.txt
index 77039b1..65a9393 100644
--- a/hr/doctype/earning_type/earning_type.txt
+++ b/hr/doctype/earning_type/earning_type.txt
@@ -1,113 +1,102 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:13", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:35:54", 
+  "modified": "2013-01-22 14:46:41", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:35:54"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
-  "module": "HR", 
-  "doctype": "DocType", 
-  "allow_trash": 1, 
-  "document_type": "Master", 
   "autoname": "field:earning_name", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "server_code_error": " ", 
-  "show_in_menu": 0, 
-  "version": 13
+  "doctype": "DocType", 
+  "document_type": "Master", 
+  "module": "HR", 
+  "name": "__common__"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Earning Type", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
-  "report": 1, 
   "name": "__common__", 
   "parent": "Earning Type", 
-  "read": 1, 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "cancel": 1, 
+  "name": "__common__", 
+  "parent": "Earning Type", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
   "permlevel": 0, 
-  "parentfield": "permissions"
+  "read": 1, 
+  "report": 1, 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "name": "Earning Type", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Earning Type"
  }, 
  {
-  "role": "System Manager", 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "HR User", 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "HR Manager", 
-  "doctype": "DocPerm"
- }, 
- {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Trash Reason", 
-  "oldfieldname": "trash_reason", 
   "fieldname": "trash_reason", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Trash Reason", 
+  "oldfieldname": "trash_reason", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Name", 
-  "oldfieldname": "earning_name", 
   "fieldname": "earning_name", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Name", 
+  "oldfieldname": "earning_name", 
+  "oldfieldtype": "Data", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Description", 
-  "oldfieldname": "description", 
-  "width": "300px", 
   "fieldname": "description", 
   "fieldtype": "Small Text", 
+  "label": "Description", 
+  "oldfieldname": "description", 
+  "oldfieldtype": "Small Text", 
   "reqd": 0, 
-  "permlevel": 0
+  "width": "300px"
  }, 
  {
-  "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Taxable", 
-  "oldfieldname": "taxable", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "taxable", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "options": "\nYes\nNo"
+  "label": "Taxable", 
+  "oldfieldname": "taxable", 
+  "oldfieldtype": "Select", 
+  "options": "\nYes\nNo", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Currency", 
-  "colour": "White:FFF", 
+  "depends_on": "eval:doc.taxable=='No'", 
   "doctype": "DocField", 
-  "label": "Exemption Limit", 
-  "oldfieldname": "exemption_limit", 
   "fieldname": "exemption_limit", 
   "fieldtype": "Currency", 
-  "depends_on": "eval:doc.taxable=='No'", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Exemption Limit", 
+  "oldfieldname": "exemption_limit", 
+  "oldfieldtype": "Currency"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "System Manager"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "HR User"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "HR Manager"
  }
 ]
\ No newline at end of file
diff --git a/hr/doctype/employee/employee.txt b/hr/doctype/employee/employee.txt
index b03ae25..3a1809f 100644
--- a/hr/doctype/employee/employee.txt
+++ b/hr/doctype/employee/employee.txt
@@ -1,890 +1,774 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:13", 
   "docstatus": 0, 
-  "creation": "2013-01-02 16:17:01", 
+  "modified": "2013-01-22 14:56:01", 
   "modified_by": "Administrator", 
-  "modified": "2013-01-09 14:46:42"
+  "owner": "Administrator"
  }, 
  {
-  "document_type": "Master", 
   "allow_attach": 1, 
   "autoname": "naming_series:", 
-  "module": "HR", 
   "doctype": "DocType", 
-  "search_fields": "employee_name", 
-  "name": "__common__"
+  "document_type": "Master", 
+  "module": "HR", 
+  "name": "__common__", 
+  "search_fields": "employee_name"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Employee", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Employee", 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
   "amend": 0, 
-  "submit": 0, 
   "doctype": "DocPerm", 
-  "read": 1, 
+  "name": "__common__", 
+  "parent": "Employee", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
+  "permlevel": 0, 
+  "read": 1, 
+  "report": 1, 
+  "submit": 0
  }, 
  {
-  "name": "Employee", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Employee"
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Basic Information", 
   "fieldname": "basic_information", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Basic Information", 
+  "oldfieldtype": "Section Break"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break0", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
   "doctype": "DocField", 
-  "options": "image", 
   "fieldname": "image_view", 
   "fieldtype": "Image", 
   "label": "Image View", 
-  "permlevel": 0
+  "options": "image"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Employee", 
   "fieldname": "employee", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 0, 
+  "label": "Employee", 
+  "no_copy": 1, 
+  "print_hide": 1, 
   "report_hide": 1
  }, 
  {
   "description": "<span class=\"sys_manager\">To setup, please go to Setup > Naming Series</span>", 
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Naming Series", 
-  "oldfieldname": "naming_series", 
-  "permlevel": 0, 
   "fieldname": "naming_series", 
   "fieldtype": "Select", 
-  "reqd": 0, 
-  "options": "EMP/"
+  "label": "Naming Series", 
+  "no_copy": 1, 
+  "oldfieldname": "naming_series", 
+  "oldfieldtype": "Select", 
+  "options": "EMP/", 
+  "reqd": 0
  }, 
  {
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Salutation", 
-  "oldfieldname": "salutation", 
-  "permlevel": 0, 
   "fieldname": "salutation", 
   "fieldtype": "Select", 
-  "search_index": 0, 
-  "options": "\nMr\nMs"
+  "label": "Salutation", 
+  "oldfieldname": "salutation", 
+  "oldfieldtype": "Select", 
+  "options": "\nMr\nMs", 
+  "search_index": 0
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Full Name", 
-  "oldfieldname": "employee_name", 
   "fieldname": "employee_name", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Full Name", 
+  "oldfieldname": "employee_name", 
+  "oldfieldtype": "Data", 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "options": "attach_files:", 
   "fieldname": "image", 
   "fieldtype": "Select", 
   "label": "Image", 
-  "permlevel": 0
+  "options": "attach_files:"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
   "description": "System User (login) ID. If set, it will become default for all HR forms.", 
   "doctype": "DocField", 
-  "label": "User ID", 
-  "permlevel": 0, 
   "fieldname": "user_id", 
   "fieldtype": "Link", 
+  "label": "User ID", 
   "options": "Profile"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Employee Number", 
-  "oldfieldname": "employee_number", 
   "fieldname": "employee_number", 
   "fieldtype": "Data", 
-  "search_index": 0, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Employee Number", 
+  "oldfieldname": "employee_number", 
+  "oldfieldtype": "Data", 
+  "search_index": 0
  }, 
  {
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Date of Joining", 
-  "oldfieldname": "date_of_joining", 
   "fieldname": "date_of_joining", 
   "fieldtype": "Date", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Date of Joining", 
+  "oldfieldname": "date_of_joining", 
+  "oldfieldtype": "Date", 
+  "reqd": 1
  }, 
  {
   "description": "You can enter any date manually", 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Date of Birth", 
-  "oldfieldname": "date_of_birth", 
   "fieldname": "date_of_birth", 
   "fieldtype": "Date", 
-  "search_index": 0, 
+  "in_filter": 1, 
+  "label": "Date of Birth", 
+  "oldfieldname": "date_of_birth", 
+  "oldfieldtype": "Date", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 0
  }, 
  {
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Gender", 
-  "oldfieldname": "gender", 
-  "permlevel": 0, 
   "fieldname": "gender", 
   "fieldtype": "Select", 
-  "search_index": 0, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Gender", 
+  "oldfieldname": "gender", 
+  "oldfieldtype": "Select", 
   "options": "\nMale\nFemale", 
-  "in_filter": 1
+  "reqd": 1, 
+  "search_index": 0
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Company", 
-  "permlevel": 0, 
   "fieldname": "company", 
   "fieldtype": "Select", 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Company", 
   "options": "link:Company", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Employment Details", 
   "fieldname": "employment_details", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Employment Details"
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "col_break_21", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
   "default": "Active", 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Status", 
-  "oldfieldname": "status", 
-  "options": "\nActive\nLeft", 
   "fieldname": "status", 
   "fieldtype": "Select", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Status", 
+  "oldfieldname": "status", 
+  "oldfieldtype": "Select", 
+  "options": "\nActive\nLeft", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Employment Type", 
-  "oldfieldname": "employment_type", 
-  "permlevel": 0, 
   "fieldname": "employment_type", 
   "fieldtype": "Link", 
-  "search_index": 0, 
+  "in_filter": 1, 
+  "label": "Employment Type", 
+  "oldfieldname": "employment_type", 
+  "oldfieldtype": "Link", 
   "options": "Employment Type", 
-  "in_filter": 1
+  "search_index": 0
  }, 
  {
   "description": "Applicable Holiday List", 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Holiday List", 
-  "oldfieldname": "holiday_list", 
-  "permlevel": 0, 
   "fieldname": "holiday_list", 
   "fieldtype": "Link", 
+  "label": "Holiday List", 
+  "oldfieldname": "holiday_list", 
+  "oldfieldtype": "Link", 
   "options": "Holiday List"
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "col_break_22", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Scheduled Confirmation Date", 
-  "oldfieldname": "scheduled_confirmation_date", 
   "fieldname": "scheduled_confirmation_date", 
   "fieldtype": "Date", 
-  "search_index": 0, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Scheduled Confirmation Date", 
+  "oldfieldname": "scheduled_confirmation_date", 
+  "oldfieldtype": "Date", 
+  "search_index": 0
  }, 
  {
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Final Confirmation Date", 
-  "oldfieldname": "final_confirmation_date", 
   "fieldname": "final_confirmation_date", 
   "fieldtype": "Date", 
-  "search_index": 0, 
-  "permlevel": 0
+  "label": "Final Confirmation Date", 
+  "oldfieldname": "final_confirmation_date", 
+  "oldfieldtype": "Date", 
+  "search_index": 0
  }, 
  {
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Contract End Date", 
-  "oldfieldname": "contract_end_date", 
   "fieldname": "contract_end_date", 
   "fieldtype": "Date", 
-  "search_index": 0, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Contract End Date", 
+  "oldfieldname": "contract_end_date", 
+  "oldfieldtype": "Date", 
+  "search_index": 0
  }, 
  {
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Date Of Retirement", 
-  "oldfieldname": "date_of_retirement", 
   "fieldname": "date_of_retirement", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "Date Of Retirement", 
+  "oldfieldname": "date_of_retirement", 
+  "oldfieldtype": "Date"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Job Profile", 
   "fieldname": "job_profile", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Job Profile"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break2", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Branch", 
-  "oldfieldname": "branch", 
-  "permlevel": 0, 
   "fieldname": "branch", 
   "fieldtype": "Link", 
-  "reqd": 0, 
+  "in_filter": 1, 
+  "label": "Branch", 
+  "oldfieldname": "branch", 
+  "oldfieldtype": "Link", 
   "options": "Branch", 
-  "in_filter": 1
+  "reqd": 0
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Department", 
-  "oldfieldname": "department", 
-  "permlevel": 0, 
   "fieldname": "department", 
   "fieldtype": "Link", 
-  "reqd": 0, 
+  "in_filter": 1, 
+  "label": "Department", 
+  "oldfieldname": "department", 
+  "oldfieldtype": "Link", 
   "options": "Department", 
-  "in_filter": 1
+  "reqd": 0
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Designation", 
-  "oldfieldname": "designation", 
-  "permlevel": 0, 
   "fieldname": "designation", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 0, 
+  "in_filter": 1, 
+  "label": "Designation", 
+  "oldfieldname": "designation", 
+  "oldfieldtype": "Link", 
   "options": "Designation", 
-  "in_filter": 1
+  "reqd": 0, 
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Grade", 
-  "oldfieldname": "grade", 
-  "permlevel": 0, 
   "fieldname": "grade", 
   "fieldtype": "Link", 
-  "reqd": 0, 
+  "in_filter": 1, 
+  "label": "Grade", 
+  "oldfieldname": "grade", 
+  "oldfieldtype": "Link", 
   "options": "Grade", 
-  "in_filter": 1
+  "reqd": 0
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Reports to", 
-  "oldfieldname": "reports_to", 
-  "permlevel": 0, 
   "fieldname": "reports_to", 
   "fieldtype": "Link", 
+  "label": "Reports to", 
+  "oldfieldname": "reports_to", 
+  "oldfieldtype": "Link", 
   "options": "Employee"
  }, 
  {
   "description": "Provide email id registered in company", 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Email (By company)", 
-  "oldfieldname": "company_email", 
   "fieldname": "company_email", 
   "fieldtype": "Data", 
-  "reqd": 0, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Email (By company)", 
+  "oldfieldname": "company_email", 
+  "oldfieldtype": "Data", 
+  "reqd": 0
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Salary Information", 
-  "width": "50%", 
   "fieldname": "salary_information", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "label": "Salary Information", 
+  "oldfieldtype": "Section Break", 
+  "width": "50%"
  }, 
  {
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Salary Mode", 
-  "oldfieldname": "salary_mode", 
-  "permlevel": 0, 
   "fieldname": "salary_mode", 
   "fieldtype": "Select", 
+  "label": "Salary Mode", 
+  "oldfieldname": "salary_mode", 
+  "oldfieldtype": "Select", 
   "options": "\nBank\nCash\nCheque"
  }, 
  {
-  "oldfieldtype": "Link", 
+  "depends_on": "eval:doc.salary_mode == 'Bank'", 
   "doctype": "DocField", 
-  "label": "Bank Name", 
-  "oldfieldname": "bank_name", 
-  "permlevel": 0, 
   "fieldname": "bank_name", 
   "fieldtype": "Data", 
-  "depends_on": "eval:doc.salary_mode == 'Bank'", 
   "hidden": 0, 
-  "options": "Suggest", 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Bank Name", 
+  "oldfieldname": "bank_name", 
+  "oldfieldtype": "Link", 
+  "options": "Suggest"
  }, 
  {
-  "oldfieldtype": "Data", 
+  "depends_on": "eval:doc.salary_mode == 'Bank'", 
   "doctype": "DocField", 
-  "label": "Bank A/C No.", 
-  "oldfieldname": "bank_ac_no", 
   "fieldname": "bank_ac_no", 
   "fieldtype": "Data", 
-  "depends_on": "eval:doc.salary_mode == 'Bank'", 
   "hidden": 0, 
-  "permlevel": 0
+  "label": "Bank A/C No.", 
+  "oldfieldname": "bank_ac_no", 
+  "oldfieldtype": "Data"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "ESIC CARD No", 
-  "oldfieldname": "esic_card_no", 
   "fieldname": "esic_card_no", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "ESIC CARD No", 
+  "oldfieldname": "esic_card_no", 
+  "oldfieldtype": "Data"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "PF Number", 
-  "oldfieldname": "pf_number", 
   "fieldname": "pf_number", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "PF Number", 
+  "oldfieldname": "pf_number", 
+  "oldfieldtype": "Data"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Gratuity LIC ID", 
-  "oldfieldname": "gratuity_lic_id", 
   "fieldname": "gratuity_lic_id", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Gratuity LIC ID", 
+  "oldfieldname": "gratuity_lic_id", 
+  "oldfieldtype": "Data"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Contact Details", 
   "fieldname": "contact_details", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Contact Details"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break3", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Cell Number", 
   "fieldname": "cell_number", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Cell Number"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Personal Email", 
   "fieldname": "personal_email", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Personal Email"
  }, 
  {
-  "oldfieldtype": "Int", 
   "doctype": "DocField", 
-  "label": "Notice - Number of Days", 
-  "oldfieldname": "notice_number_of_days", 
   "fieldname": "notice_number_of_days", 
   "fieldtype": "Int", 
-  "permlevel": 0
+  "label": "Notice - Number of Days", 
+  "oldfieldname": "notice_number_of_days", 
+  "oldfieldtype": "Int"
  }, 
  {
   "doctype": "DocField", 
-  "options": "<b>Emergency Contact Details</b>", 
   "fieldname": "emergency_contact_details", 
   "fieldtype": "HTML", 
   "label": "Emergency Contact Details", 
-  "permlevel": 0
+  "options": "<b>Emergency Contact Details</b>"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Person To Be Contacted", 
   "fieldname": "person_to_be_contacted", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Person To Be Contacted"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Relation", 
   "fieldname": "relation", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Relation"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Emergency Phone Number", 
   "fieldname": "emergency_phone_number", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Emergency Phone Number"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break4", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
   "doctype": "DocField", 
-  "options": "\nRented\nOwned", 
   "fieldname": "permanent_accommodation_type", 
   "fieldtype": "Select", 
   "label": "Permanent Accommodation Type", 
-  "permlevel": 0
+  "options": "\nRented\nOwned"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Permanent Address", 
   "fieldname": "permanent_address", 
   "fieldtype": "Small Text", 
-  "permlevel": 0
+  "label": "Permanent Address"
  }, 
  {
   "doctype": "DocField", 
-  "options": "\nRented\nOwned", 
   "fieldname": "current_accommodation_type", 
   "fieldtype": "Select", 
   "label": "Current Accommodation Type", 
-  "permlevel": 0
+  "options": "\nRented\nOwned"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Current Address", 
   "fieldname": "current_address", 
   "fieldtype": "Small Text", 
-  "permlevel": 0
+  "label": "Current Address"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Bio", 
   "fieldname": "sb53", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Bio"
  }, 
  {
   "description": "Short biography for website and other publications.", 
   "doctype": "DocField", 
-  "label": "Bio", 
   "fieldname": "bio", 
   "fieldtype": "Text Editor", 
-  "permlevel": 0
+  "label": "Bio"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Personal Details", 
   "fieldname": "personal_details", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Personal Details"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break5", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
   "doctype": "DocField", 
-  "label": "PAN Number", 
   "fieldname": "pan_number", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "PAN Number"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Passport Number", 
   "fieldname": "passport_number", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Passport Number"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Date of Issue", 
   "fieldname": "date_of_issue", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "Date of Issue"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Valid Upto", 
   "fieldname": "valid_upto", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "Valid Upto"
  }, 
  {
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Salary Structure", 
   "fieldname": "salary_structure", 
   "fieldtype": "Button", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Salary Structure", 
+  "oldfieldtype": "Button"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Place of Issue", 
   "fieldname": "place_of_issue", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Place of Issue"
  }, 
  {
   "doctype": "DocField", 
-  "options": "\nSingle\nMarried\nDivorced\nWidowed", 
   "fieldname": "marital_status", 
   "fieldtype": "Select", 
   "label": "Marital Status", 
-  "permlevel": 0
+  "options": "\nSingle\nMarried\nDivorced\nWidowed"
  }, 
  {
   "doctype": "DocField", 
-  "options": "\nA+\nA-\nB+\nB-\nAB+\nAB-\nO+\nO-", 
   "fieldname": "blood_group", 
   "fieldtype": "Select", 
   "label": "Blood Group", 
-  "permlevel": 0
+  "options": "\nA+\nA-\nB+\nB-\nAB+\nAB-\nO+\nO-"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break6", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
   "description": "Here you can maintain family details like name and occupation of parent, spouse and children", 
   "doctype": "DocField", 
-  "label": "Family Background", 
   "fieldname": "family_background", 
   "fieldtype": "Small Text", 
-  "permlevel": 0
+  "label": "Family Background"
  }, 
  {
   "description": "Here you can maintain height, weight, allergies, medical concerns etc", 
   "doctype": "DocField", 
-  "label": "Health Details", 
   "fieldname": "health_details", 
   "fieldtype": "Small Text", 
-  "permlevel": 0
+  "label": "Health Details"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Educational Qualification", 
   "fieldname": "educational_qualification", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Educational Qualification"
  }, 
  {
   "doctype": "DocField", 
-  "options": "Employee Education", 
   "fieldname": "educational_qualification_details", 
   "fieldtype": "Table", 
   "label": "Educational Qualification Details", 
-  "permlevel": 0
+  "options": "Employee Education"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Career History", 
   "fieldname": "career_history", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Career History"
  }, 
  {
   "doctype": "DocField", 
-  "options": "Simple", 
   "fieldname": "previous_work_experience", 
   "fieldtype": "Section Break", 
   "label": "Previous Work Experience", 
-  "permlevel": 0
+  "options": "Simple"
  }, 
  {
   "doctype": "DocField", 
-  "options": "Employee External Work History", 
   "fieldname": "previous_experience_details", 
   "fieldtype": "Table", 
   "label": "Employee External Work History", 
-  "permlevel": 0
+  "options": "Employee External Work History"
  }, 
  {
   "doctype": "DocField", 
-  "options": "Simple", 
   "fieldname": "history_in_company", 
   "fieldtype": "Section Break", 
   "label": "History In Company", 
-  "permlevel": 0
+  "options": "Simple"
  }, 
  {
   "doctype": "DocField", 
-  "options": "Employee Internal Work History", 
   "fieldname": "experience_in_company_details", 
   "fieldtype": "Table", 
   "label": "Employee Internal Work Historys", 
-  "permlevel": 0
+  "options": "Employee Internal Work History"
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Exit", 
   "fieldname": "exit", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Exit", 
+  "oldfieldtype": "Section Break"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break7", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Resignation Letter Date", 
-  "oldfieldname": "resignation_letter_date", 
   "fieldname": "resignation_letter_date", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "Resignation Letter Date", 
+  "oldfieldname": "resignation_letter_date", 
+  "oldfieldtype": "Date"
  }, 
  {
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Relieving Date", 
-  "oldfieldname": "relieving_date", 
   "fieldname": "relieving_date", 
   "fieldtype": "Date", 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Relieving Date", 
+  "oldfieldname": "relieving_date", 
+  "oldfieldtype": "Date"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Reason for Leaving", 
-  "oldfieldname": "reason_for_leaving", 
   "fieldname": "reason_for_leaving", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Reason for Leaving", 
+  "oldfieldname": "reason_for_leaving", 
+  "oldfieldtype": "Data"
  }, 
  {
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Leave Encashed?", 
-  "oldfieldname": "leave_encashed", 
-  "permlevel": 0, 
   "fieldname": "leave_encashed", 
   "fieldtype": "Select", 
+  "label": "Leave Encashed?", 
+  "oldfieldname": "leave_encashed", 
+  "oldfieldtype": "Select", 
   "options": "\nYes\nNo"
  }, 
  {
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Encashment Date", 
-  "oldfieldname": "encashment_date", 
   "fieldname": "encashment_date", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "Encashment Date", 
+  "oldfieldname": "encashment_date", 
+  "oldfieldtype": "Date"
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "label": "Exit Interview Details", 
-  "oldfieldname": "col_brk6", 
-  "width": "50%", 
   "fieldname": "exit_interview_details", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "label": "Exit Interview Details", 
+  "oldfieldname": "col_brk6", 
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Held On", 
-  "oldfieldname": "held_on", 
   "fieldname": "held_on", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "Held On", 
+  "oldfieldname": "held_on", 
+  "oldfieldtype": "Date"
  }, 
  {
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Reason for Resignation", 
-  "oldfieldname": "reason_for_resignation", 
-  "permlevel": 0, 
   "fieldname": "reason_for_resignation", 
   "fieldtype": "Select", 
+  "label": "Reason for Resignation", 
+  "oldfieldname": "reason_for_resignation", 
+  "oldfieldtype": "Select", 
   "options": "\nBetter Prospects\nHealth Concerns"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "New Workplace", 
-  "oldfieldname": "new_workplace", 
   "fieldname": "new_workplace", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "New Workplace", 
+  "oldfieldname": "new_workplace", 
+  "oldfieldtype": "Data"
  }, 
  {
-  "oldfieldtype": "Text", 
   "doctype": "DocField", 
-  "label": "Feedback", 
-  "oldfieldname": "feedback", 
   "fieldname": "feedback", 
   "fieldtype": "Small Text", 
-  "permlevel": 0
+  "label": "Feedback", 
+  "oldfieldname": "feedback", 
+  "oldfieldtype": "Text"
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "File List", 
   "fieldname": "file_list", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "File List", 
+  "print_hide": 1
  }, 
  {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Trash Reason", 
-  "oldfieldname": "trash_reason", 
   "fieldname": "trash_reason", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Trash Reason", 
+  "oldfieldname": "trash_reason", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1
  }, 
  {
+  "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "write": 0, 
-  "cancel": 0, 
+  "match": "employee", 
   "role": "Employee", 
-  "report": 1, 
-  "permlevel": 0, 
-  "match": "employee"
+  "write": 0
  }, 
  {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "role": "Employee", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "cancel": 1, 
+  "match": "company", 
   "role": "HR User", 
-  "report": 1, 
-  "permlevel": 0, 
-  "match": "company"
+  "write": 1
  }, 
  {
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "report": 1, 
   "role": "HR Manager", 
-  "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "role": "HR User", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "role": "HR Manager", 
-  "cancel": 0, 
-  "permlevel": 1
+  "write": 1
  }
 ]
\ No newline at end of file
diff --git a/hr/doctype/employment_type/employment_type.txt b/hr/doctype/employment_type/employment_type.txt
index 0fc5a0f..a3e40f0 100644
--- a/hr/doctype/employment_type/employment_type.txt
+++ b/hr/doctype/employment_type/employment_type.txt
@@ -1,77 +1,72 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:14", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:35:55", 
+  "modified": "2013-01-22 14:46:42", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:35:55"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
-  "module": "HR", 
-  "doctype": "DocType", 
-  "allow_trash": 1, 
-  "document_type": "Master", 
   "autoname": "field:employee_type_name", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "server_code_error": " ", 
-  "show_in_menu": 0, 
-  "version": 16
+  "doctype": "DocType", 
+  "document_type": "Master", 
+  "module": "HR", 
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Employment Type", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
-  "report": 1, 
-  "name": "__common__", 
-  "parent": "Employment Type", 
-  "read": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "cancel": 1, 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Employment Type", 
-  "doctype": "DocType"
- }, 
- {
-  "role": "System Manager", 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "HR User", 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "HR Manager", 
-  "doctype": "DocPerm"
- }, 
- {
-  "oldfieldtype": "Data", 
-  "doctype": "DocField", 
-  "label": "Employment Type", 
-  "oldfieldname": "employee_type_name", 
-  "fieldname": "employee_type_name", 
-  "fieldtype": "Data", 
-  "reqd": 1, 
   "permlevel": 0
  }, 
  {
-  "oldfieldtype": "Small Text", 
+  "cancel": 1, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Employment Type", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
+  "permlevel": 0, 
+  "read": 1, 
+  "report": 1, 
+  "submit": 0, 
+  "write": 1
+ }, 
+ {
+  "doctype": "DocType", 
+  "name": "Employment Type"
+ }, 
+ {
   "doctype": "DocField", 
-  "label": "Trash Reason", 
-  "oldfieldname": "trash_reason", 
+  "fieldname": "employee_type_name", 
+  "fieldtype": "Data", 
+  "label": "Employment Type", 
+  "oldfieldname": "employee_type_name", 
+  "oldfieldtype": "Data", 
+  "reqd": 1
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "trash_reason", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Trash Reason", 
+  "oldfieldname": "trash_reason", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "System Manager"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "HR User"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "HR Manager"
  }
 ]
\ No newline at end of file
diff --git a/hr/doctype/expense_claim/expense_claim.txt b/hr/doctype/expense_claim/expense_claim.txt
index 569ea41..a1331fa 100644
--- a/hr/doctype/expense_claim/expense_claim.txt
+++ b/hr/doctype/expense_claim/expense_claim.txt
@@ -1,278 +1,245 @@
 [
  {
-  "owner": "harshada@webnotestech.com", 
+  "creation": "2013-01-10 16:34:14", 
   "docstatus": 0, 
-  "creation": "2012-12-05 16:53:59", 
+  "modified": "2013-01-22 14:56:02", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-07 13:25:44"
+  "owner": "harshada@webnotestech.com"
  }, 
  {
-  "is_submittable": 1, 
-  "name": "__common__", 
   "autoname": "EXP.######", 
-  "module": "HR", 
   "doctype": "DocType", 
+  "is_submittable": 1, 
+  "module": "HR", 
+  "name": "__common__", 
   "search_fields": "approval_status,employee,employee_name"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Expense Claim", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "name": "__common__", 
-  "parent": "Expense Claim", 
-  "read": 1, 
+  "create": 1, 
   "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Expense Claim", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Expense Claim", 
-  "doctype": "DocType"
- }, 
- {
   "permlevel": 0, 
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
-  "doctype": "DocField", 
-  "label": "Approval Status", 
-  "oldfieldname": "approval_status", 
+  "read": 1, 
+  "report": 1, 
+  "write": 1
+ }, 
+ {
+  "doctype": "DocType", 
+  "name": "Expense Claim"
+ }, 
+ {
   "default": "Draft", 
+  "doctype": "DocField", 
   "fieldname": "approval_status", 
   "fieldtype": "Select", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Approval Status", 
+  "no_copy": 1, 
+  "oldfieldname": "approval_status", 
+  "oldfieldtype": "Select", 
   "options": "\nDraft\nApproved\nRejected", 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Approver", 
-  "oldfieldname": "exp_approver", 
-  "width": "160px", 
   "fieldname": "exp_approver", 
   "fieldtype": "Select", 
-  "permlevel": 0
+  "label": "Approver", 
+  "oldfieldname": "exp_approver", 
+  "oldfieldtype": "Select", 
+  "width": "160px"
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break0", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Total Claimed Amount", 
-  "oldfieldname": "total_claimed_amount", 
-  "width": "160px", 
   "fieldname": "total_claimed_amount", 
   "fieldtype": "Currency", 
+  "in_filter": 0, 
+  "label": "Total Claimed Amount", 
+  "no_copy": 1, 
+  "oldfieldname": "total_claimed_amount", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1, 
   "reqd": 0, 
-  "permlevel": 1, 
-  "in_filter": 0
+  "width": "160px"
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Total Sanctioned Amount", 
-  "oldfieldname": "total_sanctioned_amount", 
-  "width": "160px", 
   "fieldname": "total_sanctioned_amount", 
   "fieldtype": "Currency", 
-  "permlevel": 1, 
-  "in_filter": 0
+  "in_filter": 0, 
+  "label": "Total Sanctioned Amount", 
+  "no_copy": 1, 
+  "oldfieldname": "total_sanctioned_amount", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1, 
+  "width": "160px"
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Expense Details", 
   "fieldname": "expense_details", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Expense Details", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "oldfieldtype": "Table", 
   "allow_on_submit": 0, 
   "doctype": "DocField", 
-  "label": "Expense Claim Details", 
-  "oldfieldname": "expense_voucher_details", 
-  "permlevel": 0, 
   "fieldname": "expense_voucher_details", 
   "fieldtype": "Table", 
+  "label": "Expense Claim Details", 
+  "oldfieldname": "expense_voucher_details", 
+  "oldfieldtype": "Table", 
   "options": "Expense Claim Detail"
  }, 
  {
   "doctype": "DocField", 
-  "permlevel": 0, 
   "fieldname": "sb1", 
   "fieldtype": "Section Break", 
   "options": "Simple"
  }, 
  {
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "From Employee", 
-  "oldfieldname": "employee", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "employee", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "From Employee", 
+  "oldfieldname": "employee", 
+  "oldfieldtype": "Link", 
   "options": "Employee", 
-  "in_filter": 1
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Employee Name", 
-  "oldfieldname": "employee_name", 
-  "width": "150px", 
   "fieldname": "employee_name", 
   "fieldtype": "Data", 
+  "in_filter": 1, 
+  "label": "Employee Name", 
+  "oldfieldname": "employee_name", 
+  "oldfieldtype": "Data", 
+  "read_only": 1, 
   "search_index": 0, 
-  "permlevel": 1, 
-  "in_filter": 1
+  "width": "150px"
  }, 
  {
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Fiscal Year", 
-  "oldfieldname": "fiscal_year", 
-  "permlevel": 0, 
   "fieldname": "fiscal_year", 
   "fieldtype": "Select", 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Fiscal Year", 
+  "oldfieldname": "fiscal_year", 
+  "oldfieldtype": "Select", 
   "options": "link:Fiscal Year", 
-  "in_filter": 1
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Company", 
-  "oldfieldname": "company", 
-  "permlevel": 0, 
   "fieldname": "company", 
   "fieldtype": "Select", 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Company", 
+  "oldfieldname": "company", 
+  "oldfieldtype": "Link", 
   "options": "link:Company", 
-  "in_filter": 1
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "cb1", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Posting Date", 
-  "oldfieldname": "posting_date", 
   "fieldname": "posting_date", 
   "fieldtype": "Date", 
-  "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Posting Date", 
+  "oldfieldname": "posting_date", 
+  "oldfieldtype": "Date", 
+  "reqd": 1
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Small Text", 
-  "colour": "White:FFF", 
   "allow_on_submit": 0, 
   "doctype": "DocField", 
-  "label": "Remark", 
-  "oldfieldname": "remark", 
   "fieldname": "remark", 
   "fieldtype": "Small Text", 
-  "permlevel": 0
+  "label": "Remark", 
+  "no_copy": 1, 
+  "oldfieldname": "remark", 
+  "oldfieldtype": "Small Text"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Employees Email Id", 
-  "oldfieldname": "email_id", 
   "fieldname": "email_id", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Employees Email Id", 
+  "oldfieldname": "email_id", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Amended From", 
-  "oldfieldname": "amended_from", 
-  "width": "160px", 
   "fieldname": "amended_from", 
   "fieldtype": "Data", 
-  "permlevel": 1, 
-  "report_hide": 1
+  "label": "Amended From", 
+  "no_copy": 1, 
+  "oldfieldname": "amended_from", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "report_hide": 1, 
+  "width": "160px"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Amendment Date", 
-  "oldfieldname": "amendment_date", 
-  "width": "160px", 
   "fieldname": "amendment_date", 
   "fieldtype": "Date", 
-  "permlevel": 1, 
-  "report_hide": 1
+  "label": "Amendment Date", 
+  "no_copy": 1, 
+  "oldfieldname": "amendment_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "report_hide": 1, 
+  "width": "160px"
  }, 
  {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "Employee", 
-  "report": 1, 
-  "permlevel": 0, 
-  "match": "owner"
+  "match": "owner", 
+  "role": "Employee"
  }, 
  {
   "amend": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
   "cancel": 1, 
+  "doctype": "DocPerm", 
+  "match": "exp_approver:user", 
   "role": "Expense Approver", 
-  "report": 1, 
-  "permlevel": 0, 
-  "match": "exp_approver:user"
+  "submit": 1
  }, 
  {
   "amend": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "report": 1, 
-  "role": "HR User", 
   "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "role": "All", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
+  "doctype": "DocPerm", 
+  "role": "HR User", 
+  "submit": 1
  }
 ]
\ No newline at end of file
diff --git a/hr/doctype/grade/grade.txt b/hr/doctype/grade/grade.txt
index 339db8b..51a041e 100644
--- a/hr/doctype/grade/grade.txt
+++ b/hr/doctype/grade/grade.txt
@@ -1,78 +1,72 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:14", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:35:57", 
+  "modified": "2013-01-22 14:46:59", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:35:57"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
-  "module": "HR", 
-  "doctype": "DocType", 
-  "allow_trash": 1, 
-  "document_type": "Master", 
   "autoname": "field:grade_name", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "server_code_error": " ", 
-  "show_in_menu": 0, 
-  "version": 7
+  "doctype": "DocType", 
+  "document_type": "Master", 
+  "module": "HR", 
+  "name": "__common__"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Grade", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
-  "report": 1, 
   "name": "__common__", 
   "parent": "Grade", 
-  "read": 1, 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "cancel": 1, 
+  "name": "__common__", 
+  "parent": "Grade", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
   "permlevel": 0, 
-  "parentfield": "permissions"
+  "read": 1, 
+  "report": 1, 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "name": "Grade", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Grade"
  }, 
  {
-  "role": "System Manager", 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "HR User", 
-  "doctype": "DocPerm", 
-  "submit": 0
- }, 
- {
-  "role": "HR Manager", 
-  "doctype": "DocPerm"
- }, 
- {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Trash Reason", 
-  "oldfieldname": "trash_reason", 
   "fieldname": "trash_reason", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Trash Reason", 
+  "oldfieldname": "trash_reason", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Grade", 
-  "oldfieldname": "grade_name", 
   "fieldname": "grade_name", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Grade", 
+  "oldfieldname": "grade_name", 
+  "oldfieldtype": "Data", 
+  "reqd": 1
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "System Manager"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "HR User"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "HR Manager"
  }
 ]
\ No newline at end of file
diff --git a/hr/doctype/holiday_list/holiday_list.txt b/hr/doctype/holiday_list/holiday_list.txt
index ef83520..fc16aa9 100644
--- a/hr/doctype/holiday_list/holiday_list.txt
+++ b/hr/doctype/holiday_list/holiday_list.txt
@@ -1,125 +1,114 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:14", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:35:57", 
+  "modified": "2013-01-22 14:47:00", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:35:57"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
-  "module": "HR", 
   "doctype": "DocType", 
-  "allow_trash": 1, 
   "document_type": "Master", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "server_code_error": " ", 
-  "show_in_menu": 0, 
-  "version": 17
+  "module": "HR", 
+  "name": "__common__"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Holiday List", 
   "doctype": "DocField", 
+  "name": "__common__", 
+  "parent": "Holiday List", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "parent": "Holiday List", 
-  "read": 1, 
-  "report": 1, 
   "cancel": 1, 
-  "name": "__common__", 
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
+  "name": "__common__", 
+  "parent": "Holiday List", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "role": "HR Manager", 
   "permlevel": 0, 
-  "parentfield": "permissions"
+  "read": 1, 
+  "report": 1, 
+  "role": "HR Manager", 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "name": "Holiday List", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Holiday List"
  }, 
  {
-  "doctype": "DocPerm"
- }, 
- {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Trash Reason", 
-  "oldfieldname": "trash_reason", 
   "fieldname": "trash_reason", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Trash Reason", 
+  "oldfieldname": "trash_reason", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Holiday List Name", 
-  "oldfieldname": "holiday_list_name", 
   "fieldname": "holiday_list_name", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Holiday List Name", 
+  "oldfieldname": "holiday_list_name", 
+  "oldfieldtype": "Data", 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Default", 
   "fieldname": "is_default", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "Default"
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Fiscal Year", 
-  "oldfieldname": "fiscal_year", 
-  "options": "link:Fiscal Year", 
   "fieldname": "fiscal_year", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Fiscal Year", 
+  "oldfieldname": "fiscal_year", 
+  "oldfieldtype": "Link", 
+  "options": "link:Fiscal Year", 
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Weekly Off", 
-  "options": "\nSunday\nMonday\nTuesday\nWednesday\nThursday\nFriday\nSaturday", 
   "fieldname": "weekly_off", 
   "fieldtype": "Select", 
-  "permlevel": 0, 
+  "label": "Weekly Off", 
+  "no_copy": 1, 
+  "options": "\nSunday\nMonday\nTuesday\nWednesday\nThursday\nFriday\nSaturday", 
+  "print_hide": 1, 
   "report_hide": 1
  }, 
  {
   "doctype": "DocField", 
-  "options": "get_weekly_off_dates", 
   "fieldname": "get_weekly_off_dates", 
   "fieldtype": "Button", 
   "label": "Get Weekly Off Dates", 
-  "permlevel": 0
+  "options": "get_weekly_off_dates"
  }, 
  {
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "Holidays", 
-  "oldfieldname": "holiday_list_details", 
-  "options": "Holiday", 
   "fieldname": "holiday_list_details", 
   "fieldtype": "Table", 
-  "reqd": 0, 
-  "permlevel": 0
+  "label": "Holidays", 
+  "oldfieldname": "holiday_list_details", 
+  "oldfieldtype": "Table", 
+  "options": "Holiday", 
+  "reqd": 0
  }, 
  {
   "doctype": "DocField", 
-  "options": "clear_table", 
   "fieldname": "clear_table", 
   "fieldtype": "Button", 
   "label": "Clear Table", 
-  "permlevel": 0
+  "options": "clear_table"
+ }, 
+ {
+  "doctype": "DocPerm"
  }
 ]
\ No newline at end of file
diff --git a/hr/doctype/leave_allocation/leave_allocation.txt b/hr/doctype/leave_allocation/leave_allocation.txt
index ed94520..027a447 100644
--- a/hr/doctype/leave_allocation/leave_allocation.txt
+++ b/hr/doctype/leave_allocation/leave_allocation.txt
@@ -1,223 +1,186 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:14", 
   "docstatus": 0, 
-  "creation": "2012-10-02 18:51:49", 
+  "modified": "2013-01-22 14:56:04", 
   "modified_by": "Administrator", 
-  "modified": "2012-10-17 12:51:44"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
-  "is_submittable": 1, 
-  "search_fields": "employee,employee_name,leave_type,total_leaves_allocated,fiscal_year", 
-  "module": "HR", 
-  "server_code_error": " ", 
   "autoname": "LAL/.#####", 
-  "_last_update": "1317365120", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
   "doctype": "DocType", 
-  "show_in_menu": 0, 
-  "version": 1
- }, 
- {
+  "is_submittable": 1, 
+  "module": "HR", 
   "name": "__common__", 
-  "parent": "Leave Allocation", 
-  "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
-  "name": "__common__", 
-  "parent": "Leave Allocation", 
-  "read": 1, 
-  "doctype": "DocPerm", 
-  "parenttype": "DocType", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Leave Allocation", 
-  "doctype": "DocType"
+  "search_fields": "employee,employee_name,leave_type,total_leaves_allocated,fiscal_year"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
-  "fieldname": "column_break0", 
-  "fieldtype": "Column Break", 
+  "name": "__common__", 
+  "parent": "Leave Allocation", 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
   "permlevel": 0
  }, 
  {
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
-  "doctype": "DocField", 
-  "label": "Employee", 
-  "oldfieldname": "employee", 
+  "amend": 1, 
+  "cancel": 1, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Leave Allocation", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
   "permlevel": 0, 
-  "trigger": "Client", 
+  "read": 1, 
+  "report": 1, 
+  "submit": 1, 
+  "write": 1
+ }, 
+ {
+  "doctype": "DocType", 
+  "name": "Leave Allocation"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "column_break0", 
+  "fieldtype": "Column Break", 
+  "width": "50%"
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "employee", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Employee", 
+  "oldfieldname": "employee", 
+  "oldfieldtype": "Link", 
   "options": "Employee", 
-  "in_filter": 1
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "Employee Name", 
   "fieldname": "employee_name", 
   "fieldtype": "Data", 
-  "permlevel": 1, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Employee Name", 
+  "read_only": 1, 
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Leave Type", 
-  "oldfieldname": "leave_type", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "leave_type", 
   "fieldtype": "Select", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Leave Type", 
+  "oldfieldname": "leave_type", 
+  "oldfieldtype": "Link", 
   "options": "link:Leave Type", 
-  "in_filter": 1
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
-  "colour": "White:FFF", 
-  "doctype": "DocField", 
-  "label": "Posting Date", 
-  "oldfieldname": "date", 
   "default": "Today", 
+  "doctype": "DocField", 
   "fieldname": "posting_date", 
   "fieldtype": "Date", 
-  "search_index": 0, 
-  "reqd": 1, 
   "hidden": 0, 
-  "permlevel": 1
+  "label": "Posting Date", 
+  "no_copy": 1, 
+  "oldfieldname": "date", 
+  "oldfieldtype": "Date", 
+  "read_only": 1, 
+  "reqd": 1, 
+  "search_index": 0
  }, 
  {
-  "oldfieldtype": "Data", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Fiscal Year", 
-  "oldfieldname": "fiscal_year", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "fiscal_year", 
   "fieldtype": "Select", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Fiscal Year", 
+  "oldfieldname": "fiscal_year", 
+  "oldfieldtype": "Data", 
   "options": "link:Fiscal Year", 
-  "in_filter": 1
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Small Text", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Description", 
-  "oldfieldname": "reason", 
-  "width": "300px", 
   "fieldname": "description", 
   "fieldtype": "Small Text", 
   "hidden": 0, 
-  "permlevel": 0
+  "label": "Description", 
+  "oldfieldname": "reason", 
+  "oldfieldtype": "Small Text", 
+  "width": "300px"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Carry Forward", 
-  "trigger": "Client", 
   "fieldname": "carry_forward", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "Carry Forward"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Carry Forwarded Leaves", 
-  "trigger": "Client", 
   "fieldname": "carry_forwarded_leaves", 
-  "fieldtype": "Currency", 
-  "permlevel": 0
+  "fieldtype": "Float", 
+  "label": "Carry Forwarded Leaves"
  }, 
  {
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "New Leaves Allocated", 
-  "trigger": "Client", 
   "fieldname": "new_leaves_allocated", 
-  "fieldtype": "Currency", 
-  "permlevel": 0
+  "fieldtype": "Float", 
+  "label": "New Leaves Allocated"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Total Leaves Allocated", 
   "fieldname": "total_leaves_allocated", 
-  "fieldtype": "Currency", 
-  "reqd": 1, 
-  "permlevel": 1
+  "fieldtype": "Float", 
+  "label": "Total Leaves Allocated", 
+  "read_only": 1, 
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Amended From", 
-  "oldfieldname": "amended_from", 
   "fieldname": "amended_from", 
   "fieldtype": "Data", 
   "hidden": 0, 
-  "permlevel": 1
+  "label": "Amended From", 
+  "no_copy": 1, 
+  "oldfieldname": "amended_from", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "The date at which current entry is corrected in the system.", 
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Amendment Date", 
-  "oldfieldname": "amendment_date", 
   "fieldname": "amendment_date", 
   "fieldtype": "Date", 
   "hidden": 0, 
-  "permlevel": 1
+  "label": "Amendment Date", 
+  "no_copy": 1, 
+  "oldfieldname": "amendment_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "amend": 1, 
-  "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "cancel": 1, 
-  "role": "HR User", 
-  "report": 1, 
-  "permlevel": 0, 
-  "match": "owner"
+  "match": "owner", 
+  "role": "HR User"
  }, 
  {
-  "amend": 1, 
-  "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "report": 1, 
-  "role": "HR Manager", 
-  "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "role": "All", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
+  "role": "HR Manager"
  }
 ]
\ No newline at end of file
diff --git a/hr/doctype/leave_application/leave_application.txt b/hr/doctype/leave_application/leave_application.txt
index 033728c..cc2bf15 100644
--- a/hr/doctype/leave_application/leave_application.txt
+++ b/hr/doctype/leave_application/leave_application.txt
@@ -1,240 +1,239 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:14", 
   "docstatus": 0, 
-  "creation": "2012-12-19 12:46:47", 
+  "modified": "2013-01-22 14:47:02", 
   "modified_by": "Administrator", 
-  "modified": "2013-01-01 15:13:51"
+  "owner": "Administrator"
  }, 
  {
+  "autoname": "LAP/.#####", 
+  "description": "Apply / Approve Leaves", 
+  "doctype": "DocType", 
   "document_type": "Transaction", 
   "is_submittable": 1, 
-  "description": "Apply / Approve Leaves", 
-  "autoname": "LAP/.#####", 
   "module": "HR", 
-  "doctype": "DocType", 
-  "search_fields": "employee,employee_name,leave_type,from_date,to_date,total_leave_days,fiscal_year", 
-  "name": "__common__"
+  "name": "__common__", 
+  "search_fields": "employee,employee_name,leave_type,from_date,to_date,total_leave_days,fiscal_year"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Leave Application", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Leave Application", 
-  "read": 1, 
+  "parentfield": "fields", 
+  "parenttype": "DocType"
+ }, 
+ {
   "doctype": "DocPerm", 
-  "write": 1, 
+  "name": "__common__", 
+  "parent": "Leave Application", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
+  "read": 1, 
+  "report": 1, 
+  "write": 1
  }, 
  {
-  "name": "Leave Application", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Leave Application"
  }, 
  {
-  "permlevel": 2, 
   "default": "Open", 
   "doctype": "DocField", 
-  "label": "Status", 
-  "no_copy": 1, 
   "fieldname": "status", 
   "fieldtype": "Select", 
-  "options": "Open\nApproved\nRejected"
+  "label": "Status", 
+  "no_copy": 1, 
+  "options": "Open\nApproved\nRejected", 
+  "permlevel": 2
  }, 
  {
   "description": "Leave can be approved by users with Role, \"Leave Approver\"", 
   "doctype": "DocField", 
-  "label": "Leave Approver", 
-  "permlevel": 0, 
   "fieldname": "leave_approver", 
   "fieldtype": "Select", 
-  "options": "link:Profile"
+  "label": "Leave Approver", 
+  "options": "link:Profile", 
+  "permlevel": 0
  }, 
  {
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "Leave Type", 
-  "permlevel": 0, 
   "fieldname": "leave_type", 
   "fieldtype": "Select", 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Leave Type", 
   "options": "link:Leave Type", 
-  "in_filter": 1
+  "permlevel": 0, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "From Date", 
   "fieldname": "from_date", 
   "fieldtype": "Date", 
+  "label": "From Date", 
+  "permlevel": 0, 
   "reqd": 1, 
-  "permlevel": 0
+  "search_index": 1
  }, 
  {
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "To Date", 
   "fieldname": "to_date", 
   "fieldtype": "Date", 
+  "label": "To Date", 
+  "permlevel": 0, 
   "reqd": 1, 
-  "permlevel": 0
+  "search_index": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Half Day", 
   "fieldname": "half_day", 
   "fieldtype": "Check", 
+  "label": "Half Day", 
   "permlevel": 0
  }, 
  {
-  "print_width": "50%", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "permlevel": 0, 
+  "print_width": "50%", 
+  "width": "50%"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Reason", 
   "fieldname": "description", 
   "fieldtype": "Small Text", 
+  "label": "Reason", 
   "permlevel": 0
  }, 
  {
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "Employee", 
-  "permlevel": 0, 
   "fieldname": "employee", 
   "fieldtype": "Link", 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Employee", 
   "options": "Employee", 
-  "in_filter": 1
+  "permlevel": 0, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "read_only": 1, 
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "Employee Name", 
   "fieldname": "employee_name", 
   "fieldtype": "Data", 
+  "in_filter": 1, 
+  "label": "Employee Name", 
   "permlevel": 0, 
-  "in_filter": 1
+  "read_only": 1, 
+  "search_index": 0
  }, 
  {
-  "read_only": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Leave Balance Before Application", 
   "fieldname": "leave_balance", 
-  "fieldtype": "Currency", 
-  "permlevel": 0
- }, 
- {
-  "read_only": 1, 
+  "fieldtype": "Float", 
+  "label": "Leave Balance Before Application", 
   "no_copy": 1, 
-  "doctype": "DocField", 
-  "label": "Total Leave Days", 
-  "fieldname": "total_leave_days", 
-  "fieldtype": "Currency", 
-  "permlevel": 0
+  "permlevel": 0, 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "More Info", 
+  "fieldname": "total_leave_days", 
+  "fieldtype": "Float", 
+  "label": "Total Leave Days", 
+  "no_copy": 1, 
+  "permlevel": 0, 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "sb10", 
   "fieldtype": "Section Break", 
+  "label": "More Info", 
   "permlevel": 0
  }, 
  {
   "default": "Today", 
   "doctype": "DocField", 
-  "label": "Posting Date", 
-  "no_copy": 1, 
   "fieldname": "posting_date", 
   "fieldtype": "Date", 
-  "reqd": 1, 
-  "permlevel": 2
+  "label": "Posting Date", 
+  "no_copy": 1, 
+  "permlevel": 2, 
+  "reqd": 1
  }, 
  {
-  "read_only": 0, 
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "Fiscal Year", 
-  "permlevel": 2, 
   "fieldname": "fiscal_year", 
   "fieldtype": "Select", 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Fiscal Year", 
   "options": "link:Fiscal Year", 
-  "in_filter": 1
+  "permlevel": 2, 
+  "read_only": 0, 
+  "reqd": 1, 
+  "search_index": 0
  }, 
  {
-  "read_only": 0, 
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Letter Head", 
-  "permlevel": 2, 
   "fieldname": "letter_head", 
   "fieldtype": "Link", 
-  "options": "Letter Head"
+  "label": "Letter Head", 
+  "options": "Letter Head", 
+  "permlevel": 2, 
+  "print_hide": 1, 
+  "read_only": 0
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Amended From", 
-  "permlevel": 1, 
   "fieldname": "amended_from", 
   "fieldtype": "Link", 
-  "options": "Sales Invoice"
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "role": "Employee", 
-  "report": 1, 
+  "label": "Amended From", 
+  "no_copy": 1, 
+  "options": "Sales Invoice", 
   "permlevel": 0, 
-  "match": "employee"
+  "print_hide": 1, 
+  "read_only": 1
+ }, 
+ {
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "match": "employee", 
+  "permlevel": 0, 
+  "role": "Employee"
  }, 
  {
   "amend": 1, 
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 1, 
-  "report": 1, 
+  "permlevel": 0, 
   "role": "HR User", 
-  "cancel": 1, 
-  "permlevel": 0
+  "submit": 1
  }, 
  {
   "amend": 1, 
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 1, 
-  "cancel": 1, 
+  "match": "leave_approver:user", 
+  "permlevel": 0, 
   "role": "Leave Approver", 
-  "report": 1, 
-  "permlevel": 0, 
-  "match": "leave_approver:user"
+  "submit": 1
  }, 
  {
-  "role": "HR User", 
+  "doctype": "DocPerm", 
   "permlevel": 2, 
-  "doctype": "DocPerm"
+  "role": "HR User"
  }, 
  {
   "amend": 0, 
+  "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "submit": 0, 
+  "permlevel": 2, 
   "role": "Leave Approver", 
-  "cancel": 0, 
-  "permlevel": 2
+  "submit": 0
  }
 ]
\ No newline at end of file
diff --git a/hr/doctype/leave_control_panel/leave_control_panel.txt b/hr/doctype/leave_control_panel/leave_control_panel.txt
index a3472f3..b9014ad 100644
--- a/hr/doctype/leave_control_panel/leave_control_panel.txt
+++ b/hr/doctype/leave_control_panel/leave_control_panel.txt
@@ -1,181 +1,140 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:15", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:35:59", 
+  "modified": "2013-01-22 13:38:08", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:35:59"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
-  "allow_print": 1, 
-  "module": "HR", 
-  "doctype": "DocType", 
-  "server_code_error": " ", 
-  "read_only": 1, 
+  "allow_copy": 1, 
   "allow_email": 1, 
+  "allow_print": 1, 
+  "doctype": "DocType", 
   "hide_heading": 0, 
-  "issingle": 1, 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "_last_update": "1297751828", 
-  "show_in_menu": 0, 
-  "version": 162, 
   "hide_toolbar": 0, 
-  "allow_copy": 1
+  "issingle": 1, 
+  "module": "HR", 
+  "name": "__common__", 
+  "read_only": 1
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Leave Control Panel", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Leave Control Panel", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
   "permlevel": 0, 
-  "parentfield": "fields"
- }, 
- {
-  "name": "__common__", 
-  "parent": "Leave Control Panel", 
   "read": 1, 
-  "doctype": "DocPerm", 
-  "parenttype": "DocType", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Leave Control Panel", 
-  "doctype": "DocType"
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "System Manager", 
-  "permlevel": 0
- }, 
- {
-  "role": "System Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
+  "report": 0, 
   "role": "HR User", 
-  "permlevel": 0
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "HR Manager", 
-  "permlevel": 0
+  "doctype": "DocType", 
+  "name": "Leave Control Panel"
  }, 
  {
-  "role": "HR User", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "HR Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "width": "50%", 
+  "doctype": "DocField", 
   "fieldname": "column_break0", 
   "fieldtype": "Column Break", 
-  "doctype": "DocField"
+  "width": "50%"
  }, 
  {
   "description": "Leave blank if considered for all employee types", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Employee Type", 
   "fieldname": "employee_type", 
   "fieldtype": "Select", 
+  "label": "Employee Type", 
   "options": "link:Employment Type"
  }, 
  {
   "description": "Leave blank if considered for all branches", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Branch", 
   "fieldname": "branch", 
   "fieldtype": "Select", 
+  "label": "Branch", 
   "options": "link:Branch"
  }, 
  {
   "description": "Leave blank if considered for all departments", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Department", 
   "fieldname": "department", 
   "fieldtype": "Select", 
+  "label": "Department", 
   "options": "link:Department"
  }, 
  {
   "description": "Leave blank if considered for all designations", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Designation", 
   "fieldname": "designation", 
   "fieldtype": "Select", 
+  "label": "Designation", 
   "options": "link:Designation"
  }, 
  {
   "description": "Leave blank if considered for all grades", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Grade", 
   "fieldname": "grade", 
   "fieldtype": "Select", 
+  "label": "Grade", 
   "options": "link:Grade"
  }, 
  {
-  "width": "50%", 
+  "doctype": "DocField", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
-  "doctype": "DocField"
+  "width": "50%"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Fiscal Year", 
   "fieldname": "fiscal_year", 
   "fieldtype": "Select", 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Fiscal Year", 
   "options": "link:Fiscal Year", 
-  "in_filter": 1
- }, 
- {
-  "doctype": "DocField", 
-  "label": "Leave Type", 
-  "fieldname": "leave_type", 
-  "fieldtype": "Select", 
-  "reqd": 1, 
-  "options": "link:Leave Type"
- }, 
- {
-  "description": "Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year", 
-  "colour": "White:FFF", 
-  "doctype": "DocField", 
-  "label": "Carry Forward", 
-  "fieldname": "carry_forward", 
-  "fieldtype": "Check"
- }, 
- {
-  "doctype": "DocField", 
-  "label": "New Leaves Allocated (In Days)", 
-  "fieldname": "no_of_days", 
-  "fieldtype": "Currency", 
   "reqd": 1
  }, 
  {
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Allocate", 
-  "trigger": "Server", 
+  "fieldname": "leave_type", 
+  "fieldtype": "Select", 
+  "label": "Leave Type", 
+  "options": "link:Leave Type", 
+  "reqd": 1
+ }, 
+ {
+  "description": "Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year", 
+  "doctype": "DocField", 
+  "fieldname": "carry_forward", 
+  "fieldtype": "Check", 
+  "label": "Carry Forward"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "no_of_days", 
+  "fieldtype": "Float", 
+  "label": "New Leaves Allocated (In Days)", 
+  "reqd": 1
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "allocate", 
   "fieldtype": "Button", 
+  "label": "Allocate", 
   "options": "allocate_leave"
+ }, 
+ {
+  "doctype": "DocPerm"
  }
 ]
\ No newline at end of file
diff --git a/hr/doctype/leave_type/leave_type.txt b/hr/doctype/leave_type/leave_type.txt
index d993760..5524bcf 100644
--- a/hr/doctype/leave_type/leave_type.txt
+++ b/hr/doctype/leave_type/leave_type.txt
@@ -1,115 +1,106 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:15", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:35:59", 
+  "modified": "2013-01-22 14:47:02", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:35:59"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
-  "module": "HR", 
-  "doctype": "DocType", 
-  "allow_trash": 1, 
-  "document_type": "Master", 
   "autoname": "field:leave_type_name", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "server_code_error": " ", 
-  "show_in_menu": 0, 
-  "version": 23
+  "doctype": "DocType", 
+  "document_type": "Master", 
+  "module": "HR", 
+  "name": "__common__"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Leave Type", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
-  "report": 1, 
   "name": "__common__", 
   "parent": "Leave Type", 
-  "read": 1, 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "cancel": 1, 
+  "name": "__common__", 
+  "parent": "Leave Type", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
   "permlevel": 0, 
-  "parentfield": "permissions"
+  "read": 1, 
+  "report": 1, 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "name": "Leave Type", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Leave Type"
  }, 
  {
-  "role": "System Manager", 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "HR User", 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "HR Manager", 
-  "doctype": "DocPerm"
- }, 
- {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Trash Reason", 
-  "oldfieldname": "trash_reason", 
   "fieldname": "trash_reason", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Trash Reason", 
+  "oldfieldname": "trash_reason", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Leave Type Name", 
-  "oldfieldname": "leave_type_name", 
   "fieldname": "leave_type_name", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Leave Type Name", 
+  "oldfieldname": "leave_type_name", 
+  "oldfieldtype": "Data", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Max Days Leave Allowed", 
-  "oldfieldname": "max_days_allowed", 
   "fieldname": "max_days_allowed", 
   "fieldtype": "Data", 
-  "reqd": 0, 
-  "permlevel": 0
+  "label": "Max Days Leave Allowed", 
+  "oldfieldname": "max_days_allowed", 
+  "oldfieldtype": "Data", 
+  "reqd": 0
  }, 
  {
-  "oldfieldtype": "Check", 
   "doctype": "DocField", 
-  "label": "Is Carry Forward", 
-  "oldfieldname": "is_carry_forward", 
   "fieldname": "is_carry_forward", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "Is Carry Forward", 
+  "oldfieldname": "is_carry_forward", 
+  "oldfieldtype": "Check"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Check", 
   "doctype": "DocField", 
-  "label": "Is Encash", 
-  "oldfieldname": "is_encash", 
   "fieldname": "is_encash", 
   "fieldtype": "Check", 
   "hidden": 1, 
-  "permlevel": 0, 
+  "label": "Is Encash", 
+  "oldfieldname": "is_encash", 
+  "oldfieldtype": "Check", 
+  "print_hide": 1, 
   "report_hide": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Is LWP", 
   "fieldname": "is_lwp", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "Is LWP"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "System Manager"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "HR User"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "HR Manager"
  }
 ]
\ No newline at end of file
diff --git a/hr/doctype/other_income_detail/other_income_detail.txt b/hr/doctype/other_income_detail/other_income_detail.txt
index 6da3363..0913e4c 100644
--- a/hr/doctype/other_income_detail/other_income_detail.txt
+++ b/hr/doctype/other_income_detail/other_income_detail.txt
@@ -1,107 +1,98 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:15", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:35:59", 
+  "modified": "2013-01-22 14:56:40", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:35:59"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
-  "istable": 1, 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "module": "HR", 
-  "server_code_error": " ", 
-  "version": 6, 
   "doctype": "DocType", 
-  "show_in_menu": 0
+  "istable": 1, 
+  "module": "HR", 
+  "name": "__common__"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Other Income Detail", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Other Income Detail", 
-  "read": 1, 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
   "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Other Income Detail", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "role": "System Manager", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Other Income Detail", 
-  "doctype": "DocType"
- }, 
- {
-  "write": 1, 
-  "report": 1, 
   "permlevel": 0, 
-  "doctype": "DocPerm"
+  "read": 1, 
+  "report": 1, 
+  "role": "System Manager", 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "permlevel": 1, 
-  "doctype": "DocPerm"
+  "doctype": "DocType", 
+  "name": "Other Income Detail"
  }, 
  {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Particulars", 
-  "oldfieldname": "particulars2", 
-  "width": "200px", 
   "fieldname": "particulars2", 
   "fieldtype": "Small Text", 
+  "label": "Particulars", 
+  "oldfieldname": "particulars2", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1, 
   "reqd": 1, 
-  "permlevel": 1
+  "width": "200px"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Under Section", 
-  "oldfieldname": "under_section2", 
   "fieldname": "under_section2", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 1
+  "label": "Under Section", 
+  "oldfieldname": "under_section2", 
+  "oldfieldtype": "Data", 
+  "read_only": 1, 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Max. Limit", 
-  "oldfieldname": "max_limit2", 
   "fieldname": "max_limit2", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Max. Limit", 
+  "oldfieldname": "max_limit2", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Actual Amount", 
-  "oldfieldname": "actual_amount2", 
   "fieldname": "actual_amount2", 
   "fieldtype": "Currency", 
-  "permlevel": 0
+  "label": "Actual Amount", 
+  "oldfieldname": "actual_amount2", 
+  "oldfieldtype": "Currency"
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Eligible Amount", 
-  "oldfieldname": "eligible_amount2", 
   "fieldname": "eligible_amount2", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Eligible Amount", 
+  "oldfieldname": "eligible_amount2", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Modified Amount", 
-  "oldfieldname": "modified_amount2", 
   "fieldname": "modified_amount2", 
   "fieldtype": "Currency", 
-  "permlevel": 0
+  "label": "Modified Amount", 
+  "oldfieldname": "modified_amount2", 
+  "oldfieldtype": "Currency"
+ }, 
+ {
+  "doctype": "DocPerm"
  }
 ]
\ No newline at end of file
diff --git a/hr/doctype/salary_slip/salary_slip.txt b/hr/doctype/salary_slip/salary_slip.txt
index c03f84c..5ab7204 100644
--- a/hr/doctype/salary_slip/salary_slip.txt
+++ b/hr/doctype/salary_slip/salary_slip.txt
@@ -1,448 +1,401 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:15", 
   "docstatus": 0, 
-  "creation": "2012-07-03 13:29:40", 
+  "modified": "2013-01-22 14:57:22", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-03 17:10:41"
+  "owner": "Administrator"
  }, 
  {
+  "doctype": "DocType", 
   "is_submittable": 1, 
-  "name": "__common__", 
   "module": "HR", 
-  "doctype": "DocType"
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Salary Slip", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
-  "name": "__common__", 
-  "parent": "Salary Slip", 
-  "read": 1, 
-  "doctype": "DocPerm", 
-  "parenttype": "DocType", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Salary Slip", 
-  "doctype": "DocType"
- }, 
- {
-  "oldfieldtype": "Column Break", 
-  "doctype": "DocField", 
-  "width": "50%", 
-  "fieldname": "column_break0", 
-  "fieldtype": "Column Break", 
   "permlevel": 0
  }, 
  {
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Salary Slip", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
+  "permlevel": 0, 
+  "read": 1, 
+  "report": 1, 
+  "submit": 1, 
+  "write": 1
+ }, 
+ {
+  "doctype": "DocType", 
+  "name": "Salary Slip"
+ }, 
+ {
   "doctype": "DocField", 
-  "label": "Employee", 
-  "oldfieldname": "employee", 
-  "options": "Employee", 
+  "fieldname": "column_break0", 
+  "fieldtype": "Column Break", 
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "employee", 
   "fieldtype": "Link", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Employee", 
+  "oldfieldname": "employee", 
+  "oldfieldtype": "Link", 
+  "options": "Employee", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Employee Name", 
-  "oldfieldname": "employee_name", 
   "fieldname": "employee_name", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 1, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Employee Name", 
+  "oldfieldname": "employee_name", 
+  "oldfieldtype": "Data", 
+  "read_only": 1, 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Department", 
-  "oldfieldname": "department", 
-  "permlevel": 1, 
   "fieldname": "department", 
   "fieldtype": "Link", 
-  "search_index": 0, 
-  "reqd": 0, 
+  "in_filter": 1, 
+  "label": "Department", 
+  "oldfieldname": "department", 
+  "oldfieldtype": "Link", 
   "options": "Department", 
-  "in_filter": 1
+  "read_only": 1, 
+  "reqd": 0, 
+  "search_index": 0
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Designation", 
-  "oldfieldname": "designation", 
-  "permlevel": 1, 
   "fieldname": "designation", 
   "fieldtype": "Link", 
-  "search_index": 0, 
+  "in_filter": 1, 
+  "label": "Designation", 
+  "oldfieldname": "designation", 
+  "oldfieldtype": "Link", 
   "options": "Designation", 
-  "in_filter": 1
+  "read_only": 1, 
+  "search_index": 0
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Branch", 
-  "oldfieldname": "branch", 
-  "permlevel": 1, 
   "fieldname": "branch", 
   "fieldtype": "Link", 
-  "search_index": 0, 
+  "in_filter": 1, 
+  "label": "Branch", 
+  "oldfieldname": "branch", 
+  "oldfieldtype": "Link", 
   "options": "Branch", 
-  "in_filter": 1
+  "read_only": 1, 
+  "search_index": 0
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Grade", 
-  "oldfieldname": "grade", 
-  "permlevel": 1, 
   "fieldname": "grade", 
   "fieldtype": "Link", 
-  "search_index": 0, 
+  "in_filter": 1, 
+  "label": "Grade", 
+  "oldfieldname": "grade", 
+  "oldfieldtype": "Link", 
   "options": "Grade", 
-  "in_filter": 1
+  "read_only": 1, 
+  "search_index": 0
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "PF No.", 
-  "oldfieldname": "pf_no", 
   "fieldname": "pf_no", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "PF No.", 
+  "oldfieldname": "pf_no", 
+  "oldfieldtype": "Data", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "ESIC No.", 
-  "oldfieldname": "esic_no", 
   "fieldname": "esic_no", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "ESIC No.", 
+  "oldfieldname": "esic_no", 
+  "oldfieldtype": "Data", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "options": "Letter Head", 
   "fieldname": "letter_head", 
   "fieldtype": "Link", 
   "label": "Letter Head", 
-  "permlevel": 0
+  "options": "Letter Head"
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
-  "oldfieldtype": "Data", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Fiscal Year", 
-  "oldfieldname": "fiscal_year", 
-  "options": "Fiscal Year", 
   "fieldname": "fiscal_year", 
   "fieldtype": "Link", 
-  "search_index": 0, 
+  "in_filter": 1, 
+  "label": "Fiscal Year", 
+  "oldfieldname": "fiscal_year", 
+  "oldfieldtype": "Data", 
+  "options": "Fiscal Year", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 0
  }, 
  {
   "doctype": "DocField", 
-  "label": "Company", 
-  "permlevel": 0, 
   "fieldname": "company", 
   "fieldtype": "Select", 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Company", 
   "options": "link:Company", 
-  "in_filter": 1
+  "reqd": 1
  }, 
  {
-  "permlevel": 0, 
-  "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Month", 
-  "oldfieldname": "month", 
-  "width": "37%", 
-  "trigger": "Client", 
   "fieldname": "month", 
   "fieldtype": "Select", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Month", 
+  "oldfieldname": "month", 
+  "oldfieldtype": "Select", 
   "options": "\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12", 
-  "in_filter": 1
+  "reqd": 1, 
+  "search_index": 1, 
+  "width": "37%"
  }, 
  {
-  "oldfieldtype": "Int", 
   "doctype": "DocField", 
-  "label": "Total days in month", 
-  "oldfieldname": "total_days_in_month", 
   "fieldname": "total_days_in_month", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 1
+  "label": "Total days in month", 
+  "oldfieldname": "total_days_in_month", 
+  "oldfieldtype": "Int", 
+  "read_only": 1, 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Currency", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
+  "fieldname": "leave_without_pay", 
+  "fieldtype": "Float", 
   "label": "Leave Without Pay", 
   "oldfieldname": "leave_without_pay", 
-  "trigger": "Client", 
-  "fieldname": "leave_without_pay", 
-  "fieldtype": "Currency", 
-  "permlevel": 0
+  "oldfieldtype": "Currency"
  }, 
  {
-  "oldfieldtype": "Float", 
   "doctype": "DocField", 
-  "label": "Payment days", 
-  "oldfieldname": "payment_days", 
   "fieldname": "payment_days", 
   "fieldtype": "Float", 
-  "reqd": 1, 
-  "permlevel": 1
+  "label": "Payment days", 
+  "oldfieldname": "payment_days", 
+  "oldfieldtype": "Float", 
+  "read_only": 1, 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Bank Name", 
-  "oldfieldname": "bank_name", 
   "fieldname": "bank_name", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Bank Name", 
+  "oldfieldname": "bank_name", 
+  "oldfieldtype": "Data", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Bank Account No.", 
-  "oldfieldname": "bank_account_no", 
   "fieldname": "bank_account_no", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Bank Account No.", 
+  "oldfieldname": "bank_account_no", 
+  "oldfieldtype": "Data", 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Check", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Email", 
-  "oldfieldname": "email_check", 
   "fieldname": "email_check", 
   "fieldtype": "Check", 
-  "permlevel": 0, 
+  "label": "Email", 
+  "no_copy": 1, 
+  "oldfieldname": "email_check", 
+  "oldfieldtype": "Check", 
+  "print_hide": 1, 
   "report_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Amended From", 
-  "oldfieldname": "amended_from", 
   "fieldname": "amended_from", 
   "fieldtype": "Data", 
   "hidden": 0, 
-  "permlevel": 0, 
+  "label": "Amended From", 
+  "no_copy": 1, 
+  "oldfieldname": "amended_from", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
   "report_hide": 0
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Amendment Date", 
-  "oldfieldname": "amendment_date", 
   "fieldname": "amendment_date", 
   "fieldtype": "Date", 
   "hidden": 0, 
-  "permlevel": 0, 
+  "label": "Amendment Date", 
+  "no_copy": 1, 
+  "oldfieldname": "amendment_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
   "report_hide": 0
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Earning & Deduction", 
   "fieldname": "earning_deduction", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Earning & Deduction", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "oldfieldtype": "Column Break", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Earning", 
-  "width": "50%", 
   "fieldname": "earning", 
   "fieldtype": "Column Break", 
+  "label": "Earning", 
+  "oldfieldtype": "Column Break", 
   "reqd": 0, 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "oldfieldtype": "Table", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Salary Structure Earnings", 
-  "oldfieldname": "earning_details", 
-  "permlevel": 0, 
   "fieldname": "earning_details", 
   "fieldtype": "Table", 
+  "label": "Salary Structure Earnings", 
+  "oldfieldname": "earning_details", 
+  "oldfieldtype": "Table", 
   "options": "Salary Slip Earning"
  }, 
  {
-  "oldfieldtype": "Column Break", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Deduction", 
-  "width": "50%", 
   "fieldname": "deduction", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "label": "Deduction", 
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "Deductions", 
-  "oldfieldname": "deduction_details", 
-  "permlevel": 0, 
   "fieldname": "deduction_details", 
   "fieldtype": "Table", 
+  "label": "Deductions", 
+  "oldfieldname": "deduction_details", 
+  "oldfieldtype": "Table", 
   "options": "Salary Slip Deduction"
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Totals", 
   "fieldname": "totals", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Totals", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break2", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Arrear Amount", 
-  "oldfieldname": "arrear_amount", 
   "fieldname": "arrear_amount", 
   "fieldtype": "Currency", 
-  "permlevel": 0
+  "label": "Arrear Amount", 
+  "oldfieldname": "arrear_amount", 
+  "oldfieldtype": "Currency"
  }, 
  {
-  "oldfieldtype": "Currency", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Leave Encashment Amount", 
-  "oldfieldname": "encashment_amount", 
   "fieldname": "leave_encashment_amount", 
   "fieldtype": "Currency", 
-  "permlevel": 0
+  "label": "Leave Encashment Amount", 
+  "oldfieldname": "encashment_amount", 
+  "oldfieldtype": "Currency"
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Gross Pay", 
-  "oldfieldname": "gross_pay", 
   "fieldname": "gross_pay", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Gross Pay", 
+  "oldfieldname": "gross_pay", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Total Deduction", 
-  "oldfieldname": "total_deduction", 
   "fieldname": "total_deduction", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Total Deduction", 
+  "oldfieldname": "total_deduction", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break3", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
   "description": "Gross Pay + Arrear Amount +Encashment Amount - Total Deduction", 
-  "oldfieldtype": "Currency", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Net Pay", 
-  "oldfieldname": "net_pay", 
   "fieldname": "net_pay", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Net Pay", 
+  "oldfieldname": "net_pay", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Rounded Total", 
   "fieldname": "rounded_total", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Rounded Total", 
+  "read_only": 1
  }, 
  {
   "description": "Net Pay (in words) will be visible once you save the Salary Slip.", 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Total in words", 
-  "oldfieldname": "net_pay_in_words", 
   "fieldname": "total_in_words", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Total in words", 
+  "oldfieldname": "net_pay_in_words", 
+  "oldfieldtype": "Data", 
+  "read_only": 1
  }, 
  {
   "amend": 0, 
-  "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "role": "HR User", 
-  "report": 1, 
-  "permlevel": 0
+  "role": "HR User"
  }, 
  {
   "amend": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "report": 1, 
-  "role": "HR Manager", 
   "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "role": "HR User", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "HR Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
+  "doctype": "DocPerm", 
+  "role": "HR Manager"
  }
 ]
\ No newline at end of file
diff --git a/hr/doctype/salary_slip_deduction/salary_slip_deduction.txt b/hr/doctype/salary_slip_deduction/salary_slip_deduction.txt
index 0388ba9..8586bf2 100644
--- a/hr/doctype/salary_slip_deduction/salary_slip_deduction.txt
+++ b/hr/doctype/salary_slip_deduction/salary_slip_deduction.txt
@@ -1,84 +1,75 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:15", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:36:00", 
+  "modified": "2013-01-22 14:47:58", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:36:00"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
-  "istable": 1, 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "module": "HR", 
-  "server_code_error": " ", 
-  "version": 9, 
   "doctype": "DocType", 
-  "show_in_menu": 0
+  "istable": 1, 
+  "module": "HR", 
+  "name": "__common__"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Salary Slip Deduction", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
+  "name": "__common__", 
+  "parent": "Salary Slip Deduction", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "parent": "Salary Slip Deduction", 
-  "read": 1, 
-  "report": 1, 
-  "name": "__common__", 
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
+  "name": "__common__", 
+  "parent": "Salary Slip Deduction", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "role": "System Manager", 
   "permlevel": 0, 
-  "parentfield": "permissions"
+  "read": 1, 
+  "report": 1, 
+  "role": "System Manager", 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "name": "Salary Slip Deduction", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Salary Slip Deduction"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "d_type", 
+  "fieldtype": "Link", 
+  "label": "Type", 
+  "oldfieldname": "d_type", 
+  "oldfieldtype": "Data", 
+  "options": "Deduction Type", 
+  "width": "200px"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "d_amount", 
+  "fieldtype": "Currency", 
+  "label": "Amount", 
+  "oldfieldname": "d_amount", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "d_modified_amount", 
+  "fieldtype": "Currency", 
+  "label": "Modified Amount"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "d_depends_on_lwp", 
+  "fieldtype": "Check", 
+  "label": "Depends on LWP"
  }, 
  {
   "doctype": "DocPerm"
- }, 
- {
-  "oldfieldtype": "Data", 
-  "doctype": "DocField", 
-  "label": "Type", 
-  "oldfieldname": "d_type", 
-  "width": "200px", 
-  "options": "Deduction Type", 
-  "fieldname": "d_type", 
-  "fieldtype": "Link", 
-  "permlevel": 0
- }, 
- {
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Amount", 
-  "oldfieldname": "d_amount", 
-  "fieldname": "d_amount", 
-  "fieldtype": "Currency", 
-  "permlevel": 1
- }, 
- {
-  "doctype": "DocField", 
-  "label": "Modified Amount", 
-  "trigger": "Client", 
-  "fieldname": "d_modified_amount", 
-  "fieldtype": "Currency", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "label": "Depends on LWP", 
-  "trigger": "Client", 
-  "fieldname": "d_depends_on_lwp", 
-  "fieldtype": "Check", 
-  "permlevel": 0
  }
 ]
\ No newline at end of file
diff --git a/hr/doctype/salary_slip_earning/salary_slip_earning.txt b/hr/doctype/salary_slip_earning/salary_slip_earning.txt
index 6283d3d..5280cd8 100644
--- a/hr/doctype/salary_slip_earning/salary_slip_earning.txt
+++ b/hr/doctype/salary_slip_earning/salary_slip_earning.txt
@@ -1,85 +1,75 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:15", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:36:00", 
+  "modified": "2013-01-22 14:47:59", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:36:00"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
-  "istable": 1, 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "module": "HR", 
-  "server_code_error": " ", 
-  "version": 7, 
   "doctype": "DocType", 
-  "show_in_menu": 0
+  "istable": 1, 
+  "module": "HR", 
+  "name": "__common__"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Salary Slip Earning", 
   "doctype": "DocField", 
+  "name": "__common__", 
+  "parent": "Salary Slip Earning", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "parent": "Salary Slip Earning", 
-  "read": 1, 
-  "report": 1, 
-  "name": "__common__", 
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
+  "name": "__common__", 
+  "parent": "Salary Slip Earning", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "role": "System Manager", 
   "permlevel": 0, 
-  "parentfield": "permissions"
+  "read": 1, 
+  "report": 1, 
+  "role": "System Manager", 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "name": "Salary Slip Earning", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Salary Slip Earning"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "e_type", 
+  "fieldtype": "Link", 
+  "label": "Type", 
+  "oldfieldname": "e_type", 
+  "oldfieldtype": "Data", 
+  "options": "Earning Type", 
+  "width": "200px"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "e_amount", 
+  "fieldtype": "Currency", 
+  "label": "Amount", 
+  "oldfieldname": "e_amount", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "e_modified_amount", 
+  "fieldtype": "Currency", 
+  "label": "Modified Amount"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "e_depends_on_lwp", 
+  "fieldtype": "Check", 
+  "label": "Depends on LWP"
  }, 
  {
   "doctype": "DocPerm"
- }, 
- {
-  "oldfieldtype": "Data", 
-  "doctype": "DocField", 
-  "label": "Type", 
-  "oldfieldname": "e_type", 
-  "width": "200px", 
-  "options": "Earning Type", 
-  "fieldname": "e_type", 
-  "fieldtype": "Link", 
-  "permlevel": 0
- }, 
- {
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Amount", 
-  "oldfieldname": "e_amount", 
-  "fieldname": "e_amount", 
-  "fieldtype": "Currency", 
-  "permlevel": 1
- }, 
- {
-  "colour": "White:FFF", 
-  "doctype": "DocField", 
-  "label": "Modified Amount", 
-  "trigger": "Client", 
-  "fieldname": "e_modified_amount", 
-  "fieldtype": "Currency", 
-  "permlevel": 0
- }, 
- {
-  "colour": "White:FFF", 
-  "doctype": "DocField", 
-  "label": "Depends on LWP", 
-  "trigger": "Client", 
-  "fieldname": "e_depends_on_lwp", 
-  "fieldtype": "Check", 
-  "permlevel": 0
  }
 ]
\ No newline at end of file
diff --git a/hr/doctype/salary_structure/salary_structure.txt b/hr/doctype/salary_structure/salary_structure.txt
index 1a104ad..2800aeb 100644
--- a/hr/doctype/salary_structure/salary_structure.txt
+++ b/hr/doctype/salary_structure/salary_structure.txt
@@ -1,315 +1,269 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:15", 
   "docstatus": 0, 
-  "creation": "2012-07-03 13:29:41", 
+  "modified": "2013-01-22 14:57:22", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-03 17:10:41"
+  "owner": "Administrator"
  }, 
  {
-  "name": "__common__", 
+  "doctype": "DocType", 
   "module": "HR", 
-  "doctype": "DocType"
+  "name": "__common__"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Salary Structure", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Salary Structure", 
-  "read": 1, 
-  "doctype": "DocPerm", 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
   "amend": 0, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Salary Structure", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
+  "permlevel": 0, 
+  "read": 1, 
+  "report": 1, 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "name": "Salary Structure", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Salary Structure"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break0", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Employee", 
-  "oldfieldname": "employee", 
-  "trigger": "Client", 
   "fieldname": "employee", 
   "fieldtype": "Link", 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Employee", 
+  "oldfieldname": "employee", 
+  "oldfieldtype": "Link", 
   "options": "Employee", 
-  "permlevel": 0, 
-  "in_filter": 1
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Employee Name", 
-  "oldfieldname": "employee_name", 
   "fieldname": "employee_name", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Employee Name", 
+  "oldfieldname": "employee_name", 
+  "oldfieldtype": "Data", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Branch", 
-  "oldfieldname": "branch", 
-  "permlevel": 1, 
   "fieldname": "branch", 
   "fieldtype": "Select", 
-  "reqd": 0, 
+  "in_filter": 1, 
+  "label": "Branch", 
+  "oldfieldname": "branch", 
+  "oldfieldtype": "Select", 
   "options": "link:Branch", 
-  "in_filter": 1
+  "read_only": 1, 
+  "reqd": 0
  }, 
  {
-  "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Designation", 
-  "oldfieldname": "designation", 
-  "permlevel": 1, 
   "fieldname": "designation", 
   "fieldtype": "Select", 
-  "reqd": 0, 
+  "in_filter": 1, 
+  "label": "Designation", 
+  "oldfieldname": "designation", 
+  "oldfieldtype": "Select", 
   "options": "link:Designation", 
-  "in_filter": 1
+  "read_only": 1, 
+  "reqd": 0
  }, 
  {
-  "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Department", 
-  "oldfieldname": "department", 
-  "permlevel": 1, 
   "fieldname": "department", 
   "fieldtype": "Select", 
-  "reqd": 0, 
+  "in_filter": 1, 
+  "label": "Department", 
+  "oldfieldname": "department", 
+  "oldfieldtype": "Select", 
   "options": "link:Department", 
-  "in_filter": 1
+  "read_only": 1, 
+  "reqd": 0
  }, 
  {
-  "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Grade", 
-  "oldfieldname": "grade", 
-  "permlevel": 1, 
   "fieldname": "grade", 
   "fieldtype": "Select", 
-  "reqd": 0, 
+  "in_filter": 1, 
+  "label": "Grade", 
+  "oldfieldname": "grade", 
+  "oldfieldtype": "Select", 
   "options": "link:Grade", 
-  "in_filter": 1
+  "read_only": 1, 
+  "reqd": 0
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
   "default": "Yes", 
-  "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Is Active", 
-  "oldfieldname": "is_active", 
-  "options": "\nYes\nNo", 
   "fieldname": "is_active", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Is Active", 
+  "oldfieldname": "is_active", 
+  "oldfieldtype": "Select", 
+  "options": "\nYes\nNo", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "From Date", 
-  "oldfieldname": "from_date", 
   "fieldname": "from_date", 
   "fieldtype": "Date", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "From Date", 
+  "oldfieldname": "from_date", 
+  "oldfieldtype": "Date", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "To Date", 
-  "oldfieldname": "to_date", 
   "fieldname": "to_date", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "To Date", 
+  "oldfieldname": "to_date", 
+  "oldfieldtype": "Date"
  }, 
  {
   "description": "Cost to Company", 
-  "oldfieldtype": "Currency", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "CTC", 
-  "oldfieldname": "ctc", 
   "fieldname": "ctc", 
   "fieldtype": "Currency", 
-  "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "CTC", 
+  "oldfieldname": "ctc", 
+  "oldfieldtype": "Currency", 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Company", 
-  "permlevel": 0, 
   "fieldname": "company", 
   "fieldtype": "Select", 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Company", 
   "options": "link:Company", 
-  "in_filter": 1
+  "reqd": 1
  }, 
  {
   "description": "You can create more earning and deduction type from Setup --> HR", 
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Earning & Deduction", 
-  "oldfieldname": "earning_deduction", 
   "fieldname": "earning_deduction", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Earning & Deduction", 
+  "oldfieldname": "earning_deduction", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "oldfieldtype": "Column Break", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Earning", 
-  "oldfieldname": "col_brk2", 
-  "width": "50%", 
   "fieldname": "earning", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
-  "permlevel": 0
+  "label": "Earning", 
+  "oldfieldname": "col_brk2", 
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
-  "oldfieldtype": "Table", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Earning1", 
-  "oldfieldname": "earning_details", 
-  "permlevel": 0, 
   "fieldname": "earning_details", 
   "fieldtype": "Table", 
   "hidden": 0, 
+  "label": "Earning1", 
+  "oldfieldname": "earning_details", 
+  "oldfieldtype": "Table", 
   "options": "Salary Structure Earning"
  }, 
  {
-  "oldfieldtype": "Column Break", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Deduction", 
-  "oldfieldname": "col_brk3", 
-  "width": "50%", 
   "fieldname": "deduction", 
   "fieldtype": "Column Break", 
   "hidden": 0, 
-  "permlevel": 0
+  "label": "Deduction", 
+  "oldfieldname": "col_brk3", 
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
-  "oldfieldtype": "Table", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Deduction1", 
-  "oldfieldname": "deduction_details", 
-  "permlevel": 0, 
   "fieldname": "deduction_details", 
   "fieldtype": "Table", 
   "hidden": 0, 
+  "label": "Deduction1", 
+  "oldfieldname": "deduction_details", 
+  "oldfieldtype": "Table", 
   "options": "Salary Structure Deduction"
  }, 
  {
   "doctype": "DocField", 
-  "permlevel": 0, 
   "fieldname": "section_break0", 
   "fieldtype": "Section Break", 
   "options": "Simple"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break2", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Total Earning", 
-  "oldfieldname": "total_earning", 
   "fieldname": "total_earning", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Total Earning", 
+  "oldfieldname": "total_earning", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Total Deduction", 
-  "oldfieldname": "total_deduction", 
   "fieldname": "total_deduction", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Total Deduction", 
+  "oldfieldname": "total_deduction", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break3", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Net Pay", 
   "fieldname": "net_pay", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Net Pay", 
+  "read_only": 1
  }, 
  {
-  "write": 0, 
-  "role": "All", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "HR User", 
-  "report": 1, 
-  "permlevel": 0
+  "role": "HR User"
  }, 
  {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "HR Manager", 
-  "report": 1, 
-  "permlevel": 0
- }, 
- {
-  "role": "HR Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "HR User", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
+  "role": "HR Manager"
  }
 ]
\ No newline at end of file
diff --git a/manufacturing/doctype/bom/bom.txt b/manufacturing/doctype/bom/bom.txt
index aa37782..dbf835cc 100644
--- a/manufacturing/doctype/bom/bom.txt
+++ b/manufacturing/doctype/bom/bom.txt
@@ -1,311 +1,268 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:16", 
   "docstatus": 0, 
-  "creation": "2012-12-19 12:29:06", 
+  "modified": "2013-01-22 14:55:57", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-19 15:52:47"
+  "owner": "Administrator"
  }, 
  {
-  "istable": 0, 
-  "in_create": 0, 
-  "allow_print": 0, 
-  "search_fields": "item", 
-  "module": "Manufacturing", 
-  "doctype": "DocType", 
-  "issingle": 0, 
-  "document_type": "Master", 
   "allow_attach": 0, 
-  "read_only": 0, 
+  "allow_copy": 0, 
   "allow_email": 0, 
-  "hide_heading": 0, 
-  "name": "__common__", 
+  "allow_print": 0, 
   "allow_rename": 0, 
-  "is_submittable": 1, 
+  "doctype": "DocType", 
+  "document_type": "Master", 
+  "hide_heading": 0, 
   "hide_toolbar": 0, 
-  "allow_copy": 0
+  "in_create": 0, 
+  "is_submittable": 1, 
+  "issingle": 0, 
+  "istable": 0, 
+  "module": "Manufacturing", 
+  "name": "__common__", 
+  "read_only": 0, 
+  "search_fields": "item"
  }, 
  {
-  "name": "__common__", 
-  "parent": "BOM", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "BOM", 
-  "read": 1, 
-  "doctype": "DocPerm", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
+  "permlevel": 0
  }, 
  {
-  "name": "BOM", 
-  "doctype": "DocType"
+  "cancel": 1, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "BOM", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
+  "permlevel": 0, 
+  "read": 1, 
+  "report": 1, 
+  "submit": 1, 
+  "write": 1
+ }, 
+ {
+  "doctype": "DocType", 
+  "name": "BOM"
  }, 
  {
   "description": "Item to be manufactured or repacked", 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Item", 
-  "oldfieldname": "item", 
-  "options": "Item", 
   "fieldname": "item", 
   "fieldtype": "Link", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Item", 
+  "oldfieldname": "item", 
+  "oldfieldtype": "Link", 
+  "options": "Item", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "cb0", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
   "allow_on_submit": 1, 
-  "doctype": "DocField", 
-  "label": "Is Active", 
-  "oldfieldname": "is_active", 
   "default": "1", 
+  "doctype": "DocField", 
   "fieldname": "is_active", 
   "fieldtype": "Check", 
-  "reqd": 0, 
   "hidden": 0, 
-  "permlevel": 0
+  "label": "Is Active", 
+  "no_copy": 1, 
+  "oldfieldname": "is_active", 
+  "oldfieldtype": "Select", 
+  "reqd": 0
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Check", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Is Default", 
-  "oldfieldname": "is_default", 
   "fieldname": "is_default", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "Is Default", 
+  "no_copy": 1, 
+  "oldfieldname": "is_default", 
+  "oldfieldtype": "Check"
  }, 
  {
   "description": "Manage cost of operations", 
   "doctype": "DocField", 
-  "label": "With Operations", 
   "fieldname": "with_operations", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "With Operations"
  }, 
  {
-  "oldfieldtype": "Section Break", 
+  "depends_on": "with_operations", 
   "doctype": "DocField", 
-  "label": "Operations", 
-  "permlevel": 0, 
   "fieldname": "operations", 
   "fieldtype": "Section Break", 
-  "depends_on": "with_operations", 
+  "label": "Operations", 
+  "oldfieldtype": "Section Break", 
   "options": "Specify the operations, operating cost and give a unique Operation no to your operations."
  }, 
  {
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "BOM Operations", 
-  "oldfieldname": "bom_operations", 
-  "permlevel": 0, 
   "fieldname": "bom_operations", 
   "fieldtype": "Table", 
+  "label": "BOM Operations", 
+  "oldfieldname": "bom_operations", 
+  "oldfieldtype": "Table", 
   "options": "BOM Operation"
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Materials", 
   "fieldname": "materials", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Materials", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "BOM Item", 
-  "oldfieldname": "bom_materials", 
-  "permlevel": 0, 
   "fieldname": "bom_materials", 
   "fieldtype": "Table", 
+  "label": "BOM Item", 
+  "oldfieldname": "bom_materials", 
+  "oldfieldtype": "Table", 
   "options": "BOM Item"
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Costing", 
   "fieldname": "costing", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Costing", 
+  "oldfieldtype": "Section Break"
  }, 
  {
   "doctype": "DocField", 
-  "options": "Valuation Rate\nLast Purchase Rate", 
   "fieldname": "rm_cost_as_per", 
   "fieldtype": "Select", 
   "label": "Rate Of Materials Based On", 
-  "permlevel": 0
+  "options": "Valuation Rate\nLast Purchase Rate"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Total Cost", 
   "fieldname": "total_cost", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Total Cost", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "cb1", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Total Raw Material Cost", 
   "fieldname": "raw_material_cost", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Total Raw Material Cost", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Total Operating Cost", 
   "fieldname": "operating_cost", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Total Operating Cost", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "More Info", 
   "fieldname": "more_info_section", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "More Info"
  }, 
  {
-  "description": "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials", 
   "default": "1", 
-  "oldfieldtype": "Currency", 
+  "description": "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials", 
   "doctype": "DocField", 
+  "fieldname": "quantity", 
+  "fieldtype": "Float", 
   "label": "Quantity", 
   "oldfieldname": "quantity", 
-  "fieldname": "quantity", 
-  "fieldtype": "Currency", 
-  "reqd": 1, 
-  "permlevel": 0
+  "oldfieldtype": "Currency", 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "options": "link:UOM", 
   "fieldname": "uom", 
   "fieldtype": "Select", 
   "label": "Item UOM", 
-  "permlevel": 1
+  "options": "link:UOM", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "col_break23", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Project Name", 
-  "oldfieldname": "project_name", 
-  "permlevel": 0, 
   "fieldname": "project_name", 
   "fieldtype": "Link", 
-  "options": "Project", 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Project Name", 
+  "oldfieldname": "project_name", 
+  "oldfieldtype": "Link", 
+  "options": "Project"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Item Desription", 
   "fieldname": "description", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Item Desription", 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Amended From", 
-  "permlevel": 1, 
   "fieldname": "amended_from", 
   "fieldtype": "Link", 
-  "options": "BOM"
+  "label": "Amended From", 
+  "no_copy": 1, 
+  "options": "BOM", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 0, 
   "depends_on": "eval:!doc.__islocal", 
   "doctype": "DocField", 
-  "label": "Materials Required (Exploded)", 
   "fieldname": "section_break0", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
-  "permlevel": 0
+  "label": "Materials Required (Exploded)", 
+  "print_hide": 0
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Table", 
-  "doctype": "DocField", 
-  "label": "Materials Required (Exploded)", 
-  "oldfieldname": "flat_bom_details", 
   "default": "No Toolbar", 
-  "options": "BOM Explosion Item", 
+  "doctype": "DocField", 
   "fieldname": "flat_bom_details", 
   "fieldtype": "Table", 
   "hidden": 0, 
-  "permlevel": 1
+  "label": "Materials Required (Exploded)", 
+  "no_copy": 1, 
+  "oldfieldname": "flat_bom_details", 
+  "oldfieldtype": "Table", 
+  "options": "BOM Explosion Item", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "cancel": 1, 
-  "role": "System Manager", 
-  "report": 1, 
-  "permlevel": 0
+  "role": "System Manager"
  }, 
  {
-  "role": "System Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "cancel": 1, 
-  "role": "Manufacturing Manager", 
-  "report": 1, 
-  "permlevel": 0
+  "role": "Manufacturing Manager"
  }, 
  {
-  "role": "Manufacturing Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "cancel": 1, 
-  "role": "Manufacturing User", 
-  "report": 1, 
-  "permlevel": 0
- }, 
- {
-  "role": "Manufacturing User", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
+  "role": "Manufacturing User"
  }
 ]
\ No newline at end of file
diff --git a/manufacturing/doctype/bom_explosion_item/bom_explosion_item.txt b/manufacturing/doctype/bom_explosion_item/bom_explosion_item.txt
index 52c7796..08ab2de 100644
--- a/manufacturing/doctype/bom_explosion_item/bom_explosion_item.txt
+++ b/manufacturing/doctype/bom_explosion_item/bom_explosion_item.txt
@@ -1,107 +1,108 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:16", 
   "docstatus": 0, 
-  "creation": "2012-12-14 10:15:16", 
+  "modified": "2013-01-22 14:18:20", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-14 16:53:30"
+  "owner": "Administrator"
  }, 
  {
-  "read_only": 0, 
-  "istable": 1, 
   "autoname": "FBD/.######", 
-  "name": "__common__", 
   "default_print_format": "Standard", 
   "doctype": "DocType", 
-  "module": "Manufacturing"
+  "istable": 1, 
+  "module": "Manufacturing", 
+  "name": "__common__", 
+  "read_only": 0
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "BOM Explosion Item", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "permlevel": 1, 
-  "parentfield": "fields"
+  "permlevel": 0, 
+  "read_only": 1
  }, 
  {
-  "name": "BOM Explosion Item", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "BOM Explosion Item"
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Item Code", 
-  "oldfieldname": "item_code", 
   "fieldname": "item_code", 
   "fieldtype": "Link", 
+  "label": "Item Code", 
+  "oldfieldname": "item_code", 
+  "oldfieldtype": "Link", 
   "options": "Item"
  }, 
  {
-  "oldfieldtype": "Text", 
   "doctype": "DocField", 
+  "fieldname": "description", 
+  "fieldtype": "Text", 
   "label": "Description", 
   "oldfieldname": "description", 
-  "width": "300px", 
-  "fieldname": "description", 
-  "fieldtype": "Text"
+  "oldfieldtype": "Text", 
+  "width": "300px"
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "qty", 
+  "fieldtype": "Float", 
   "label": "Qty", 
   "oldfieldname": "qty", 
-  "fieldname": "qty", 
-  "fieldtype": "Float"
+  "oldfieldtype": "Currency"
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "rate", 
+  "fieldtype": "Float", 
   "label": "Rate", 
   "oldfieldname": "standard_rate", 
-  "fieldname": "rate", 
-  "fieldtype": "Float"
+  "oldfieldtype": "Currency"
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "amount", 
+  "fieldtype": "Currency", 
   "label": "Amount", 
   "oldfieldname": "amount_as_per_sr", 
-  "fieldname": "amount", 
-  "fieldtype": "Currency"
+  "oldfieldtype": "Currency"
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Stock UOM", 
-  "oldfieldname": "stock_uom", 
   "fieldname": "stock_uom", 
   "fieldtype": "Link", 
+  "label": "Stock UOM", 
+  "oldfieldname": "stock_uom", 
+  "oldfieldtype": "Link", 
   "options": "UOM"
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Parent BOM", 
-  "oldfieldname": "parent_bom", 
-  "width": "250px", 
   "fieldname": "parent_bom", 
   "fieldtype": "Link", 
   "hidden": 0, 
-  "options": "BOM"
+  "label": "Parent BOM", 
+  "oldfieldname": "parent_bom", 
+  "oldfieldtype": "Link", 
+  "options": "BOM", 
+  "width": "250px"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Mat Detail No", 
   "fieldname": "mat_detail_no", 
   "fieldtype": "Data", 
-  "hidden": 1
+  "hidden": 1, 
+  "label": "Mat Detail No"
  }, 
  {
-  "no_copy": 0, 
   "doctype": "DocField", 
-  "label": "Qty Consumed Per Unit", 
   "fieldname": "qty_consumed_per_unit", 
   "fieldtype": "Float", 
-  "hidden": 0
+  "hidden": 0, 
+  "label": "Qty Consumed Per Unit", 
+  "no_copy": 0
  }
 ]
\ No newline at end of file
diff --git a/manufacturing/doctype/bom_item/bom_item.txt b/manufacturing/doctype/bom_item/bom_item.txt
index 8a9dd18..fd3c44d 100644
--- a/manufacturing/doctype/bom_item/bom_item.txt
+++ b/manufacturing/doctype/bom_item/bom_item.txt
@@ -1,151 +1,142 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:16", 
   "docstatus": 0, 
-  "creation": "2012-12-14 10:15:16", 
+  "modified": "2013-01-22 14:55:58", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-14 16:35:33"
+  "owner": "Administrator"
  }, 
  {
+  "doctype": "DocType", 
   "istable": 1, 
-  "name": "__common__", 
   "module": "Manufacturing", 
-  "doctype": "DocType"
+  "name": "__common__"
  }, 
  {
-  "name": "__common__", 
-  "parent": "BOM Item", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "BOM Item", 
-  "read": 1, 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
   "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "BOM Item", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
+  "permlevel": 0, 
+  "read": 1, 
+  "report": 1, 
   "role": "System Manager", 
-  "parentfield": "permissions"
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "name": "BOM Item", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "BOM Item"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Operation No", 
-  "oldfieldname": "operation_no", 
   "fieldname": "operation_no", 
   "fieldtype": "Select", 
-  "reqd": 0, 
-  "permlevel": 0
+  "label": "Operation No", 
+  "oldfieldname": "operation_no", 
+  "oldfieldtype": "Data", 
+  "reqd": 0
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Item Code", 
-  "oldfieldname": "item_code", 
-  "permlevel": 0, 
   "fieldname": "item_code", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Item Code", 
+  "oldfieldname": "item_code", 
+  "oldfieldtype": "Link", 
   "options": "Item", 
-  "in_filter": 1
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "BOM No", 
-  "oldfieldname": "bom_no", 
-  "width": "150px", 
-  "options": "BOM", 
   "fieldname": "bom_no", 
   "fieldtype": "Link", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "BOM No", 
+  "oldfieldname": "bom_no", 
+  "oldfieldtype": "Link", 
+  "options": "BOM", 
   "reqd": 0, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 1, 
+  "width": "150px"
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Qty", 
-  "oldfieldname": "qty", 
   "fieldname": "qty", 
   "fieldtype": "Float", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Qty", 
+  "oldfieldname": "qty", 
+  "oldfieldtype": "Currency", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Stock UOM", 
-  "oldfieldname": "stock_uom", 
   "fieldname": "stock_uom", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 1
+  "label": "Stock UOM", 
+  "oldfieldname": "stock_uom", 
+  "oldfieldtype": "Data", 
+  "read_only": 1, 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Rate", 
   "fieldname": "rate", 
   "fieldtype": "Float", 
-  "permlevel": 0
+  "label": "Rate"
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Amount", 
-  "oldfieldname": "amount_as_per_mar", 
-  "width": "150px", 
   "fieldname": "amount", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Amount", 
+  "oldfieldname": "amount_as_per_mar", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "scrap", 
+  "fieldtype": "Float", 
   "label": "Scrap %", 
   "oldfieldname": "scrap", 
-  "fieldname": "scrap", 
-  "fieldtype": "Currency", 
-  "permlevel": 0
+  "oldfieldtype": "Currency", 
+  "print_hide": 1
  }, 
  {
-  "oldfieldtype": "Text", 
   "doctype": "DocField", 
-  "label": "Item Description", 
-  "oldfieldname": "description", 
-  "width": "250px", 
   "fieldname": "description", 
   "fieldtype": "Text", 
+  "label": "Item Description", 
+  "oldfieldname": "description", 
+  "oldfieldtype": "Text", 
   "reqd": 0, 
-  "permlevel": 0
+  "width": "250px"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Float", 
   "doctype": "DocField", 
-  "label": "Qty Consumed Per Unit", 
-  "oldfieldname": "qty_consumed_per_unit", 
   "fieldname": "qty_consumed_per_unit", 
   "fieldtype": "Float", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Qty Consumed Per Unit", 
+  "oldfieldname": "qty_consumed_per_unit", 
+  "oldfieldtype": "Float", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "write": 1, 
-  "report": 1, 
-  "permlevel": 0, 
-  "doctype": "DocPerm"
- }, 
- {
-  "permlevel": 1, 
   "doctype": "DocPerm"
  }
 ]
\ No newline at end of file
diff --git a/manufacturing/doctype/bom_operation/bom_operation.txt b/manufacturing/doctype/bom_operation/bom_operation.txt
index d072ec3..c31c57a 100644
--- a/manufacturing/doctype/bom_operation/bom_operation.txt
+++ b/manufacturing/doctype/bom_operation/bom_operation.txt
@@ -1,102 +1,99 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:16", 
   "docstatus": 0, 
-  "creation": "2012-12-14 10:15:16", 
+  "modified": "2013-01-22 14:55:58", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-14 16:06:37"
+  "owner": "Administrator"
  }, 
  {
+  "doctype": "DocType", 
   "istable": 1, 
-  "name": "__common__", 
   "module": "Manufacturing", 
-  "doctype": "DocType"
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "BOM Operation", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "BOM Operation", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
   "permlevel": 0, 
-  "parentfield": "fields"
- }, 
- {
-  "name": "__common__", 
-  "parent": "BOM Operation", 
   "read": 1, 
-  "doctype": "DocPerm", 
-  "parenttype": "DocType", 
+  "report": 1, 
   "role": "System Manager", 
-  "parentfield": "permissions"
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "name": "BOM Operation", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "BOM Operation"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Operation No", 
-  "oldfieldname": "operation_no", 
   "fieldname": "operation_no", 
   "fieldtype": "Data", 
+  "label": "Operation No", 
+  "oldfieldname": "operation_no", 
+  "oldfieldtype": "Data", 
   "reqd": 1
  }, 
  {
-  "oldfieldtype": "Text", 
   "doctype": "DocField", 
-  "label": "Operation Description", 
-  "oldfieldname": "opn_description", 
   "fieldname": "opn_description", 
   "fieldtype": "Text", 
+  "label": "Operation Description", 
+  "oldfieldname": "opn_description", 
+  "oldfieldtype": "Text", 
   "reqd": 1
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Workstation", 
-  "oldfieldname": "workstation", 
   "fieldname": "workstation", 
   "fieldtype": "Link", 
-  "reqd": 0, 
-  "options": "Workstation"
+  "label": "Workstation", 
+  "oldfieldname": "workstation", 
+  "oldfieldtype": "Link", 
+  "options": "Workstation", 
+  "reqd": 0
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Hour Rate", 
-  "oldfieldname": "hour_rate", 
   "fieldname": "hour_rate", 
   "fieldtype": "Currency", 
+  "label": "Hour Rate", 
+  "oldfieldname": "hour_rate", 
+  "oldfieldtype": "Currency", 
   "reqd": 0
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "time_in_mins", 
+  "fieldtype": "Float", 
   "label": "Operation Time (mins)", 
   "oldfieldname": "time_in_mins", 
-  "fieldname": "time_in_mins", 
-  "fieldtype": "Currency", 
+  "oldfieldtype": "Currency", 
   "reqd": 0
  }, 
  {
-  "oldfieldtype": "Currency", 
   "allow_on_submit": 0, 
   "doctype": "DocField", 
-  "label": "Operating Cost", 
-  "oldfieldname": "operating_cost", 
   "fieldname": "operating_cost", 
   "fieldtype": "Currency", 
+  "label": "Operating Cost", 
+  "oldfieldname": "operating_cost", 
+  "oldfieldtype": "Currency", 
   "reqd": 0
  }, 
  {
-  "write": 1, 
-  "report": 1, 
-  "permlevel": 0, 
-  "doctype": "DocPerm"
- }, 
- {
-  "permlevel": 1, 
   "doctype": "DocPerm"
  }
 ]
\ No newline at end of file
diff --git a/manufacturing/doctype/production_plan_item/production_plan_item.txt b/manufacturing/doctype/production_plan_item/production_plan_item.txt
index 2cb2a59..a2f9367 100644
--- a/manufacturing/doctype/production_plan_item/production_plan_item.txt
+++ b/manufacturing/doctype/production_plan_item/production_plan_item.txt
@@ -1,104 +1,104 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-19 10:23:34", 
   "docstatus": 0, 
-  "creation": "2013-01-16 14:48:56", 
+  "modified": "2013-01-22 14:00:34", 
   "modified_by": "Administrator", 
-  "modified": "2013-01-17 11:21:46"
+  "owner": "Administrator"
  }, 
  {
-  "istable": 1, 
   "autoname": "PPID/.#####", 
-  "name": "__common__", 
   "doctype": "DocType", 
-  "module": "Manufacturing"
+  "istable": 1, 
+  "module": "Manufacturing", 
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Production Plan Item", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "permlevel": 0, 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "name": "Production Plan Item", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Production Plan Item"
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Item Code", 
-  "oldfieldname": "item_code", 
-  "width": "150px", 
   "fieldname": "item_code", 
   "fieldtype": "Link", 
+  "label": "Item Code", 
+  "oldfieldname": "item_code", 
+  "oldfieldtype": "Link", 
+  "options": "Item", 
   "reqd": 1, 
-  "options": "Item"
+  "width": "150px"
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "BOM No", 
-  "oldfieldname": "bom_no", 
-  "width": "100px", 
   "fieldname": "bom_no", 
   "fieldtype": "Link", 
+  "label": "BOM No", 
+  "oldfieldname": "bom_no", 
+  "oldfieldtype": "Link", 
+  "options": "BOM", 
   "reqd": 1, 
-  "options": "BOM"
+  "width": "100px"
  }, 
  {
   "default": "0.00", 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "planned_qty", 
+  "fieldtype": "Float", 
   "label": "Planned Qty", 
   "oldfieldname": "planned_qty", 
-  "width": "100px", 
-  "fieldname": "planned_qty", 
-  "fieldtype": "Currency", 
-  "reqd": 1
+  "oldfieldtype": "Currency", 
+  "reqd": 1, 
+  "width": "100px"
  }, 
  {
-  "read_only": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Sales Order", 
-  "oldfieldname": "source_docname", 
   "fieldname": "sales_order", 
   "fieldtype": "Link", 
-  "options": "Sales Order"
+  "label": "Sales Order", 
+  "oldfieldname": "source_docname", 
+  "oldfieldtype": "Data", 
+  "options": "Sales Order", 
+  "read_only": 1
  }, 
  {
-  "read_only": 1, 
   "default": "0.00", 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "so_pending_qty", 
+  "fieldtype": "Float", 
   "label": "SO Pending Qty", 
   "oldfieldname": "prevdoc_reqd_qty", 
-  "width": "100px", 
-  "fieldname": "so_pending_qty", 
-  "fieldtype": "Currency", 
-  "reqd": 0
+  "oldfieldtype": "Currency", 
+  "read_only": 1, 
+  "reqd": 0, 
+  "width": "100px"
  }, 
  {
-  "read_only": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "UOM", 
-  "oldfieldname": "stock_uom", 
-  "width": "80px", 
   "fieldname": "stock_uom", 
   "fieldtype": "Data", 
-  "reqd": 1
+  "label": "UOM", 
+  "oldfieldname": "stock_uom", 
+  "oldfieldtype": "Data", 
+  "read_only": 1, 
+  "reqd": 1, 
+  "width": "80px"
  }, 
  {
-  "read_only": 1, 
-  "oldfieldtype": "Text", 
   "doctype": "DocField", 
+  "fieldname": "description", 
+  "fieldtype": "Text", 
   "label": "Description", 
   "oldfieldname": "description", 
-  "width": "200px", 
-  "fieldname": "description", 
-  "fieldtype": "Text"
+  "oldfieldtype": "Text", 
+  "read_only": 1, 
+  "width": "200px"
  }
 ]
\ No newline at end of file
diff --git a/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.txt b/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.txt
index 9b32691..193a041 100644
--- a/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.txt
+++ b/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.txt
@@ -1,84 +1,81 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:17", 
   "docstatus": 0, 
-  "creation": "2012-12-20 18:14:56", 
+  "modified": "2013-01-22 14:56:41", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-24 19:38:10"
+  "owner": "Administrator"
  }, 
  {
-  "istable": 1, 
-  "name": "__common__", 
   "autoname": "PP/.SO/.#####", 
+  "doctype": "DocType", 
+  "istable": 1, 
   "module": "Manufacturing", 
-  "doctype": "DocType"
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Production Plan Sales Order", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Production Plan Sales Order", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
   "permlevel": 0, 
-  "parentfield": "fields"
- }, 
- {
-  "name": "__common__", 
-  "parent": "Production Plan Sales Order", 
   "read": 1, 
-  "doctype": "DocPerm", 
-  "parenttype": "DocType", 
+  "report": 1, 
   "role": "System Manager", 
-  "parentfield": "permissions"
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "name": "Production Plan Sales Order", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Production Plan Sales Order"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Sales Order", 
-  "oldfieldname": "prevdoc_docname", 
-  "width": "150px", 
   "fieldname": "sales_order", 
   "fieldtype": "Link", 
-  "options": "Sales Order"
+  "label": "Sales Order", 
+  "oldfieldname": "prevdoc_docname", 
+  "oldfieldtype": "Data", 
+  "options": "Sales Order", 
+  "width": "150px"
  }, 
  {
-  "read_only": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
+  "fieldname": "sales_order_date", 
+  "fieldtype": "Date", 
   "label": "SO Date", 
   "oldfieldname": "document_date", 
-  "width": "120px", 
-  "fieldname": "sales_order_date", 
-  "fieldtype": "Date"
+  "oldfieldtype": "Date", 
+  "read_only": 1, 
+  "width": "120px"
  }, 
  {
-  "read_only": 1, 
   "doctype": "DocField", 
-  "label": "Customer", 
-  "width": "150px", 
   "fieldname": "customer", 
   "fieldtype": "Link", 
-  "options": "Customer"
- }, 
- {
+  "label": "Customer", 
+  "options": "Customer", 
   "read_only": 1, 
+  "width": "150px"
+ }, 
+ {
   "doctype": "DocField", 
-  "label": "Grand Total", 
-  "width": "120px", 
   "fieldname": "grand_total", 
-  "fieldtype": "Currency"
+  "fieldtype": "Currency", 
+  "label": "Grand Total", 
+  "read_only": 1, 
+  "width": "120px"
  }, 
  {
-  "write": 1, 
-  "report": 1, 
-  "permlevel": 0, 
-  "doctype": "DocPerm"
- }, 
- {
-  "permlevel": 1, 
   "doctype": "DocPerm"
  }
 ]
\ No newline at end of file
diff --git a/manufacturing/doctype/update_delivery_date/locale/_messages_doc.json b/manufacturing/doctype/update_delivery_date/locale/_messages_doc.json
deleted file mode 100644
index eab278c..0000000
--- a/manufacturing/doctype/update_delivery_date/locale/_messages_doc.json
+++ /dev/null
@@ -1,13 +0,0 @@
-[
- "Customer", 
- "Get Open Sales Order", 
- "Manufacturing", 
- "Company", 
- "Update Delivery Date", 
- "To Date", 
- "From Date", 
- "Entries", 
- "Sales Order", 
- "Territory", 
- "Update Sales Order"
-]
\ No newline at end of file
diff --git a/manufacturing/doctype/update_delivery_date/locale/hi-doc.json b/manufacturing/doctype/update_delivery_date/locale/hi-doc.json
deleted file mode 100644
index bb6474c..0000000
--- a/manufacturing/doctype/update_delivery_date/locale/hi-doc.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "Company": "\u0915\u0902\u092a\u0928\u0940", 
- "Customer": "\u0917\u094d\u0930\u093e\u0939\u0915", 
- "Entries": "\u092a\u094d\u0930\u0935\u093f\u0937\u094d\u091f\u093f\u092f\u093e\u0902", 
- "From Date": "\u0926\u093f\u0928\u093e\u0902\u0915 \u0938\u0947", 
- "Get Open Sales Order": "\u0913\u092a\u0928 \u092c\u093f\u0915\u094d\u0930\u0940 \u0906\u0926\u0947\u0936", 
- "Manufacturing": "\u0935\u093f\u0928\u093f\u0930\u094d\u092e\u093e\u0923", 
- "Sales Order": "\u092c\u093f\u0915\u094d\u0930\u0940 \u0906\u0926\u0947\u0936", 
- "Territory": "\u0915\u094d\u0937\u0947\u0924\u094d\u0930", 
- "To Date": "\u0924\u093f\u0925\u093f \u0915\u0930\u0928\u0947 \u0915\u0947 \u0932\u093f\u090f", 
- "Update Delivery Date": "\u0905\u0926\u094d\u092f\u0924\u0928 \u0921\u093f\u0932\u0940\u0935\u0930\u0940 \u0915\u0940 \u0924\u093e\u0930\u0940\u0916", 
- "Update Sales Order": "\u0905\u0926\u094d\u092f\u0924\u0928 \u092c\u093f\u0915\u094d\u0930\u0940 \u0906\u0926\u0947\u0936"
-}
\ No newline at end of file
diff --git a/manufacturing/doctype/workstation/workstation.txt b/manufacturing/doctype/workstation/workstation.txt
index 4f967f1..cba3227 100644
--- a/manufacturing/doctype/workstation/workstation.txt
+++ b/manufacturing/doctype/workstation/workstation.txt
@@ -1,220 +1,170 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:17", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:36:05", 
+  "modified": "2013-01-22 14:50:39", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-10 18:30:00"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
-  "doctype": "DocType", 
-  "module": "Manufacturing", 
-  "server_code_error": " ", 
-  "allow_trash": 1, 
-  "autoname": "field:workstation_name", 
-  "document_type": "Master", 
   "allow_email": 0, 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "_last_update": "1322125389", 
-  "show_in_menu": 0, 
-  "version": 14
+  "autoname": "field:workstation_name", 
+  "doctype": "DocType", 
+  "document_type": "Master", 
+  "module": "Manufacturing", 
+  "name": "__common__"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Workstation", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Workstation", 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
+  "cancel": 1, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Workstation", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
+  "permlevel": 0, 
   "read": 1, 
-  "doctype": "DocPerm", 
-  "parenttype": "DocType", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Workstation", 
-  "doctype": "DocType"
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "cancel": 1, 
-  "role": "System Manager", 
   "report": 1, 
-  "permlevel": 0
- }, 
- {
-  "role": "System Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "cancel": 1, 
   "role": "Manufacturing User", 
-  "report": 1, 
-  "permlevel": 0
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "cancel": 1, 
-  "role": "Manufacturing User", 
-  "report": 1, 
-  "permlevel": 0
+  "doctype": "DocType", 
+  "name": "Workstation"
  }, 
  {
-  "role": "Manufacturing Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "Manufacturing User", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Trash Reason", 
-  "oldfieldname": "trash_reason", 
   "fieldname": "trash_reason", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Trash Reason", 
+  "oldfieldname": "trash_reason", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Workstation Name", 
-  "oldfieldname": "workstation_name", 
   "fieldname": "workstation_name", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Workstation Name", 
+  "oldfieldname": "workstation_name", 
+  "oldfieldtype": "Data", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Warehouse", 
-  "oldfieldname": "warehouse", 
-  "options": "Warehouse", 
   "fieldname": "warehouse", 
   "fieldtype": "Link", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Warehouse", 
+  "oldfieldname": "warehouse", 
+  "oldfieldtype": "Link", 
+  "options": "Warehouse", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Text", 
   "doctype": "DocField", 
-  "label": "Description", 
-  "oldfieldname": "description", 
-  "width": "300px", 
   "fieldname": "description", 
   "fieldtype": "Text", 
-  "permlevel": 0
+  "label": "Description", 
+  "oldfieldname": "description", 
+  "oldfieldtype": "Text", 
+  "width": "300px"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Capacity", 
-  "oldfieldname": "capacity", 
   "fieldname": "capacity", 
   "fieldtype": "Data", 
-  "reqd": 0, 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Capacity", 
+  "oldfieldname": "capacity", 
+  "oldfieldtype": "Data", 
+  "reqd": 0
  }, 
  {
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Capacity Units", 
-  "oldfieldname": "capacity_units", 
-  "options": "\nUnits/Shifts\nUnits/Hour", 
   "fieldname": "capacity_units", 
   "fieldtype": "Select", 
-  "reqd": 0, 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Capacity Units", 
+  "oldfieldname": "capacity_units", 
+  "oldfieldtype": "Select", 
+  "options": "\nUnits/Shifts\nUnits/Hour", 
+  "reqd": 0
  }, 
  {
-  "oldfieldtype": "Currency", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Hour Rate Labour", 
-  "oldfieldname": "hour_rate_labour", 
   "fieldname": "hour_rate_labour", 
   "fieldtype": "Currency", 
-  "reqd": 0, 
-  "permlevel": 0
+  "label": "Hour Rate Labour", 
+  "oldfieldname": "hour_rate_labour", 
+  "oldfieldtype": "Currency", 
+  "reqd": 0
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Over Heads", 
   "fieldname": "over_heads", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Over Heads", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Hour Rate Electricity", 
-  "oldfieldname": "hour_rate_electricity", 
   "fieldname": "hour_rate_electricity", 
   "fieldtype": "Currency", 
-  "permlevel": 0
+  "label": "Hour Rate Electricity", 
+  "oldfieldname": "hour_rate_electricity", 
+  "oldfieldtype": "Currency"
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Hour Rate Consumable", 
-  "oldfieldname": "hour_rate_consumable", 
   "fieldname": "hour_rate_consumable", 
   "fieldtype": "Currency", 
-  "permlevel": 0
+  "label": "Hour Rate Consumable", 
+  "oldfieldname": "hour_rate_consumable", 
+  "oldfieldtype": "Currency"
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Hour Rate Rent", 
-  "oldfieldname": "hour_rate_rent", 
   "fieldname": "hour_rate_rent", 
   "fieldtype": "Currency", 
-  "permlevel": 0
+  "label": "Hour Rate Rent", 
+  "oldfieldname": "hour_rate_rent", 
+  "oldfieldtype": "Currency"
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Overhead", 
-  "oldfieldname": "overhead", 
   "fieldname": "overhead", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Overhead", 
+  "oldfieldname": "overhead", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Hour Rate", 
   "fieldname": "hour_rate_section_break", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Hour Rate", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Hour Rate", 
-  "oldfieldname": "hour_rate", 
   "fieldname": "hour_rate", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Hour Rate", 
+  "oldfieldname": "hour_rate", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocPerm"
  }
 ]
\ No newline at end of file
diff --git a/projects/doctype/project/project.txt b/projects/doctype/project/project.txt
index f822213..2c277b2 100644
--- a/projects/doctype/project/project.txt
+++ b/projects/doctype/project/project.txt
@@ -1,432 +1,387 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:17", 
   "docstatus": 0, 
-  "creation": "2012-11-28 11:26:18", 
+  "modified": "2013-01-22 14:56:41", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-03 17:10:41"
+  "owner": "Administrator"
  }, 
  {
-  "document_type": "Master", 
   "allow_attach": 1, 
   "autoname": "field:project_name", 
-  "module": "Projects", 
   "doctype": "DocType", 
+  "document_type": "Master", 
   "max_attachments": 4, 
-  "search_fields": "customer, status, priority, is_active", 
-  "name": "__common__"
+  "module": "Projects", 
+  "name": "__common__", 
+  "search_fields": "customer, status, priority, is_active"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Project", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
-  "name": "__common__", 
-  "parent": "Project", 
-  "read": 1, 
-  "doctype": "DocPerm", 
-  "parenttype": "DocType", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Project", 
-  "doctype": "DocType"
- }, 
- {
-  "doctype": "DocField", 
-  "label": "Status", 
-  "fieldname": "cb_project_status", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
- }, 
- {
-  "description": "Project will get saved and will be searchable with project name given", 
-  "no_copy": 0, 
-  "oldfieldtype": "Data", 
-  "doctype": "DocField", 
-  "label": "Project Name", 
-  "oldfieldname": "project_name", 
-  "fieldname": "project_name", 
-  "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0
- }, 
- {
-  "permlevel": 0, 
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
-  "doctype": "DocField", 
-  "label": "Status", 
-  "oldfieldname": "status", 
-  "default": "Open", 
-  "fieldname": "status", 
-  "fieldtype": "Select", 
-  "search_index": 1, 
-  "reqd": 1, 
-  "options": "Open\nCompleted\nCancelled", 
-  "in_filter": 1
- }, 
- {
-  "no_copy": 0, 
-  "oldfieldtype": "Select", 
-  "doctype": "DocField", 
-  "label": "Is Active", 
-  "oldfieldname": "is_active", 
-  "permlevel": 0, 
-  "fieldname": "is_active", 
-  "fieldtype": "Select", 
-  "search_index": 0, 
-  "options": "Yes\nNo"
- }, 
- {
-  "no_copy": 0, 
-  "oldfieldtype": "Select", 
-  "doctype": "DocField", 
-  "label": "Priority", 
-  "oldfieldname": "priority", 
-  "permlevel": 0, 
-  "fieldname": "priority", 
-  "fieldtype": "Select", 
-  "search_index": 0, 
-  "options": "Medium\nLow\nHigh"
- }, 
- {
-  "doctype": "DocField", 
-  "label": "Dates", 
-  "fieldname": "cb_project_dates", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
- }, 
- {
-  "no_copy": 0, 
-  "oldfieldtype": "Date", 
-  "doctype": "DocField", 
-  "label": "Project Start Date", 
-  "oldfieldname": "project_start_date", 
-  "fieldname": "project_start_date", 
-  "fieldtype": "Date", 
-  "search_index": 0, 
-  "permlevel": 0, 
-  "in_filter": 1
- }, 
- {
-  "no_copy": 0, 
-  "oldfieldtype": "Date", 
-  "doctype": "DocField", 
-  "label": "Completion Date", 
-  "oldfieldname": "completion_date", 
-  "fieldname": "completion_date", 
-  "fieldtype": "Date", 
-  "search_index": 0, 
-  "permlevel": 0
- }, 
- {
-  "no_copy": 0, 
-  "oldfieldtype": "Date", 
-  "doctype": "DocField", 
-  "label": "Actual Completion Date", 
-  "oldfieldname": "act_completion_date", 
-  "fieldname": "act_completion_date", 
-  "fieldtype": "Date", 
-  "search_index": 0, 
-  "permlevel": 0
- }, 
- {
-  "no_copy": 0, 
-  "oldfieldtype": "Data", 
-  "doctype": "DocField", 
-  "label": "Project Type", 
-  "oldfieldname": "project_type", 
-  "permlevel": 0, 
-  "fieldname": "project_type", 
-  "fieldtype": "Select", 
-  "search_index": 0, 
-  "options": "Internal\nExternal\nOther"
- }, 
- {
-  "description": "Important dates and commitments in your project life cycle", 
-  "oldfieldtype": "Section Break", 
-  "colour": "White:FFF", 
-  "doctype": "DocField", 
-  "label": "Milestones", 
-  "fieldname": "sb_milestones", 
-  "fieldtype": "Section Break", 
-  "permlevel": 0
- }, 
- {
-  "description": "Milestones will be added as Events in the Calendar", 
-  "no_copy": 0, 
-  "oldfieldtype": "Table", 
-  "colour": "White:FFF", 
-  "doctype": "DocField", 
-  "label": "Project Milestones", 
-  "oldfieldname": "project_milestones", 
-  "options": "Project Milestone", 
-  "fieldname": "project_milestones", 
-  "fieldtype": "Table", 
-  "search_index": 0, 
-  "permlevel": 0
- }, 
- {
-  "description": "Tasks belonging to this Project.", 
-  "colour": "White:FFF", 
-  "doctype": "DocField", 
-  "label": "Tasks", 
-  "fieldname": "sb_tasks", 
-  "fieldtype": "Section Break", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "label": "Project Tasks", 
-  "fieldname": "project_tasks", 
-  "fieldtype": "HTML", 
-  "permlevel": 0
- }, 
- {
-  "oldfieldtype": "Section Break", 
-  "doctype": "DocField", 
-  "label": "Project Details", 
-  "permlevel": 0, 
-  "fieldname": "section_break0", 
-  "fieldtype": "Section Break", 
-  "options": "Simple"
- }, 
- {
-  "no_copy": 0, 
-  "oldfieldtype": "Text Editor", 
-  "doctype": "DocField", 
-  "label": "Notes", 
-  "oldfieldname": "notes", 
-  "fieldname": "notes", 
-  "fieldtype": "Text Editor", 
-  "search_index": 0, 
-  "permlevel": 0
- }, 
- {
-  "oldfieldtype": "Section Break", 
-  "doctype": "DocField", 
-  "label": "Project Costing", 
-  "permlevel": 0, 
-  "fieldname": "project_details", 
-  "fieldtype": "Section Break", 
-  "options": "Simple"
- }, 
- {
-  "no_copy": 0, 
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Project Value", 
-  "oldfieldname": "project_value", 
-  "trigger": "Client", 
-  "fieldname": "project_value", 
-  "fieldtype": "Currency", 
-  "search_index": 0, 
-  "reqd": 0, 
-  "permlevel": 0
- }, 
- {
-  "no_copy": 0, 
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Estimated Material Cost", 
-  "oldfieldname": "est_material_cost", 
-  "trigger": "Client", 
-  "fieldname": "est_material_cost", 
-  "fieldtype": "Currency", 
-  "search_index": 0, 
-  "permlevel": 0
- }, 
- {
-  "oldfieldtype": "Column Break", 
-  "doctype": "DocField", 
-  "label": "Margin", 
-  "width": "50%", 
-  "fieldname": "column_break0", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
- }, 
- {
-  "no_copy": 0, 
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Gross Margin Value", 
-  "oldfieldname": "gross_margin_value", 
-  "fieldname": "gross_margin_value", 
-  "fieldtype": "Currency", 
-  "search_index": 0, 
-  "reqd": 0, 
-  "permlevel": 0
- }, 
- {
-  "no_copy": 0, 
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Gross Margin %", 
-  "oldfieldname": "per_gross_margin", 
-  "fieldname": "per_gross_margin", 
-  "fieldtype": "Currency", 
-  "search_index": 0, 
-  "reqd": 0, 
-  "permlevel": 0
- }, 
- {
-  "oldfieldtype": "Section Break", 
-  "doctype": "DocField", 
-  "label": "Customer Details", 
-  "fieldname": "customer_details", 
-  "fieldtype": "Section Break", 
-  "permlevel": 0
- }, 
- {
-  "print_hide": 1, 
-  "description": "Select name of Customer to whom project belongs", 
-  "no_copy": 0, 
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
-  "doctype": "DocField", 
-  "label": "Customer", 
-  "oldfieldname": "customer", 
-  "permlevel": 0, 
-  "trigger": "Client", 
-  "fieldname": "customer", 
-  "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 0, 
-  "options": "Customer", 
-  "in_filter": 1
- }, 
- {
-  "no_copy": 0, 
-  "oldfieldtype": "Data", 
-  "doctype": "DocField", 
-  "label": "Customer Name", 
-  "oldfieldname": "customer_name", 
-  "fieldname": "customer_name", 
-  "fieldtype": "Data", 
-  "search_index": 1, 
-  "permlevel": 1, 
-  "in_filter": 1
- }, 
- {
-  "no_copy": 0, 
-  "oldfieldtype": "Small Text", 
-  "doctype": "DocField", 
-  "label": "Customer Address", 
-  "oldfieldname": "customer_address", 
-  "fieldname": "customer_address", 
-  "fieldtype": "Small Text", 
-  "search_index": 0, 
-  "permlevel": 1
- }, 
- {
-  "no_copy": 0, 
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
-  "doctype": "DocField", 
-  "label": "Contact Person", 
-  "oldfieldname": "contact_person", 
-  "permlevel": 0, 
-  "trigger": "Client", 
-  "fieldname": "contact_person", 
-  "fieldtype": "Link", 
-  "search_index": 0, 
-  "reqd": 0, 
-  "options": "Contact", 
-  "in_filter": 1
- }, 
- {
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
-  "doctype": "DocField", 
-  "label": "Territory", 
-  "oldfieldname": "territory", 
-  "permlevel": 0, 
-  "trigger": "Client", 
-  "fieldname": "territory", 
-  "fieldtype": "Link", 
-  "search_index": 0, 
-  "reqd": 0, 
-  "options": "Territory", 
-  "in_filter": 1
- }, 
- {
-  "no_copy": 0, 
-  "oldfieldtype": "Data", 
-  "doctype": "DocField", 
-  "label": "Contact No", 
-  "oldfieldname": "contact_no", 
-  "fieldname": "contact_no", 
-  "fieldtype": "Data", 
-  "search_index": 0, 
-  "permlevel": 1
- }, 
- {
-  "no_copy": 0, 
-  "oldfieldtype": "Data", 
-  "doctype": "DocField", 
-  "label": "Email Id", 
-  "oldfieldname": "email_id", 
-  "fieldname": "email_id", 
-  "fieldtype": "Data", 
-  "search_index": 0, 
-  "permlevel": 1
- }, 
- {
-  "no_copy": 0, 
-  "oldfieldtype": "Link", 
-  "doctype": "DocField", 
-  "label": "Customer Group", 
-  "oldfieldname": "customer_group", 
-  "permlevel": 1, 
-  "fieldname": "customer_group", 
-  "fieldtype": "Link", 
-  "search_index": 0, 
-  "options": "Customer Group"
- }, 
- {
-  "print_hide": 1, 
-  "no_copy": 0, 
-  "oldfieldtype": "Small Text", 
-  "doctype": "DocField", 
-  "label": "Trash Reason", 
-  "oldfieldname": "trash_reason", 
-  "fieldname": "trash_reason", 
-  "fieldtype": "Small Text", 
-  "search_index": 0, 
-  "hidden": 1, 
-  "permlevel": 0
- }, 
- {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "search_index": 0, 
-  "colour": "White:FFF", 
-  "doctype": "DocField", 
-  "label": "File List", 
-  "fieldname": "file_list", 
-  "fieldtype": "Small Text", 
-  "hidden": 1, 
   "permlevel": 0
  }, 
  {
   "amend": 0, 
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 1, 
+  "name": "__common__", 
+  "parent": "Project", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
+  "permlevel": 0, 
+  "read": 1, 
   "report": 1, 
   "role": "Projects User", 
-  "cancel": 1, 
-  "permlevel": 0
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "role": "All", 
-  "permlevel": 1, 
+  "doctype": "DocType", 
+  "name": "Project"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "cb_project_status", 
+  "fieldtype": "Column Break", 
+  "label": "Status"
+ }, 
+ {
+  "description": "Project will get saved and will be searchable with project name given", 
+  "doctype": "DocField", 
+  "fieldname": "project_name", 
+  "fieldtype": "Data", 
+  "label": "Project Name", 
+  "no_copy": 0, 
+  "oldfieldname": "project_name", 
+  "oldfieldtype": "Data", 
+  "reqd": 1
+ }, 
+ {
+  "default": "Open", 
+  "doctype": "DocField", 
+  "fieldname": "status", 
+  "fieldtype": "Select", 
+  "in_filter": 1, 
+  "label": "Status", 
+  "no_copy": 1, 
+  "oldfieldname": "status", 
+  "oldfieldtype": "Select", 
+  "options": "Open\nCompleted\nCancelled", 
+  "reqd": 1, 
+  "search_index": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "is_active", 
+  "fieldtype": "Select", 
+  "label": "Is Active", 
+  "no_copy": 0, 
+  "oldfieldname": "is_active", 
+  "oldfieldtype": "Select", 
+  "options": "Yes\nNo", 
+  "search_index": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "priority", 
+  "fieldtype": "Select", 
+  "label": "Priority", 
+  "no_copy": 0, 
+  "oldfieldname": "priority", 
+  "oldfieldtype": "Select", 
+  "options": "Medium\nLow\nHigh", 
+  "search_index": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "cb_project_dates", 
+  "fieldtype": "Column Break", 
+  "label": "Dates"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "project_start_date", 
+  "fieldtype": "Date", 
+  "in_filter": 1, 
+  "label": "Project Start Date", 
+  "no_copy": 0, 
+  "oldfieldname": "project_start_date", 
+  "oldfieldtype": "Date", 
+  "search_index": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "completion_date", 
+  "fieldtype": "Date", 
+  "label": "Completion Date", 
+  "no_copy": 0, 
+  "oldfieldname": "completion_date", 
+  "oldfieldtype": "Date", 
+  "search_index": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "act_completion_date", 
+  "fieldtype": "Date", 
+  "label": "Actual Completion Date", 
+  "no_copy": 0, 
+  "oldfieldname": "act_completion_date", 
+  "oldfieldtype": "Date", 
+  "search_index": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "project_type", 
+  "fieldtype": "Select", 
+  "label": "Project Type", 
+  "no_copy": 0, 
+  "oldfieldname": "project_type", 
+  "oldfieldtype": "Data", 
+  "options": "Internal\nExternal\nOther", 
+  "search_index": 0
+ }, 
+ {
+  "description": "Important dates and commitments in your project life cycle", 
+  "doctype": "DocField", 
+  "fieldname": "sb_milestones", 
+  "fieldtype": "Section Break", 
+  "label": "Milestones", 
+  "oldfieldtype": "Section Break"
+ }, 
+ {
+  "description": "Milestones will be added as Events in the Calendar", 
+  "doctype": "DocField", 
+  "fieldname": "project_milestones", 
+  "fieldtype": "Table", 
+  "label": "Project Milestones", 
+  "no_copy": 0, 
+  "oldfieldname": "project_milestones", 
+  "oldfieldtype": "Table", 
+  "options": "Project Milestone", 
+  "search_index": 0
+ }, 
+ {
+  "description": "Tasks belonging to this Project.", 
+  "doctype": "DocField", 
+  "fieldname": "sb_tasks", 
+  "fieldtype": "Section Break", 
+  "label": "Tasks"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "project_tasks", 
+  "fieldtype": "HTML", 
+  "label": "Project Tasks"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "section_break0", 
+  "fieldtype": "Section Break", 
+  "label": "Project Details", 
+  "oldfieldtype": "Section Break", 
+  "options": "Simple"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "notes", 
+  "fieldtype": "Text Editor", 
+  "label": "Notes", 
+  "no_copy": 0, 
+  "oldfieldname": "notes", 
+  "oldfieldtype": "Text Editor", 
+  "search_index": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "project_details", 
+  "fieldtype": "Section Break", 
+  "label": "Project Costing", 
+  "oldfieldtype": "Section Break", 
+  "options": "Simple"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "project_value", 
+  "fieldtype": "Currency", 
+  "label": "Project Value", 
+  "no_copy": 0, 
+  "oldfieldname": "project_value", 
+  "oldfieldtype": "Currency", 
+  "reqd": 0, 
+  "search_index": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "est_material_cost", 
+  "fieldtype": "Currency", 
+  "label": "Estimated Material Cost", 
+  "no_copy": 0, 
+  "oldfieldname": "est_material_cost", 
+  "oldfieldtype": "Currency", 
+  "search_index": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "column_break0", 
+  "fieldtype": "Column Break", 
+  "label": "Margin", 
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "gross_margin_value", 
+  "fieldtype": "Currency", 
+  "label": "Gross Margin Value", 
+  "no_copy": 0, 
+  "oldfieldname": "gross_margin_value", 
+  "oldfieldtype": "Currency", 
+  "reqd": 0, 
+  "search_index": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "per_gross_margin", 
+  "fieldtype": "Currency", 
+  "label": "Gross Margin %", 
+  "no_copy": 0, 
+  "oldfieldname": "per_gross_margin", 
+  "oldfieldtype": "Currency", 
+  "reqd": 0, 
+  "search_index": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "customer_details", 
+  "fieldtype": "Section Break", 
+  "label": "Customer Details", 
+  "oldfieldtype": "Section Break"
+ }, 
+ {
+  "description": "Select name of Customer to whom project belongs", 
+  "doctype": "DocField", 
+  "fieldname": "customer", 
+  "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Customer", 
+  "no_copy": 0, 
+  "oldfieldname": "customer", 
+  "oldfieldtype": "Link", 
+  "options": "Customer", 
+  "print_hide": 1, 
+  "reqd": 0, 
+  "search_index": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "customer_name", 
+  "fieldtype": "Data", 
+  "in_filter": 1, 
+  "label": "Customer Name", 
+  "no_copy": 0, 
+  "oldfieldname": "customer_name", 
+  "oldfieldtype": "Data", 
+  "read_only": 1, 
+  "search_index": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "customer_address", 
+  "fieldtype": "Small Text", 
+  "label": "Customer Address", 
+  "no_copy": 0, 
+  "oldfieldname": "customer_address", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1, 
+  "search_index": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "contact_person", 
+  "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Contact Person", 
+  "no_copy": 0, 
+  "oldfieldname": "contact_person", 
+  "oldfieldtype": "Link", 
+  "options": "Contact", 
+  "reqd": 0, 
+  "search_index": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "territory", 
+  "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Territory", 
+  "oldfieldname": "territory", 
+  "oldfieldtype": "Link", 
+  "options": "Territory", 
+  "reqd": 0, 
+  "search_index": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "contact_no", 
+  "fieldtype": "Data", 
+  "label": "Contact No", 
+  "no_copy": 0, 
+  "oldfieldname": "contact_no", 
+  "oldfieldtype": "Data", 
+  "read_only": 1, 
+  "search_index": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "email_id", 
+  "fieldtype": "Data", 
+  "label": "Email Id", 
+  "no_copy": 0, 
+  "oldfieldname": "email_id", 
+  "oldfieldtype": "Data", 
+  "read_only": 1, 
+  "search_index": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "customer_group", 
+  "fieldtype": "Link", 
+  "label": "Customer Group", 
+  "no_copy": 0, 
+  "oldfieldname": "customer_group", 
+  "oldfieldtype": "Link", 
+  "options": "Customer Group", 
+  "read_only": 1, 
+  "search_index": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "trash_reason", 
+  "fieldtype": "Small Text", 
+  "hidden": 1, 
+  "label": "Trash Reason", 
+  "no_copy": 0, 
+  "oldfieldname": "trash_reason", 
+  "oldfieldtype": "Small Text", 
+  "print_hide": 1, 
+  "search_index": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "file_list", 
+  "fieldtype": "Small Text", 
+  "hidden": 1, 
+  "label": "File List", 
+  "no_copy": 1, 
+  "print_hide": 1, 
+  "search_index": 0
+ }, 
+ {
   "doctype": "DocPerm"
  }
 ]
\ No newline at end of file
diff --git a/projects/doctype/task/task.txt b/projects/doctype/task/task.txt
index e95c456..8573b97 100644
--- a/projects/doctype/task/task.txt
+++ b/projects/doctype/task/task.txt
@@ -1,253 +1,246 @@
 [
  {
-  "owner": "Administrator", 
-  "docstatus": 0, 
   "creation": "2013-01-10 16:34:17", 
+  "docstatus": 0, 
+  "modified": "2013-01-22 14:57:26", 
   "modified_by": "Administrator", 
-  "modified": "2013-01-14 14:03:52"
+  "owner": "Administrator"
  }, 
  {
-  "autoname": "TASK.#####", 
   "allow_attach": 1, 
+  "autoname": "TASK.#####", 
   "doctype": "DocType", 
-  "module": "Projects", 
-  "max_attachments": 5, 
   "document_type": "Master", 
+  "max_attachments": 5, 
+  "module": "Projects", 
   "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Task", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "permlevel": 0, 
-  "parentfield": "fields"
- }, 
- {
-  "name": "__common__", 
-  "parent": "Task", 
-  "read": 1, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "report": 1, 
-  "parenttype": "DocType", 
-  "role": "Projects User", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Task", 
-  "doctype": "DocType"
- }, 
- {
-  "print_width": "50%", 
-  "oldfieldtype": "Section Break", 
-  "doctype": "DocField", 
-  "label": "Task Details", 
-  "width": "50%", 
-  "fieldname": "task_details", 
-  "fieldtype": "Section Break", 
-  "search_index": 0
- }, 
- {
-  "oldfieldtype": "Data", 
-  "doctype": "DocField", 
-  "label": "Subject", 
-  "oldfieldname": "subject", 
-  "fieldname": "subject", 
-  "fieldtype": "Data", 
-  "reqd": 1, 
-  "in_filter": 1
- }, 
- {
-  "oldfieldtype": "Date", 
-  "doctype": "DocField", 
-  "label": "Expected Start Date", 
-  "oldfieldname": "exp_start_date", 
-  "fieldname": "exp_start_date", 
-  "fieldtype": "Date", 
-  "reqd": 0
- }, 
- {
-  "oldfieldtype": "Date", 
-  "doctype": "DocField", 
-  "label": "Expected End Date", 
-  "oldfieldname": "exp_end_date", 
-  "fieldname": "exp_end_date", 
-  "fieldtype": "Date", 
-  "search_index": 1, 
-  "reqd": 0, 
-  "in_filter": 1
- }, 
- {
-  "print_width": "50%", 
-  "oldfieldtype": "Column Break", 
-  "doctype": "DocField", 
-  "width": "50%", 
-  "fieldname": "column_break0", 
-  "fieldtype": "Column Break"
- }, 
- {
-  "oldfieldtype": "Link", 
-  "doctype": "DocField", 
-  "label": "Project", 
-  "oldfieldname": "project", 
-  "fieldname": "project", 
-  "fieldtype": "Link", 
-  "options": "Project"
- }, 
- {
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
-  "doctype": "DocField", 
-  "label": "Status", 
-  "oldfieldname": "status", 
-  "fieldname": "status", 
-  "fieldtype": "Select", 
-  "options": "Open\nWorking\nPending Review\nClosed\nCancelled"
- }, 
- {
-  "oldfieldtype": "Select", 
-  "doctype": "DocField", 
-  "label": "Priority", 
-  "oldfieldname": "priority", 
-  "fieldname": "priority", 
-  "fieldtype": "Select", 
-  "search_index": 1, 
-  "reqd": 0, 
-  "options": "Low\nMedium\nHigh\nUrgent", 
-  "in_filter": 1
- }, 
- {
-  "oldfieldtype": "Section Break", 
-  "doctype": "DocField", 
-  "fieldname": "section_break0", 
-  "fieldtype": "Section Break", 
-  "options": "Simple"
- }, 
- {
-  "print_width": "300px", 
-  "oldfieldtype": "Text Editor", 
-  "doctype": "DocField", 
-  "label": "Details", 
-  "oldfieldname": "description", 
-  "width": "300px", 
-  "fieldname": "description", 
-  "fieldtype": "Text Editor", 
-  "reqd": 0
- }, 
- {
-  "oldfieldtype": "Section Break", 
-  "doctype": "DocField", 
-  "label": "Time and Budget", 
-  "fieldname": "time_and_budget", 
-  "fieldtype": "Section Break"
- }, 
- {
-  "print_width": "50%", 
-  "oldfieldtype": "Column Break", 
-  "doctype": "DocField", 
-  "label": "Expected", 
-  "width": "50%", 
-  "fieldname": "expected", 
-  "fieldtype": "Column Break"
- }, 
- {
-  "oldfieldtype": "Data", 
-  "doctype": "DocField", 
-  "label": "Total Hours (Expected)", 
-  "oldfieldname": "exp_total_hrs", 
-  "fieldname": "exp_total_hrs", 
-  "fieldtype": "Data", 
-  "reqd": 0
- }, 
- {
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Allocated Budget", 
-  "oldfieldname": "allocated_budget", 
-  "fieldname": "allocated_budget", 
-  "fieldtype": "Currency"
- }, 
- {
-  "print_width": "50%", 
-  "oldfieldtype": "Column Break", 
-  "doctype": "DocField", 
-  "label": "Actual", 
-  "width": "50%", 
-  "fieldname": "actual", 
-  "fieldtype": "Column Break"
- }, 
- {
-  "oldfieldtype": "Date", 
-  "doctype": "DocField", 
-  "label": "Actual Start Date", 
-  "oldfieldname": "act_start_date", 
-  "fieldname": "act_start_date", 
-  "fieldtype": "Date"
- }, 
- {
-  "oldfieldtype": "Date", 
-  "doctype": "DocField", 
-  "label": "Actual End Date", 
-  "oldfieldname": "act_end_date", 
-  "fieldname": "act_end_date", 
-  "fieldtype": "Date"
- }, 
- {
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Actual Budget", 
-  "oldfieldname": "actual_budget", 
-  "fieldname": "actual_budget", 
-  "fieldtype": "Currency"
- }, 
- {
-  "doctype": "DocField", 
-  "label": "More Details", 
-  "fieldname": "more_details", 
-  "fieldtype": "Section Break"
- }, 
- {
-  "oldfieldtype": "Date", 
-  "doctype": "DocField", 
-  "label": "Review Date", 
-  "oldfieldname": "review_date", 
-  "fieldname": "review_date", 
-  "fieldtype": "Date", 
-  "depends_on": "eval:doc.status == \"Closed\" || doc.status == \"Pending Review\"", 
-  "hidden": 0
- }, 
- {
-  "oldfieldtype": "Date", 
-  "doctype": "DocField", 
-  "label": "Closing Date", 
-  "oldfieldname": "closing_date", 
-  "fieldname": "closing_date", 
-  "fieldtype": "Date", 
-  "depends_on": "eval:doc.status == \"Closed\"", 
-  "hidden": 0
- }, 
- {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "doctype": "DocField", 
-  "label": "File List", 
-  "fieldname": "file_list", 
-  "fieldtype": "Text", 
-  "hidden": 1
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "cancel": 1, 
   "permlevel": 0
  }, 
  {
-  "amend": 0, 
-  "create": 0, 
+  "cancel": 1, 
+  "create": 1, 
   "doctype": "DocPerm", 
-  "cancel": 0, 
-  "permlevel": 1
+  "name": "__common__", 
+  "parent": "Task", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
+  "permlevel": 0, 
+  "read": 1, 
+  "report": 1, 
+  "role": "Projects User", 
+  "submit": 0, 
+  "write": 1
+ }, 
+ {
+  "doctype": "DocType", 
+  "name": "Task"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "task_details", 
+  "fieldtype": "Section Break", 
+  "label": "Task Details", 
+  "oldfieldtype": "Section Break", 
+  "print_width": "50%", 
+  "search_index": 0, 
+  "width": "50%"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "subject", 
+  "fieldtype": "Data", 
+  "in_filter": 1, 
+  "label": "Subject", 
+  "oldfieldname": "subject", 
+  "oldfieldtype": "Data", 
+  "reqd": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "exp_start_date", 
+  "fieldtype": "Date", 
+  "label": "Expected Start Date", 
+  "oldfieldname": "exp_start_date", 
+  "oldfieldtype": "Date", 
+  "reqd": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "exp_end_date", 
+  "fieldtype": "Date", 
+  "in_filter": 1, 
+  "label": "Expected End Date", 
+  "oldfieldname": "exp_end_date", 
+  "oldfieldtype": "Date", 
+  "reqd": 0, 
+  "search_index": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "column_break0", 
+  "fieldtype": "Column Break", 
+  "oldfieldtype": "Column Break", 
+  "print_width": "50%", 
+  "width": "50%"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "project", 
+  "fieldtype": "Link", 
+  "label": "Project", 
+  "oldfieldname": "project", 
+  "oldfieldtype": "Link", 
+  "options": "Project"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "status", 
+  "fieldtype": "Select", 
+  "label": "Status", 
+  "no_copy": 1, 
+  "oldfieldname": "status", 
+  "oldfieldtype": "Select", 
+  "options": "Open\nWorking\nPending Review\nClosed\nCancelled"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "priority", 
+  "fieldtype": "Select", 
+  "in_filter": 1, 
+  "label": "Priority", 
+  "oldfieldname": "priority", 
+  "oldfieldtype": "Select", 
+  "options": "Low\nMedium\nHigh\nUrgent", 
+  "reqd": 0, 
+  "search_index": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "section_break0", 
+  "fieldtype": "Section Break", 
+  "oldfieldtype": "Section Break", 
+  "options": "Simple"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "description", 
+  "fieldtype": "Text Editor", 
+  "label": "Details", 
+  "oldfieldname": "description", 
+  "oldfieldtype": "Text Editor", 
+  "print_width": "300px", 
+  "reqd": 0, 
+  "width": "300px"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "time_and_budget", 
+  "fieldtype": "Section Break", 
+  "label": "Time and Budget", 
+  "oldfieldtype": "Section Break"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "expected", 
+  "fieldtype": "Column Break", 
+  "label": "Expected", 
+  "oldfieldtype": "Column Break", 
+  "print_width": "50%", 
+  "width": "50%"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "exp_total_hrs", 
+  "fieldtype": "Data", 
+  "label": "Total Hours (Expected)", 
+  "oldfieldname": "exp_total_hrs", 
+  "oldfieldtype": "Data", 
+  "reqd": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "allocated_budget", 
+  "fieldtype": "Currency", 
+  "label": "Allocated Budget", 
+  "oldfieldname": "allocated_budget", 
+  "oldfieldtype": "Currency"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "actual", 
+  "fieldtype": "Column Break", 
+  "label": "Actual", 
+  "oldfieldtype": "Column Break", 
+  "print_width": "50%", 
+  "width": "50%"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "act_start_date", 
+  "fieldtype": "Date", 
+  "label": "Actual Start Date", 
+  "oldfieldname": "act_start_date", 
+  "oldfieldtype": "Date"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "act_end_date", 
+  "fieldtype": "Date", 
+  "label": "Actual End Date", 
+  "oldfieldname": "act_end_date", 
+  "oldfieldtype": "Date"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "actual_budget", 
+  "fieldtype": "Currency", 
+  "label": "Actual Budget", 
+  "oldfieldname": "actual_budget", 
+  "oldfieldtype": "Currency"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "more_details", 
+  "fieldtype": "Section Break", 
+  "label": "More Details"
+ }, 
+ {
+  "depends_on": "eval:doc.status == \"Closed\" || doc.status == \"Pending Review\"", 
+  "doctype": "DocField", 
+  "fieldname": "review_date", 
+  "fieldtype": "Date", 
+  "hidden": 0, 
+  "label": "Review Date", 
+  "oldfieldname": "review_date", 
+  "oldfieldtype": "Date"
+ }, 
+ {
+  "depends_on": "eval:doc.status == \"Closed\"", 
+  "doctype": "DocField", 
+  "fieldname": "closing_date", 
+  "fieldtype": "Date", 
+  "hidden": 0, 
+  "label": "Closing Date", 
+  "oldfieldname": "closing_date", 
+  "oldfieldtype": "Date"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "file_list", 
+  "fieldtype": "Text", 
+  "hidden": 1, 
+  "label": "File List", 
+  "no_copy": 1, 
+  "print_hide": 1
+ }, 
+ {
+  "doctype": "DocPerm"
  }
 ]
\ No newline at end of file
diff --git a/projects/doctype/timesheet/timesheet.txt b/projects/doctype/timesheet/timesheet.txt
index d9b65ba..8f3cc6e 100644
--- a/projects/doctype/timesheet/timesheet.txt
+++ b/projects/doctype/timesheet/timesheet.txt
@@ -1,175 +1,144 @@
 [
  {
-  "owner": "ashwini@webnotestech.com", 
+  "creation": "2013-01-10 16:34:17", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:36:07", 
+  "modified": "2013-01-22 14:57:26", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 18:47:10"
+  "owner": "ashwini@webnotestech.com"
  }, 
  {
-  "section_style": "Simple", 
-  "is_submittable": 1, 
-  "search_fields": "status, owner, timesheet_date", 
-  "module": "Projects", 
   "autoname": "TimeSheet.#####", 
-  "show_in_menu": 0, 
-  "subject": "%(owner)s", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
   "doctype": "DocType", 
-  "server_code_error": " ", 
-  "version": 69
+  "is_submittable": 1, 
+  "module": "Projects", 
+  "name": "__common__", 
+  "search_fields": "status, owner, timesheet_date"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Timesheet", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Timesheet", 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
+  "amend": 1, 
+  "cancel": 1, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Timesheet", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
+  "permlevel": 0, 
   "read": 1, 
-  "doctype": "DocPerm", 
-  "parenttype": "DocType", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Timesheet", 
-  "doctype": "DocType"
- }, 
- {
-  "amend": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
   "report": 1, 
-  "role": "Projects User", 
-  "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "role": "Projects User", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "amend": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
   "submit": 1, 
-  "write": 1, 
-  "report": 1, 
-  "role": "System Manager", 
-  "cancel": 1, 
-  "permlevel": 0
+  "write": 1
  }, 
  {
-  "role": "System Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
+  "doctype": "DocType", 
+  "name": "Timesheet"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Timesheet Details", 
   "fieldname": "timesheet_details_section_break", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Timesheet Details"
  }, 
  {
   "default": "Draft", 
-  "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Status", 
-  "oldfieldname": "status", 
-  "permlevel": 1, 
   "fieldname": "status", 
   "fieldtype": "Select", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 0, 
+  "label": "Status", 
+  "oldfieldname": "status", 
+  "oldfieldtype": "Select", 
   "options": "\nDraft\nSubmitted\nCancelled", 
-  "in_filter": 0
+  "read_only": 1, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
   "default": "Today", 
-  "oldfieldtype": "Date", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Timesheet Date", 
-  "oldfieldname": "timesheet_date", 
   "fieldname": "timesheet_date", 
   "fieldtype": "Date", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Timesheet Date", 
+  "oldfieldname": "timesheet_date", 
+  "oldfieldtype": "Date", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "Timesheet By", 
-  "oldfieldname": "owner", 
-  "permlevel": 0, 
   "fieldname": "owner", 
   "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Timesheet By", 
+  "oldfieldname": "owner", 
   "oldfieldtype": "Link", 
-  "reqd": 1, 
   "options": "Profile", 
-  "in_filter": 1
+  "reqd": 1, 
+  "search_index": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Amended From", 
-  "oldfieldname": "amended_from", 
   "fieldname": "amended_from", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Amended From", 
+  "oldfieldname": "amended_from", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Amendment Date", 
-  "oldfieldname": "amendment_date", 
   "fieldname": "amendment_date", 
   "fieldtype": "Date", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Amendment Date", 
+  "oldfieldname": "amendment_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "column_break0", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Notes", 
   "fieldname": "notes", 
   "fieldtype": "Text", 
-  "permlevel": 0
+  "label": "Notes"
  }, 
  {
   "doctype": "DocField", 
-  "options": "Simple", 
   "fieldname": "section_break0", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "options": "Simple"
  }, 
  {
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "Timesheet Details", 
-  "oldfieldname": "timesheet_details", 
-  "options": "Timesheet Detail", 
   "fieldname": "timesheet_details", 
   "fieldtype": "Table", 
-  "permlevel": 0
+  "label": "Timesheet Details", 
+  "oldfieldname": "timesheet_details", 
+  "oldfieldtype": "Table", 
+  "options": "Timesheet Detail"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "Projects User"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "System Manager"
  }
 ]
\ No newline at end of file
diff --git a/projects/doctype/timesheet_detail/timesheet_detail.txt b/projects/doctype/timesheet_detail/timesheet_detail.txt
index 6d55d4b..b99425b 100644
--- a/projects/doctype/timesheet_detail/timesheet_detail.txt
+++ b/projects/doctype/timesheet_detail/timesheet_detail.txt
@@ -1,139 +1,132 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:18", 
   "docstatus": 0, 
-  "creation": "2012-12-03 10:31:04", 
+  "modified": "2013-01-22 14:50:09", 
   "modified_by": "Administrator", 
-  "modified": "2013-01-02 12:46:48"
+  "owner": "Administrator"
  }, 
  {
-  "istable": 1, 
   "autoname": "TSD.#####", 
-  "name": "__common__", 
   "doctype": "DocType", 
-  "module": "Projects"
+  "istable": 1, 
+  "module": "Projects", 
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Timesheet Detail", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "name": "Timesheet Detail", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Timesheet Detail"
  }, 
  {
-  "print_width": "160px", 
-  "oldfieldtype": "Time", 
   "doctype": "DocField", 
-  "label": "Actual Start Time", 
-  "oldfieldname": "act_start_time", 
-  "width": "160px", 
   "fieldname": "act_start_time", 
   "fieldtype": "Time", 
+  "label": "Actual Start Time", 
+  "oldfieldname": "act_start_time", 
+  "oldfieldtype": "Time", 
+  "print_width": "160px", 
   "reqd": 1, 
-  "permlevel": 0
+  "width": "160px"
  }, 
  {
-  "print_width": "160px", 
-  "oldfieldtype": "Time", 
   "doctype": "DocField", 
-  "label": "Actual End Time", 
-  "oldfieldname": "act_end_time", 
-  "width": "160px", 
   "fieldname": "act_end_time", 
   "fieldtype": "Time", 
+  "label": "Actual End Time", 
+  "oldfieldname": "act_end_time", 
+  "oldfieldtype": "Time", 
+  "print_width": "160px", 
   "reqd": 1, 
-  "permlevel": 0
+  "width": "160px"
  }, 
  {
-  "print_width": "200px", 
-  "permlevel": 0, 
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "Activity Type", 
-  "width": "200px", 
   "fieldname": "activity_type", 
   "fieldtype": "Link", 
+  "label": "Activity Type", 
+  "options": "Activity Type", 
+  "print_width": "200px", 
   "reqd": 1, 
-  "options": "Activity Type"
+  "search_index": 0, 
+  "width": "200px"
  }, 
  {
-  "print_width": "200px", 
-  "oldfieldtype": "Text", 
   "doctype": "DocField", 
-  "label": "Additional Info", 
-  "oldfieldname": "other_details", 
-  "width": "200px", 
   "fieldname": "other_details", 
   "fieldtype": "Text", 
-  "permlevel": 0
+  "label": "Additional Info", 
+  "oldfieldname": "other_details", 
+  "oldfieldtype": "Text", 
+  "print_width": "200px", 
+  "width": "200px"
  }, 
  {
-  "print_width": "100px", 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Total Hours (Actual)", 
-  "oldfieldname": "act_total_hrs", 
-  "width": "100px", 
   "fieldname": "act_total_hrs", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Total Hours (Actual)", 
+  "oldfieldname": "act_total_hrs", 
+  "oldfieldtype": "Data", 
+  "print_width": "100px", 
+  "read_only": 1, 
+  "width": "100px"
  }, 
  {
-  "print_width": "150px", 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Customer Name", 
-  "oldfieldname": "customer_name", 
-  "width": "150px", 
-  "options": "Customer", 
   "fieldname": "customer_name", 
   "fieldtype": "Link", 
-  "permlevel": 0
+  "label": "Customer Name", 
+  "oldfieldname": "customer_name", 
+  "oldfieldtype": "Data", 
+  "options": "Customer", 
+  "print_width": "150px", 
+  "width": "150px"
  }, 
  {
-  "print_width": "150px", 
-  "permlevel": 0, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Project", 
-  "oldfieldname": "project_name", 
-  "width": "150px", 
   "fieldname": "project_name", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 0, 
+  "in_filter": 1, 
+  "label": "Project", 
+  "oldfieldname": "project_name", 
+  "oldfieldtype": "Link", 
   "options": "Project", 
-  "in_filter": 1
+  "print_width": "150px", 
+  "reqd": 0, 
+  "search_index": 1, 
+  "width": "150px"
  }, 
  {
-  "print_width": "150px", 
-  "permlevel": 0, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Task Id", 
-  "oldfieldname": "task_id", 
-  "width": "150px", 
   "fieldname": "task_id", 
   "fieldtype": "Link", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Task Id", 
+  "oldfieldname": "task_id", 
+  "oldfieldtype": "Link", 
   "options": "Task", 
-  "in_filter": 1
+  "print_width": "150px", 
+  "search_index": 1, 
+  "width": "150px"
  }, 
  {
-  "print_width": "250px", 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Task Name", 
-  "oldfieldname": "task_name", 
-  "width": "250px", 
   "fieldname": "task_name", 
   "fieldtype": "Data", 
-  "search_index": 0, 
+  "label": "Task Name", 
+  "oldfieldname": "task_name", 
+  "oldfieldtype": "Link", 
+  "print_width": "250px", 
   "reqd": 0, 
-  "permlevel": 0
+  "search_index": 0, 
+  "width": "250px"
  }
 ]
\ No newline at end of file
diff --git a/selling/doctype/campaign/campaign.txt b/selling/doctype/campaign/campaign.txt
index c457928..b9db8a5 100644
--- a/selling/doctype/campaign/campaign.txt
+++ b/selling/doctype/campaign/campaign.txt
@@ -1,133 +1,96 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:18", 
   "docstatus": 0, 
-  "creation": "2012-07-03 13:30:38", 
+  "modified": "2013-01-22 14:55:58", 
   "modified_by": "Administrator", 
-  "modified": "2012-07-12 13:21:52"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
-  "description": "Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. ", 
-  "module": "Selling", 
-  "server_code_error": " ", 
-  "allow_trash": 1, 
   "autoname": "field:campaign_name", 
-  "document_type": "Master", 
-  "_last_update": "1326102553", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
+  "description": "Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. ", 
   "doctype": "DocType", 
-  "show_in_menu": 0, 
-  "version": 1
+  "document_type": "Master", 
+  "module": "Selling", 
+  "name": "__common__"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Campaign", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Campaign", 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
   "amend": 0, 
-  "submit": 0, 
   "doctype": "DocPerm", 
-  "read": 1, 
+  "name": "__common__", 
+  "parent": "Campaign", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Campaign", 
-  "doctype": "DocType"
- }, 
- {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "role": "Sales Manager", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
+  "permlevel": 0, 
+  "read": 1, 
   "report": 1, 
-  "role": "Sales Manager", 
-  "cancel": 0, 
-  "permlevel": 0
+  "submit": 0
  }, 
  {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "role": "Sales Master Manager", 
-  "cancel": 0, 
-  "permlevel": 1
+  "doctype": "DocType", 
+  "name": "Campaign"
  }, 
  {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "role": "Sales User", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "report": 1, 
-  "role": "Sales User", 
-  "cancel": 0, 
-  "permlevel": 0
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "report": 1, 
-  "role": "Sales Master Manager", 
-  "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Trash Reason", 
-  "oldfieldname": "trash_reason", 
   "fieldname": "trash_reason", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Trash Reason", 
+  "oldfieldname": "trash_reason", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Campaign", 
   "fieldname": "campaign", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Campaign", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Campaign Name", 
-  "oldfieldname": "campaign_name", 
   "fieldname": "campaign_name", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Campaign Name", 
+  "oldfieldname": "campaign_name", 
+  "oldfieldtype": "Data", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Text", 
   "doctype": "DocField", 
-  "label": "Description", 
-  "oldfieldname": "description", 
-  "width": "300px", 
   "fieldname": "description", 
   "fieldtype": "Text", 
-  "permlevel": 0
+  "label": "Description", 
+  "oldfieldname": "description", 
+  "oldfieldtype": "Text", 
+  "width": "300px"
+ }, 
+ {
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "role": "Sales Manager", 
+  "write": 0
+ }, 
+ {
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "role": "Sales User", 
+  "write": 0
+ }, 
+ {
+  "cancel": 1, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "role": "Sales Master Manager", 
+  "write": 1
  }
 ]
\ No newline at end of file
diff --git a/selling/doctype/customer/customer.txt b/selling/doctype/customer/customer.txt
index 2365045..0e0b29b 100644
--- a/selling/doctype/customer/customer.txt
+++ b/selling/doctype/customer/customer.txt
@@ -1,186 +1,188 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:18", 
   "docstatus": 0, 
-  "creation": "2012-12-07 15:15:26", 
+  "modified": "2013-01-22 15:06:09", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-27 14:02:01"
+  "owner": "Administrator"
  }, 
  {
-  "document_type": "Master", 
-  "description": "Buyer of Goods and Services.", 
-  "autoname": "naming_series:", 
-  "allow_rename": 1, 
   "allow_print": 0, 
-  "module": "Selling", 
+  "allow_rename": 1, 
+  "autoname": "naming_series:", 
+  "description": "Buyer of Goods and Services.", 
   "doctype": "DocType", 
-  "search_fields": "customer_name,customer_group,country,territory", 
-  "name": "__common__"
+  "document_type": "Master", 
+  "module": "Selling", 
+  "name": "__common__", 
+  "search_fields": "customer_name,customer_group,country,territory"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Customer", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Customer", 
-  "read": 1, 
-  "doctype": "DocPerm", 
-  "parenttype": "DocType", 
-  "parentfield": "permissions"
+  "parentfield": "fields", 
+  "parenttype": "DocType"
  }, 
  {
-  "name": "Customer", 
-  "doctype": "DocType"
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Customer", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
+  "read": 1
+ }, 
+ {
+  "doctype": "DocType", 
+  "name": "Customer"
  }, 
  {
   "description": "Note: You Can Manage Multiple Address or Contacts via Addresses & Contacts", 
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Basic Info", 
   "fieldname": "basic_info", 
   "fieldtype": "Section Break", 
-  "reqd": 0, 
-  "permlevel": 0
+  "label": "Basic Info", 
+  "oldfieldtype": "Section Break", 
+  "permlevel": 0, 
+  "reqd": 0
  }, 
  {
-  "print_hide": 0, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Customer Name", 
-  "oldfieldname": "customer_name", 
   "fieldname": "customer_name", 
   "fieldtype": "Data", 
-  "search_index": 1, 
-  "reqd": 1, 
   "hidden": 0, 
+  "in_filter": 1, 
+  "label": "Customer Name", 
+  "no_copy": 1, 
+  "oldfieldname": "customer_name", 
+  "oldfieldtype": "Data", 
   "permlevel": 0, 
+  "print_hide": 0, 
   "report_hide": 0, 
-  "in_filter": 1
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Customer Type", 
-  "oldfieldname": "customer_type", 
-  "permlevel": 0, 
   "fieldname": "customer_type", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "options": "\nCompany\nIndividual"
+  "label": "Customer Type", 
+  "oldfieldname": "customer_type", 
+  "oldfieldtype": "Select", 
+  "options": "\nCompany\nIndividual", 
+  "permlevel": 0, 
+  "reqd": 1
  }, 
  {
-  "print_hide": 0, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Series", 
-  "permlevel": 0, 
   "fieldname": "naming_series", 
   "fieldtype": "Select", 
-  "options": "\nCUST\nCUSTMUM"
+  "label": "Series", 
+  "no_copy": 1, 
+  "options": "\nCUST\nCUSTMUM", 
+  "permlevel": 0, 
+  "print_hide": 0
  }, 
  {
-  "print_hide": 1, 
   "description": "Fetch lead which will be converted into customer.", 
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Lead Ref", 
-  "oldfieldname": "lead_name", 
-  "permlevel": 0, 
   "fieldname": "lead_name", 
   "fieldtype": "Link", 
   "hidden": 0, 
+  "in_filter": 1, 
+  "label": "Lead Ref", 
+  "no_copy": 1, 
+  "oldfieldname": "lead_name", 
+  "oldfieldtype": "Link", 
   "options": "Lead", 
-  "report_hide": 1, 
-  "in_filter": 1
+  "permlevel": 0, 
+  "print_hide": 1, 
+  "report_hide": 1
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break0", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "permlevel": 0, 
+  "width": "50%"
  }, 
  {
-  "print_hide": 0, 
   "description": "<a href=\"#!Sales Browser/Customer Group\">To manage Customer Groups, click here</a>", 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Customer Group", 
-  "oldfieldname": "customer_group", 
-  "permlevel": 0, 
   "fieldname": "customer_group", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
   "hidden": 0, 
+  "in_filter": 1, 
+  "label": "Customer Group", 
+  "oldfieldname": "customer_group", 
+  "oldfieldtype": "Link", 
   "options": "Customer Group", 
-  "in_filter": 1
+  "permlevel": 0, 
+  "print_hide": 0, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "<a href=\"#!Sales Browser/Territory\">To manage Territory, click here</a>", 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Territory", 
-  "oldfieldname": "territory", 
-  "permlevel": 0, 
   "fieldname": "territory", 
   "fieldtype": "Link", 
-  "reqd": 1, 
-  "options": "Territory"
+  "label": "Territory", 
+  "oldfieldname": "territory", 
+  "oldfieldtype": "Link", 
+  "options": "Territory", 
+  "permlevel": 0, 
+  "print_hide": 1, 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Address & Contacts", 
   "fieldname": "address_contacts", 
   "fieldtype": "Section Break", 
+  "label": "Address & Contacts", 
   "permlevel": 0
  }, 
  {
   "depends_on": "eval:doc.__islocal", 
   "doctype": "DocField", 
-  "label": "Address Desc", 
-  "permlevel": 0, 
   "fieldname": "address_desc", 
   "fieldtype": "HTML", 
-  "options": "<em>Addresses will appear only when you save the customer</em>"
+  "label": "Address Desc", 
+  "options": "<em>Addresses will appear only when you save the customer</em>", 
+  "permlevel": 0
  }, 
  {
   "doctype": "DocField", 
-  "label": "Address HTML", 
   "fieldname": "address_html", 
   "fieldtype": "HTML", 
-  "permlevel": 1
+  "label": "Address HTML", 
+  "permlevel": 0, 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "permlevel": 0, 
+  "width": "50%"
  }, 
  {
   "depends_on": "eval:doc.__islocal", 
   "doctype": "DocField", 
-  "label": "Contact Desc", 
-  "permlevel": 0, 
   "fieldname": "contact_desc", 
   "fieldtype": "HTML", 
-  "options": "<em>Contact Details will appear only when you save the customer</em>"
+  "label": "Contact Desc", 
+  "options": "<em>Contact Details will appear only when you save the customer</em>", 
+  "permlevel": 0
  }, 
  {
-  "oldfieldtype": "HTML", 
   "doctype": "DocField", 
-  "label": "Contact HTML", 
   "fieldname": "contact_html", 
   "fieldtype": "HTML", 
-  "permlevel": 1
+  "label": "Contact HTML", 
+  "oldfieldtype": "HTML", 
+  "permlevel": 0, 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
@@ -190,250 +192,168 @@
  }, 
  {
   "doctype": "DocField", 
-  "label": "Communication HTML", 
   "fieldname": "communication_html", 
   "fieldtype": "HTML", 
+  "label": "Communication HTML", 
   "permlevel": 0
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "More Info", 
   "fieldname": "more_info", 
   "fieldtype": "Section Break", 
+  "label": "More Info", 
+  "oldfieldtype": "Section Break", 
   "permlevel": 0
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break2", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "permlevel": 0, 
+  "width": "50%"
  }, 
  {
   "description": "To create an Account Head under a different company, select the company and save customer.", 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Company", 
-  "oldfieldname": "company", 
-  "options": "Company", 
   "fieldname": "company", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Company", 
+  "oldfieldname": "company", 
+  "oldfieldtype": "Link", 
+  "options": "Company", 
   "permlevel": 0, 
-  "in_filter": 1
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
   "doctype": "DocField", 
-  "options": "Price List", 
   "fieldname": "default_price_list", 
   "fieldtype": "Link", 
   "label": "Default Price List", 
+  "options": "Price List", 
   "permlevel": 0
  }, 
  {
   "description": "This currency will get fetched in Sales transactions of this customer", 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Default Currency", 
-  "permlevel": 0, 
   "fieldname": "default_currency", 
   "fieldtype": "Select", 
-  "options": "link:Currency"
+  "label": "Default Currency", 
+  "no_copy": 1, 
+  "options": "link:Currency", 
+  "permlevel": 0
  }, 
  {
   "description": "Your Customer's TAX registration numbers (if applicable) or any general information", 
-  "oldfieldtype": "Code", 
   "doctype": "DocField", 
-  "label": "Customer Details", 
-  "oldfieldname": "customer_details", 
   "fieldname": "customer_details", 
   "fieldtype": "Text", 
+  "label": "Customer Details", 
+  "oldfieldname": "customer_details", 
+  "oldfieldtype": "Code", 
   "permlevel": 0
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break3", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "permlevel": 0, 
+  "width": "50%"
  }, 
  {
-  "oldfieldtype": "Int", 
   "doctype": "DocField", 
-  "label": "Credit Days", 
-  "oldfieldname": "credit_days", 
   "fieldname": "credit_days", 
   "fieldtype": "Int", 
+  "label": "Credit Days", 
+  "oldfieldname": "credit_days", 
+  "oldfieldtype": "Int", 
   "permlevel": 2
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Credit Limit", 
-  "oldfieldname": "credit_limit", 
   "fieldname": "credit_limit", 
   "fieldtype": "Currency", 
+  "label": "Credit Limit", 
+  "oldfieldname": "credit_limit", 
+  "oldfieldtype": "Currency", 
   "permlevel": 2
  }, 
  {
   "doctype": "DocField", 
-  "label": "Website", 
   "fieldname": "website", 
   "fieldtype": "Data", 
+  "label": "Website", 
   "permlevel": 0
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Sales Team", 
   "fieldname": "sales_team_section_break", 
   "fieldtype": "Section Break", 
+  "label": "Sales Team", 
+  "oldfieldtype": "Section Break", 
   "permlevel": 0
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Default Sales Partner", 
-  "oldfieldname": "default_sales_partner", 
-  "permlevel": 0, 
   "fieldname": "default_sales_partner", 
   "fieldtype": "Link", 
-  "options": "Sales Partner"
+  "label": "Default Sales Partner", 
+  "oldfieldname": "default_sales_partner", 
+  "oldfieldtype": "Link", 
+  "options": "Sales Partner", 
+  "permlevel": 0
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "default_commission_rate", 
+  "fieldtype": "Float", 
   "label": "Default Commission Rate", 
   "oldfieldname": "default_commission_rate", 
-  "fieldname": "default_commission_rate", 
-  "fieldtype": "Currency", 
+  "oldfieldtype": "Currency", 
   "permlevel": 0
  }, 
  {
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "Sales Team Details", 
-  "oldfieldname": "sales_team", 
-  "permlevel": 0, 
   "fieldname": "sales_team", 
   "fieldtype": "Table", 
-  "options": "Sales Team"
- }, 
- {
-  "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, 
-  "report": 1, 
-  "role": "Sales Manager", 
-  "cancel": 0, 
+  "label": "Sales Team Details", 
+  "oldfieldname": "sales_team", 
+  "oldfieldtype": "Table", 
+  "options": "Sales Team", 
   "permlevel": 0
  }, 
  {
   "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Sales User", 
   "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
+  "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
+  "permlevel": 0, 
   "report": 1, 
   "role": "Sales User", 
-  "cancel": 0, 
-  "permlevel": 0
+  "submit": 0, 
+  "write": 1
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "permlevel": 2, 
+  "role": "Sales User"
  }, 
  {
   "amend": 0, 
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 1, 
+  "permlevel": 0, 
   "report": 1, 
   "role": "Sales Master Manager", 
-  "cancel": 1, 
-  "permlevel": 0
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "amend": 0, 
-  "create": 0, 
   "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
+  "permlevel": 2, 
   "role": "Sales Master Manager", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "amend": 0, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 1, 
-  "report": 1, 
-  "role": "Purchase User", 
-  "cancel": 0, 
-  "permlevel": 0
- }, 
- {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "Accounts Manager", 
-  "cancel": 0, 
-  "permlevel": 2
- }, 
- {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "System Manager", 
-  "cancel": 0, 
-  "permlevel": 2
- }, 
- {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "role": "All", 
-  "cancel": 0, 
-  "permlevel": 2
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "cancel": 1, 
-  "role": "Accounts Manager", 
-  "report": 1, 
-  "permlevel": 0
- }, 
- {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "role": "All", 
-  "cancel": 0, 
-  "permlevel": 1
+  "write": 1
  }
 ]
\ No newline at end of file
diff --git a/selling/doctype/installation_note/installation_note.txt b/selling/doctype/installation_note/installation_note.txt
index 1a69087..52917e0 100644
--- a/selling/doctype/installation_note/installation_note.txt
+++ b/selling/doctype/installation_note/installation_note.txt
@@ -1,378 +1,316 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:18", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:36:09", 
+  "modified": "2013-01-22 14:56:02", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 18:48:02"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
+  "autoname": "IN/.####", 
+  "doctype": "DocType", 
   "is_submittable": 1, 
   "module": "Selling", 
-  "server_code_error": " ", 
-  "autoname": "IN/.####", 
-  "subject": "At %(customer_name)s on %(inst_date)s", 
-  "_last_update": "1306480044", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "doctype": "DocType", 
-  "show_in_menu": 0, 
-  "version": 98
+  "name": "__common__"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Installation Note", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Installation Note", 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
+  "amend": 1, 
+  "cancel": 1, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Installation Note", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
+  "permlevel": 0, 
   "read": 1, 
-  "doctype": "DocPerm", 
-  "parenttype": "DocType", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Installation Note", 
-  "doctype": "DocType"
- }, 
- {
-  "amend": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
   "report": 1, 
-  "role": "System Manager", 
-  "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "role": "System Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "amend": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
   "submit": 1, 
-  "write": 1, 
-  "report": 1, 
-  "role": "Sales User", 
-  "cancel": 1, 
-  "permlevel": 0
+  "write": 1
  }, 
  {
-  "amend": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "report": 1, 
-  "role": "Sales Manager", 
-  "cancel": 1, 
-  "permlevel": 0
+  "doctype": "DocType", 
+  "name": "Installation Note"
  }, 
  {
-  "role": "Sales User", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "Sales Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Installation Note", 
   "fieldname": "installation_note", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Installation Note", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break0", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Series", 
-  "oldfieldname": "naming_series", 
-  "options": "\nIN", 
   "fieldname": "naming_series", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Series", 
+  "no_copy": 1, 
+  "oldfieldname": "naming_series", 
+  "oldfieldtype": "Select", 
+  "options": "\nIN", 
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "Customer", 
-  "oldfieldname": "customer", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "customer", 
   "fieldtype": "Link", 
+  "label": "Customer", 
+  "oldfieldname": "customer", 
   "oldfieldtype": "Link", 
+  "options": "Customer", 
+  "print_hide": 1, 
   "reqd": 1, 
-  "options": "Customer"
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Customer Address", 
-  "permlevel": 0, 
   "fieldname": "customer_address", 
   "fieldtype": "Link", 
-  "options": "Address"
+  "label": "Customer Address", 
+  "options": "Address", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Contact Person", 
-  "permlevel": 0, 
   "fieldname": "contact_person", 
   "fieldtype": "Link", 
-  "options": "Contact"
+  "label": "Contact Person", 
+  "options": "Contact", 
+  "print_hide": 1
  }, 
  {
-  "search_index": 0, 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Name", 
-  "oldfieldname": "customer_name", 
   "fieldname": "customer_name", 
   "fieldtype": "Data", 
+  "label": "Name", 
+  "oldfieldname": "customer_name", 
   "oldfieldtype": "Data", 
+  "read_only": 1, 
   "reqd": 0, 
-  "permlevel": 1
+  "search_index": 0
  }, 
  {
   "doctype": "DocField", 
-  "label": "Address", 
   "fieldname": "address_display", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Address", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Contact", 
   "fieldname": "contact_display", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Contact", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Mobile No", 
   "fieldname": "contact_mobile", 
   "fieldtype": "Text", 
-  "permlevel": 1
+  "label": "Mobile No", 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Contact Email", 
   "fieldname": "contact_email", 
   "fieldtype": "Text", 
-  "permlevel": 1
+  "label": "Contact Email", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "Territory", 
-  "options": "Territory", 
   "fieldname": "territory", 
   "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Territory", 
+  "options": "Territory", 
+  "print_hide": 1, 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Customer Group", 
-  "permlevel": 0, 
   "fieldname": "customer_group", 
   "fieldtype": "Link", 
-  "options": "Customer Group"
+  "label": "Customer Group", 
+  "options": "Customer Group", 
+  "print_hide": 1
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "Installation Date", 
-  "oldfieldname": "inst_date", 
   "fieldname": "inst_date", 
   "fieldtype": "Date", 
+  "label": "Installation Date", 
+  "oldfieldname": "inst_date", 
   "oldfieldtype": "Date", 
   "reqd": 1, 
-  "permlevel": 0
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Time", 
   "doctype": "DocField", 
-  "label": "Installation Time", 
-  "oldfieldname": "inst_time", 
   "fieldname": "inst_time", 
   "fieldtype": "Time", 
-  "permlevel": 0
+  "label": "Installation Time", 
+  "oldfieldname": "inst_time", 
+  "oldfieldtype": "Time"
  }, 
  {
-  "print_hide": 1, 
-  "permlevel": 1, 
   "default": "Draft", 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Status", 
-  "oldfieldname": "status", 
-  "no_copy": 1, 
   "fieldname": "status", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "options": "Draft\nSubmitted\nCancelled"
+  "label": "Status", 
+  "no_copy": 1, 
+  "oldfieldname": "status", 
+  "oldfieldtype": "Select", 
+  "options": "Draft\nSubmitted\nCancelled", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "Select the relevant company name if you have multiple companies.", 
-  "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Company", 
-  "oldfieldname": "company", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "company", 
   "fieldtype": "Select", 
-  "search_index": 0, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Company", 
+  "oldfieldname": "company", 
+  "oldfieldtype": "Select", 
   "options": "link:Company", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Fiscal Year", 
-  "oldfieldname": "fiscal_year", 
-  "permlevel": 0, 
   "fieldname": "fiscal_year", 
   "fieldtype": "Select", 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Fiscal Year", 
+  "oldfieldname": "fiscal_year", 
+  "oldfieldtype": "Select", 
   "options": "link:Fiscal Year", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Amended From", 
-  "oldfieldname": "amended_from", 
   "fieldname": "amended_from", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Amended From", 
+  "no_copy": 1, 
+  "oldfieldname": "amended_from", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "The date at which current entry is corrected in the system.", 
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Amendment Date", 
-  "oldfieldname": "amendment_date", 
   "fieldname": "amendment_date", 
   "fieldtype": "Date", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Amendment Date", 
+  "no_copy": 1, 
+  "oldfieldname": "amendment_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Remarks", 
-  "oldfieldname": "remarks", 
   "fieldname": "remarks", 
   "fieldtype": "Small Text", 
-  "permlevel": 0
+  "label": "Remarks", 
+  "oldfieldname": "remarks", 
+  "oldfieldtype": "Small Text", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Cancel Reason", 
-  "oldfieldname": "cancel_reason", 
   "fieldname": "cancel_reason", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Cancel Reason", 
+  "no_copy": 1, 
+  "oldfieldname": "cancel_reason", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Item Details", 
-  "options": "Simple", 
   "fieldname": "item_details", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Item Details", 
+  "oldfieldtype": "Section Break", 
+  "options": "Simple"
  }, 
  {
-  "print_hide": 0, 
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Delivery Note No", 
-  "oldfieldname": "delivery_note_no", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "delivery_note_no", 
   "fieldtype": "Link", 
-  "search_index": 1, 
+  "label": "Delivery Note No", 
+  "no_copy": 1, 
+  "oldfieldname": "delivery_note_no", 
+  "oldfieldtype": "Link", 
+  "options": "Delivery Note", 
+  "print_hide": 0, 
   "reqd": 1, 
-  "options": "Delivery Note"
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Get Items", 
-  "options": "pull_delivery_note_details", 
   "fieldname": "get_items", 
   "fieldtype": "Button", 
   "hidden": 0, 
-  "permlevel": 0
+  "label": "Get Items", 
+  "oldfieldtype": "Button", 
+  "options": "pull_delivery_note_details", 
+  "print_hide": 1
  }, 
  {
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "Installation Note Item", 
-  "oldfieldname": "installed_item_details", 
-  "options": "Installation Note Item", 
   "fieldname": "installed_item_details", 
   "fieldtype": "Table", 
-  "permlevel": 0
+  "label": "Installation Note Item", 
+  "oldfieldname": "installed_item_details", 
+  "oldfieldtype": "Table", 
+  "options": "Installation Note Item"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "System Manager"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "Sales User"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "Sales Manager"
  }
 ]
\ No newline at end of file
diff --git a/selling/doctype/installation_note_item/installation_note_item.txt b/selling/doctype/installation_note_item/installation_note_item.txt
index 65d3477..16f9bbc 100644
--- a/selling/doctype/installation_note_item/installation_note_item.txt
+++ b/selling/doctype/installation_note_item/installation_note_item.txt
@@ -1,127 +1,120 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:18", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:36:10", 
+  "modified": "2013-01-22 14:47:00", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:36:10"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
+  "autoname": "IID/.#####", 
+  "doctype": "DocType", 
   "istable": 1, 
   "module": "Selling", 
-  "server_code_error": " ", 
-  "doctype": "DocType", 
-  "autoname": "IID/.#####", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "show_in_menu": 0, 
-  "version": 25
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Installation Note Item", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "name": "Installation Note Item", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Installation Note Item"
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Item Code", 
-  "oldfieldname": "item_code", 
-  "permlevel": 0, 
   "fieldname": "item_code", 
   "fieldtype": "Link", 
-  "reqd": 1, 
-  "options": "Item"
+  "label": "Item Code", 
+  "oldfieldname": "item_code", 
+  "oldfieldtype": "Link", 
+  "options": "Item", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Description", 
-  "oldfieldname": "description", 
-  "width": "300px", 
   "fieldname": "description", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Description", 
+  "oldfieldname": "description", 
+  "oldfieldtype": "Data", 
+  "read_only": 1, 
+  "width": "300px"
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Delivery Date", 
-  "oldfieldname": "prevdoc_date", 
   "fieldname": "prevdoc_date", 
   "fieldtype": "Date", 
   "hidden": 0, 
-  "permlevel": 1
+  "label": "Delivery Date", 
+  "oldfieldname": "prevdoc_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 0, 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Serial No", 
-  "oldfieldname": "serial_no", 
-  "width": "180px", 
   "fieldname": "serial_no", 
   "fieldtype": "Small Text", 
-  "permlevel": 0
+  "label": "Serial No", 
+  "oldfieldname": "serial_no", 
+  "oldfieldtype": "Small Text", 
+  "width": "180px"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Against Document Detail No", 
-  "oldfieldname": "prevdoc_detail_docname", 
-  "width": "150px", 
   "fieldname": "prevdoc_detail_docname", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Against Document Detail No", 
+  "no_copy": 1, 
+  "oldfieldname": "prevdoc_detail_docname", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Against Document No", 
-  "oldfieldname": "prevdoc_docname", 
-  "width": "150px", 
   "fieldname": "prevdoc_docname", 
   "fieldtype": "Data", 
-  "search_index": 1, 
   "hidden": 1, 
-  "permlevel": 1, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Against Document No", 
+  "no_copy": 1, 
+  "oldfieldname": "prevdoc_docname", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "search_index": 1, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Document Type", 
-  "oldfieldname": "prevdoc_doctype", 
-  "width": "150px", 
   "fieldname": "prevdoc_doctype", 
   "fieldtype": "Data", 
-  "search_index": 1, 
   "hidden": 1, 
-  "permlevel": 1, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Document Type", 
+  "no_copy": 1, 
+  "oldfieldname": "prevdoc_doctype", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "search_index": 1, 
+  "width": "150px"
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "qty", 
+  "fieldtype": "Float", 
   "label": "Installed Qty", 
   "oldfieldname": "qty", 
-  "fieldname": "qty", 
-  "fieldtype": "Currency", 
-  "reqd": 1, 
-  "permlevel": 0
+  "oldfieldtype": "Currency", 
+  "reqd": 1
  }
 ]
\ No newline at end of file
diff --git a/selling/doctype/lead/lead.txt b/selling/doctype/lead/lead.txt
index a4f02060..0d4983a 100644
--- a/selling/doctype/lead/lead.txt
+++ b/selling/doctype/lead/lead.txt
@@ -1,545 +1,475 @@
 [
  {
-  "owner": "Administrator", 
-  "docstatus": 0, 
   "creation": "2013-01-10 16:34:18", 
+  "docstatus": 0, 
+  "modified": "2013-01-22 14:56:03", 
   "modified_by": "Administrator", 
-  "modified": "2013-01-16 10:51:58"
+  "owner": "Administrator"
  }, 
  {
   "autoname": "naming_series:", 
-  "name": "__common__", 
-  "search_fields": "lead_name,lead_owner,status", 
-  "module": "Selling", 
   "doctype": "DocType", 
-  "document_type": "Master"
+  "document_type": "Master", 
+  "module": "Selling", 
+  "name": "__common__", 
+  "search_fields": "lead_name,lead_owner,status"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Lead", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Lead", 
-  "amend": 0, 
-  "submit": 0, 
-  "doctype": "DocPerm", 
-  "read": 1, 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "report": 1, 
-  "parentfield": "permissions"
+  "permlevel": 0
  }, 
  {
-  "name": "Lead", 
-  "doctype": "DocType"
+  "amend": 0, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Lead", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
+  "permlevel": 0, 
+  "read": 1, 
+  "report": 1, 
+  "submit": 0, 
+  "write": 1
+ }, 
+ {
+  "doctype": "DocType", 
+  "name": "Lead"
  }, 
  {
   "description": "To manage multiple series please go to Setup > Manage Series", 
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Naming Series", 
-  "oldfieldname": "naming_series", 
-  "options": "LEAD\nLEAD/10-11/\nLEAD/MUMBAI/", 
   "fieldname": "naming_series", 
   "fieldtype": "Select", 
-  "reqd": 0, 
-  "permlevel": 0
+  "label": "Naming Series", 
+  "no_copy": 1, 
+  "oldfieldname": "naming_series", 
+  "oldfieldtype": "Select", 
+  "options": "LEAD\nLEAD/10-11/\nLEAD/MUMBAI/", 
+  "reqd": 0
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Contact Name", 
-  "oldfieldname": "lead_name", 
   "fieldname": "lead_name", 
   "fieldtype": "Data", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Contact Name", 
+  "oldfieldname": "lead_name", 
+  "oldfieldtype": "Data", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Email Id", 
-  "oldfieldname": "email_id", 
   "fieldname": "email_id", 
   "fieldtype": "Data", 
-  "search_index": 1, 
+  "label": "Email Id", 
+  "oldfieldname": "email_id", 
+  "oldfieldtype": "Data", 
   "reqd": 0, 
-  "permlevel": 0
+  "search_index": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "cb6", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
-  "permlevel": 0, 
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
-  "doctype": "DocField", 
-  "label": "Status", 
-  "oldfieldname": "status", 
   "default": "Open", 
+  "doctype": "DocField", 
   "fieldname": "status", 
   "fieldtype": "Select", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Status", 
+  "no_copy": 1, 
+  "oldfieldname": "status", 
+  "oldfieldtype": "Select", 
   "options": "\nOpen\nReplied\nAttempted to Contact\nContact in Future\nContacted\nInterested\nNot interested\nLead Lost\nConverted", 
-  "in_filter": 1
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
   "description": "Source of the lead. If via a campaign, select \"Campaign\"", 
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Source", 
-  "oldfieldname": "source", 
-  "permlevel": 0, 
   "fieldname": "source", 
   "fieldtype": "Select", 
-  "search_index": 0, 
-  "reqd": 0, 
   "in_filter": 1, 
-  "options": "\nAdvertisement\nBlog\nCampaign\nCall\nCustomer\nExhibition\nSupplier\nWebsite\nEmail"
+  "label": "Source", 
+  "no_copy": 1, 
+  "oldfieldname": "source", 
+  "oldfieldtype": "Select", 
+  "options": "\nAdvertisement\nBlog\nCampaign\nCall\nCustomer\nExhibition\nSupplier\nWebsite\nEmail", 
+  "reqd": 0, 
+  "search_index": 0
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "communication_history", 
-  "fieldtype": "Section Break", 
-  "permlevel": 0
+  "fieldtype": "Section Break"
  }, 
  {
-  "oldfieldtype": "Table", 
   "allow_on_submit": 0, 
   "doctype": "DocField", 
-  "label": "Communication HTML", 
-  "oldfieldname": "follow_up", 
   "fieldname": "communication_html", 
   "fieldtype": "HTML", 
-  "permlevel": 0
+  "label": "Communication HTML", 
+  "oldfieldname": "follow_up", 
+  "oldfieldtype": "Table"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Lead Details", 
   "fieldname": "sb8", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Lead Details"
  }, 
  {
   "description": "Name of organization from where lead has come", 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Company Name", 
-  "oldfieldname": "company_name", 
   "fieldname": "company_name", 
   "fieldtype": "Data", 
-  "search_index": 0, 
+  "in_filter": 1, 
+  "label": "Company Name", 
+  "oldfieldname": "company_name", 
+  "oldfieldtype": "Data", 
   "reqd": 0, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 0
  }, 
  {
+  "depends_on": "eval:doc.source == 'Existing Customer'", 
   "description": "Source of th", 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "From Customer", 
-  "oldfieldname": "customer", 
-  "options": "Customer", 
   "fieldname": "customer", 
   "fieldtype": "Link", 
-  "depends_on": "eval:doc.source == 'Existing Customer'", 
   "hidden": 0, 
-  "permlevel": 0
+  "label": "From Customer", 
+  "oldfieldname": "customer", 
+  "oldfieldtype": "Link", 
+  "options": "Customer"
  }, 
  {
+  "depends_on": "eval:doc.source == 'Campaign'", 
   "description": "Enter campaign name if the source of lead is campaign.", 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Campaign Name", 
-  "oldfieldname": "campaign_name", 
-  "options": "Campaign", 
   "fieldname": "campaign_name", 
   "fieldtype": "Link", 
-  "depends_on": "eval:doc.source == 'Campaign'", 
   "hidden": 0, 
-  "permlevel": 0
+  "label": "Campaign Name", 
+  "oldfieldname": "campaign_name", 
+  "oldfieldtype": "Link", 
+  "options": "Campaign"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Lead Type", 
-  "oldfieldname": "type", 
-  "options": "\nClient\nChannel Partner\nConsultant", 
   "fieldname": "type", 
   "fieldtype": "Select", 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Lead Type", 
+  "oldfieldname": "type", 
+  "oldfieldtype": "Select", 
+  "options": "\nClient\nChannel Partner\nConsultant"
  }, 
  {
-  "oldfieldtype": "Text", 
   "doctype": "DocField", 
-  "label": "Remark", 
-  "oldfieldname": "remark", 
   "fieldname": "remark", 
   "fieldtype": "Small Text", 
-  "permlevel": 0
+  "label": "Remark", 
+  "oldfieldname": "remark", 
+  "oldfieldtype": "Text"
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "label": "Contact Info", 
   "fieldname": "contact_info", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Contact Info", 
+  "oldfieldtype": "Column Break"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Phone", 
-  "oldfieldname": "contact_no", 
   "fieldname": "phone", 
   "fieldtype": "Data", 
-  "reqd": 0, 
-  "permlevel": 0
+  "label": "Phone", 
+  "oldfieldname": "contact_no", 
+  "oldfieldtype": "Data", 
+  "reqd": 0
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Mobile No.", 
-  "oldfieldname": "mobile_no", 
   "fieldname": "mobile_no", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Mobile No.", 
+  "oldfieldname": "mobile_no", 
+  "oldfieldtype": "Data"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Fax", 
-  "oldfieldname": "fax", 
   "fieldname": "fax", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Fax", 
+  "oldfieldname": "fax", 
+  "oldfieldtype": "Data"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Website", 
-  "oldfieldname": "website", 
   "fieldname": "website", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Website", 
+  "oldfieldname": "website", 
+  "oldfieldtype": "Data"
  }, 
  {
-  "print_hide": 1, 
   "description": "<a href=\"javascript:cur_frm.cscript.TerritoryHelp();\">To manage Territory, click here</a>", 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Territory", 
-  "oldfieldname": "territory", 
-  "options": "Territory", 
   "fieldname": "territory", 
   "fieldtype": "Link", 
-  "permlevel": 0
+  "label": "Territory", 
+  "oldfieldname": "territory", 
+  "oldfieldtype": "Link", 
+  "options": "Territory", 
+  "print_hide": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "column_break2", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Address Line 1", 
-  "oldfieldname": "address_line1", 
   "fieldname": "address_line1", 
   "fieldtype": "Data", 
-  "reqd": 0, 
-  "permlevel": 0
+  "label": "Address Line 1", 
+  "oldfieldname": "address_line1", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "reqd": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Address Line 2", 
-  "oldfieldname": "address_line2", 
   "fieldname": "address_line2", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Address Line 2", 
+  "oldfieldname": "address_line2", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "City", 
-  "oldfieldname": "city", 
   "fieldname": "city", 
   "fieldtype": "Data", 
-  "reqd": 0, 
-  "permlevel": 0
+  "label": "City", 
+  "oldfieldname": "city", 
+  "oldfieldtype": "Select", 
+  "print_hide": 1, 
+  "reqd": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Country", 
-  "oldfieldname": "country", 
-  "options": "link:Country", 
   "fieldname": "country", 
   "fieldtype": "Select", 
-  "reqd": 0, 
-  "permlevel": 0
+  "label": "Country", 
+  "oldfieldname": "country", 
+  "oldfieldtype": "Select", 
+  "options": "link:Country", 
+  "print_hide": 1, 
+  "reqd": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "State", 
-  "oldfieldname": "state", 
-  "options": "Suggest", 
   "fieldname": "state", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "State", 
+  "oldfieldname": "state", 
+  "oldfieldtype": "Select", 
+  "options": "Suggest", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Pin Code", 
-  "oldfieldname": "pincode", 
   "fieldname": "pincode", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Pin Code", 
+  "oldfieldname": "pincode", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "More Info", 
   "fieldname": "more_info", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "More Info", 
+  "oldfieldtype": "Section Break"
  }, 
  {
   "default": "__user", 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Lead Owner", 
-  "oldfieldname": "lead_owner", 
-  "options": "Profile", 
   "fieldname": "lead_owner", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Lead Owner", 
+  "oldfieldname": "lead_owner", 
+  "oldfieldtype": "Link", 
+  "options": "Profile", 
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Market Segment", 
-  "oldfieldname": "market_segment", 
-  "permlevel": 0, 
   "fieldname": "market_segment", 
   "fieldtype": "Select", 
-  "search_index": 0, 
-  "reqd": 0, 
   "hidden": 0, 
+  "in_filter": 1, 
+  "label": "Market Segment", 
+  "oldfieldname": "market_segment", 
+  "oldfieldtype": "Select", 
   "options": "\nLower Income\nMiddle Income\nUpper Income", 
-  "in_filter": 1
+  "reqd": 0, 
+  "search_index": 0
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Industry", 
-  "oldfieldname": "industry", 
-  "options": "Industry Type", 
   "fieldname": "industry", 
   "fieldtype": "Link", 
-  "permlevel": 0
+  "label": "Industry", 
+  "oldfieldname": "industry", 
+  "oldfieldtype": "Link", 
+  "options": "Industry Type"
  }, 
  {
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Request Type", 
-  "oldfieldname": "request_type", 
-  "options": "\nProduct Enquiry\nRequest for Information\nSuggestions\nOther", 
   "fieldname": "request_type", 
   "fieldtype": "Select", 
-  "permlevel": 0
+  "label": "Request Type", 
+  "oldfieldname": "request_type", 
+  "oldfieldtype": "Select", 
+  "options": "\nProduct Enquiry\nRequest for Information\nSuggestions\nOther"
  }, 
  {
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Fiscal Year", 
-  "oldfieldname": "fiscal_year", 
-  "options": "link:Fiscal Year", 
   "fieldname": "fiscal_year", 
   "fieldtype": "Select", 
   "hidden": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Fiscal Year", 
+  "oldfieldname": "fiscal_year", 
+  "oldfieldtype": "Select", 
+  "options": "link:Fiscal Year"
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break3", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
-  "oldfieldtype": "Link", 
   "allow_on_submit": 0, 
+  "depends_on": "eval:doc.status == 'Lead Lost'", 
   "doctype": "DocField", 
-  "label": "Lost Reason", 
-  "oldfieldname": "order_lost_reason", 
-  "options": "Quotation Lost Reason", 
   "fieldname": "order_lost_reason", 
   "fieldtype": "Link", 
-  "depends_on": "eval:doc.status == 'Lead Lost'", 
   "hidden": 0, 
-  "permlevel": 0
+  "label": "Lost Reason", 
+  "oldfieldname": "order_lost_reason", 
+  "oldfieldtype": "Link", 
+  "options": "Quotation Lost Reason"
  }, 
  {
-  "print_hide": 0, 
-  "description": "Your sales person who will contact the lead in future", 
-  "permlevel": 0, 
-  "oldfieldtype": "Link", 
   "allow_on_submit": 0, 
+  "description": "Your sales person who will contact the lead in future", 
   "doctype": "DocField", 
-  "label": "Next Contact By", 
-  "oldfieldname": "contact_by", 
-  "width": "100px", 
   "fieldname": "contact_by", 
   "fieldtype": "Link", 
-  "reqd": 0, 
   "hidden": 0, 
   "in_filter": 1, 
-  "options": "Profile"
+  "label": "Next Contact By", 
+  "oldfieldname": "contact_by", 
+  "oldfieldtype": "Link", 
+  "options": "Profile", 
+  "print_hide": 0, 
+  "reqd": 0, 
+  "width": "100px"
  }, 
  {
-  "description": "Your sales person will get a reminder on this date to contact the lead", 
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
   "allow_on_submit": 0, 
+  "description": "Your sales person will get a reminder on this date to contact the lead", 
   "doctype": "DocField", 
-  "label": "Next Contact Date", 
-  "oldfieldname": "contact_date", 
-  "width": "100px", 
   "fieldname": "contact_date", 
   "fieldtype": "Date", 
-  "reqd": 0, 
   "in_filter": 1, 
-  "permlevel": 0
+  "label": "Next Contact Date", 
+  "no_copy": 1, 
+  "oldfieldname": "contact_date", 
+  "oldfieldtype": "Date", 
+  "reqd": 0, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
+  "depends_on": "eval:!doc.__islocal", 
   "description": "Date on which the lead was last contacted", 
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Last Contact Date", 
-  "oldfieldname": "last_contact_date", 
   "fieldname": "last_contact_date", 
   "fieldtype": "Date", 
-  "depends_on": "eval:!doc.__islocal", 
-  "permlevel": 1
+  "label": "Last Contact Date", 
+  "no_copy": 1, 
+  "oldfieldname": "last_contact_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Company", 
-  "oldfieldname": "company", 
-  "options": "Company", 
   "fieldname": "company", 
   "fieldtype": "Link", 
-  "reqd": 0, 
-  "permlevel": 0
+  "label": "Company", 
+  "oldfieldname": "company", 
+  "oldfieldtype": "Link", 
+  "options": "Company", 
+  "reqd": 0
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Trash Reason", 
-  "oldfieldname": "trash_reason", 
   "fieldname": "trash_reason", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Trash Reason", 
+  "no_copy": 1, 
+  "oldfieldname": "trash_reason", 
+  "oldfieldtype": "Small Text", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Unsubscribed", 
   "fieldname": "unsubscribed", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "Unsubscribed"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Blog Subscriber", 
   "fieldname": "blog_subscriber", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "Blog Subscriber"
  }, 
  {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "role": "All", 
   "cancel": 0, 
-  "permlevel": 1
+  "doctype": "DocPerm", 
+  "role": "Sales User"
  }, 
  {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "Sales User", 
-  "cancel": 0, 
-  "permlevel": 0
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "Sales Manager", 
   "cancel": 1, 
-  "permlevel": 0
+  "doctype": "DocPerm", 
+  "role": "Sales Manager"
  }, 
  {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "System Manager", 
   "cancel": 0, 
-  "permlevel": 0
- }, 
- {
-  "create": 0, 
   "doctype": "DocPerm", 
-  "write": 0, 
-  "role": "Sales Manager", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "role": "Sales User", 
-  "cancel": 0, 
-  "permlevel": 1
+  "role": "System Manager"
  }
 ]
\ No newline at end of file
diff --git a/selling/doctype/opportunity/opportunity.txt b/selling/doctype/opportunity/opportunity.txt
index fce7dda..1547ad7 100644
--- a/selling/doctype/opportunity/opportunity.txt
+++ b/selling/doctype/opportunity/opportunity.txt
@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-01-18 12:35:41", 
+  "creation": "2013-01-10 16:34:19", 
   "docstatus": 0, 
-  "modified": "2013-01-22 12:08:56", 
+  "modified": "2013-01-22 15:23:24", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -21,22 +21,29 @@
   "name": "__common__", 
   "parent": "Opportunity", 
   "parentfield": "fields", 
-  "parenttype": "DocType"
+  "parenttype": "DocType", 
+  "permlevel": 0
  }, 
  {
+  "amend": 1, 
+  "cancel": 1, 
+  "create": 1, 
   "doctype": "DocPerm", 
   "name": "__common__", 
   "parent": "Opportunity", 
   "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "read": 1
+  "permlevel": 0, 
+  "read": 1, 
+  "report": 1, 
+  "submit": 1, 
+  "write": 1
  }, 
  {
   "doctype": "DocType", 
   "name": "Opportunity"
  }, 
  {
-  "default": "OPPTY", 
   "description": "To manage multiple series please go to Setup > Manage Series", 
   "doctype": "DocField", 
   "fieldname": "naming_series", 
@@ -45,8 +52,7 @@
   "no_copy": 1, 
   "oldfieldname": "naming_series", 
   "oldfieldtype": "Select", 
-  "options": "\nOPPTY", 
-  "permlevel": 0, 
+  "options": "OPPT", 
   "reqd": 1
  }, 
  {
@@ -57,7 +63,6 @@
   "oldfieldname": "enquiry_from", 
   "oldfieldtype": "Select", 
   "options": "\nLead\nCustomer", 
-  "permlevel": 0, 
   "print_hide": 1, 
   "report_hide": 0, 
   "reqd": 1
@@ -72,7 +77,6 @@
   "oldfieldname": "customer", 
   "oldfieldtype": "Link", 
   "options": "Customer", 
-  "permlevel": 0, 
   "print_hide": 1, 
   "reqd": 0, 
   "search_index": 0
@@ -87,7 +91,6 @@
   "oldfieldname": "lead", 
   "oldfieldtype": "Link", 
   "options": "Lead", 
-  "permlevel": 0, 
   "print_hide": 1
  }, 
  {
@@ -95,7 +98,6 @@
   "fieldname": "column_break0", 
   "fieldtype": "Column Break", 
   "oldfieldtype": "Column Break", 
-  "permlevel": 0, 
   "width": "50%"
  }, 
  {
@@ -108,7 +110,7 @@
   "oldfieldname": "status", 
   "oldfieldtype": "Select", 
   "options": "\nDraft\nSubmitted\nQuotation Sent\nOrder Confirmed\nOpportunity Lost\nCancelled", 
-  "permlevel": 1, 
+  "read_only": 1, 
   "reqd": 1
  }, 
  {
@@ -119,7 +121,6 @@
   "oldfieldname": "enquiry_type", 
   "oldfieldtype": "Select", 
   "options": "\nSales\nMaintenance", 
-  "permlevel": 0, 
   "reqd": 1
  }, 
  {
@@ -127,8 +128,7 @@
   "fieldname": "items", 
   "fieldtype": "Section Break", 
   "label": "Items", 
-  "oldfieldtype": "Section Break", 
-  "permlevel": 0
+  "oldfieldtype": "Section Break"
  }, 
  {
   "description": "Items which do not exist in Item master can also be entered on customer's request", 
@@ -138,16 +138,14 @@
   "label": "Opportunity Items", 
   "oldfieldname": "enquiry_details", 
   "oldfieldtype": "Table", 
-  "options": "Opportunity Item", 
-  "permlevel": 0
+  "options": "Opportunity Item"
  }, 
  {
   "description": "Keep a track of communication related to this enquiry which will help for future reference.", 
   "doctype": "DocField", 
   "fieldname": "communication_history", 
   "fieldtype": "Section Break", 
-  "oldfieldtype": "Section Break", 
-  "permlevel": 0
+  "oldfieldtype": "Section Break"
  }, 
  {
   "allow_on_submit": 1, 
@@ -156,15 +154,13 @@
   "fieldtype": "HTML", 
   "label": "Communication HTML", 
   "oldfieldname": "follow_up", 
-  "oldfieldtype": "Table", 
-  "permlevel": 0
+  "oldfieldtype": "Table"
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "contact_info", 
   "fieldtype": "Section Break", 
-  "label": "Contact Info", 
-  "permlevel": 0
+  "label": "Contact Info"
  }, 
  {
   "doctype": "DocField", 
@@ -173,7 +169,6 @@
   "in_filter": 1, 
   "label": "Contact Person", 
   "options": "Contact", 
-  "permlevel": 0, 
   "print_hide": 1
  }, 
  {
@@ -183,7 +178,6 @@
   "in_filter": 1, 
   "label": "Customer Address", 
   "options": "Address", 
-  "permlevel": 0, 
   "print_hide": 1
  }, 
  {
@@ -191,8 +185,8 @@
   "fieldname": "customer_name", 
   "fieldtype": "Data", 
   "label": "Customer Name", 
-  "permlevel": 1, 
-  "print_hide": 0
+  "print_hide": 0, 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
@@ -202,34 +196,33 @@
   "label": "Address", 
   "oldfieldname": "address", 
   "oldfieldtype": "Small Text", 
-  "permlevel": 1
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "column_break3", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "contact_display", 
   "fieldtype": "Small Text", 
   "label": "Contact", 
-  "permlevel": 1
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "contact_email", 
   "fieldtype": "Text", 
   "label": "Contact Email", 
-  "permlevel": 1
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "contact_mobile", 
   "fieldtype": "Text", 
   "label": "Contact Mobile No", 
-  "permlevel": 1
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
@@ -239,7 +232,7 @@
   "label": "Name", 
   "oldfieldname": "lead_name", 
   "oldfieldtype": "Data", 
-  "permlevel": 1
+  "read_only": 1
  }, 
  {
   "depends_on": "eval:doc.enquiry_from==\"Customer\"", 
@@ -253,7 +246,6 @@
   "oldfieldname": "customer_group", 
   "oldfieldtype": "Link", 
   "options": "Customer Group", 
-  "permlevel": 0, 
   "print_hide": 1, 
   "reqd": 0, 
   "search_index": 1
@@ -266,7 +258,6 @@
   "in_filter": 1, 
   "label": "Territory", 
   "options": "Territory", 
-  "permlevel": 0, 
   "print_hide": 1, 
   "reqd": 0, 
   "search_index": 1
@@ -277,15 +268,13 @@
   "fieldname": "more_info", 
   "fieldtype": "Section Break", 
   "label": "More Info", 
-  "oldfieldtype": "Section Break", 
-  "permlevel": 0
+  "oldfieldtype": "Section Break"
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
   "oldfieldtype": "Column Break", 
-  "permlevel": 0, 
   "width": "50%"
  }, 
  {
@@ -297,7 +286,6 @@
   "label": "Opportunity Date", 
   "oldfieldname": "transaction_date", 
   "oldfieldtype": "Date", 
-  "permlevel": 0, 
   "reqd": 1, 
   "width": "50px"
  }, 
@@ -310,7 +298,6 @@
   "oldfieldname": "fiscal_year", 
   "oldfieldtype": "Select", 
   "options": "link:Fiscal Year", 
-  "permlevel": 0, 
   "print_hide": 1, 
   "reqd": 1, 
   "search_index": 1
@@ -322,8 +309,7 @@
   "label": "Source", 
   "oldfieldname": "source", 
   "oldfieldtype": "Select", 
-  "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign\nWalk In", 
-  "permlevel": 0
+  "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign\nWalk In"
  }, 
  {
   "description": "Enter name of campaign if source of enquiry is campaign", 
@@ -333,8 +319,7 @@
   "label": "Campaign", 
   "oldfieldname": "campaign", 
   "oldfieldtype": "Link", 
-  "options": "Campaign", 
-  "permlevel": 0
+  "options": "Campaign"
  }, 
  {
   "depends_on": "eval:!doc.__islocal", 
@@ -345,7 +330,7 @@
   "no_copy": 1, 
   "oldfieldname": "order_lost_reason", 
   "oldfieldtype": "Small Text", 
-  "permlevel": 1, 
+  "read_only": 1, 
   "report_hide": 0
  }, 
  {
@@ -357,7 +342,6 @@
   "oldfieldname": "company", 
   "oldfieldtype": "Link", 
   "options": "Company", 
-  "permlevel": 0, 
   "print_hide": 1, 
   "reqd": 1, 
   "search_index": 1
@@ -367,7 +351,6 @@
   "fieldname": "column_break2", 
   "fieldtype": "Column Break", 
   "oldfieldtype": "Column Break", 
-  "permlevel": 0, 
   "width": "50%"
  }, 
  {
@@ -380,7 +363,6 @@
   "oldfieldname": "contact_by", 
   "oldfieldtype": "Link", 
   "options": "Profile", 
-  "permlevel": 0, 
   "width": "75px"
  }, 
  {
@@ -390,8 +372,7 @@
   "fieldtype": "Date", 
   "label": "Next Contact Date", 
   "oldfieldname": "contact_date", 
-  "oldfieldtype": "Date", 
-  "permlevel": 0
+  "oldfieldtype": "Date"
  }, 
  {
   "allow_on_submit": 0, 
@@ -404,8 +385,8 @@
   "no_copy": 1, 
   "oldfieldname": "last_contact_date", 
   "oldfieldtype": "Date", 
-  "permlevel": 1, 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
@@ -414,8 +395,7 @@
   "label": "To Discuss", 
   "no_copy": 1, 
   "oldfieldname": "to_discuss", 
-  "oldfieldtype": "Small Text", 
-  "permlevel": 0
+  "oldfieldtype": "Small Text"
  }, 
  {
   "doctype": "DocField", 
@@ -425,8 +405,8 @@
   "no_copy": 1, 
   "oldfieldname": "amended_from", 
   "oldfieldtype": "Data", 
-  "permlevel": 1, 
   "print_hide": 1, 
+  "read_only": 1, 
   "width": "150px"
  }, 
  {
@@ -437,63 +417,20 @@
   "no_copy": 1, 
   "oldfieldname": "amendment_date", 
   "oldfieldtype": "Date", 
-  "permlevel": 1, 
   "print_hide": 1, 
+  "read_only": 1, 
   "width": "150px"
  }, 
  {
-  "amend": 0, 
-  "cancel": 0, 
-  "create": 0, 
   "doctype": "DocPerm", 
-  "permlevel": 1, 
-  "role": "Sales Manager", 
-  "submit": 0, 
-  "write": 0
- }, 
- {
-  "amend": 1, 
-  "cancel": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "permlevel": 0, 
-  "role": "System Manager", 
-  "submit": 1, 
-  "write": 1
- }, 
- {
-  "doctype": "DocPerm", 
-  "permlevel": 1, 
   "role": "System Manager"
  }, 
  {
-  "amend": 1, 
-  "cancel": 1, 
-  "create": 1, 
   "doctype": "DocPerm", 
-  "permlevel": 0, 
-  "role": "Sales User", 
-  "submit": 1, 
-  "write": 1
+  "role": "Sales User"
  }, 
  {
-  "amend": 0, 
-  "cancel": 0, 
-  "create": 0, 
   "doctype": "DocPerm", 
-  "permlevel": 1, 
-  "role": "Sales User", 
-  "submit": 0, 
-  "write": 0
- }, 
- {
-  "amend": 1, 
-  "cancel": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "permlevel": 0, 
-  "role": "Sales Manager", 
-  "submit": 1, 
-  "write": 1
+  "role": "Sales Manager"
  }
 ]
\ No newline at end of file
diff --git a/selling/doctype/opportunity_item/opportunity_item.txt b/selling/doctype/opportunity_item/opportunity_item.txt
index a0a7e04..923546d 100644
--- a/selling/doctype/opportunity_item/opportunity_item.txt
+++ b/selling/doctype/opportunity_item/opportunity_item.txt
@@ -1,115 +1,108 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:19", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:36:08", 
+  "modified": "2013-01-22 13:41:28", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:36:08"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
+  "doctype": "DocType", 
   "istable": 1, 
-  "name": "__common__", 
-  "colour": "White:FFF", 
   "module": "Selling", 
-  "show_in_menu": 0, 
-  "version": 59, 
-  "server_code_error": " ", 
-  "doctype": "DocType"
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Opportunity Item", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "permlevel": 0, 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "name": "Opportunity Item", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Opportunity Item"
  }, 
  {
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Item Code", 
-  "oldfieldname": "item_code", 
-  "trigger": "Client", 
   "fieldname": "item_code", 
   "fieldtype": "Link", 
-  "reqd": 0, 
-  "options": "Item"
+  "label": "Item Code", 
+  "oldfieldname": "item_code", 
+  "oldfieldtype": "Link", 
+  "options": "Item", 
+  "reqd": 0
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Item Name", 
-  "oldfieldname": "item_name", 
   "fieldname": "item_name", 
   "fieldtype": "Data", 
+  "label": "Item Name", 
+  "oldfieldname": "item_name", 
+  "oldfieldtype": "Data", 
   "reqd": 1
  }, 
  {
-  "oldfieldtype": "Text", 
   "doctype": "DocField", 
-  "label": "Description", 
-  "oldfieldname": "description", 
-  "width": "300px", 
   "fieldname": "description", 
   "fieldtype": "Text", 
-  "reqd": 1
+  "label": "Description", 
+  "oldfieldname": "description", 
+  "oldfieldtype": "Text", 
+  "reqd": 1, 
+  "width": "300px"
  }, 
  {
-  "print_hide": 1, 
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "Item Group", 
-  "oldfieldname": "item_group", 
   "fieldname": "item_group", 
   "fieldtype": "Link", 
-  "oldfieldtype": "Link", 
   "hidden": 1, 
-  "options": "Item Group"
+  "label": "Item Group", 
+  "oldfieldname": "item_group", 
+  "oldfieldtype": "Link", 
+  "options": "Item Group", 
+  "print_hide": 1, 
+  "search_index": 0
  }, 
  {
-  "print_hide": 1, 
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "Brand", 
-  "oldfieldname": "brand", 
   "fieldname": "brand", 
   "fieldtype": "Link", 
-  "oldfieldtype": "Link", 
   "hidden": 1, 
-  "options": "Brand"
+  "label": "Brand", 
+  "oldfieldname": "brand", 
+  "oldfieldtype": "Link", 
+  "options": "Brand", 
+  "print_hide": 1, 
+  "search_index": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Basic Rate", 
-  "oldfieldname": "basic_rate", 
   "fieldname": "basic_rate", 
   "fieldtype": "Currency", 
-  "hidden": 1
+  "hidden": 1, 
+  "label": "Basic Rate", 
+  "oldfieldname": "basic_rate", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "qty", 
+  "fieldtype": "Float", 
   "label": "Qty", 
   "oldfieldname": "qty", 
-  "fieldname": "qty", 
-  "fieldtype": "Currency"
+  "oldfieldtype": "Currency"
  }, 
  {
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "UOM", 
-  "oldfieldname": "uom", 
   "fieldname": "uom", 
   "fieldtype": "Link", 
+  "label": "UOM", 
+  "oldfieldname": "uom", 
   "oldfieldtype": "Link", 
-  "options": "UOM"
+  "options": "UOM", 
+  "search_index": 0
  }
 ]
\ No newline at end of file
diff --git a/selling/doctype/quotation/quotation.txt b/selling/doctype/quotation/quotation.txt
index a0e0713..5f7c20e 100644
--- a/selling/doctype/quotation/quotation.txt
+++ b/selling/doctype/quotation/quotation.txt
@@ -1,968 +1,865 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:19", 
   "docstatus": 0, 
-  "creation": "2012-12-07 15:15:27", 
+  "modified": "2013-01-22 14:57:22", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-19 12:13:38"
+  "owner": "Administrator"
  }, 
  {
-  "is_submittable": 1, 
   "allow_attach": 1, 
-  "search_fields": "status,transaction_date,customer,lead,order_type", 
-  "module": "Selling", 
-  "doctype": "DocType", 
-  "read_only_onload": 1, 
-  "autoname": "naming_series:", 
-  "document_type": "Transaction", 
   "allow_email": 0, 
-  "name": "__common__", 
+  "autoname": "naming_series:", 
+  "doctype": "DocType", 
+  "document_type": "Transaction", 
+  "hide_toolbar": 0, 
+  "is_submittable": 1, 
   "max_attachments": 1, 
-  "hide_toolbar": 0
+  "module": "Selling", 
+  "name": "__common__", 
+  "read_only_onload": 1, 
+  "search_fields": "status,transaction_date,customer,lead,order_type"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Quotation", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Quotation", 
-  "read": 1, 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
   "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Quotation", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
+  "permlevel": 0, 
+  "read": 1, 
+  "report": 1
  }, 
  {
-  "name": "Quotation", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Quotation"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break0", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
   "description": "To manage multiple series please go to Setup > Manage Series", 
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Naming Series", 
-  "oldfieldname": "naming_series", 
-  "options": "QTN", 
   "fieldname": "naming_series", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Naming Series", 
+  "no_copy": 1, 
+  "oldfieldname": "naming_series", 
+  "oldfieldtype": "Select", 
+  "options": "QTN", 
+  "print_hide": 1, 
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Quotation To", 
-  "oldfieldname": "quotation_to", 
-  "options": "\nLead\nCustomer", 
   "fieldname": "quotation_to", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "permlevel": 0, 
+  "in_filter": 1, 
+  "label": "Quotation To", 
+  "oldfieldname": "quotation_to", 
+  "oldfieldtype": "Select", 
+  "options": "\nLead\nCustomer", 
+  "print_hide": 1, 
   "report_hide": 0, 
-  "in_filter": 1
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Customer", 
-  "oldfieldname": "customer", 
-  "options": "Customer", 
   "fieldname": "customer", 
   "fieldtype": "Link", 
-  "search_index": 1, 
   "hidden": 0, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Customer", 
+  "oldfieldname": "customer", 
+  "oldfieldtype": "Link", 
+  "options": "Customer", 
+  "print_hide": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Lead", 
-  "oldfieldname": "lead", 
-  "permlevel": 0, 
   "fieldname": "lead", 
   "fieldtype": "Link", 
   "hidden": 0, 
+  "in_filter": 1, 
+  "label": "Lead", 
+  "oldfieldname": "lead", 
+  "oldfieldtype": "Link", 
   "options": "Lead", 
-  "in_filter": 1
+  "print_hide": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Lead Name", 
   "fieldname": "lead_name", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 1, 
-  "in_filter": 0
+  "in_filter": 0, 
+  "label": "Lead Name", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Customer Name", 
   "fieldname": "customer_name", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Customer Name", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Organization", 
   "fieldname": "organization", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Organization", 
+  "read_only": 1
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Address", 
-  "oldfieldname": "customer_address", 
   "fieldname": "address_display", 
   "fieldtype": "Small Text", 
-  "search_index": 0, 
-  "reqd": 0, 
   "hidden": 1, 
-  "permlevel": 1, 
-  "in_filter": 0
+  "in_filter": 0, 
+  "label": "Address", 
+  "oldfieldname": "customer_address", 
+  "oldfieldtype": "Small Text", 
+  "print_hide": 0, 
+  "read_only": 1, 
+  "reqd": 0, 
+  "search_index": 0
  }, 
  {
-  "print_hide": 0, 
   "doctype": "DocField", 
-  "label": "Contact", 
   "fieldname": "contact_display", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
-  "permlevel": 1, 
-  "in_filter": 0
+  "in_filter": 0, 
+  "label": "Contact", 
+  "print_hide": 0, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 0, 
   "doctype": "DocField", 
-  "label": "Mobile No", 
   "fieldname": "contact_mobile", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Mobile No", 
+  "print_hide": 0, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Contact Email", 
   "fieldname": "contact_email", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Contact Email", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
-  "description": "The date at which current entry is made in system.", 
-  "width": "100px", 
   "default": "Today", 
-  "oldfieldtype": "Date", 
+  "description": "The date at which current entry is made in system.", 
   "doctype": "DocField", 
-  "label": "Quotation Date", 
-  "oldfieldname": "transaction_date", 
-  "no_copy": 1, 
   "fieldname": "transaction_date", 
   "fieldtype": "Date", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Quotation Date", 
+  "no_copy": 1, 
+  "oldfieldname": "transaction_date", 
+  "oldfieldtype": "Date", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 1, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
   "default": "Sales", 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Order Type", 
-  "oldfieldname": "order_type", 
-  "permlevel": 0, 
   "fieldname": "order_type", 
   "fieldtype": "Select", 
-  "search_index": 0, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Order Type", 
+  "oldfieldname": "order_type", 
+  "oldfieldtype": "Select", 
   "options": "\nSales\nMaintenance", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 0
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Items", 
   "fieldname": "items", 
   "fieldtype": "Section Break", 
-  "search_index": 0, 
-  "permlevel": 0
+  "label": "Items", 
+  "oldfieldtype": "Section Break", 
+  "print_hide": 0, 
+  "search_index": 0
  }, 
  {
-  "permlevel": 0, 
-  "oldfieldtype": "Table", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Quotation Items", 
-  "oldfieldname": "quotation_details", 
-  "width": "40px", 
   "fieldname": "quotation_details", 
   "fieldtype": "Table", 
-  "options": "Quotation Item"
+  "label": "Quotation Items", 
+  "oldfieldname": "quotation_details", 
+  "oldfieldtype": "Table", 
+  "options": "Quotation Item", 
+  "width": "40px"
  }, 
  {
   "doctype": "DocField", 
-  "permlevel": 0, 
   "fieldname": "sec_break23", 
   "fieldtype": "Section Break", 
   "options": "Simple"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "col_break34", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "print_hide": 0, 
-  "no_copy": 0, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Net Total*", 
-  "oldfieldname": "net_total", 
-  "width": "100px", 
   "fieldname": "net_total", 
   "fieldtype": "Currency", 
+  "label": "Net Total*", 
+  "no_copy": 0, 
+  "oldfieldname": "net_total", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 0, 
+  "read_only": 1, 
   "reqd": 0, 
-  "permlevel": 1
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Re-Calculate Values", 
   "fieldname": "recalculate_values", 
   "fieldtype": "Button", 
-  "permlevel": 0
+  "label": "Re-Calculate Values", 
+  "oldfieldtype": "Button", 
+  "print_hide": 1
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "col_break35", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "print_hide": 0, 
   "description": "To create Quotation against Opportunity, Select Opportunity No. and click on 'Pull Opportunity Details' ", 
-  "no_copy": 0, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Opportunity No", 
-  "oldfieldname": "enq_no", 
-  "permlevel": 0, 
   "fieldname": "enq_no", 
   "fieldtype": "Link", 
-  "search_index": 0, 
   "hidden": 0, 
+  "in_filter": 1, 
+  "label": "Opportunity No", 
+  "no_copy": 0, 
+  "oldfieldname": "enq_no", 
+  "oldfieldtype": "Link", 
   "options": "Opportunity", 
+  "print_hide": 0, 
   "report_hide": 0, 
-  "in_filter": 1
+  "search_index": 0
  }, 
  {
-  "print_hide": 0, 
-  "no_copy": 0, 
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Pull Opportunity Detail", 
   "fieldname": "pull_enquiry_detail", 
   "fieldtype": "Button", 
   "hidden": 0, 
-  "permlevel": 0, 
+  "label": "Pull Opportunity Detail", 
+  "no_copy": 0, 
+  "oldfieldtype": "Button", 
+  "print_hide": 0, 
   "report_hide": 0
  }, 
  {
   "doctype": "DocField", 
-  "label": "Price List and Currency", 
   "fieldname": "section_break0", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Price List and Currency"
  }, 
  {
-  "print_hide": 1, 
   "description": "Select the price list as entered in \"Price List\" master. This will pull the reference rates of items against this price list as specified in \"Item\" master.", 
-  "permlevel": 0, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Price List", 
-  "oldfieldname": "price_list_name", 
-  "width": "100px", 
   "fieldname": "price_list_name", 
   "fieldtype": "Select", 
-  "search_index": 0, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Price List", 
+  "oldfieldname": "price_list_name", 
+  "oldfieldtype": "Select", 
   "options": "link:Price List", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 0, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
   "description": "Select the currency in which price list is maintained", 
   "doctype": "DocField", 
-  "label": "Price List Currency", 
-  "permlevel": 0, 
   "fieldname": "price_list_currency", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "options": "link:Currency"
+  "label": "Price List Currency", 
+  "options": "link:Currency", 
+  "print_hide": 1, 
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "Rate at which Price list currency is converted to company's base currency", 
   "doctype": "DocField", 
-  "label": "Price List Currency Conversion Rate", 
   "fieldname": "plc_conversion_rate", 
   "fieldtype": "Float", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Price List Currency Conversion Rate", 
+  "print_hide": 1, 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break2", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
   "description": "Customer's currency - If you want to select a currency that is not the default currency, then you must also specify the Currency Conversion Rate.", 
-  "permlevel": 0, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Currency", 
-  "oldfieldname": "currency", 
-  "width": "100px", 
   "fieldname": "currency", 
   "fieldtype": "Select", 
-  "search_index": 0, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Currency", 
+  "oldfieldname": "currency", 
+  "oldfieldtype": "Select", 
   "options": "link:Currency", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 0, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
-  "description": "Rate at which customer's currency is converted to company's base currency", 
   "default": "1.00", 
-  "oldfieldtype": "Currency", 
+  "description": "Rate at which customer's currency is converted to company's base currency", 
   "doctype": "DocField", 
-  "label": "Conversion Rate", 
-  "oldfieldname": "conversion_rate", 
-  "width": "100px", 
   "fieldname": "conversion_rate", 
   "fieldtype": "Float", 
+  "label": "Conversion Rate", 
+  "oldfieldname": "conversion_rate", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
   "reqd": 1, 
-  "permlevel": 0
+  "width": "100px"
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Taxes", 
   "fieldname": "taxes", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Taxes", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Sales Taxes and Charges", 
-  "oldfieldname": "charge", 
-  "permlevel": 0, 
   "fieldname": "charge", 
   "fieldtype": "Link", 
   "hidden": 0, 
-  "options": "Sales Taxes and Charges Master"
+  "label": "Sales Taxes and Charges", 
+  "oldfieldname": "charge", 
+  "oldfieldtype": "Link", 
+  "options": "Sales Taxes and Charges Master", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Get Taxes and Charges", 
   "fieldname": "get_charges", 
   "fieldtype": "Button", 
   "hidden": 0, 
-  "permlevel": 0
+  "label": "Get Taxes and Charges", 
+  "oldfieldtype": "Button", 
+  "print_hide": 1
  }, 
  {
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "Sales Taxes and Charges", 
-  "oldfieldname": "other_charges", 
-  "permlevel": 0, 
   "fieldname": "other_charges", 
   "fieldtype": "Table", 
+  "label": "Sales Taxes and Charges", 
+  "oldfieldname": "other_charges", 
+  "oldfieldtype": "Table", 
   "options": "Sales Taxes and Charges"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Calculate Taxes and Charges", 
   "fieldname": "calculate_charges", 
   "fieldtype": "Button", 
-  "permlevel": 0
+  "label": "Calculate Taxes and Charges", 
+  "oldfieldtype": "Button", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Taxes and Charges Total*", 
-  "oldfieldname": "other_charges_total", 
   "fieldname": "other_charges_total", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Taxes and Charges Total*", 
+  "oldfieldname": "other_charges_total", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "HTML", 
   "doctype": "DocField", 
-  "label": "Taxes and Charges Calculation", 
   "fieldname": "other_charges_calculation", 
   "fieldtype": "HTML", 
-  "permlevel": 0
+  "label": "Taxes and Charges Calculation", 
+  "oldfieldtype": "HTML", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Totals", 
   "fieldname": "totals", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Totals", 
+  "oldfieldtype": "Section Break", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 0, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Grand Total*", 
-  "oldfieldname": "grand_total", 
-  "width": "200px", 
   "fieldname": "grand_total", 
   "fieldtype": "Currency", 
+  "label": "Grand Total*", 
+  "no_copy": 0, 
+  "oldfieldname": "grand_total", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
   "reqd": 0, 
-  "permlevel": 1
+  "width": "200px"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 0, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Rounded Total", 
-  "oldfieldname": "rounded_total", 
-  "width": "200px", 
   "fieldname": "rounded_total", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Rounded Total", 
+  "no_copy": 0, 
+  "oldfieldname": "rounded_total", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "width": "200px"
  }, 
  {
-  "print_hide": 1, 
   "description": "In Words will be visible once you save the Quotation.", 
-  "no_copy": 0, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "In Words", 
-  "oldfieldname": "in_words", 
-  "width": "200px", 
   "fieldname": "in_words", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "In Words", 
+  "no_copy": 0, 
+  "oldfieldname": "in_words", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "width": "200px"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break3", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "print_hide": 1, 
+  "width": "50%"
  }, 
  {
-  "print_hide": 0, 
-  "no_copy": 0, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Grand Total", 
-  "oldfieldname": "grand_total_export", 
-  "width": "200px", 
   "fieldname": "grand_total_export", 
   "fieldtype": "Currency", 
+  "label": "Grand Total", 
+  "no_copy": 0, 
+  "oldfieldname": "grand_total_export", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 0, 
+  "read_only": 1, 
   "reqd": 0, 
-  "permlevel": 1
+  "width": "200px"
  }, 
  {
-  "print_hide": 0, 
-  "no_copy": 0, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Rounded Total", 
-  "oldfieldname": "rounded_total_export", 
-  "width": "200px", 
   "fieldname": "rounded_total_export", 
   "fieldtype": "Currency", 
+  "label": "Rounded Total", 
+  "no_copy": 0, 
+  "oldfieldname": "rounded_total_export", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 0, 
+  "read_only": 1, 
   "reqd": 0, 
-  "permlevel": 1
+  "width": "200px"
  }, 
  {
-  "print_hide": 0, 
-  "no_copy": 0, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "In Words", 
-  "oldfieldname": "in_words_export", 
-  "width": "200px", 
   "fieldname": "in_words_export", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "In Words", 
+  "no_copy": 0, 
+  "oldfieldname": "in_words_export", 
+  "oldfieldtype": "Data", 
+  "print_hide": 0, 
+  "read_only": 1, 
+  "width": "200px"
  }, 
  {
-  "print_hide": 0, 
   "description": "Add Terms and Conditions for the Quotation like Payment Terms, Validity of Offer etc. You can also prepare a Terms and Conditions Master and use the Template", 
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Terms and Conditions", 
   "fieldname": "terms_section_break", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Terms and Conditions", 
+  "oldfieldtype": "Section Break", 
+  "print_hide": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Select Terms and Conditions", 
-  "oldfieldname": "tc_name", 
-  "permlevel": 0, 
   "fieldname": "tc_name", 
   "fieldtype": "Link", 
+  "label": "Select Terms and Conditions", 
+  "oldfieldname": "tc_name", 
+  "oldfieldtype": "Link", 
   "options": "Terms and Conditions", 
+  "print_hide": 1, 
   "report_hide": 1
  }, 
  {
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Get Terms and Conditions", 
-  "permlevel": 0, 
   "fieldname": "get_terms", 
   "fieldtype": "Button", 
+  "label": "Get Terms and Conditions", 
+  "oldfieldtype": "Button", 
   "options": "get_tc_details"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "HTML", 
   "doctype": "DocField", 
-  "label": "Terms and Conditions HTML", 
-  "permlevel": 0, 
   "fieldname": "terms_html", 
   "fieldtype": "HTML", 
-  "options": "You can add Terms and Notes that will be printed in the Transaction"
+  "label": "Terms and Conditions HTML", 
+  "oldfieldtype": "HTML", 
+  "options": "You can add Terms and Notes that will be printed in the Transaction", 
+  "print_hide": 1
  }, 
  {
-  "oldfieldtype": "Text Editor", 
   "doctype": "DocField", 
-  "label": "Term Details", 
-  "oldfieldname": "terms", 
   "fieldname": "terms", 
   "fieldtype": "Text Editor", 
-  "permlevel": 0
+  "label": "Term Details", 
+  "oldfieldname": "terms", 
+  "oldfieldtype": "Text Editor"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Contact Info", 
   "fieldname": "contact_section", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Contact Info"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "col_break98", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Customer Address", 
-  "permlevel": 0, 
   "fieldname": "customer_address", 
   "fieldtype": "Link", 
   "hidden": 0, 
+  "in_filter": 1, 
+  "label": "Customer Address", 
   "options": "Address", 
-  "in_filter": 1
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Contact Person", 
-  "oldfieldname": "contact_person", 
-  "options": "Contact", 
   "fieldname": "contact_person", 
   "fieldtype": "Link", 
-  "reqd": 0, 
   "hidden": 0, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Contact Person", 
+  "oldfieldname": "contact_person", 
+  "oldfieldtype": "Link", 
+  "options": "Contact", 
+  "print_hide": 1, 
+  "reqd": 0
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "col_break99", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
   "description": "Will be fetched from Customer", 
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "Territory", 
-  "options": "Territory", 
   "fieldname": "territory", 
   "fieldtype": "Link", 
-  "reqd": 1, 
   "hidden": 0, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Territory", 
+  "options": "Territory", 
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Customer Group", 
-  "oldfieldname": "customer_group", 
-  "options": "Customer Group", 
   "fieldname": "customer_group", 
   "fieldtype": "Link", 
-  "search_index": 0, 
+  "in_filter": 1, 
+  "label": "Customer Group", 
+  "oldfieldname": "customer_group", 
+  "oldfieldtype": "Link", 
+  "options": "Customer Group", 
+  "print_hide": 1, 
   "reqd": 0, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 0
  }, 
  {
-  "print_hide": 1, 
   "description": "Filling in additional information about the Quotation will help you analyze your data better.", 
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "More Info", 
   "fieldname": "more_info", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "More Info", 
+  "oldfieldtype": "Section Break", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Select", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Letter Head", 
-  "oldfieldname": "letter_head", 
-  "permlevel": 0, 
   "fieldname": "letter_head", 
   "fieldtype": "Select", 
-  "options": "link:Letter Head"
+  "label": "Letter Head", 
+  "oldfieldname": "letter_head", 
+  "oldfieldtype": "Select", 
+  "options": "link:Letter Head", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "Select the relevant company name if you have multiple companies.", 
-  "permlevel": 0, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Company", 
-  "oldfieldname": "company", 
-  "width": "150px", 
   "fieldname": "company", 
   "fieldtype": "Link", 
-  "search_index": 0, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Company", 
+  "oldfieldname": "company", 
+  "oldfieldtype": "Link", 
   "options": "Company", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 0, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 0, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Source", 
-  "oldfieldname": "source", 
-  "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign", 
   "fieldname": "source", 
   "fieldtype": "Select", 
   "hidden": 0, 
-  "permlevel": 0, 
+  "label": "Source", 
+  "no_copy": 0, 
+  "oldfieldname": "source", 
+  "oldfieldtype": "Select", 
+  "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign", 
+  "print_hide": 1, 
   "report_hide": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Fiscal Year", 
-  "oldfieldname": "fiscal_year", 
-  "options": "link:Fiscal Year", 
   "fieldname": "fiscal_year", 
   "fieldtype": "Select", 
-  "search_index": 0, 
+  "in_filter": 1, 
+  "label": "Fiscal Year", 
+  "oldfieldname": "fiscal_year", 
+  "oldfieldtype": "Select", 
+  "options": "link:Fiscal Year", 
+  "print_hide": 1, 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 0
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 0, 
-  "oldfieldtype": "Text", 
   "doctype": "DocField", 
-  "label": "Opportunity Item", 
-  "oldfieldname": "enq_det", 
   "fieldname": "enq_det", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 1, 
+  "label": "Opportunity Item", 
+  "no_copy": 0, 
+  "oldfieldname": "enq_det", 
+  "oldfieldtype": "Text", 
+  "print_hide": 1, 
+  "read_only": 1, 
   "report_hide": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break4", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "print_hide": 1, 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
-  "permlevel": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
   "allow_on_submit": 0, 
-  "doctype": "DocField", 
-  "label": "Status", 
-  "oldfieldname": "status", 
   "default": "Draft", 
+  "doctype": "DocField", 
   "fieldname": "status", 
   "fieldtype": "Select", 
-  "search_index": 0, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Status", 
+  "no_copy": 1, 
+  "oldfieldname": "status", 
+  "oldfieldtype": "Select", 
   "options": "\nDraft\nSubmitted\nOrder Confirmed\nOrder Lost\nCancelled", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "read_only": 1, 
+  "reqd": 1, 
+  "search_index": 0
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 0, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Campaign", 
-  "oldfieldname": "campaign", 
-  "options": "Campaign", 
   "fieldname": "campaign", 
   "fieldtype": "Link", 
   "hidden": 0, 
-  "permlevel": 0, 
+  "label": "Campaign", 
+  "no_copy": 0, 
+  "oldfieldname": "campaign", 
+  "oldfieldtype": "Link", 
+  "options": "Campaign", 
+  "print_hide": 1, 
   "report_hide": 0
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Small Text", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Quotation Lost Reason", 
-  "oldfieldname": "order_lost_reason", 
   "fieldname": "order_lost_reason", 
   "fieldtype": "Small Text", 
-  "permlevel": 0
+  "label": "Quotation Lost Reason", 
+  "no_copy": 1, 
+  "oldfieldname": "order_lost_reason", 
+  "oldfieldtype": "Small Text", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Select Print Heading", 
-  "oldfieldname": "select_print_heading", 
-  "options": "Print Heading", 
   "fieldname": "select_print_heading", 
   "fieldtype": "Link", 
-  "permlevel": 0, 
+  "label": "Select Print Heading", 
+  "no_copy": 1, 
+  "oldfieldname": "select_print_heading", 
+  "oldfieldtype": "Link", 
+  "options": "Print Heading", 
+  "print_hide": 1, 
   "report_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Amended From", 
-  "oldfieldname": "amended_from", 
-  "width": "150px", 
   "fieldname": "amended_from", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Amended From", 
+  "no_copy": 1, 
+  "oldfieldname": "amended_from", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
   "description": "The date at which current entry is corrected in the system.", 
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Amendment Date", 
-  "oldfieldname": "amendment_date", 
-  "width": "100px", 
   "fieldname": "amendment_date", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "Amendment Date", 
+  "no_copy": 1, 
+  "oldfieldname": "amendment_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
   "description": "Keep a track on communications regarding this Quotation. This will help you remember earlier communications in case the Customer comes back again", 
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Communication History", 
   "fieldname": "communication_history", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Communication History", 
+  "oldfieldtype": "Section Break", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Table", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Communication HTML", 
-  "oldfieldname": "follow_up", 
-  "width": "40px", 
   "fieldname": "communication_html", 
   "fieldtype": "HTML", 
-  "permlevel": 0
+  "label": "Communication HTML", 
+  "oldfieldname": "follow_up", 
+  "oldfieldtype": "Table", 
+  "print_hide": 1, 
+  "width": "40px"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "File List", 
   "fieldname": "file_list", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
-  "permlevel": 0
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Sales Manager", 
-  "cancel": 0, 
-  "permlevel": 1
+  "label": "File List", 
+  "no_copy": 1, 
+  "print_hide": 1
  }, 
  {
   "amend": 1, 
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "report": 1, 
   "role": "Sales Manager", 
-  "cancel": 1, 
-  "permlevel": 0
+  "submit": 1, 
+  "write": 1
  }, 
  {
   "amend": 1, 
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
+  "role": "Sales User", 
   "submit": 1, 
-  "write": 1, 
-  "report": 1, 
-  "role": "Sales User", 
-  "cancel": 1, 
-  "permlevel": 0
+  "write": 1
  }, 
  {
   "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Sales User", 
   "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "amend": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "report": 1, 
   "role": "Customer", 
-  "cancel": 0, 
-  "permlevel": 0
+  "submit": 0, 
+  "write": 0
  }, 
  {
   "amend": 1, 
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
+  "role": "Maintenance Manager", 
   "submit": 1, 
-  "write": 1, 
-  "report": 1, 
-  "role": "Maintenance Manager", 
-  "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Maintenance Manager", 
-  "cancel": 0, 
-  "permlevel": 1
+  "write": 1
  }, 
  {
   "amend": 1, 
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
+  "role": "Maintenance User", 
   "submit": 1, 
-  "write": 1, 
-  "report": 1, 
-  "role": "Maintenance User", 
-  "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Maintenance User", 
-  "cancel": 0, 
-  "permlevel": 1
+  "write": 1
  }
 ]
\ No newline at end of file
diff --git a/selling/doctype/quotation_item/quotation_item.txt b/selling/doctype/quotation_item/quotation_item.txt
index cdf0441..13b9966 100644
--- a/selling/doctype/quotation_item/quotation_item.txt
+++ b/selling/doctype/quotation_item/quotation_item.txt
@@ -1,297 +1,275 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:19", 
   "docstatus": 0, 
-  "creation": "2012-06-08 16:07:57", 
+  "modified": "2013-01-22 14:47:57", 
   "modified_by": "Administrator", 
-  "modified": "2012-07-09 11:04:47"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Tray", 
+  "autoname": "QUOD/.#####", 
+  "doctype": "DocType", 
   "istable": 1, 
   "module": "Selling", 
-  "server_code_error": " ", 
-  "doctype": "DocType", 
-  "autoname": "QUOD/.#####", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "is_transaction_doc": 0, 
-  "show_in_menu": 0, 
-  "version": 1
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Quotation Item", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "name": "Quotation Item", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Quotation Item"
  }, 
  {
-  "print_hide": 0, 
-  "permlevel": 0, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Item Code", 
-  "oldfieldname": "item_code", 
-  "width": "150px", 
-  "trigger": "Client", 
   "fieldname": "item_code", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
   "hidden": 0, 
+  "in_filter": 1, 
+  "label": "Item Code", 
+  "oldfieldname": "item_code", 
+  "oldfieldtype": "Link", 
   "options": "Item", 
-  "in_filter": 1
+  "print_hide": 0, 
+  "reqd": 1, 
+  "search_index": 1, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Customer's Item Code", 
   "fieldname": "customer_item_code", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Customer's Item Code", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "Item Name", 
-  "oldfieldname": "item_name", 
-  "width": "150px", 
   "fieldname": "item_name", 
   "fieldtype": "Data", 
+  "in_filter": 1, 
+  "label": "Item Name", 
+  "oldfieldname": "item_name", 
   "oldfieldtype": "Data", 
+  "print_hide": 1, 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 1, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Description", 
-  "oldfieldname": "description", 
-  "width": "300px", 
   "fieldname": "description", 
   "fieldtype": "Small Text", 
+  "label": "Description", 
+  "oldfieldname": "description", 
+  "oldfieldtype": "Small Text", 
+  "print_hide": 0, 
   "reqd": 1, 
-  "permlevel": 0
+  "width": "300px"
  }, 
  {
-  "print_hide": 0, 
   "default": "0.00", 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "qty", 
+  "fieldtype": "Float", 
+  "in_filter": 0, 
   "label": "Quantity", 
   "oldfieldname": "qty", 
-  "width": "100px", 
-  "trigger": "Client", 
-  "fieldname": "qty", 
-  "fieldtype": "Currency", 
-  "search_index": 0, 
+  "oldfieldtype": "Currency", 
+  "print_hide": 0, 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 0
+  "search_index": 0, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Data", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "UOM", 
-  "oldfieldname": "stock_uom", 
-  "width": "100px", 
   "fieldname": "stock_uom", 
   "fieldtype": "Data", 
+  "label": "UOM", 
+  "oldfieldname": "stock_uom", 
+  "oldfieldtype": "Data", 
+  "print_hide": 0, 
+  "read_only": 1, 
   "reqd": 0, 
-  "permlevel": 1
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
   "default": "0.00", 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Price List Rate", 
-  "oldfieldname": "ref_rate", 
-  "width": "100px", 
-  "trigger": "Client", 
   "fieldname": "ref_rate", 
   "fieldtype": "Currency", 
+  "label": "Price List Rate", 
+  "oldfieldname": "ref_rate", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
   "reqd": 0, 
-  "permlevel": 0
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
   "default": "0.00", 
-  "oldfieldtype": "Float", 
   "doctype": "DocField", 
-  "label": "Discount (%)", 
-  "oldfieldname": "adj_rate", 
-  "width": "100px", 
-  "trigger": "Client", 
   "fieldname": "adj_rate", 
   "fieldtype": "Float", 
-  "permlevel": 0
+  "label": "Discount (%)", 
+  "oldfieldname": "adj_rate", 
+  "oldfieldtype": "Float", 
+  "print_hide": 1, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 0, 
   "default": "0.00", 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Rate", 
-  "oldfieldname": "export_rate", 
-  "width": "100px", 
-  "trigger": "Client", 
   "fieldname": "export_rate", 
   "fieldtype": "Currency", 
-  "search_index": 0, 
+  "in_filter": 0, 
+  "label": "Rate", 
+  "oldfieldname": "export_rate", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 0, 
   "reqd": 0, 
-  "permlevel": 0, 
-  "in_filter": 0
+  "search_index": 0, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 0, 
   "default": "0.00", 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Amount", 
-  "oldfieldname": "export_amount", 
-  "width": "100px", 
   "fieldname": "export_amount", 
   "fieldtype": "Currency", 
-  "search_index": 0, 
+  "in_filter": 0, 
+  "label": "Amount", 
+  "oldfieldname": "export_amount", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 0, 
+  "read_only": 1, 
   "reqd": 0, 
-  "permlevel": 1, 
-  "in_filter": 0
+  "search_index": 0, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Price List Rate*", 
-  "oldfieldname": "base_ref_rate", 
-  "width": "100px", 
   "fieldname": "base_ref_rate", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Price List Rate*", 
+  "oldfieldname": "base_ref_rate", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
   "default": "0.00", 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Basic Rate*", 
-  "oldfieldname": "basic_rate", 
-  "width": "100px", 
-  "trigger": "Client", 
   "fieldname": "basic_rate", 
   "fieldtype": "Currency", 
-  "search_index": 0, 
+  "in_filter": 0, 
+  "label": "Basic Rate*", 
+  "oldfieldname": "basic_rate", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
   "reqd": 0, 
-  "permlevel": 0, 
-  "in_filter": 0
+  "search_index": 0, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
   "default": "0.00", 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Amount*", 
-  "oldfieldname": "amount", 
-  "width": "100px", 
-  "trigger": "Client", 
   "fieldname": "amount", 
   "fieldtype": "Currency", 
-  "search_index": 0, 
+  "in_filter": 0, 
+  "label": "Amount*", 
+  "oldfieldname": "amount", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
   "reqd": 0, 
-  "permlevel": 1, 
-  "in_filter": 0
+  "search_index": 0, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Item Group", 
-  "oldfieldname": "item_group", 
-  "options": "Item Group", 
   "fieldname": "item_group", 
   "fieldtype": "Link", 
-  "search_index": 1, 
   "hidden": 1, 
-  "permlevel": 1, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Item Group", 
+  "oldfieldname": "item_group", 
+  "oldfieldtype": "Link", 
+  "options": "Item Group", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "permlevel": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Brand", 
-  "oldfieldname": "brand", 
-  "width": "150px", 
   "fieldname": "brand", 
   "fieldtype": "Link", 
-  "search_index": 1, 
   "hidden": 1, 
+  "in_filter": 1, 
+  "label": "Brand", 
+  "oldfieldname": "brand", 
+  "oldfieldtype": "Link", 
   "options": "Brand", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "read_only": 1, 
+  "search_index": 1, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Item Tax Rate", 
-  "oldfieldname": "item_tax_rate", 
   "fieldname": "item_tax_rate", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
-  "permlevel": 1, 
+  "label": "Item Tax Rate", 
+  "oldfieldname": "item_tax_rate", 
+  "oldfieldtype": "Small Text", 
+  "print_hide": 1, 
+  "read_only": 1, 
   "report_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Against Docname", 
-  "oldfieldname": "prevdoc_docname", 
-  "width": "150px", 
   "fieldname": "prevdoc_docname", 
   "fieldtype": "Data", 
-  "permlevel": 1, 
-  "report_hide": 0
+  "label": "Against Docname", 
+  "no_copy": 1, 
+  "oldfieldname": "prevdoc_docname", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "report_hide": 0, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Against Doctype", 
-  "oldfieldname": "prevdoc_doctype", 
-  "width": "150px", 
   "fieldname": "prevdoc_doctype", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1, 
-  "report_hide": 0
+  "label": "Against Doctype", 
+  "no_copy": 1, 
+  "oldfieldname": "prevdoc_doctype", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "report_hide": 0, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Check", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Page Break", 
-  "oldfieldname": "page_break", 
   "fieldname": "page_break", 
   "fieldtype": "Check", 
   "hidden": 0, 
-  "permlevel": 0, 
+  "label": "Page Break", 
+  "no_copy": 1, 
+  "oldfieldname": "page_break", 
+  "oldfieldtype": "Check", 
+  "print_hide": 1, 
   "report_hide": 1
  }
 ]
\ No newline at end of file
diff --git a/selling/doctype/sales_and_purchase_return_item/sales_and_purchase_return_item.txt b/selling/doctype/sales_and_purchase_return_item/sales_and_purchase_return_item.txt
index b5b67c6..7cc6442 100644
--- a/selling/doctype/sales_and_purchase_return_item/sales_and_purchase_return_item.txt
+++ b/selling/doctype/sales_and_purchase_return_item/sales_and_purchase_return_item.txt
@@ -1,115 +1,108 @@
 [
  {
-  "owner": "wasim@webnotestech.com", 
+  "creation": "2013-01-10 16:34:20", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:36:14", 
+  "modified": "2013-01-22 14:47:59", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:36:14"
+  "owner": "wasim@webnotestech.com"
  }, 
  {
-  "section_style": "Simple", 
+  "doctype": "DocType", 
   "istable": 1, 
-  "name": "__common__", 
-  "colour": "White:FFF", 
   "module": "Selling", 
-  "show_in_menu": 0, 
-  "version": 8, 
-  "server_code_error": " ", 
-  "doctype": "DocType"
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Sales and Purchase Return Item", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "name": "Sales and Purchase Return Item", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Sales and Purchase Return Item"
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Item Code", 
-  "oldfieldname": "item_code", 
-  "permlevel": 1, 
   "fieldname": "item_code", 
   "fieldtype": "Link", 
-  "reqd": 1, 
-  "options": "Item"
+  "label": "Item Code", 
+  "oldfieldname": "item_code", 
+  "oldfieldtype": "Link", 
+  "options": "Item", 
+  "read_only": 1, 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Description", 
-  "oldfieldname": "description", 
-  "width": "300px", 
   "fieldname": "description", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Description", 
+  "oldfieldname": "description", 
+  "oldfieldtype": "Data", 
+  "read_only": 1, 
+  "width": "300px"
  }, 
  {
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "UOM", 
-  "oldfieldname": "uom", 
-  "permlevel": 1, 
   "fieldname": "uom", 
   "fieldtype": "Link", 
+  "label": "UOM", 
+  "oldfieldname": "uom", 
   "oldfieldtype": "Link", 
-  "options": "UOM"
+  "options": "UOM", 
+  "read_only": 1, 
+  "search_index": 0
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Rate", 
-  "oldfieldname": "rate", 
   "fieldname": "rate", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Rate", 
+  "oldfieldname": "rate", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Qty", 
-  "oldfieldname": "qty", 
   "fieldname": "qty", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Qty", 
+  "oldfieldname": "qty", 
+  "oldfieldtype": "Data", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Returned Qty", 
-  "oldfieldname": "returned_qty", 
   "fieldname": "returned_qty", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Returned Qty", 
+  "oldfieldname": "returned_qty", 
+  "oldfieldtype": "Data", 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Serial No", 
   "fieldname": "serial_no", 
   "fieldtype": "Small Text", 
-  "permlevel": 0
+  "label": "Serial No"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Batch No", 
   "fieldname": "batch_no", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Batch No"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Detail Name", 
-  "oldfieldname": "detail_name", 
   "fieldname": "detail_name", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Detail Name", 
+  "oldfieldname": "detail_name", 
+  "oldfieldtype": "Data", 
+  "read_only": 1
  }
 ]
\ No newline at end of file
diff --git a/selling/doctype/sales_order/sales_order.txt b/selling/doctype/sales_order/sales_order.txt
index 984337d..47cae4a 100644
--- a/selling/doctype/sales_order/sales_order.txt
+++ b/selling/doctype/sales_order/sales_order.txt
@@ -1,1172 +1,982 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:20", 
   "docstatus": 0, 
-  "creation": "2012-11-28 11:26:20", 
+  "modified": "2013-01-22 13:52:58", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-03 17:10:41"
+  "owner": "Administrator"
  }, 
  {
-  "is_submittable": 1, 
   "allow_attach": 1, 
-  "search_fields": "status,transaction_date,customer,customer_name, territory,order_type,company", 
-  "module": "Selling", 
-  "read_only_onload": 1, 
-  "document_type": "Transaction", 
-  "issingle": 0, 
   "autoname": "naming_series:", 
+  "doctype": "DocType", 
+  "document_type": "Transaction", 
+  "is_submittable": 1, 
+  "issingle": 0, 
+  "module": "Selling", 
   "name": "__common__", 
-  "doctype": "DocType"
+  "read_only_onload": 1, 
+  "search_fields": "status,transaction_date,customer,customer_name, territory,order_type,company"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Sales Order", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Sales Order", 
-  "read": 1, 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
   "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Sales Order", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
+  "permlevel": 0, 
+  "read": 1
  }, 
  {
-  "name": "Sales Order", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Sales Order"
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break0", 
   "fieldtype": "Column Break", 
+  "in_filter": 0, 
+  "oldfieldtype": "Column Break", 
   "search_index": 0, 
-  "permlevel": 0, 
-  "in_filter": 0
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
   "description": "To manage multiple series please go to Setup > Manage Series", 
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Series", 
-  "oldfieldname": "naming_series", 
-  "permlevel": 0, 
   "fieldname": "naming_series", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "options": "PI/2011/\nSO\nSO/10-11/\nSO1112"
+  "label": "Series", 
+  "no_copy": 1, 
+  "oldfieldname": "naming_series", 
+  "oldfieldtype": "Select", 
+  "options": "PI/2011/\nSO\nSO/10-11/\nSO1112", 
+  "print_hide": 1, 
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "Select Customer", 
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Customer", 
-  "oldfieldname": "customer", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "customer", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Customer", 
+  "oldfieldname": "customer", 
+  "oldfieldtype": "Link", 
   "options": "Customer", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Name", 
   "fieldname": "customer_name", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Name", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Address", 
   "fieldname": "address_display", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Address", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Contact", 
   "fieldname": "contact_display", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Contact", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Mobile No", 
   "fieldname": "contact_mobile", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Mobile No", 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Contact Email", 
   "fieldname": "contact_email", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Contact Email", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
   "default": "Sales", 
-  "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Order Type", 
-  "oldfieldname": "order_type", 
-  "options": "\nSales\nMaintenance", 
   "fieldname": "order_type", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Order Type", 
+  "oldfieldname": "order_type", 
+  "oldfieldtype": "Select", 
+  "options": "\nSales\nMaintenance", 
+  "print_hide": 1, 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
-  "print_hide": 0, 
-  "description": "The date at which current entry is made in system.", 
-  "width": "160px", 
   "default": "Today", 
-  "oldfieldtype": "Date", 
+  "description": "The date at which current entry is made in system.", 
   "doctype": "DocField", 
-  "label": "Sales Order Date", 
-  "oldfieldname": "transaction_date", 
-  "no_copy": 1, 
   "fieldname": "transaction_date", 
   "fieldtype": "Date", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Sales Order Date", 
+  "no_copy": 1, 
+  "oldfieldname": "transaction_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 0, 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 1, 
+  "width": "160px"
  }, 
  {
-  "print_hide": 1, 
+  "depends_on": "eval:doc.order_type == 'Sales'", 
   "doctype": "DocField", 
-  "search_index": 1, 
-  "colour": "White:FFF", 
-  "oldfieldtype": "Date", 
-  "label": "Expected Delivery Date", 
-  "oldfieldname": "delivery_date", 
-  "width": "160px", 
   "fieldname": "delivery_date", 
   "fieldtype": "Date", 
-  "depends_on": "eval:doc.order_type == 'Sales'", 
-  "reqd": 0, 
   "hidden": 0, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Expected Delivery Date", 
+  "oldfieldname": "delivery_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
+  "reqd": 0, 
+  "search_index": 1, 
+  "width": "160px"
  }, 
  {
-  "print_hide": 0, 
   "description": "Purchase Order sent by customer", 
-  "oldfieldtype": "Data", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "P.O. No", 
-  "oldfieldname": "po_no", 
-  "width": "100px", 
   "fieldname": "po_no", 
   "fieldtype": "Data", 
-  "reqd": 0, 
   "hidden": 0, 
-  "permlevel": 0
+  "label": "P.O. No", 
+  "oldfieldname": "po_no", 
+  "oldfieldtype": "Data", 
+  "print_hide": 0, 
+  "reqd": 0, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Date", 
-  "colour": "White:FFF", 
+  "depends_on": "eval:doc.po_no", 
   "doctype": "DocField", 
-  "label": "P.O. Date", 
-  "oldfieldname": "po_date", 
-  "width": "100px", 
   "fieldname": "po_date", 
   "fieldtype": "Date", 
-  "depends_on": "eval:doc.po_no", 
-  "reqd": 0, 
   "hidden": 0, 
-  "permlevel": 0
+  "label": "P.O. Date", 
+  "oldfieldname": "po_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 0, 
+  "reqd": 0, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Shipping Address Name", 
-  "permlevel": 1, 
   "fieldname": "shipping_address_name", 
   "fieldtype": "Link", 
   "hidden": 1, 
+  "in_filter": 1, 
+  "label": "Shipping Address Name", 
   "options": "Address", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Shipping Address", 
   "fieldname": "shipping_address", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
-  "permlevel": 1, 
-  "in_filter": 0
+  "in_filter": 0, 
+  "label": "Shipping Address", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Section Break", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Items", 
   "fieldname": "items", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Items", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Table", 
-  "colour": "White:FFF", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Sales Order Items", 
-  "oldfieldname": "sales_order_details", 
-  "permlevel": 0, 
   "fieldname": "sales_order_details", 
   "fieldtype": "Table", 
-  "options": "Sales Order Item"
+  "label": "Sales Order Items", 
+  "oldfieldname": "sales_order_details", 
+  "oldfieldtype": "Table", 
+  "options": "Sales Order Item", 
+  "print_hide": 0
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "section_break0", 
-  "fieldtype": "Section Break", 
-  "permlevel": 0
+  "fieldtype": "Section Break"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "col_break20", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Net Total*", 
-  "oldfieldname": "net_total", 
-  "width": "150px", 
   "fieldname": "net_total", 
   "fieldtype": "Currency", 
+  "label": "Net Total*", 
+  "oldfieldname": "net_total", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 0, 
+  "read_only": 1, 
   "reqd": 0, 
-  "permlevel": 1
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Re-Calculate Values", 
-  "trigger": "Client", 
   "fieldname": "recalculate_values", 
   "fieldtype": "Button", 
-  "search_index": 0, 
-  "permlevel": 0
+  "label": "Re-Calculate Values", 
+  "oldfieldtype": "Button", 
+  "print_hide": 1, 
+  "search_index": 0
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "col_break_21", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
-  "permlevel": 0, 
   "description": "Quotation no against which this Sales Order is made ", 
-  "no_copy": 0, 
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Quotation No", 
-  "oldfieldname": "quotation_no", 
-  "width": "150px", 
-  "trigger": "Client", 
   "fieldname": "quotation_no", 
   "fieldtype": "Link", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Quotation No", 
+  "no_copy": 0, 
+  "oldfieldname": "quotation_no", 
+  "oldfieldtype": "Link", 
   "options": "Quotation", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "search_index": 1, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 0, 
-  "oldfieldtype": "Date", 
-  "colour": "White:FFF", 
+  "depends_on": "eval:doc.quotation_no", 
   "doctype": "DocField", 
-  "label": "Quotation Date", 
-  "oldfieldname": "quotation_date", 
-  "width": "100px", 
   "fieldname": "quotation_date", 
   "fieldtype": "Date", 
-  "depends_on": "eval:doc.quotation_no", 
-  "reqd": 0, 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Quotation Date", 
+  "no_copy": 0, 
+  "oldfieldname": "quotation_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "reqd": 0, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Pull Quotation Items", 
-  "permlevel": 0, 
   "fieldname": "pull_quotation_details", 
   "fieldtype": "Button", 
-  "options": "pull_quotation_details"
+  "label": "Pull Quotation Items", 
+  "oldfieldtype": "Button", 
+  "options": "pull_quotation_details", 
+  "print_hide": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Price List and Currency", 
   "fieldname": "sec_break45", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Price List and Currency"
  }, 
  {
-  "print_hide": 1, 
   "description": "Select the price list as entered in \"Price List\" master. This will pull the reference rates of items against this price list as specified in \"Item\" master.", 
-  "permlevel": 0, 
-  "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Price List", 
-  "oldfieldname": "price_list_name", 
-  "width": "100px", 
-  "trigger": "Client", 
   "fieldname": "price_list_name", 
   "fieldtype": "Select", 
+  "label": "Price List", 
+  "oldfieldname": "price_list_name", 
+  "oldfieldtype": "Select", 
+  "options": "link:Price List", 
+  "print_hide": 1, 
   "reqd": 1, 
-  "options": "link:Price List"
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
   "description": "Select the currency in which price list is maintained", 
   "doctype": "DocField", 
-  "label": "Price List Currency", 
-  "permlevel": 0, 
   "fieldname": "price_list_currency", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "options": "link:Currency"
+  "label": "Price List Currency", 
+  "options": "link:Currency", 
+  "print_hide": 1, 
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "Rate at which Price list currency is converted to company's base currency", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Price List Currency Conversion Rate", 
   "fieldname": "plc_conversion_rate", 
   "fieldtype": "Float", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Price List Currency Conversion Rate", 
+  "print_hide": 1, 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break2", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
   "description": "Customer's currency", 
-  "permlevel": 0, 
-  "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Currency", 
-  "oldfieldname": "currency", 
-  "width": "100px", 
   "fieldname": "currency", 
   "fieldtype": "Select", 
+  "label": "Currency", 
+  "oldfieldname": "currency", 
+  "oldfieldtype": "Select", 
+  "options": "link:Currency", 
+  "print_hide": 1, 
   "reqd": 1, 
-  "options": "link:Currency"
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
-  "description": "Rate at which customer's currency is converted to company's base currency", 
   "default": "1.00", 
-  "oldfieldtype": "Currency", 
-  "colour": "White:FFF", 
+  "description": "Rate at which customer's currency is converted to company's base currency", 
   "doctype": "DocField", 
-  "label": "Conversion Rate", 
-  "oldfieldname": "conversion_rate", 
-  "width": "100px", 
-  "trigger": "Client", 
   "fieldname": "conversion_rate", 
   "fieldtype": "Float", 
+  "label": "Conversion Rate", 
+  "oldfieldname": "conversion_rate", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
   "reqd": 1, 
-  "permlevel": 0
+  "width": "100px"
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Section Break", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Taxes", 
   "fieldname": "taxes", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Taxes", 
+  "oldfieldtype": "Section Break", 
+  "print_hide": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Sales Taxes and Charges", 
-  "oldfieldname": "charge", 
-  "permlevel": 0, 
   "fieldname": "charge", 
   "fieldtype": "Link", 
-  "options": "Sales Taxes and Charges Master"
+  "label": "Sales Taxes and Charges", 
+  "oldfieldname": "charge", 
+  "oldfieldtype": "Link", 
+  "options": "Sales Taxes and Charges Master", 
+  "print_hide": 1
  }, 
  {
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Get Taxes and Charges", 
-  "trigger": "Client", 
   "fieldname": "get_charges", 
   "fieldtype": "Button", 
-  "permlevel": 0
+  "label": "Get Taxes and Charges", 
+  "oldfieldtype": "Button"
  }, 
  {
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "Sales Taxes and Charges", 
-  "oldfieldname": "other_charges", 
-  "permlevel": 0, 
   "fieldname": "other_charges", 
   "fieldtype": "Table", 
+  "label": "Sales Taxes and Charges", 
+  "oldfieldname": "other_charges", 
+  "oldfieldtype": "Table", 
   "options": "Sales Taxes and Charges"
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Calculate Taxes and Charges", 
-  "trigger": "Client", 
   "fieldname": "calculate_charges", 
   "fieldtype": "Button", 
-  "permlevel": 0
+  "label": "Calculate Taxes and Charges", 
+  "oldfieldtype": "Button", 
+  "print_hide": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Taxes and Charges Total*", 
-  "oldfieldname": "other_charges_total", 
-  "width": "150px", 
   "fieldname": "other_charges_total", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Taxes and Charges Total*", 
+  "oldfieldname": "other_charges_total", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "HTML", 
   "doctype": "DocField", 
-  "label": "Taxes and Charges Calculation", 
   "fieldname": "other_charges_calculation", 
   "fieldtype": "HTML", 
-  "permlevel": 0
+  "label": "Taxes and Charges Calculation", 
+  "oldfieldtype": "HTML", 
+  "print_hide": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Section Break", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Totals", 
   "fieldname": "totals", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Totals", 
+  "oldfieldtype": "Section Break", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Grand Total*", 
-  "oldfieldname": "grand_total", 
-  "width": "150px", 
   "fieldname": "grand_total", 
   "fieldtype": "Currency", 
+  "label": "Grand Total*", 
+  "oldfieldname": "grand_total", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
   "reqd": 0, 
-  "permlevel": 1
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Rounded Total", 
-  "oldfieldname": "rounded_total", 
-  "width": "150px", 
   "fieldname": "rounded_total", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Rounded Total", 
+  "oldfieldname": "rounded_total", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
   "description": "In Words will be visible once you save the Sales Order.", 
-  "oldfieldtype": "Data", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "In Words", 
-  "oldfieldname": "in_words", 
-  "width": "200px", 
   "fieldname": "in_words", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "In Words", 
+  "oldfieldname": "in_words", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "width": "200px"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break3", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "print_hide": 1, 
+  "width": "50%"
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Grand Total (Export)", 
-  "oldfieldname": "grand_total_export", 
-  "width": "150px", 
   "fieldname": "grand_total_export", 
   "fieldtype": "Currency", 
+  "label": "Grand Total (Export)", 
+  "oldfieldname": "grand_total_export", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 0, 
+  "read_only": 1, 
   "reqd": 0, 
-  "permlevel": 1
+  "width": "150px"
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Rounded Total (Export)", 
-  "oldfieldname": "rounded_total_export", 
-  "width": "150px", 
   "fieldname": "rounded_total_export", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Rounded Total (Export)", 
+  "oldfieldname": "rounded_total_export", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 0, 
+  "read_only": 1, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Data", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "In Words (Export)", 
-  "oldfieldname": "in_words_export", 
-  "width": "200px", 
   "fieldname": "in_words_export", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "In Words (Export)", 
+  "oldfieldname": "in_words_export", 
+  "oldfieldtype": "Data", 
+  "print_hide": 0, 
+  "read_only": 1, 
+  "width": "200px"
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Section Break", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Terms and Conditions", 
   "fieldname": "terms_section_break", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Terms and Conditions", 
+  "oldfieldtype": "Section Break", 
+  "print_hide": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Select Terms and Conditions", 
-  "oldfieldname": "tc_name", 
-  "permlevel": 0, 
   "fieldname": "tc_name", 
   "fieldtype": "Link", 
-  "search_index": 0, 
-  "options": "Terms and Conditions"
+  "label": "Select Terms and Conditions", 
+  "oldfieldname": "tc_name", 
+  "oldfieldtype": "Link", 
+  "options": "Terms and Conditions", 
+  "print_hide": 1, 
+  "search_index": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Get Terms and Conditions", 
-  "permlevel": 0, 
   "fieldname": "get_terms", 
   "fieldtype": "Button", 
-  "options": "get_tc_details"
+  "label": "Get Terms and Conditions", 
+  "oldfieldtype": "Button", 
+  "options": "get_tc_details", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "HTML", 
   "doctype": "DocField", 
-  "label": "Terms and Conditions HTML", 
-  "permlevel": 0, 
   "fieldname": "terms_html", 
   "fieldtype": "HTML", 
-  "options": "You can add Terms and Notes that will be printed in the Transaction"
+  "label": "Terms and Conditions HTML", 
+  "oldfieldtype": "HTML", 
+  "options": "You can add Terms and Notes that will be printed in the Transaction", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Text Editor", 
   "doctype": "DocField", 
-  "label": "Terms and Conditions Details", 
-  "oldfieldname": "terms", 
   "fieldname": "terms", 
   "fieldtype": "Text Editor", 
-  "permlevel": 0
+  "label": "Terms and Conditions Details", 
+  "oldfieldname": "terms", 
+  "oldfieldtype": "Text Editor", 
+  "print_hide": 0
  }, 
  {
   "doctype": "DocField", 
-  "label": "Contact Info", 
   "fieldname": "contact_info", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Contact Info"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "col_break45", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Customer Address", 
-  "permlevel": 0, 
   "fieldname": "customer_address", 
   "fieldtype": "Link", 
   "hidden": 0, 
+  "in_filter": 1, 
+  "label": "Customer Address", 
   "options": "Address", 
-  "in_filter": 1
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Contact Person", 
-  "permlevel": 0, 
   "fieldname": "contact_person", 
   "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Contact Person", 
   "options": "Contact", 
-  "in_filter": 1
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "Territory", 
-  "permlevel": 0, 
   "fieldname": "territory", 
   "fieldtype": "Link", 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Territory", 
   "options": "Territory", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "col_break46", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
   "description": "Category of customer as entered in Customer master", 
-  "search_index": 1, 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Customer Group", 
-  "options": "Customer Group", 
   "fieldname": "customer_group", 
   "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Customer Group", 
+  "options": "Customer Group", 
+  "print_hide": 1, 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "Filling in additional information about the Sales Order will help you analyze your data better.", 
-  "oldfieldtype": "Section Break", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "More Info", 
   "fieldname": "more_info", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "More Info", 
+  "oldfieldtype": "Section Break", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break4", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "print_hide": 1, 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Select", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Letter Head", 
-  "oldfieldname": "letter_head", 
-  "permlevel": 0, 
   "fieldname": "letter_head", 
   "fieldtype": "Select", 
-  "options": "link:Letter Head"
+  "label": "Letter Head", 
+  "oldfieldname": "letter_head", 
+  "oldfieldtype": "Select", 
+  "options": "link:Letter Head", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Select Print Heading", 
-  "oldfieldname": "select_print_heading", 
-  "permlevel": 0, 
   "fieldname": "select_print_heading", 
   "fieldtype": "Link", 
+  "label": "Select Print Heading", 
+  "no_copy": 1, 
+  "oldfieldname": "select_print_heading", 
+  "oldfieldtype": "Link", 
   "options": "Print Heading", 
+  "print_hide": 1, 
   "report_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
+  "depends_on": "eval:doc.source == 'Campaign'", 
   "doctype": "DocField", 
-  "label": "Campaign", 
-  "oldfieldname": "campaign", 
-  "permlevel": 0, 
   "fieldname": "campaign", 
   "fieldtype": "Link", 
-  "depends_on": "eval:doc.source == 'Campaign'", 
-  "options": "Campaign"
+  "label": "Campaign", 
+  "oldfieldname": "campaign", 
+  "oldfieldtype": "Link", 
+  "options": "Campaign", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Amended From", 
-  "oldfieldname": "amended_from", 
-  "width": "150px", 
   "fieldname": "amended_from", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Amended From", 
+  "no_copy": 1, 
+  "oldfieldname": "amended_from", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
   "description": "The date at which current entry is corrected in the system.", 
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Amendment Date", 
-  "oldfieldname": "amendment_date", 
-  "width": "100px", 
   "fieldname": "amendment_date", 
   "fieldtype": "Date", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Amendment Date", 
+  "no_copy": 1, 
+  "oldfieldname": "amendment_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
   "description": "Select the relevant company name if you have multiple companies.", 
-  "permlevel": 0, 
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Company", 
-  "oldfieldname": "company", 
-  "width": "150px", 
-  "trigger": "Client", 
   "fieldname": "company", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Company", 
+  "oldfieldname": "company", 
+  "oldfieldtype": "Link", 
   "options": "Company", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 1, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
-  "permlevel": 0, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Fiscal Year", 
-  "oldfieldname": "fiscal_year", 
-  "width": "150px", 
   "fieldname": "fiscal_year", 
   "fieldtype": "Select", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Fiscal Year", 
+  "oldfieldname": "fiscal_year", 
+  "oldfieldtype": "Select", 
   "options": "link:Fiscal Year", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 1, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "depends_on": "eval:!doc.__islocal", 
-  "colour": "White:FFF", 
-  "no_column": 0, 
   "doctype": "DocField", 
-  "label": "Cancel Reason", 
-  "oldfieldname": "cancel_reason", 
   "fieldname": "cancel_reason", 
   "fieldtype": "Data", 
+  "label": "Cancel Reason", 
+  "no_copy": 1, 
+  "oldfieldname": "cancel_reason", 
   "oldfieldtype": "Data", 
-  "permlevel": 1
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break5", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "print_hide": 1, 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Source", 
-  "oldfieldname": "source", 
-  "permlevel": 0, 
   "fieldname": "source", 
   "fieldtype": "Select", 
-  "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign"
+  "label": "Source", 
+  "oldfieldname": "source", 
+  "oldfieldtype": "Select", 
+  "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign", 
+  "print_hide": 1
  }, 
  {
   "description": "Track this Sales Order against any Project", 
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Project Name", 
-  "oldfieldname": "project_name", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "project_name", 
   "fieldtype": "Link", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Project Name", 
+  "oldfieldname": "project_name", 
+  "oldfieldtype": "Link", 
   "options": "Project", 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "permlevel": 1, 
-  "width": "100px", 
   "default": "Draft", 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Status", 
-  "oldfieldname": "status", 
-  "no_copy": 1, 
   "fieldname": "status", 
   "fieldtype": "Select", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Status", 
+  "no_copy": 1, 
+  "oldfieldname": "status", 
+  "oldfieldtype": "Select", 
   "options": "\nDraft\nSubmitted\nStopped\nCancelled", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "read_only": 1, 
+  "reqd": 1, 
+  "search_index": 1, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
+  "depends_on": "eval:!doc.__islocal", 
   "description": "% of materials delivered against this Sales Order", 
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "%  Delivered", 
-  "oldfieldname": "per_delivered", 
-  "width": "100px", 
   "fieldname": "per_delivered", 
-  "fieldtype": "Currency", 
-  "depends_on": "eval:!doc.__islocal", 
-  "permlevel": 1, 
-  "in_filter": 1
- }, 
- {
-  "print_hide": 1, 
-  "description": "% of materials billed against this Sales Order", 
+  "fieldtype": "Float", 
+  "in_filter": 1, 
+  "label": "%  Delivered", 
   "no_copy": 1, 
+  "oldfieldname": "per_delivered", 
   "oldfieldtype": "Currency", 
-  "colour": "White:FFF", 
-  "doctype": "DocField", 
-  "label": "% Amount Billed", 
-  "oldfieldname": "per_billed", 
-  "width": "100px", 
-  "fieldname": "per_billed", 
-  "fieldtype": "Currency", 
-  "depends_on": "eval:!doc.__islocal", 
-  "permlevel": 1, 
-  "in_filter": 1
+  "print_hide": 1, 
+  "read_only": 1, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
+  "depends_on": "eval:!doc.__islocal", 
+  "description": "% of materials billed against this Sales Order", 
   "doctype": "DocField", 
-  "label": "Delivery Status", 
-  "permlevel": 0, 
+  "fieldname": "per_billed", 
+  "fieldtype": "Float", 
+  "in_filter": 1, 
+  "label": "% Amount Billed", 
+  "no_copy": 1, 
+  "oldfieldname": "per_billed", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "width": "100px"
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "delivery_status", 
   "fieldtype": "Select", 
-  "no_column": 0, 
   "hidden": 1, 
-  "options": "Delivered\nNot Delivered\nPartly Delivered\nClosed\nNot Applicable"
+  "label": "Delivery Status", 
+  "no_copy": 1, 
+  "options": "Delivered\nNot Delivered\nPartly Delivered\nClosed\nNot Applicable", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Billing Status", 
-  "permlevel": 0, 
   "fieldname": "billing_status", 
   "fieldtype": "Select", 
-  "no_column": 0, 
   "hidden": 1, 
-  "options": "Billed\nNot Billed\nPartly Billed\nClosed"
+  "label": "Billing Status", 
+  "no_copy": 1, 
+  "options": "Billed\nNot Billed\nPartly Billed\nClosed", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "Display all the individual items delivered with the main items", 
-  "oldfieldtype": "Section Break", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Packing List", 
   "fieldname": "packing_list", 
   "fieldtype": "Section Break", 
   "hidden": 0, 
-  "permlevel": 0
+  "label": "Packing List", 
+  "oldfieldtype": "Section Break", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Table", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Packing Details", 
-  "oldfieldname": "packing_details", 
-  "permlevel": 1, 
   "fieldname": "packing_details", 
   "fieldtype": "Table", 
-  "options": "Delivery Note Packing Item"
+  "label": "Packing Details", 
+  "oldfieldname": "packing_details", 
+  "oldfieldtype": "Table", 
+  "options": "Delivery Note Packing Item", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Sales Team", 
   "fieldname": "sales_team_section_break", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Sales Team", 
+  "oldfieldtype": "Section Break", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break6", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "print_hide": 1, 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
   "description": "Name as entered in Sales Partner master", 
-  "permlevel": 0, 
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Sales Partner", 
-  "oldfieldname": "sales_partner", 
-  "width": "150px", 
-  "trigger": "Client", 
   "fieldname": "sales_partner", 
   "fieldtype": "Link", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Sales Partner", 
+  "oldfieldname": "sales_partner", 
+  "oldfieldtype": "Link", 
   "options": "Sales Partner", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "search_index": 1, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break7", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "print_hide": 1, 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "commission_rate", 
+  "fieldtype": "Float", 
   "label": "Commission Rate", 
   "oldfieldname": "commission_rate", 
-  "width": "100px", 
-  "trigger": "Client", 
-  "fieldname": "commission_rate", 
-  "fieldtype": "Currency", 
-  "permlevel": 0
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Total Commission", 
-  "oldfieldname": "total_commission", 
-  "trigger": "Client", 
   "fieldname": "total_commission", 
   "fieldtype": "Currency", 
-  "permlevel": 0
+  "label": "Total Commission", 
+  "oldfieldname": "total_commission", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "options": "Simple", 
   "fieldname": "section_break1", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "options": "Simple", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "Sales Team1", 
-  "oldfieldname": "sales_team", 
-  "permlevel": 0, 
   "fieldname": "sales_team", 
   "fieldtype": "Table", 
-  "options": "Sales Team"
+  "label": "Sales Team1", 
+  "oldfieldname": "sales_team", 
+  "oldfieldtype": "Table", 
+  "options": "Sales Team", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "File List", 
   "fieldname": "file_list", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "File List", 
+  "no_copy": 1, 
+  "print_hide": 1
  }, 
  {
   "amend": 1, 
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
   "report": 1, 
   "role": "Sales User", 
-  "cancel": 1, 
-  "permlevel": 0
+  "submit": 1, 
+  "write": 1
  }, 
  {
   "amend": 1, 
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
   "report": 1, 
   "role": "Maintenance User", 
-  "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Maintenance Manager", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "amend": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
   "submit": 1, 
-  "write": 1, 
-  "report": 1, 
-  "role": "Maintenance Manager", 
-  "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "amend": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "report": 1, 
-  "role": "Sales Manager", 
-  "cancel": 1, 
-  "permlevel": 0
+  "write": 1
  }, 
  {
   "amend": 0, 
+  "cancel": 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": 1, 
-  "role": "Accounts User", 
-  "cancel": 0, 
-  "permlevel": 2
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "cancel": 0, 
+  "match": "customer", 
+  "report": 0, 
   "role": "Customer", 
-  "report": 1, 
-  "permlevel": 0, 
-  "match": "customer"
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
   "submit": 0, 
-  "write": 0, 
-  "role": "Sales User", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Maintenance User", 
-  "cancel": 0, 
-  "permlevel": 1
+  "write": 0
  }
 ]
\ No newline at end of file
diff --git a/selling/doctype/sales_order_item/sales_order_item.txt b/selling/doctype/sales_order_item/sales_order_item.txt
index 72e763e..bf2b37d 100644
--- a/selling/doctype/sales_order_item/sales_order_item.txt
+++ b/selling/doctype/sales_order_item/sales_order_item.txt
@@ -1,382 +1,352 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:21", 
   "docstatus": 0, 
-  "creation": "2012-06-08 16:07:58", 
+  "modified": "2013-01-22 13:47:03", 
   "modified_by": "Administrator", 
-  "modified": "2012-07-09 11:05:16"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Tray", 
+  "autoname": "SOD/.#####", 
+  "doctype": "DocType", 
   "istable": 1, 
   "module": "Selling", 
-  "server_code_error": " ", 
-  "doctype": "DocType", 
-  "autoname": "SOD/.#####", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "show_in_menu": 0, 
-  "version": 1
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Sales Order Item", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "name": "Sales Order Item", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Sales Order Item"
  }, 
  {
-  "permlevel": 0, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Item Code", 
-  "oldfieldname": "item_code", 
-  "width": "150px", 
-  "trigger": "Client", 
   "fieldname": "item_code", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Item Code", 
+  "oldfieldname": "item_code", 
+  "oldfieldtype": "Link", 
   "options": "Item", 
-  "in_filter": 1
+  "reqd": 1, 
+  "search_index": 1, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Customer's Item Code", 
   "fieldname": "customer_item_code", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Customer's Item Code", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Item Name", 
-  "oldfieldname": "item_name", 
-  "width": "150", 
   "fieldname": "item_name", 
   "fieldtype": "Data", 
+  "label": "Item Name", 
+  "oldfieldname": "item_name", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
   "reqd": 1, 
-  "permlevel": 0
+  "width": "150"
  }, 
  {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Description", 
-  "oldfieldname": "description", 
-  "width": "300px", 
   "fieldname": "description", 
   "fieldtype": "Small Text", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Description", 
+  "oldfieldname": "description", 
+  "oldfieldtype": "Small Text", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 1, 
+  "width": "300px"
  }, 
  {
   "default": "0.00", 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "qty", 
+  "fieldtype": "Float", 
   "label": "Quantity", 
   "oldfieldname": "qty", 
-  "width": "100px", 
-  "trigger": "Client", 
-  "fieldname": "qty", 
-  "fieldtype": "Currency", 
+  "oldfieldtype": "Currency", 
   "reqd": 1, 
-  "permlevel": 0
+  "width": "100px"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "UOM", 
-  "oldfieldname": "stock_uom", 
-  "width": "70px", 
   "fieldname": "stock_uom", 
   "fieldtype": "Data", 
-  "reqd": 0, 
   "hidden": 0, 
-  "permlevel": 1
+  "label": "UOM", 
+  "oldfieldname": "stock_uom", 
+  "oldfieldtype": "Data", 
+  "read_only": 1, 
+  "reqd": 0, 
+  "width": "70px"
  }, 
  {
-  "print_hide": 1, 
   "default": "0.00", 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Price List Rate", 
-  "oldfieldname": "ref_rate", 
-  "width": "70px", 
-  "trigger": "Client", 
   "fieldname": "ref_rate", 
   "fieldtype": "Currency", 
+  "label": "Price List Rate", 
+  "oldfieldname": "ref_rate", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
   "reqd": 0, 
-  "permlevel": 0
+  "width": "70px"
  }, 
  {
-  "print_hide": 1, 
   "default": "0.00", 
-  "oldfieldtype": "Float", 
   "doctype": "DocField", 
-  "label": "Discount(%)", 
-  "oldfieldname": "adj_rate", 
-  "width": "70px", 
-  "trigger": "Client", 
   "fieldname": "adj_rate", 
   "fieldtype": "Float", 
-  "permlevel": 0
+  "label": "Discount(%)", 
+  "oldfieldname": "adj_rate", 
+  "oldfieldtype": "Float", 
+  "print_hide": 1, 
+  "width": "70px"
  }, 
  {
   "default": "0.00", 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Rate", 
-  "oldfieldname": "export_rate", 
-  "width": "100px", 
-  "trigger": "Client", 
   "fieldname": "export_rate", 
   "fieldtype": "Currency", 
+  "label": "Rate", 
+  "oldfieldname": "export_rate", 
+  "oldfieldtype": "Currency", 
   "reqd": 0, 
-  "permlevel": 0
+  "width": "100px"
  }, 
  {
   "default": "0.00", 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "no_copy": 0, 
-  "label": "Amount", 
-  "oldfieldname": "export_amount", 
-  "width": "100px", 
   "fieldname": "export_amount", 
   "fieldtype": "Currency", 
+  "label": "Amount", 
+  "no_copy": 0, 
+  "oldfieldname": "export_amount", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1, 
   "reqd": 0, 
-  "permlevel": 1
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Price List Rate*", 
-  "oldfieldname": "base_ref_rate", 
-  "width": "100px", 
   "fieldname": "base_ref_rate", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Price List Rate*", 
+  "oldfieldname": "base_ref_rate", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
   "default": "0.00", 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Basic Rate*", 
-  "oldfieldname": "basic_rate", 
-  "width": "100px", 
-  "trigger": "Client", 
   "fieldname": "basic_rate", 
   "fieldtype": "Currency", 
+  "label": "Basic Rate*", 
+  "oldfieldname": "basic_rate", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
   "reqd": 0, 
-  "permlevel": 0
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
   "default": "0.00", 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "no_copy": 0, 
-  "label": "Amount*", 
-  "oldfieldname": "amount", 
-  "width": "100px", 
   "fieldname": "amount", 
   "fieldtype": "Currency", 
+  "label": "Amount*", 
+  "no_copy": 0, 
+  "oldfieldname": "amount", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
   "reqd": 0, 
-  "permlevel": 1
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
-  "permlevel": 0, 
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Reserved Warehouse", 
-  "oldfieldname": "reserved_warehouse", 
-  "width": "150px", 
-  "trigger": "Client", 
   "fieldname": "reserved_warehouse", 
   "fieldtype": "Link", 
-  "reqd": 0, 
-  "options": "Warehouse"
- }, 
- {
-  "print_hide": 1, 
-  "width": "70px", 
-  "default": "0.00", 
-  "oldfieldtype": "Currency", 
-  "colour": "White:FFF", 
-  "doctype": "DocField", 
-  "label": "Projected Qty", 
-  "oldfieldname": "projected_qty", 
+  "label": "Reserved Warehouse", 
   "no_copy": 1, 
-  "fieldname": "projected_qty", 
-  "fieldtype": "Currency", 
-  "hidden": 1, 
-  "permlevel": 1
+  "oldfieldname": "reserved_warehouse", 
+  "oldfieldtype": "Link", 
+  "options": "Warehouse", 
+  "print_hide": 1, 
+  "reqd": 0, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
-  "width": "70px", 
   "default": "0.00", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
+  "fieldname": "projected_qty", 
+  "fieldtype": "Float", 
+  "hidden": 1, 
+  "label": "Projected Qty", 
+  "no_copy": 1, 
+  "oldfieldname": "projected_qty", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "width": "70px"
+ }, 
+ {
+  "default": "0.00", 
+  "doctype": "DocField", 
+  "fieldname": "actual_qty", 
+  "fieldtype": "Float", 
   "label": "Actual Qty", 
   "no_copy": 1, 
-  "fieldname": "actual_qty", 
-  "fieldtype": "Currency", 
-  "permlevel": 1
+  "print_hide": 1, 
+  "read_only": 1, 
+  "width": "70px"
  }, 
  {
-  "print_hide": 1, 
-  "width": "100px", 
   "default": "0.00", 
-  "oldfieldtype": "Currency", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Delivered Qty", 
-  "oldfieldname": "delivered_qty", 
-  "no_copy": 1, 
   "fieldname": "delivered_qty", 
-  "fieldtype": "Currency", 
-  "search_index": 0, 
+  "fieldtype": "Float", 
   "hidden": 0, 
-  "permlevel": 1, 
-  "in_filter": 0
+  "in_filter": 0, 
+  "label": "Delivered Qty", 
+  "no_copy": 1, 
+  "oldfieldname": "delivered_qty", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "search_index": 0, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Billed Amt", 
   "fieldname": "billed_amt", 
   "fieldtype": "Currency", 
-  "permlevel": 1
- }, 
- {
-  "print_hide": 1, 
-  "description": "For Production", 
+  "label": "Billed Amt", 
   "no_copy": 1, 
-  "oldfieldtype": "Currency", 
-  "colour": "White:FFF", 
-  "doctype": "DocField", 
-  "label": "Planned Quantity", 
-  "oldfieldname": "planned_qty", 
-  "width": "50px", 
-  "fieldname": "planned_qty", 
-  "fieldtype": "Currency", 
-  "hidden": 1, 
-  "permlevel": 1, 
-  "report_hide": 1
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "For Production", 
-  "oldfieldtype": "Currency", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
+  "fieldname": "planned_qty", 
+  "fieldtype": "Float", 
+  "hidden": 1, 
+  "label": "Planned Quantity", 
+  "no_copy": 1, 
+  "oldfieldname": "planned_qty", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "report_hide": 1, 
+  "width": "50px"
+ }, 
+ {
+  "description": "For Production", 
+  "doctype": "DocField", 
+  "fieldname": "produced_qty", 
+  "fieldtype": "Float", 
+  "hidden": 1, 
   "label": "Produced Quantity", 
   "oldfieldname": "produced_qty", 
-  "width": "50px", 
-  "fieldname": "produced_qty", 
-  "fieldtype": "Currency", 
-  "hidden": 1, 
-  "permlevel": 1, 
-  "report_hide": 1
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "report_hide": 1, 
+  "width": "50px"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Brand Name", 
-  "oldfieldname": "brand", 
-  "permlevel": 1, 
   "fieldname": "brand", 
   "fieldtype": "Link", 
-  "search_index": 1, 
   "hidden": 1, 
+  "in_filter": 1, 
+  "label": "Brand Name", 
+  "oldfieldname": "brand", 
+  "oldfieldtype": "Link", 
   "options": "Brand", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "read_only": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Item Group", 
-  "oldfieldname": "item_group", 
-  "permlevel": 1, 
   "fieldname": "item_group", 
   "fieldtype": "Link", 
-  "search_index": 1, 
   "hidden": 1, 
+  "in_filter": 1, 
+  "label": "Item Group", 
+  "oldfieldname": "item_group", 
+  "oldfieldtype": "Link", 
   "options": "Item Group", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "read_only": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Quotation No.", 
-  "oldfieldname": "prevdoc_docname", 
-  "options": "Quotation", 
   "fieldname": "prevdoc_docname", 
   "fieldtype": "Link", 
-  "search_index": 1, 
   "hidden": 0, 
-  "permlevel": 1, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Quotation No.", 
+  "oldfieldname": "prevdoc_docname", 
+  "oldfieldtype": "Link", 
+  "options": "Quotation", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Check", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Page Break", 
-  "oldfieldname": "page_break", 
   "fieldname": "page_break", 
   "fieldtype": "Check", 
-  "permlevel": 0, 
+  "label": "Page Break", 
+  "oldfieldname": "page_break", 
+  "oldfieldtype": "Check", 
+  "print_hide": 1, 
   "report_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Small Text", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Item Tax Rate", 
-  "oldfieldname": "item_tax_rate", 
   "fieldname": "item_tax_rate", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
-  "permlevel": 1, 
+  "label": "Item Tax Rate", 
+  "oldfieldname": "item_tax_rate", 
+  "oldfieldtype": "Small Text", 
+  "print_hide": 1, 
+  "read_only": 1, 
   "report_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "The date at which current entry is made in system.", 
-  "oldfieldtype": "Date", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Sales Order Date", 
-  "oldfieldname": "transaction_date", 
   "fieldname": "transaction_date", 
   "fieldtype": "Date", 
-  "search_index": 0, 
   "hidden": 1, 
-  "permlevel": 1, 
+  "in_filter": 0, 
+  "label": "Sales Order Date", 
+  "oldfieldname": "transaction_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
+  "read_only": 1, 
   "report_hide": 1, 
-  "in_filter": 0
+  "search_index": 0
  }
 ]
\ No newline at end of file
diff --git a/selling/doctype/sales_team/sales_team.txt b/selling/doctype/sales_team/sales_team.txt
index 1dc2819..01f5260 100644
--- a/selling/doctype/sales_team/sales_team.txt
+++ b/selling/doctype/sales_team/sales_team.txt
@@ -1,105 +1,99 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:22", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:36:17", 
+  "modified": "2013-01-22 13:47:40", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:36:17"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Tray", 
+  "doctype": "DocType", 
   "istable": 1, 
-  "name": "__common__", 
-  "colour": "White:FFF", 
   "module": "Selling", 
-  "show_in_menu": 0, 
-  "version": 5, 
-  "server_code_error": " ", 
-  "doctype": "DocType"
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Sales Team", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "permlevel": 0, 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "name": "Sales Team", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Sales Team"
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Sales Person", 
-  "oldfieldname": "sales_person", 
-  "width": "200px", 
   "fieldname": "sales_person", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Sales Person", 
+  "oldfieldname": "sales_person", 
+  "oldfieldtype": "Link", 
   "options": "Sales Person", 
-  "in_filter": 1
+  "reqd": 1, 
+  "search_index": 1, 
+  "width": "200px"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
+  "fieldname": "sales_designation", 
+  "fieldtype": "Data", 
   "label": "Designation", 
   "oldfieldname": "sales_designation", 
-  "width": "100px", 
-  "fieldname": "sales_designation", 
-  "fieldtype": "Data"
+  "oldfieldtype": "Data", 
+  "width": "100px"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Contact No.", 
-  "oldfieldname": "contact_no", 
-  "width": "100px", 
   "fieldname": "contact_no", 
   "fieldtype": "Data", 
-  "hidden": 1
+  "hidden": 1, 
+  "label": "Contact No.", 
+  "oldfieldname": "contact_no", 
+  "oldfieldtype": "Data", 
+  "width": "100px"
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "allocated_percentage", 
+  "fieldtype": "Float", 
   "label": "Allocated (%)", 
   "oldfieldname": "allocated_percentage", 
-  "width": "100px", 
-  "trigger": "Client", 
-  "fieldname": "allocated_percentage", 
-  "fieldtype": "Currency", 
-  "reqd": 0
+  "oldfieldtype": "Currency", 
+  "reqd": 0, 
+  "width": "100px"
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Allocated Amount", 
-  "oldfieldname": "allocated_amount", 
-  "width": "120px", 
   "fieldname": "allocated_amount", 
   "fieldtype": "Currency", 
-  "reqd": 0
+  "label": "Allocated Amount", 
+  "oldfieldname": "allocated_amount", 
+  "oldfieldtype": "Currency", 
+  "reqd": 0, 
+  "width": "120px"
  }, 
  {
-  "print_hide": 1, 
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "Parenttype", 
-  "oldfieldname": "parenttype", 
   "fieldname": "parenttype", 
   "fieldtype": "Data", 
-  "oldfieldtype": "Data", 
   "hidden": 1, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Parenttype", 
+  "oldfieldname": "parenttype", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "incentives", 
+  "fieldtype": "Currency", 
   "label": "Incentives", 
   "oldfieldname": "incentives", 
-  "fieldname": "incentives", 
-  "fieldtype": "Currency"
+  "oldfieldtype": "Currency"
  }
 ]
\ No newline at end of file
diff --git a/selling/doctype/shipping_address/shipping_address.txt b/selling/doctype/shipping_address/shipping_address.txt
index 16eff90..4243704 100755
--- a/selling/doctype/shipping_address/shipping_address.txt
+++ b/selling/doctype/shipping_address/shipping_address.txt
@@ -1,144 +1,119 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:22", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:36:17", 
+  "modified": "2013-01-22 14:57:24", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:36:17"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
-  "search_fields": "customer, ship_to, shipping_address", 
-  "module": "Selling", 
-  "allow_trash": 1, 
-  "document_type": "Master", 
   "autoname": "SA.#####", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
   "doctype": "DocType", 
-  "show_in_menu": 0, 
-  "version": 8
+  "document_type": "Master", 
+  "module": "Selling", 
+  "name": "__common__", 
+  "search_fields": "customer, ship_to, shipping_address"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Shipping Address", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Shipping Address", 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
+  "cancel": 1, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Shipping Address", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
+  "permlevel": 0, 
   "read": 1, 
-  "doctype": "DocPerm", 
-  "parenttype": "DocType", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Shipping Address", 
-  "doctype": "DocType"
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "cancel": 1, 
-  "role": "Sales Master Manager", 
   "report": 1, 
-  "permlevel": 0
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "role": "Sales Master Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "cancel": 1, 
-  "role": "Sales Manager", 
-  "report": 1, 
-  "permlevel": 0
- }, 
- {
-  "role": "Sales Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
+  "doctype": "DocType", 
+  "name": "Shipping Address"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break0", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Customer", 
-  "permlevel": 0, 
   "fieldname": "customer", 
   "fieldtype": "Link", 
-  "reqd": 1, 
-  "options": "Customer"
+  "label": "Customer", 
+  "options": "Customer", 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Customer Name", 
   "fieldname": "customer_name", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Customer Name", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Customer Address", 
   "fieldname": "customer_address", 
   "fieldtype": "Text", 
-  "permlevel": 1
+  "label": "Customer Address", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Ship To", 
   "fieldname": "ship_to", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Ship To", 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Shipping Address", 
   "fieldname": "shipping_address", 
   "fieldtype": "Text", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Shipping Address", 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
   "doctype": "DocField", 
-  "options": "Yes\nNo", 
   "fieldname": "is_primary_address", 
   "fieldtype": "Select", 
   "label": "Is Primary Address", 
-  "permlevel": 0
+  "options": "Yes\nNo"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Shipping Details", 
   "fieldname": "shipping_details", 
   "fieldtype": "Text Editor", 
-  "permlevel": 0
+  "label": "Shipping Details"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Trash Reason", 
   "fieldname": "trash_reason", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Trash Reason", 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "Sales Master Manager"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "Sales Manager"
  }
 ]
\ No newline at end of file
diff --git a/selling/doctype/sms_center/sms_center.txt b/selling/doctype/sms_center/sms_center.txt
index 3e608b4..e9b8fdd 100644
--- a/selling/doctype/sms_center/sms_center.txt
+++ b/selling/doctype/sms_center/sms_center.txt
@@ -1,120 +1,101 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:22", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:36:17", 
+  "modified": "2013-01-22 14:57:24", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:36:17"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
   "allow_attach": 0, 
-  "allow_print": 1, 
-  "module": "Selling", 
-  "doctype": "DocType", 
-  "server_code_error": " ", 
-  "in_create": 0, 
-  "read_only": 1, 
+  "allow_copy": 1, 
   "allow_email": 1, 
+  "allow_print": 1, 
+  "doctype": "DocType", 
   "hide_heading": 0, 
-  "issingle": 1, 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "_last_update": "1322549700", 
-  "show_in_menu": 1, 
-  "version": 41, 
-  "menu_index": 4, 
   "hide_toolbar": 0, 
-  "allow_copy": 1
+  "in_create": 0, 
+  "issingle": 1, 
+  "module": "Selling", 
+  "name": "__common__", 
+  "read_only": 1
  }, 
  {
-  "name": "__common__", 
-  "parent": "SMS Center", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "SMS Center", 
-  "read": 1, 
-  "doctype": "DocPerm", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "role": "System Manager", 
-  "parentfield": "permissions"
+  "permlevel": 0
  }, 
  {
-  "name": "SMS Center", 
-  "doctype": "DocType"
- }, 
- {
-  "write": 1, 
   "create": 1, 
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "SMS Center", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
   "permlevel": 0, 
-  "doctype": "DocPerm"
+  "read": 1, 
+  "report": 1, 
+  "role": "System Manager", 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "write": 0, 
-  "create": 0, 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
+  "doctype": "DocType", 
+  "name": "SMS Center"
  }, 
  {
-  "width": "50%", 
+  "doctype": "DocField", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
-  "doctype": "DocField"
+  "width": "50%"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Send To", 
-  "trigger": "Client", 
   "fieldname": "send_to", 
   "fieldtype": "Select", 
+  "label": "Send To", 
   "options": "\nAll Contact\nAll Customer Contact\nAll Supplier Contact\nAll Sales Partner Contact\nAll Lead (Open)\nAll Employee (Active)\nAll Sales Person"
  }, 
  {
   "depends_on": "eval:doc.send_to=='All Customer Contact'", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Customer", 
   "fieldname": "customer", 
   "fieldtype": "Link", 
+  "label": "Customer", 
   "options": "Customer"
  }, 
  {
   "depends_on": "eval:doc.send_to=='All Supplier Contact'", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Supplier", 
   "fieldname": "supplier", 
   "fieldtype": "Link", 
+  "label": "Supplier", 
   "options": "Supplier"
  }, 
  {
   "depends_on": "eval:doc.send_to=='All Employee (Active)'", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Department", 
   "fieldname": "department", 
   "fieldtype": "Select", 
+  "label": "Department", 
   "options": "link:Department"
  }, 
  {
   "depends_on": "eval:doc.send_to=='All Employee (Active)'", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Branch", 
   "fieldname": "branch", 
   "fieldtype": "Select", 
+  "label": "Branch", 
   "options": "link:Branch"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Create Receiver List", 
   "fieldname": "create_receiver_list", 
   "fieldtype": "Button", 
+  "label": "Create Receiver List", 
   "options": "create_receiver_list"
  }, 
  {
@@ -124,24 +105,27 @@
   "label": "Receiver List"
  }, 
  {
-  "width": "50%", 
+  "doctype": "DocField", 
   "fieldname": "column_break9", 
   "fieldtype": "Column Break", 
-  "doctype": "DocField"
+  "width": "50%"
  }, 
  {
   "description": "Message greater than 160 character will be splitted into multiple mesage", 
   "doctype": "DocField", 
-  "label": "Message", 
   "fieldname": "message", 
   "fieldtype": "Text", 
+  "label": "Message", 
   "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Send SMS", 
   "fieldname": "send_sms", 
   "fieldtype": "Button", 
+  "label": "Send SMS", 
   "options": "send_sms"
+ }, 
+ {
+  "doctype": "DocPerm"
  }
 ]
\ No newline at end of file
diff --git a/setup/doctype/company/company.js b/setup/doctype/company/company.js
index 3938cb5..a84bbc9 100644
--- a/setup/doctype/company/company.js
+++ b/setup/doctype/company/company.js
@@ -15,7 +15,8 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 cur_frm.cscript.refresh = function(doc, cdt, cdn) {
-  if(doc.abbr && !doc.__islocal) set_field_permlevel('abbr',1);
+	if(doc.abbr && !doc.__islocal)
+		cur_frm.set_df_property("abbr", "read_only", 1)
 }
 
 cur_frm.cscript.has_special_chars = function(t) {
diff --git a/setup/doctype/company/company.txt b/setup/doctype/company/company.txt
index e39a416..fc778ce 100644
--- a/setup/doctype/company/company.txt
+++ b/setup/doctype/company/company.txt
@@ -1,309 +1,260 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:22", 
   "docstatus": 0, 
-  "creation": "2012-08-10 13:00:45", 
+  "modified": "2013-01-22 14:55:58", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-03 11:26:05"
+  "owner": "Administrator"
  }, 
  {
-  "description": "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.", 
-  "autoname": "field:company_name", 
   "allow_rename": 1, 
-  "module": "Setup", 
+  "autoname": "field:company_name", 
+  "description": "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.", 
   "doctype": "DocType", 
   "document_type": "Master", 
+  "module": "Setup", 
   "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Company", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "name": "__common__", 
-  "parent": "Company", 
-  "read": 1, 
+  "amend": 0, 
+  "cancel": 1, 
+  "create": 1, 
   "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Company", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
+  "permlevel": 0, 
+  "read": 1, 
+  "report": 1, 
+  "role": "System Manager", 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "name": "Company", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Company"
  }, 
  {
-  "oldfieldtype": "Section Break", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Company Details", 
   "fieldname": "details", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Company Details", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "no_copy": 0, 
-  "oldfieldtype": "Data", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Company", 
-  "oldfieldname": "company_name", 
   "fieldname": "company_name", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Company", 
+  "no_copy": 0, 
+  "oldfieldname": "company_name", 
+  "oldfieldtype": "Data", 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "cb0", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
   "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
+  "label": "Abbr", 
+  "no_copy": 0, 
+  "oldfieldname": "abbr", 
+  "oldfieldtype": "Data", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Default Settings", 
   "fieldname": "default_settings", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Default Settings", 
+  "oldfieldtype": "Section Break"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Default Currency", 
-  "permlevel": 0, 
   "fieldname": "default_currency", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "options": "link:Currency"
+  "label": "Default Currency", 
+  "options": "link:Currency", 
+  "reqd": 1
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
+  "depends_on": "eval:!doc.__islocal", 
   "doctype": "DocField", 
-  "label": "Default Bank Account", 
-  "oldfieldname": "default_bank_account", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "default_bank_account", 
   "fieldtype": "Link", 
-  "depends_on": "eval:!doc.__islocal", 
+  "label": "Default Bank Account", 
+  "no_copy": 1, 
+  "oldfieldname": "default_bank_account", 
+  "oldfieldtype": "Link", 
   "options": "Account"
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
+  "depends_on": "eval:!doc.__islocal", 
   "doctype": "DocField", 
-  "label": "Receivables Group", 
-  "oldfieldname": "receivables_group", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "receivables_group", 
   "fieldtype": "Link", 
-  "depends_on": "eval:!doc.__islocal", 
+  "label": "Receivables Group", 
+  "no_copy": 1, 
+  "oldfieldname": "receivables_group", 
+  "oldfieldtype": "Link", 
   "options": "Account"
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
+  "depends_on": "eval:!doc.__islocal", 
   "doctype": "DocField", 
-  "label": "Payables Group", 
-  "oldfieldname": "payables_group", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "payables_group", 
   "fieldtype": "Link", 
-  "depends_on": "eval:!doc.__islocal", 
+  "label": "Payables Group", 
+  "no_copy": 1, 
+  "oldfieldname": "payables_group", 
+  "oldfieldtype": "Link", 
   "options": "Account"
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break0", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
-  "oldfieldtype": "Int", 
+  "depends_on": "eval:!doc.__islocal", 
   "doctype": "DocField", 
-  "label": "Credit Days", 
-  "oldfieldname": "credit_days", 
   "fieldname": "credit_days", 
   "fieldtype": "Int", 
-  "depends_on": "eval:!doc.__islocal", 
-  "permlevel": 0
+  "label": "Credit Days", 
+  "oldfieldname": "credit_days", 
+  "oldfieldtype": "Int"
  }, 
  {
-  "oldfieldtype": "Currency", 
+  "depends_on": "eval:!doc.__islocal", 
   "doctype": "DocField", 
-  "label": "Credit Limit", 
-  "oldfieldname": "credit_limit", 
   "fieldname": "credit_limit", 
   "fieldtype": "Currency", 
-  "depends_on": "eval:!doc.__islocal", 
-  "permlevel": 0
+  "label": "Credit Limit", 
+  "oldfieldname": "credit_limit", 
+  "oldfieldtype": "Currency"
  }, 
  {
-  "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
+  "depends_on": "eval:!doc.__islocal", 
   "doctype": "DocField", 
-  "label": "If Yearly Budget Exceeded", 
-  "oldfieldname": "yearly_bgt_flag", 
-  "permlevel": 0, 
   "fieldname": "yearly_bgt_flag", 
   "fieldtype": "Select", 
-  "depends_on": "eval:!doc.__islocal", 
+  "label": "If Yearly Budget Exceeded", 
+  "oldfieldname": "yearly_bgt_flag", 
+  "oldfieldtype": "Select", 
   "options": "\nWarn\nIgnore\nStop"
  }, 
  {
-  "oldfieldtype": "Select", 
+  "depends_on": "eval:!doc.__islocal", 
   "doctype": "DocField", 
-  "label": "If Monthly Budget Exceeded", 
-  "oldfieldname": "monthly_bgt_flag", 
-  "permlevel": 0, 
   "fieldname": "monthly_bgt_flag", 
   "fieldtype": "Select", 
-  "depends_on": "eval:!doc.__islocal", 
+  "label": "If Monthly Budget Exceeded", 
+  "oldfieldname": "monthly_bgt_flag", 
+  "oldfieldtype": "Select", 
   "options": "\nWarn\nIgnore\nStop"
  }, 
  {
   "description": "For reference only.", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Company Info", 
   "fieldname": "company_info", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Company Info"
  }, 
  {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Address", 
-  "oldfieldname": "address", 
   "fieldname": "address", 
   "fieldtype": "Small Text", 
-  "permlevel": 0
+  "label": "Address", 
+  "oldfieldname": "address", 
+  "oldfieldtype": "Small Text"
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Phone No", 
-  "oldfieldname": "phone_no", 
-  "permlevel": 0, 
   "fieldname": "phone_no", 
   "fieldtype": "Data", 
+  "label": "Phone No", 
+  "oldfieldname": "phone_no", 
+  "oldfieldtype": "Data", 
   "options": "Phone"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Fax", 
-  "oldfieldname": "fax", 
-  "permlevel": 0, 
   "fieldname": "fax", 
   "fieldtype": "Data", 
+  "label": "Fax", 
+  "oldfieldname": "fax", 
+  "oldfieldtype": "Data", 
   "options": "Phone"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Email", 
-  "oldfieldname": "email", 
-  "permlevel": 0, 
   "fieldname": "email", 
   "fieldtype": "Data", 
+  "label": "Email", 
+  "oldfieldname": "email", 
+  "oldfieldtype": "Data", 
   "options": "Email"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Website", 
-  "oldfieldname": "website", 
   "fieldname": "website", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Website", 
+  "oldfieldname": "website", 
+  "oldfieldtype": "Data"
  }, 
  {
   "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
+  "label": "Registration Info", 
+  "oldfieldtype": "Section Break", 
+  "width": "50%"
  }, 
  {
   "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
+  "label": "Registration Details", 
+  "oldfieldname": "registration_details", 
+  "oldfieldtype": "Code"
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Trash Reason", 
-  "oldfieldname": "trash_reason", 
   "fieldname": "trash_reason", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Trash Reason", 
+  "no_copy": 1, 
+  "oldfieldname": "trash_reason", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1
  }, 
  {
-  "amend": 0, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 1, 
-  "report": 1, 
-  "role": "System Manager", 
-  "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "amend": 0, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 1, 
-  "report": 1, 
-  "role": "System Manager", 
-  "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "cancel": 0, 
-  "role": "All", 
-  "permlevel": 1, 
   "doctype": "DocPerm"
  }
 ]
\ No newline at end of file
diff --git a/setup/doctype/currency/currency.txt b/setup/doctype/currency/currency.txt
index c8dbb62..ae7dbb1 100644
--- a/setup/doctype/currency/currency.txt
+++ b/setup/doctype/currency/currency.txt
@@ -1,93 +1,99 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-19 11:14:50", 
   "docstatus": 0, 
-  "creation": "2013-01-19 10:23:31", 
+  "modified": "2013-01-22 15:07:36", 
   "modified_by": "Administrator", 
-  "modified": "2013-01-19 11:10:45"
+  "owner": "Administrator"
  }, 
  {
-  "read_only": 0, 
   "autoname": "field:currency_name", 
-  "in_create": 0, 
   "description": "**Currency** Master", 
   "doctype": "DocType", 
+  "in_create": 0, 
   "module": "Setup", 
-  "name": "__common__"
+  "name": "__common__", 
+  "read_only": 0
  }, 
  {
-  "name": "__common__", 
-  "parent": "Currency", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Currency", 
-  "read": 1, 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
   "create": 1, 
-  "submit": 0, 
   "doctype": "DocPerm", 
-  "write": 1, 
+  "name": "__common__", 
+  "parent": "Currency", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "report": 1, 
   "permlevel": 0, 
-  "parentfield": "permissions"
+  "read": 1, 
+  "report": 1, 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "name": "Currency", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Currency"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Currency Name", 
-  "oldfieldname": "currency_name", 
   "fieldname": "currency_name", 
   "fieldtype": "Data", 
+  "label": "Currency Name", 
+  "oldfieldname": "currency_name", 
+  "oldfieldtype": "Data", 
   "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Fraction", 
+  "fieldname": "enabled", 
+  "fieldtype": "Check", 
+  "label": "Enabled"
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "fraction", 
-  "fieldtype": "Data"
+  "fieldtype": "Data", 
+  "label": "Fraction"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Fraction Units", 
   "fieldname": "fraction_units", 
-  "fieldtype": "Int"
+  "fieldtype": "Int", 
+  "label": "Fraction Units"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Symbol", 
   "fieldname": "symbol", 
-  "fieldtype": "Data"
+  "fieldtype": "Data", 
+  "label": "Symbol"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Number Format", 
   "fieldname": "number_format", 
-  "fieldtype": "Data"
+  "fieldtype": "Data", 
+  "label": "Number Format"
  }, 
  {
   "cancel": 1, 
-  "role": "Accounts Manager", 
-  "doctype": "DocPerm"
+  "doctype": "DocPerm", 
+  "role": "Accounts Manager"
  }, 
  {
   "amend": 0, 
+  "cancel": 1, 
   "doctype": "DocPerm", 
-  "role": "Sales Master Manager", 
-  "cancel": 1
+  "role": "Sales Master Manager"
  }, 
  {
   "amend": 0, 
+  "cancel": 0, 
   "doctype": "DocPerm", 
-  "role": "Purchase Master Manager", 
-  "cancel": 0
+  "role": "Purchase Master Manager"
  }
 ]
\ No newline at end of file
diff --git a/setup/doctype/customer_group/customer_group.txt b/setup/doctype/customer_group/customer_group.txt
index 3ba5c11..6b67d59 100644
--- a/setup/doctype/customer_group/customer_group.txt
+++ b/setup/doctype/customer_group/customer_group.txt
@@ -1,196 +1,157 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:23", 
   "docstatus": 0, 
-  "creation": "2012-07-12 23:29:45", 
+  "modified": "2013-01-22 14:55:59", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-06 10:28:54"
+  "owner": "Administrator"
  }, 
  {
-  "read_only": 1, 
+  "allow_rename": 1, 
+  "autoname": "field:customer_group_name", 
+  "doctype": "DocType", 
   "document_type": "Master", 
   "in_create": 1, 
-  "autoname": "field:customer_group_name", 
-  "allow_rename": 1, 
   "module": "Setup", 
-  "doctype": "DocType", 
-  "search_fields": "name,parent_customer_group", 
-  "name": "__common__"
+  "name": "__common__", 
+  "read_only": 1, 
+  "search_fields": "name,parent_customer_group"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Customer Group", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
-  "name": "__common__", 
-  "parent": "Customer Group", 
-  "amend": 0, 
-  "submit": 0, 
-  "doctype": "DocPerm", 
-  "read": 1, 
-  "parenttype": "DocType", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Customer Group", 
-  "doctype": "DocType"
- }, 
- {
-  "oldfieldtype": "Small Text", 
-  "doctype": "DocField", 
-  "label": "Trash Reason", 
-  "oldfieldname": "trash_reason", 
-  "fieldname": "trash_reason", 
-  "fieldtype": "Small Text", 
-  "permlevel": 1
- }, 
- {
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
-  "doctype": "DocField", 
-  "label": "Customer Group Name", 
-  "oldfieldname": "customer_group_name", 
-  "fieldname": "customer_group_name", 
-  "fieldtype": "Data", 
-  "reqd": 1, 
   "permlevel": 0
  }, 
  {
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
-  "doctype": "DocField", 
-  "label": "Parent Customer Group", 
-  "oldfieldname": "parent_customer_group", 
+  "amend": 0, 
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Customer Group", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
   "permlevel": 0, 
-  "trigger": "Client", 
+  "read": 1, 
+  "report": 1, 
+  "submit": 0
+ }, 
+ {
+  "doctype": "DocType", 
+  "name": "Customer Group"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "trash_reason", 
+  "fieldtype": "Small Text", 
+  "label": "Trash Reason", 
+  "oldfieldname": "trash_reason", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "customer_group_name", 
+  "fieldtype": "Data", 
+  "label": "Customer Group Name", 
+  "no_copy": 1, 
+  "oldfieldname": "customer_group_name", 
+  "oldfieldtype": "Data", 
+  "reqd": 1
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "parent_customer_group", 
   "fieldtype": "Link", 
-  "reqd": 1, 
-  "options": "Customer Group"
+  "label": "Parent Customer Group", 
+  "oldfieldname": "parent_customer_group", 
+  "oldfieldtype": "Link", 
+  "options": "Customer Group", 
+  "reqd": 1
  }, 
  {
   "description": "Only leaf nodes are allowed in transaction", 
-  "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Has Child Node", 
-  "oldfieldname": "is_group", 
-  "permlevel": 0, 
   "fieldname": "is_group", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "options": "\nYes\nNo"
+  "label": "Has Child Node", 
+  "oldfieldname": "is_group", 
+  "oldfieldtype": "Select", 
+  "options": "\nYes\nNo", 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "cb0", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
   "description": "This Price List will be selected as default for all Customers under this Group.", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Default Price List", 
-  "permlevel": 0, 
   "fieldname": "default_price_list", 
   "fieldtype": "Link", 
+  "label": "Default Price List", 
   "options": "Price List"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Int", 
   "doctype": "DocField", 
-  "label": "lft", 
-  "oldfieldname": "lft", 
   "fieldname": "lft", 
   "fieldtype": "Int", 
-  "search_index": 1, 
   "hidden": 1, 
-  "permlevel": 0, 
-  "report_hide": 1
+  "label": "lft", 
+  "no_copy": 1, 
+  "oldfieldname": "lft", 
+  "oldfieldtype": "Int", 
+  "print_hide": 1, 
+  "report_hide": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Int", 
   "doctype": "DocField", 
-  "label": "rgt", 
-  "oldfieldname": "rgt", 
   "fieldname": "rgt", 
   "fieldtype": "Int", 
-  "search_index": 1, 
   "hidden": 1, 
-  "permlevel": 0, 
-  "report_hide": 1
+  "label": "rgt", 
+  "no_copy": 1, 
+  "oldfieldname": "rgt", 
+  "oldfieldtype": "Int", 
+  "print_hide": 1, 
+  "report_hide": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "old_parent", 
-  "oldfieldname": "old_parent", 
-  "options": "Customer Group", 
   "fieldname": "old_parent", 
   "fieldtype": "Link", 
   "hidden": 1, 
-  "permlevel": 0, 
+  "label": "old_parent", 
+  "no_copy": 1, 
+  "oldfieldname": "old_parent", 
+  "oldfieldtype": "Data", 
+  "options": "Customer Group", 
+  "print_hide": 1, 
   "report_hide": 1
  }, 
  {
+  "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "write": 0, 
   "role": "Sales Manager", 
-  "cancel": 0, 
-  "permlevel": 1
+  "write": 0
  }, 
  {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "report": 1, 
-  "role": "Sales Manager", 
   "cancel": 0, 
-  "permlevel": 0
- }, 
- {
   "create": 0, 
   "doctype": "DocPerm", 
-  "write": 0, 
-  "role": "Sales Master Manager", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
   "role": "Sales User", 
-  "cancel": 0, 
-  "permlevel": 1
+  "write": 0
  }, 
  {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "report": 1, 
-  "role": "Sales User", 
-  "cancel": 0, 
-  "permlevel": 0
- }, 
- {
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "report": 1, 
   "role": "Sales Master Manager", 
-  "cancel": 1, 
-  "permlevel": 0
+  "write": 1
  }
 ]
\ No newline at end of file
diff --git a/setup/doctype/email_digest/email_digest.txt b/setup/doctype/email_digest/email_digest.txt
index ac5844a..b03c542 100644
--- a/setup/doctype/email_digest/email_digest.txt
+++ b/setup/doctype/email_digest/email_digest.txt
@@ -1,294 +1,253 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:23", 
   "docstatus": 0, 
-  "creation": "2012-09-18 10:50:53", 
+  "modified": "2013-01-22 14:56:01", 
   "modified_by": "Administrator", 
-  "modified": "2012-11-13 15:10:35"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
+  "autoname": "Prompt", 
   "description": "Send regular summary reports via Email.", 
-  "module": "Setup", 
   "doctype": "DocType", 
   "document_type": "System", 
-  "_last_update": "1324556758", 
-  "autoname": "Prompt", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "show_in_menu": 0, 
-  "version": 1
+  "module": "Setup", 
+  "name": "__common__"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Email Digest", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Email Digest", 
-  "read": 1, 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
+  "cancel": 1, 
+  "create": 1, 
   "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Email Digest", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
+  "permlevel": 0, 
+  "read": 1, 
+  "report": 1, 
   "role": "System Manager", 
-  "parentfield": "permissions"
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "name": "Email Digest", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Email Digest"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Email Digest Settings", 
   "fieldname": "settings", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Email Digest Settings"
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "column_break0", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Enabled", 
   "fieldname": "enabled", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "Enabled"
  }, 
  {
   "doctype": "DocField", 
-  "label": "For Company", 
-  "permlevel": 0, 
   "fieldname": "company", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "options": "link:Company"
+  "label": "For Company", 
+  "options": "link:Company", 
+  "reqd": 1
  }, 
  {
   "allow_on_submit": 0, 
   "doctype": "DocField", 
-  "label": "How frequently?", 
-  "options": "Daily\nWeekly\nMonthly", 
   "fieldname": "frequency", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "How frequently?", 
+  "options": "Daily\nWeekly\nMonthly", 
+  "reqd": 1
  }, 
  {
   "depends_on": "eval:doc.enabled", 
   "doctype": "DocField", 
-  "label": "Next email will be sent on:", 
   "fieldname": "next_send", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Next email will be sent on:", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "column_break1", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
   "description": "Note: Email will not be sent to disabled users", 
   "doctype": "DocField", 
-  "label": "Recipients", 
   "fieldname": "recipient_list", 
   "fieldtype": "Text", 
-  "reqd": 1, 
-  "permlevel": 1
+  "label": "Recipients", 
+  "read_only": 1, 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Add/Remove Recipients", 
-  "trigger": "Client", 
   "fieldname": "addremove_recipients", 
   "fieldtype": "Button", 
-  "permlevel": 0
+  "label": "Add/Remove Recipients"
  }, 
  {
   "description": "Check all the items below that you want to send in this digest.", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Select Digest Content", 
   "fieldname": "select_digest_content", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Select Digest Content"
  }, 
  {
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "New Leads", 
   "fieldname": "new_leads", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "New Leads"
  }, 
  {
   "doctype": "DocField", 
-  "label": "New Enquiries", 
   "fieldname": "new_enquiries", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "New Enquiries"
  }, 
  {
   "doctype": "DocField", 
-  "label": "New Quotations", 
   "fieldname": "new_quotations", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "New Quotations"
  }, 
  {
   "doctype": "DocField", 
-  "label": "New Sales Orders", 
   "fieldname": "new_sales_orders", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "New Sales Orders"
  }, 
  {
   "doctype": "DocField", 
-  "label": "New Delivery Notes", 
   "fieldname": "new_delivery_notes", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "New Delivery Notes"
  }, 
  {
   "doctype": "DocField", 
-  "label": "New Purchase Requests", 
   "fieldname": "new_purchase_requests", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "New Purchase Requests"
  }, 
  {
   "doctype": "DocField", 
-  "label": "New Supplier Quotations", 
   "fieldname": "new_supplier_quotations", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "New Supplier Quotations"
  }, 
  {
   "doctype": "DocField", 
-  "label": "New Purchase Orders", 
   "fieldname": "new_purchase_orders", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "New Purchase Orders"
  }, 
  {
   "doctype": "DocField", 
-  "label": "New Purchase Receipts", 
   "fieldname": "new_purchase_receipts", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "New Purchase Receipts"
  }, 
  {
   "doctype": "DocField", 
-  "label": "New Stock Entries", 
   "fieldname": "new_stock_entries", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "New Stock Entries"
  }, 
  {
   "doctype": "DocField", 
-  "label": "New Support Tickets", 
   "fieldname": "new_support_tickets", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "New Support Tickets"
  }, 
  {
   "doctype": "DocField", 
-  "label": "New Communications", 
   "fieldname": "new_communications", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "New Communications"
  }, 
  {
   "doctype": "DocField", 
-  "label": "New Projects", 
   "fieldname": "new_projects", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "New Projects"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Open Tickets", 
   "fieldname": "open_tickets", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "Open Tickets"
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "cb1", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Income Year to Date", 
   "fieldname": "income_year_to_date", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "Income Year to Date"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Bank Balance", 
   "fieldname": "bank_balance", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "Bank Balance"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Income", 
   "fieldname": "income", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "Income"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Expenses Booked", 
   "fieldname": "expenses_booked", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "Expenses Booked"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Collections", 
   "fieldname": "collections", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "Collections"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Payments", 
   "fieldname": "payments", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "Payments"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Receivables", 
   "fieldname": "invoiced_amount", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "Receivables"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Payables", 
   "fieldname": "payables", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "Payables"
  }, 
  {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "cancel": 1, 
-  "report": 1, 
-  "permlevel": 0
- }, 
- {
-  "permlevel": 1, 
   "doctype": "DocPerm"
  }
 ]
\ No newline at end of file
diff --git a/setup/doctype/global_defaults/global_defaults.txt b/setup/doctype/global_defaults/global_defaults.txt
index 6854fc7..2868af4 100644
--- a/setup/doctype/global_defaults/global_defaults.txt
+++ b/setup/doctype/global_defaults/global_defaults.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:23", 
   "docstatus": 0, 
-  "modified": "2013-01-21 16:32:30", 
+  "modified": "2013-01-22 14:56:02", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -34,7 +34,9 @@
   "parenttype": "DocType", 
   "read": 1, 
   "report": 0, 
-  "submit": 0
+  "role": "System Manager", 
+  "submit": 0, 
+  "write": 1
  }, 
  {
   "doctype": "DocType", 
@@ -188,7 +190,7 @@
   "description": "Percentage you are allowed to receive or deliver more against the quantity ordered. <p>For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units</p>", 
   "doctype": "DocField", 
   "fieldname": "tolerance", 
-  "fieldtype": "Currency", 
+  "fieldtype": "Float", 
   "label": "Allowance Percent"
  }, 
  {
@@ -403,25 +405,10 @@
  {
   "create": 1, 
   "doctype": "DocPerm", 
-  "permlevel": 0, 
-  "role": "System Manager", 
-  "write": 1
+  "permlevel": 0
  }, 
  {
   "doctype": "DocPerm", 
-  "permlevel": 1, 
-  "role": "System Manager", 
-  "write": 1
- }, 
- {
-  "doctype": "DocPerm", 
-  "permlevel": 1, 
-  "role": "All"
- }, 
- {
-  "doctype": "DocPerm", 
-  "permlevel": 2, 
-  "role": "System Manager", 
-  "write": 1
+  "permlevel": 2
  }
 ]
\ No newline at end of file
diff --git a/setup/doctype/item_group/item_group.txt b/setup/doctype/item_group/item_group.txt
index 2bc42f0..5976be6 100644
--- a/setup/doctype/item_group/item_group.txt
+++ b/setup/doctype/item_group/item_group.txt
@@ -1,92 +1,95 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:23", 
   "docstatus": 0, 
-  "creation": "2012-12-07 15:15:28", 
+  "modified": "2013-01-22 14:56:03", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-27 18:50:20"
+  "owner": "Administrator"
  }, 
  {
   "allow_attach": 1, 
-  "search_fields": "parent_item_group", 
-  "module": "Setup", 
-  "doctype": "DocType", 
-  "autoname": "field:item_group_name", 
-  "document_type": "Master", 
-  "description": "Item Classification", 
-  "issingle": 0, 
-  "name": "__common__", 
   "allow_rename": 1, 
+  "autoname": "field:item_group_name", 
+  "description": "Item Classification", 
+  "doctype": "DocType", 
+  "document_type": "Master", 
+  "in_create": 1, 
+  "issingle": 0, 
   "max_attachments": 3, 
-  "in_create": 1
+  "module": "Setup", 
+  "name": "__common__", 
+  "search_fields": "parent_item_group"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Item Group", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Item Group", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
   "permlevel": 0, 
-  "parentfield": "fields"
- }, 
- {
-  "name": "__common__", 
-  "parent": "Item Group", 
   "read": 1, 
-  "doctype": "DocPerm", 
-  "parenttype": "DocType", 
-  "parentfield": "permissions"
+  "report": 1, 
+  "submit": 0
  }, 
  {
-  "name": "Item Group", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Item Group"
  }, 
  {
-  "no_copy": 0, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Item Group Name", 
-  "oldfieldname": "item_group_name", 
   "fieldname": "item_group_name", 
   "fieldtype": "Data", 
-  "search_index": 0, 
-  "reqd": 1
- }, 
- {
-  "read_only": 1, 
-  "doctype": "DocField", 
-  "label": "Page Name", 
-  "fieldname": "page_name", 
-  "fieldtype": "Data"
- }, 
- {
-  "fieldname": "cb0", 
-  "fieldtype": "Column Break", 
-  "doctype": "DocField"
- }, 
- {
+  "label": "Item Group Name", 
   "no_copy": 0, 
-  "oldfieldtype": "Link", 
+  "oldfieldname": "item_group_name", 
+  "oldfieldtype": "Data", 
+  "reqd": 1, 
+  "search_index": 0
+ }, 
+ {
   "doctype": "DocField", 
-  "label": "Parent Item Group", 
-  "oldfieldname": "parent_item_group", 
+  "fieldname": "page_name", 
+  "fieldtype": "Data", 
+  "label": "Page Name", 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "cb0", 
+  "fieldtype": "Column Break"
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "parent_item_group", 
   "fieldtype": "Link", 
-  "search_index": 0, 
+  "label": "Parent Item Group", 
+  "no_copy": 0, 
+  "oldfieldname": "parent_item_group", 
+  "oldfieldtype": "Link", 
+  "options": "Item Group", 
   "reqd": 1, 
-  "options": "Item Group"
+  "search_index": 0
  }, 
  {
   "description": "Only leaf nodes are allowed in transaction", 
-  "no_copy": 0, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Has Child Node", 
-  "oldfieldname": "is_group", 
   "fieldname": "is_group", 
   "fieldtype": "Select", 
-  "search_index": 0, 
+  "label": "Has Child Node", 
+  "no_copy": 0, 
+  "oldfieldname": "is_group", 
+  "oldfieldtype": "Select", 
+  "options": "\nYes\nNo", 
   "reqd": 1, 
-  "options": "\nYes\nNo"
+  "search_index": 0
  }, 
  {
   "doctype": "DocField", 
@@ -96,139 +99,109 @@
  }, 
  {
   "description": "Check this if you want to show in website", 
-  "no_copy": 0, 
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "Show in Website", 
   "fieldname": "show_in_website", 
-  "fieldtype": "Check"
+  "fieldtype": "Check", 
+  "label": "Show in Website", 
+  "no_copy": 0, 
+  "search_index": 0
  }, 
  {
-  "description": "Show this slideshow at the top of the page", 
   "depends_on": "show_in_website", 
+  "description": "Show this slideshow at the top of the page", 
   "doctype": "DocField", 
-  "label": "Slideshow", 
   "fieldname": "slideshow", 
   "fieldtype": "Link", 
+  "label": "Slideshow", 
   "options": "Website Slideshow"
  }, 
  {
-  "description": "HTML / Banner that will show on the top of product list.", 
   "depends_on": "show_in_website", 
+  "description": "HTML / Banner that will show on the top of product list.", 
   "doctype": "DocField", 
-  "label": "Description", 
   "fieldname": "description", 
-  "fieldtype": "Text Editor"
+  "fieldtype": "Text Editor", 
+  "label": "Description"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Int", 
   "doctype": "DocField", 
-  "label": "lft", 
-  "oldfieldname": "lft", 
   "fieldname": "lft", 
   "fieldtype": "Int", 
-  "search_index": 1, 
   "hidden": 1, 
+  "in_filter": 1, 
+  "label": "lft", 
+  "no_copy": 1, 
+  "oldfieldname": "lft", 
+  "oldfieldtype": "Int", 
+  "print_hide": 1, 
   "report_hide": 0, 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Int", 
   "doctype": "DocField", 
-  "label": "rgt", 
-  "oldfieldname": "rgt", 
   "fieldname": "rgt", 
   "fieldtype": "Int", 
-  "search_index": 1, 
   "hidden": 1, 
+  "in_filter": 1, 
+  "label": "rgt", 
+  "no_copy": 1, 
+  "oldfieldname": "rgt", 
+  "oldfieldtype": "Int", 
+  "print_hide": 1, 
   "report_hide": 0, 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "old_parent", 
-  "oldfieldname": "old_parent", 
   "fieldname": "old_parent", 
   "fieldtype": "Link", 
-  "search_index": 0, 
   "hidden": 1, 
+  "label": "old_parent", 
+  "no_copy": 1, 
+  "oldfieldname": "old_parent", 
+  "oldfieldtype": "Data", 
   "options": "Item Group", 
-  "report_hide": 1
+  "print_hide": 1, 
+  "report_hide": 1, 
+  "search_index": 0
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "File List", 
   "fieldname": "file_list", 
   "fieldtype": "Text", 
-  "hidden": 1
+  "hidden": 1, 
+  "label": "File List", 
+  "no_copy": 1, 
+  "print_hide": 1
  }, 
  {
   "amend": 0, 
+  "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
   "role": "Material Manager", 
-  "cancel": 0, 
-  "permlevel": 1
+  "write": 0
  }, 
  {
   "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "report": 1, 
-  "role": "Material Manager", 
   "cancel": 0, 
-  "permlevel": 0
- }, 
- {
-  "amend": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
   "role": "Material User", 
-  "cancel": 0, 
-  "permlevel": 1
+  "write": 0
  }, 
  {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "report": 1, 
-  "role": "Material User", 
-  "cancel": 0, 
-  "permlevel": 0
- }, 
- {
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "cancel": 1, 
   "role": "System Manager", 
-  "report": 1, 
-  "permlevel": 0
+  "write": 1
  }, 
  {
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "cancel": 1, 
   "role": "Material Master Manager", 
-  "report": 1, 
-  "permlevel": 0
+  "write": 1
  }
 ]
\ No newline at end of file
diff --git a/setup/doctype/market_segment/market_segment.txt b/setup/doctype/market_segment/market_segment.txt
index c4fdf0c..a5da467 100644
--- a/setup/doctype/market_segment/market_segment.txt
+++ b/setup/doctype/market_segment/market_segment.txt
@@ -1,62 +1,56 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:23", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:36:21", 
+  "modified": "2013-01-22 14:47:03", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:36:21"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
+  "autoname": "field:segment_name", 
+  "doctype": "DocType", 
   "in_create": 1, 
   "module": "Setup", 
-  "allow_trash": 1, 
-  "read_only": 0, 
-  "autoname": "field:segment_name", 
   "name": "__common__", 
-  "colour": "White:FFF", 
-  "doctype": "DocType", 
-  "show_in_menu": 0, 
   "name_case": "Title Case", 
-  "version": 1
+  "read_only": 0
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Market Segment", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "name": "Market Segment", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Market Segment"
  }, 
  {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Trash Reason", 
-  "oldfieldname": "trash_reason", 
   "fieldname": "trash_reason", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Trash Reason", 
+  "oldfieldname": "trash_reason", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Segment Name", 
-  "oldfieldname": "segment_name", 
   "fieldname": "segment_name", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Segment Name", 
+  "oldfieldname": "segment_name", 
+  "oldfieldtype": "Data", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Text", 
   "doctype": "DocField", 
-  "label": "Details", 
-  "oldfieldname": "details", 
   "fieldname": "details", 
   "fieldtype": "Text", 
-  "permlevel": 0
+  "label": "Details", 
+  "oldfieldname": "details", 
+  "oldfieldtype": "Text"
  }
 ]
\ No newline at end of file
diff --git a/setup/doctype/naming_series/naming_series.txt b/setup/doctype/naming_series/naming_series.txt
index dcf4fe2..3de9e5c 100644
--- a/setup/doctype/naming_series/naming_series.txt
+++ b/setup/doctype/naming_series/naming_series.txt
@@ -1,89 +1,55 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:23", 
   "docstatus": 0, 
-  "creation": "2012-07-03 13:30:54", 
+  "modified": "2013-01-22 14:56:34", 
   "modified_by": "Administrator", 
-  "modified": "2012-07-12 15:59:52"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Tray", 
   "description": "Set prefix for numbering series on your transactions", 
-  "module": "Setup", 
-  "server_code_error": " ", 
-  "read_only": 1, 
-  "hide_heading": 0, 
-  "issingle": 1, 
-  "name": "__common__", 
-  "colour": "White:FFF", 
   "doctype": "DocType", 
-  "show_in_menu": 0, 
-  "version": 1, 
-  "hide_toolbar": 1
+  "hide_heading": 0, 
+  "hide_toolbar": 1, 
+  "issingle": 1, 
+  "module": "Setup", 
+  "name": "__common__", 
+  "read_only": 1
  }, 
  {
-  "name": "__common__", 
-  "parent": "Naming Series", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Naming Series", 
-  "read": 1, 
-  "doctype": "DocPerm", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Naming Series", 
-  "doctype": "DocType"
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "System Manager", 
   "permlevel": 0
  }, 
  {
   "amend": 0, 
+  "cancel": 0, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 1, 
-  "role": "System Manager", 
-  "cancel": 0, 
-  "permlevel": 0
- }, 
- {
-  "role": "System Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "System Manager", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "role": "Guest", 
+  "name": "__common__", 
+  "parent": "Naming Series", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
   "permlevel": 0, 
-  "doctype": "DocPerm"
+  "read": 1, 
+  "report": 0, 
+  "role": "System Manager", 
+  "submit": 0, 
+  "write": 1
+ }, 
+ {
+  "doctype": "DocType", 
+  "name": "Naming Series"
  }, 
  {
   "description": "Set prefix for numbering series on your transactions", 
   "doctype": "DocField", 
-  "label": "Setup Series", 
   "fieldname": "setup_series", 
-  "fieldtype": "Section Break"
+  "fieldtype": "Section Break", 
+  "label": "Setup Series"
  }, 
  {
   "doctype": "DocField", 
@@ -93,9 +59,9 @@
  }, 
  {
   "doctype": "DocField", 
-  "label": "Help HTML", 
   "fieldname": "help_html", 
   "fieldtype": "HTML", 
+  "label": "Help HTML", 
   "options": "<div class=\"help-box\">\nEdit list of Series in the box below. Each Series Prefix on a new line.<br><br>\nAllowed special characters are \"/\" and \"-\"<br>\nExamples:<br>\nINV-<br>\nINV-10-<br>\nINVK-<br>\n</div>"
  }, 
  {
@@ -106,26 +72,23 @@
  }, 
  {
   "description": "Check this if you want to force the user to select a series before saving. There will be no default if you check this.", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "User must always select", 
   "fieldname": "user_must_always_select", 
-  "fieldtype": "Check"
+  "fieldtype": "Check", 
+  "label": "User must always select"
  }, 
  {
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Update", 
   "fieldname": "update", 
-  "fieldtype": "Button"
+  "fieldtype": "Button", 
+  "label": "Update"
  }, 
  {
   "description": "Change the starting / current sequence number of an existing series.", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Update Series", 
   "fieldname": "update_series", 
-  "fieldtype": "Section Break"
+  "fieldtype": "Section Break", 
+  "label": "Update Series"
  }, 
  {
   "doctype": "DocField", 
@@ -135,18 +98,19 @@
  }, 
  {
   "description": "This is the number of the last created transaction with this prefix", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Current Value", 
   "fieldname": "current_value", 
-  "fieldtype": "Int"
+  "fieldtype": "Int", 
+  "label": "Current Value"
  }, 
  {
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Update Series Number", 
   "fieldname": "update_series_start", 
   "fieldtype": "Button", 
+  "label": "Update Series Number", 
   "options": "update_series_start"
+ }, 
+ {
+  "doctype": "DocPerm"
  }
 ]
\ No newline at end of file
diff --git a/setup/doctype/price_list/price_list.txt b/setup/doctype/price_list/price_list.txt
index 1be614c..7e48b78 100644
--- a/setup/doctype/price_list/price_list.txt
+++ b/setup/doctype/price_list/price_list.txt
@@ -1,118 +1,91 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:23", 
   "docstatus": 0, 
-  "creation": "2012-07-12 23:29:45", 
+  "modified": "2013-01-22 14:56:41", 
   "modified_by": "Administrator", 
-  "modified": "2012-11-15 10:50:52"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
-  "doctype": "DocType", 
   "allow_attach": 0, 
-  "allow_print": 1, 
-  "module": "Setup", 
-  "server_code_error": " ", 
-  "allow_trash": 1, 
-  "autoname": "field:price_list_name", 
-  "document_type": "Master", 
-  "description": "Price List Master", 
+  "allow_copy": 1, 
   "allow_email": 1, 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "_last_update": "1303100817", 
-  "show_in_menu": 0, 
+  "allow_print": 1, 
+  "autoname": "field:price_list_name", 
+  "description": "Price List Master", 
+  "doctype": "DocType", 
+  "document_type": "Master", 
   "max_attachments": 1, 
-  "version": 1, 
-  "allow_copy": 1
+  "module": "Setup", 
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Price List", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
+  "amend": 0, 
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Price List", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
   "permlevel": 0, 
-  "parentfield": "fields"
- }, 
- {
-  "name": "__common__", 
-  "parent": "Price List", 
-  "amend": 0, 
-  "submit": 0, 
-  "doctype": "DocPerm", 
   "read": 1, 
-  "parenttype": "DocType", 
-  "parentfield": "permissions"
+  "report": 1, 
+  "submit": 0
  }, 
  {
-  "name": "Price List", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Price List"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Price List Name", 
-  "oldfieldname": "price_list_name", 
   "fieldname": "price_list_name", 
   "fieldtype": "Data", 
+  "label": "Price List Name", 
+  "oldfieldname": "price_list_name", 
+  "oldfieldtype": "Data", 
   "reqd": 1
  }, 
  {
   "depends_on": "price_list_name", 
   "doctype": "DocField", 
-  "label": "How to upload", 
   "fieldname": "how_to_upload", 
   "fieldtype": "HTML", 
+  "label": "How to upload", 
   "options": "<div class=\"help\">Use the <a href=\"#data-import-tool\">Data Import Tool</a> to upload, update Item Prices in bulk:\n<ol> \n<li>Go to Data Import Tool.\n<li>Select \"Item\"\n<li>Check on \"With Data\"\n<li>Download \"Item Price\" from Child Tables.\n<li>Update the prices required and add new rows if required.\n<li>Check on \"Overwrite\"\n<li>Upload the modified sheet.\n</div>\n"
  }, 
  {
   "doctype": "DocField", 
-  "label": "File List", 
   "fieldname": "file_list", 
   "fieldtype": "Text", 
-  "hidden": 1
+  "hidden": 1, 
+  "label": "File List"
  }, 
  {
+  "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "write": 0, 
   "role": "Sales Manager", 
-  "cancel": 0, 
-  "permlevel": 1
+  "write": 0
  }, 
  {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "report": 1, 
-  "role": "Sales Manager", 
   "cancel": 0, 
-  "permlevel": 0
- }, 
- {
   "create": 0, 
   "doctype": "DocPerm", 
-  "write": 0, 
   "role": "Sales User", 
-  "cancel": 0, 
-  "permlevel": 1
+  "write": 0
  }, 
  {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "report": 1, 
-  "role": "Sales User", 
-  "cancel": 0, 
-  "permlevel": 0
- }, 
- {
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "report": 1, 
   "role": "Sales Master Manager", 
-  "cancel": 1, 
-  "permlevel": 0
+  "write": 1
  }
 ]
\ No newline at end of file
diff --git a/setup/doctype/print_heading/print_heading.txt b/setup/doctype/print_heading/print_heading.txt
index 11929a0..91df2db 100644
--- a/setup/doctype/print_heading/print_heading.txt
+++ b/setup/doctype/print_heading/print_heading.txt
@@ -1,81 +1,75 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:24", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:36:22", 
+  "modified": "2013-01-22 14:47:50", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:36:22"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
-  "search_fields": "print_heading", 
-  "module": "Setup", 
-  "allow_trash": 1, 
   "autoname": "field:print_heading", 
-  "document_type": "Master", 
-  "_last_update": "1294312215", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
   "doctype": "DocType", 
-  "server_code_error": " ", 
-  "version": 27
+  "document_type": "Master", 
+  "module": "Setup", 
+  "name": "__common__", 
+  "search_fields": "print_heading"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Print Heading", 
   "doctype": "DocField", 
+  "name": "__common__", 
+  "parent": "Print Heading", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "parent": "Print Heading", 
-  "read": 1, 
-  "report": 1, 
   "cancel": 1, 
-  "name": "__common__", 
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
+  "name": "__common__", 
+  "parent": "Print Heading", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "role": "All", 
   "permlevel": 0, 
-  "parentfield": "permissions"
+  "read": 1, 
+  "report": 1, 
+  "role": "All", 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "name": "Print Heading", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Print Heading"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "trash_reason", 
+  "fieldtype": "Small Text", 
+  "label": "Trash Reason", 
+  "oldfieldname": "trash_reason", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "print_heading", 
+  "fieldtype": "Data", 
+  "in_filter": 1, 
+  "label": "Print Heading", 
+  "oldfieldname": "print_heading", 
+  "oldfieldtype": "Data", 
+  "reqd": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "description", 
+  "fieldtype": "Small Text", 
+  "label": "Description", 
+  "oldfieldname": "description", 
+  "oldfieldtype": "Small Text", 
+  "width": "300px"
  }, 
  {
   "doctype": "DocPerm"
- }, 
- {
-  "oldfieldtype": "Small Text", 
-  "doctype": "DocField", 
-  "label": "Trash Reason", 
-  "oldfieldname": "trash_reason", 
-  "fieldname": "trash_reason", 
-  "fieldtype": "Small Text", 
-  "permlevel": 1
- }, 
- {
-  "oldfieldtype": "Data", 
-  "doctype": "DocField", 
-  "label": "Print Heading", 
-  "oldfieldname": "print_heading", 
-  "fieldname": "print_heading", 
-  "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
- }, 
- {
-  "oldfieldtype": "Small Text", 
-  "doctype": "DocField", 
-  "label": "Description", 
-  "oldfieldname": "description", 
-  "width": "300px", 
-  "fieldname": "description", 
-  "fieldtype": "Small Text", 
-  "permlevel": 0
  }
 ]
\ No newline at end of file
diff --git a/setup/doctype/quotation_lost_reason/quotation_lost_reason.txt b/setup/doctype/quotation_lost_reason/quotation_lost_reason.txt
index 8cb6090..4bb8fc7 100644
--- a/setup/doctype/quotation_lost_reason/quotation_lost_reason.txt
+++ b/setup/doctype/quotation_lost_reason/quotation_lost_reason.txt
@@ -1,75 +1,69 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:24", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:36:22", 
+  "modified": "2013-01-22 14:47:58", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:36:22"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
-  "module": "Setup", 
-  "doctype": "DocType", 
-  "allow_trash": 1, 
-  "document_type": "Master", 
   "autoname": "field:order_lost_reason", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "server_code_error": " ", 
-  "show_in_menu": 0, 
-  "version": 4
+  "doctype": "DocType", 
+  "document_type": "Master", 
+  "module": "Setup", 
+  "name": "__common__"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Quotation Lost Reason", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Quotation Lost Reason", 
-  "read": 1, 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "cancel": 1, 
+  "name": "__common__", 
+  "parent": "Quotation Lost Reason", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "report": 1, 
   "permlevel": 0, 
-  "parentfield": "permissions"
+  "read": 1, 
+  "report": 1, 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "name": "Quotation Lost Reason", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Quotation Lost Reason"
  }, 
  {
-  "role": "System Manager", 
-  "doctype": "DocPerm"
+  "doctype": "DocField", 
+  "fieldname": "trash_reason", 
+  "fieldtype": "Small Text", 
+  "label": "Trash Reason", 
+  "oldfieldname": "trash_reason", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "order_lost_reason", 
+  "fieldtype": "Data", 
+  "label": "Quotation Lost Reason", 
+  "oldfieldname": "order_lost_reason", 
+  "oldfieldtype": "Data", 
+  "reqd": 1
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "System Manager"
  }, 
  {
   "amend": 0, 
-  "role": "Sales Master Manager", 
   "doctype": "DocPerm", 
-  "submit": 0
- }, 
- {
-  "oldfieldtype": "Small Text", 
-  "doctype": "DocField", 
-  "label": "Trash Reason", 
-  "oldfieldname": "trash_reason", 
-  "fieldname": "trash_reason", 
-  "fieldtype": "Small Text", 
-  "permlevel": 1
- }, 
- {
-  "oldfieldtype": "Data", 
-  "doctype": "DocField", 
-  "label": "Quotation Lost Reason", 
-  "oldfieldname": "order_lost_reason", 
-  "fieldname": "order_lost_reason", 
-  "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0
+  "role": "Sales Master Manager"
  }
 ]
\ No newline at end of file
diff --git a/setup/doctype/sales_partner/sales_partner.txt b/setup/doctype/sales_partner/sales_partner.txt
index 59b4a49..81c7500 100644
--- a/setup/doctype/sales_partner/sales_partner.txt
+++ b/setup/doctype/sales_partner/sales_partner.txt
@@ -1,252 +1,195 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:24", 
   "docstatus": 0, 
-  "creation": "2012-07-12 23:29:44", 
+  "modified": "2013-01-22 15:04:05", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-27 14:03:00"
+  "owner": "Administrator"
  }, 
  {
-  "read_only": 0, 
-  "in_create": 0, 
   "autoname": "field:partner_name", 
-  "name": "__common__", 
-  "module": "Setup", 
+  "description": "A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.", 
   "doctype": "DocType", 
   "document_type": "Master", 
-  "description": "A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission."
+  "in_create": 0, 
+  "module": "Setup", 
+  "name": "__common__", 
+  "read_only": 0
  }, 
  {
-  "name": "__common__", 
-  "parent": "Sales Partner", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Sales Partner", 
-  "read": 1, 
-  "doctype": "DocPerm", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
+  "permlevel": 0
  }, 
  {
-  "name": "Sales Partner", 
-  "doctype": "DocType"
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Sales Partner", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
+  "permlevel": 0, 
+  "read": 1, 
+  "report": 1, 
+  "submit": 0
+ }, 
+ {
+  "doctype": "DocType", 
+  "name": "Sales Partner"
  }, 
  {
   "description": "Note: You Can Manage Multiple Address or Contacts via Addresses & Contacts", 
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Sales Partner Details", 
   "fieldname": "basic_info", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Sales Partner Details", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Sales Partner Name", 
-  "oldfieldname": "partner_name", 
   "fieldname": "partner_name", 
   "fieldtype": "Data", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Sales Partner Name", 
+  "oldfieldname": "partner_name", 
+  "oldfieldtype": "Data", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Partner Type", 
-  "oldfieldname": "partner_type", 
-  "permlevel": 0, 
   "fieldname": "partner_type", 
   "fieldtype": "Select", 
-  "search_index": 0, 
+  "in_filter": 1, 
+  "label": "Partner Type", 
+  "oldfieldname": "partner_type", 
+  "oldfieldtype": "Select", 
   "options": "\nChannel Partner\nDistributor\nDealer\nAgent\nRetailer\nImplementation Partner\nReseller", 
-  "in_filter": 1
+  "search_index": 0
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break0", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "commission_rate", 
+  "fieldtype": "Float", 
   "label": "Commission Rate", 
   "oldfieldname": "commission_rate", 
-  "fieldname": "commission_rate", 
-  "fieldtype": "Currency", 
-  "reqd": 1, 
-  "permlevel": 0
+  "oldfieldtype": "Currency", 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Territory", 
-  "permlevel": 0, 
   "fieldname": "territory", 
   "fieldtype": "Link", 
-  "reqd": 1, 
-  "options": "Territory"
+  "label": "Territory", 
+  "options": "Territory", 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Address & Contacts", 
   "fieldname": "address_contacts", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Address & Contacts"
  }, 
  {
   "depends_on": "eval:doc.__islocal", 
   "doctype": "DocField", 
-  "label": "Address Desc", 
-  "permlevel": 0, 
   "fieldname": "address_desc", 
   "fieldtype": "HTML", 
+  "label": "Address Desc", 
   "options": "<em>Addresses will appear only when you save the customer</em>"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Address HTML", 
   "fieldname": "address_html", 
   "fieldtype": "HTML", 
-  "permlevel": 1
+  "label": "Address HTML", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "column_break1", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
   "depends_on": "eval:doc.__islocal", 
   "doctype": "DocField", 
-  "label": "Contact Desc", 
-  "permlevel": 0, 
   "fieldname": "contact_desc", 
   "fieldtype": "HTML", 
+  "label": "Contact Desc", 
   "options": "<em>Contact Details will appear only when you save the customer</em>"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Contact HTML", 
   "fieldname": "contact_html", 
   "fieldtype": "HTML", 
-  "permlevel": 1
+  "label": "Contact HTML", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Sales Partner Target", 
   "fieldname": "partner_target_details_section_break", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Sales Partner Target", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "Partner Target Detail", 
-  "oldfieldname": "partner_target_details", 
-  "permlevel": 0, 
   "fieldname": "partner_target_details", 
   "fieldtype": "Table", 
-  "reqd": 0, 
-  "options": "Target Detail"
+  "label": "Partner Target Detail", 
+  "oldfieldname": "partner_target_details", 
+  "oldfieldtype": "Table", 
+  "options": "Target Detail", 
+  "reqd": 0
  }, 
  {
   "description": "Select Budget Distribution to unevenly distribute targets across months.", 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Target Distribution", 
-  "oldfieldname": "distribution_id", 
-  "permlevel": 0, 
   "fieldname": "distribution_id", 
   "fieldtype": "Link", 
+  "label": "Target Distribution", 
+  "oldfieldname": "distribution_id", 
+  "oldfieldtype": "Link", 
   "options": "Budget Distribution"
  }, 
  {
   "amend": 0, 
+  "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
   "role": "Sales Manager", 
-  "cancel": 0, 
-  "permlevel": 1
+  "write": 0
  }, 
  {
   "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "report": 1, 
-  "role": "Sales Manager", 
   "cancel": 0, 
-  "permlevel": 0
- }, 
- {
-  "amend": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
   "role": "Sales User", 
-  "cancel": 0, 
-  "permlevel": 1
+  "write": 0
  }, 
  {
   "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "report": 1, 
-  "role": "Sales User", 
-  "cancel": 0, 
-  "permlevel": 0
- }, 
- {
-  "amend": 0, 
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 1, 
-  "report": 1, 
   "role": "Sales Master Manager", 
+  "write": 1
+ }, 
+ {
   "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Sales Master Manager", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "cancel": 1, 
   "role": "System Manager", 
-  "report": 1, 
-  "permlevel": 0
- }, 
- {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "role": "System Manager", 
-  "permlevel": 1
+  "write": 1
  }
 ]
\ No newline at end of file
diff --git a/setup/doctype/sales_person/sales_person.txt b/setup/doctype/sales_person/sales_person.txt
index b46cd49..8878a65 100644
--- a/setup/doctype/sales_person/sales_person.txt
+++ b/setup/doctype/sales_person/sales_person.txt
@@ -1,225 +1,183 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:24", 
   "docstatus": 0, 
-  "creation": "2012-07-12 23:29:44", 
+  "modified": "2013-01-22 14:57:23", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-06 10:30:15"
+  "owner": "Administrator"
  }, 
  {
+  "allow_rename": 1, 
+  "autoname": "field:sales_person_name", 
+  "description": "All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.", 
+  "doctype": "DocType", 
   "document_type": "Master", 
   "in_create": 1, 
-  "autoname": "field:sales_person_name", 
-  "allow_rename": 1, 
-  "name": "__common__", 
   "module": "Setup", 
-  "doctype": "DocType", 
-  "search_fields": "name,parent_sales_person", 
-  "description": "All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets."
+  "name": "__common__", 
+  "search_fields": "name,parent_sales_person"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Sales Person", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
-  "name": "__common__", 
-  "parent": "Sales Person", 
-  "amend": 0, 
-  "submit": 0, 
-  "doctype": "DocPerm", 
-  "read": 1, 
-  "parenttype": "DocType", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Sales Person", 
-  "doctype": "DocType"
- }, 
- {
-  "oldfieldtype": "Small Text", 
-  "doctype": "DocField", 
-  "label": "Trash Reason", 
-  "oldfieldname": "trash_reason", 
-  "fieldname": "trash_reason", 
-  "fieldtype": "Small Text", 
-  "permlevel": 1
- }, 
- {
-  "oldfieldtype": "Data", 
-  "doctype": "DocField", 
-  "label": "Sales Person Name", 
-  "oldfieldname": "sales_person_name", 
-  "fieldname": "sales_person_name", 
-  "fieldtype": "Data", 
-  "search_index": 0, 
-  "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
- }, 
- {
-  "description": "Select company name first.", 
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
-  "doctype": "DocField", 
-  "label": "Parent Sales Person", 
-  "oldfieldname": "parent_sales_person", 
-  "trigger": "Client", 
-  "fieldname": "parent_sales_person", 
-  "fieldtype": "Link", 
-  "reqd": 1, 
-  "options": "Sales Person", 
   "permlevel": 0
  }, 
  {
-  "oldfieldtype": "Select", 
-  "doctype": "DocField", 
-  "label": "Has Child Node", 
-  "oldfieldname": "is_group", 
+  "amend": 0, 
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Sales Person", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
   "permlevel": 0, 
+  "read": 1, 
+  "report": 1, 
+  "submit": 0
+ }, 
+ {
+  "doctype": "DocType", 
+  "name": "Sales Person"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "trash_reason", 
+  "fieldtype": "Small Text", 
+  "label": "Trash Reason", 
+  "oldfieldname": "trash_reason", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "sales_person_name", 
+  "fieldtype": "Data", 
+  "in_filter": 1, 
+  "label": "Sales Person Name", 
+  "oldfieldname": "sales_person_name", 
+  "oldfieldtype": "Data", 
+  "reqd": 1, 
+  "search_index": 0
+ }, 
+ {
+  "description": "Select company name first.", 
+  "doctype": "DocField", 
+  "fieldname": "parent_sales_person", 
+  "fieldtype": "Link", 
+  "label": "Parent Sales Person", 
+  "oldfieldname": "parent_sales_person", 
+  "oldfieldtype": "Link", 
+  "options": "Sales Person", 
+  "reqd": 1
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "is_group", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "options": "\nYes\nNo"
+  "label": "Has Child Node", 
+  "oldfieldname": "is_group", 
+  "oldfieldtype": "Select", 
+  "options": "\nYes\nNo", 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "cb0", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
   "doctype": "DocField", 
-  "options": "Employee", 
   "fieldname": "employee", 
   "fieldtype": "Link", 
   "label": "Employee", 
-  "permlevel": 0
+  "options": "Employee"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Int", 
   "doctype": "DocField", 
-  "label": "lft", 
-  "oldfieldname": "lft", 
   "fieldname": "lft", 
   "fieldtype": "Int", 
-  "search_index": 1, 
   "hidden": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "lft", 
+  "no_copy": 1, 
+  "oldfieldname": "lft", 
+  "oldfieldtype": "Int", 
+  "print_hide": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Int", 
   "doctype": "DocField", 
-  "label": "rgt", 
-  "oldfieldname": "rgt", 
   "fieldname": "rgt", 
   "fieldtype": "Int", 
-  "search_index": 1, 
   "hidden": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "rgt", 
+  "no_copy": 1, 
+  "oldfieldname": "rgt", 
+  "oldfieldtype": "Int", 
+  "print_hide": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "old_parent", 
-  "oldfieldname": "old_parent", 
   "fieldname": "old_parent", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "old_parent", 
+  "no_copy": 1, 
+  "oldfieldname": "old_parent", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1
  }, 
  {
   "description": "Set targets Item Group-wise for this Sales Person.", 
-  "oldfieldtype": "Section Break", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Sales Person Targets", 
   "fieldname": "target_details_section_break", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Sales Person Targets", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "Target Details1", 
-  "oldfieldname": "target_details", 
-  "permlevel": 0, 
   "fieldname": "target_details", 
   "fieldtype": "Table", 
+  "label": "Target Details1", 
+  "oldfieldname": "target_details", 
+  "oldfieldtype": "Table", 
   "options": "Target Detail"
  }, 
  {
   "description": "Select Budget Distribution to unevenly distribute targets across months.", 
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Target Distribution", 
-  "oldfieldname": "distribution_id", 
-  "permlevel": 0, 
   "fieldname": "distribution_id", 
   "fieldtype": "Link", 
-  "search_index": 0, 
-  "options": "Budget Distribution"
+  "label": "Target Distribution", 
+  "oldfieldname": "distribution_id", 
+  "oldfieldtype": "Link", 
+  "options": "Budget Distribution", 
+  "search_index": 0
  }, 
  {
+  "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "write": 0, 
   "role": "Sales Manager", 
-  "cancel": 0, 
-  "permlevel": 1
+  "write": 0
  }, 
  {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "report": 1, 
-  "role": "Sales Manager", 
   "cancel": 0, 
-  "permlevel": 0
- }, 
- {
   "create": 0, 
   "doctype": "DocPerm", 
-  "write": 0, 
   "role": "Sales User", 
-  "cancel": 0, 
-  "permlevel": 1
+  "write": 0
  }, 
  {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "report": 1, 
-  "role": "Sales User", 
-  "cancel": 0, 
-  "permlevel": 0
- }, 
- {
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "report": 1, 
   "role": "Sales Master Manager", 
-  "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "role": "Sales Master Manager", 
-  "cancel": 0, 
-  "permlevel": 1
+  "write": 1
  }
 ]
\ No newline at end of file
diff --git a/setup/doctype/sms_settings/sms_settings.txt b/setup/doctype/sms_settings/sms_settings.txt
index f16bd8f..43a6d7e 100755
--- a/setup/doctype/sms_settings/sms_settings.txt
+++ b/setup/doctype/sms_settings/sms_settings.txt
@@ -1,106 +1,94 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:24", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:36:25", 
+  "modified": "2013-01-22 14:57:24", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:36:25"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
-  "in_create": 0, 
-  "allow_print": 1, 
-  "module": "Setup", 
-  "doctype": "DocType", 
-  "read_only": 0, 
+  "allow_copy": 1, 
   "allow_email": 1, 
+  "allow_print": 1, 
+  "doctype": "DocType", 
+  "in_create": 0, 
   "issingle": 1, 
+  "module": "Setup", 
   "name": "__common__", 
-  "colour": "White:FFF", 
-  "_last_update": "1306304974", 
-  "show_in_menu": 0, 
-  "version": 16, 
-  "allow_copy": 1
+  "read_only": 0
  }, 
  {
-  "name": "__common__", 
-  "parent": "SMS Settings", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "SMS Settings", 
-  "read": 1, 
-  "doctype": "DocPerm", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "role": "System Manager", 
-  "parentfield": "permissions"
+  "permlevel": 0
  }, 
  {
-  "name": "SMS Settings", 
-  "doctype": "DocType"
- }, 
- {
-  "write": 1, 
   "create": 1, 
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "SMS Settings", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
   "permlevel": 0, 
-  "doctype": "DocPerm"
+  "read": 1, 
+  "report": 1, 
+  "role": "System Manager", 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "permlevel": 1, 
-  "doctype": "DocPerm"
+  "doctype": "DocType", 
+  "name": "SMS Settings"
  }, 
  {
-  "width": "50%", 
+  "doctype": "DocField", 
   "fieldname": "column_break0", 
   "fieldtype": "Column Break", 
-  "doctype": "DocField"
+  "width": "50%"
  }, 
  {
   "description": "Eg. smsgateway.com/api/send_sms.cgi", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "SMS Gateway URL", 
   "fieldname": "sms_gateway_url", 
   "fieldtype": "Data", 
+  "label": "SMS Gateway URL", 
   "reqd": 1
  }, 
  {
   "description": "Enter url parameter for message", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Message Parameter", 
   "fieldname": "message_parameter", 
   "fieldtype": "Data", 
+  "label": "Message Parameter", 
   "reqd": 1
  }, 
  {
   "description": "Enter url parameter for receiver nos", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Receiver Parameter", 
   "fieldname": "receiver_parameter", 
   "fieldtype": "Data", 
+  "label": "Receiver Parameter", 
   "reqd": 1
  }, 
  {
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Static Parameters", 
-  "width": "50%", 
   "fieldname": "static_parameters", 
-  "fieldtype": "Column Break"
+  "fieldtype": "Column Break", 
+  "label": "Static Parameters", 
+  "width": "50%"
  }, 
  {
   "description": "Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "SMS Parameters", 
   "fieldname": "static_parameter_details", 
   "fieldtype": "Table", 
+  "label": "SMS Parameters", 
   "options": "SMS Parameter"
+ }, 
+ {
+  "doctype": "DocPerm"
  }
 ]
\ No newline at end of file
diff --git a/setup/doctype/supplier_type/supplier_type.txt b/setup/doctype/supplier_type/supplier_type.txt
index 44b4651..007bf94 100644
--- a/setup/doctype/supplier_type/supplier_type.txt
+++ b/setup/doctype/supplier_type/supplier_type.txt
@@ -1,100 +1,80 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:24", 
   "docstatus": 0, 
-  "creation": "2012-07-03 13:30:53", 
+  "modified": "2013-01-22 14:57:25", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-06 10:29:04"
+  "owner": "Administrator"
  }, 
  {
-  "name": "__common__", 
-  "autoname": "field:supplier_type", 
   "allow_rename": 1, 
-  "module": "Setup", 
+  "autoname": "field:supplier_type", 
   "doctype": "DocType", 
-  "document_type": "Master"
+  "document_type": "Master", 
+  "module": "Setup", 
+  "name": "__common__"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Supplier Type", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Supplier Type", 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
   "amend": 0, 
-  "submit": 0, 
   "doctype": "DocPerm", 
-  "read": 1, 
+  "name": "__common__", 
+  "parent": "Supplier Type", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
+  "permlevel": 0, 
+  "read": 1, 
+  "report": 1, 
+  "submit": 0
  }, 
  {
-  "name": "Supplier Type", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Supplier Type"
  }, 
  {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Trash Reason", 
-  "oldfieldname": "trash_reason", 
   "fieldname": "trash_reason", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Trash Reason", 
+  "oldfieldname": "trash_reason", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Supplier Type", 
-  "oldfieldname": "supplier_type", 
   "fieldname": "supplier_type", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Supplier Type", 
+  "oldfieldname": "supplier_type", 
+  "oldfieldtype": "Data", 
+  "reqd": 1
  }, 
  {
+  "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "write": 0, 
   "role": "Purchase Manager", 
-  "cancel": 0, 
-  "permlevel": 1
+  "write": 0
  }, 
  {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "report": 1, 
-  "role": "Purchase Manager", 
   "cancel": 0, 
-  "permlevel": 0
- }, 
- {
   "create": 0, 
   "doctype": "DocPerm", 
-  "write": 0, 
   "role": "Purchase User", 
-  "cancel": 0, 
-  "permlevel": 1
+  "write": 0
  }, 
  {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "report": 1, 
-  "role": "Purchase User", 
-  "cancel": 0, 
-  "permlevel": 0
- }, 
- {
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "report": 1, 
   "role": "Purchase Master Manager", 
-  "cancel": 1, 
-  "permlevel": 0
+  "write": 1
  }
 ]
\ No newline at end of file
diff --git a/setup/doctype/target_detail/target_detail.txt b/setup/doctype/target_detail/target_detail.txt
index 1665235..b121f99 100644
--- a/setup/doctype/target_detail/target_detail.txt
+++ b/setup/doctype/target_detail/target_detail.txt
@@ -1,75 +1,70 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:24", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:36:25", 
+  "modified": "2013-01-22 13:48:39", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:36:25"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Tray", 
+  "doctype": "DocType", 
   "istable": 1, 
-  "name": "__common__", 
-  "colour": "White:FFF", 
   "module": "Setup", 
-  "show_in_menu": 0, 
-  "version": 15, 
-  "server_code_error": " ", 
-  "doctype": "DocType"
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Target Detail", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "permlevel": 0, 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "name": "Target Detail", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Target Detail"
  }, 
  {
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "Item Group", 
-  "oldfieldname": "item_group", 
   "fieldname": "item_group", 
   "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Item Group", 
+  "oldfieldname": "item_group", 
   "oldfieldtype": "Link", 
-  "reqd": 0, 
   "options": "Item Group", 
-  "in_filter": 1
+  "reqd": 0, 
+  "search_index": 1
  }, 
  {
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "Fiscal Year", 
-  "oldfieldname": "fiscal_year", 
   "fieldname": "fiscal_year", 
   "fieldtype": "Select", 
+  "in_filter": 1, 
+  "label": "Fiscal Year", 
+  "oldfieldname": "fiscal_year", 
   "oldfieldtype": "Select", 
-  "reqd": 1, 
   "options": "link:Fiscal Year", 
-  "in_filter": 1
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "target_qty", 
+  "fieldtype": "Float", 
   "label": "Target Qty", 
   "oldfieldname": "target_qty", 
-  "fieldname": "target_qty", 
-  "fieldtype": "Currency"
+  "oldfieldtype": "Currency"
  }, 
  {
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "Target  Amount", 
-  "oldfieldname": "target_amount", 
   "fieldname": "target_amount", 
   "fieldtype": "Currency", 
+  "in_filter": 1, 
+  "label": "Target  Amount", 
+  "oldfieldname": "target_amount", 
   "oldfieldtype": "Currency", 
   "reqd": 0, 
-  "in_filter": 1
+  "search_index": 1
  }
 ]
\ No newline at end of file
diff --git a/setup/doctype/terms_and_conditions/terms_and_conditions.txt b/setup/doctype/terms_and_conditions/terms_and_conditions.txt
index da319bb..9aa2ba2 100644
--- a/setup/doctype/terms_and_conditions/terms_and_conditions.txt
+++ b/setup/doctype/terms_and_conditions/terms_and_conditions.txt
@@ -1,138 +1,98 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:24", 
   "docstatus": 0, 
-  "creation": "2012-07-03 13:30:54", 
+  "modified": "2013-01-22 14:57:26", 
   "modified_by": "Administrator", 
-  "modified": "2012-07-12 11:37:56"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
-  "description": "Standard Terms and Conditions that can be added to Sales and Purchases.\n\nExamples:\n\n1. Validity of the offer.\n1. Payment Terms (In Advance, On Credit, part advance etc).\n1. What is extra (or payable by the Customer).\n1. Safety / usage warning.\n1. Warranty if any.\n1. Returns Policy.\n1. Terms of shipping, if applicable.\n1. Ways of addressing disputes, indemnity, liability, etc.\n1. Address and Contact of your Company.", 
-  "module": "Setup", 
-  "server_code_error": " ", 
-  "allow_trash": 1, 
   "autoname": "field:title", 
-  "document_type": "Master", 
-  "_last_update": "1322549700", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
+  "description": "Standard Terms and Conditions that can be added to Sales and Purchases.\n\nExamples:\n\n1. Validity of the offer.\n1. Payment Terms (In Advance, On Credit, part advance etc).\n1. What is extra (or payable by the Customer).\n1. Safety / usage warning.\n1. Warranty if any.\n1. Returns Policy.\n1. Terms of shipping, if applicable.\n1. Ways of addressing disputes, indemnity, liability, etc.\n1. Address and Contact of your Company.", 
   "doctype": "DocType", 
-  "show_in_menu": 0, 
-  "version": 1
+  "document_type": "Master", 
+  "module": "Setup", 
+  "name": "__common__"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Terms and Conditions", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Terms and Conditions", 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Terms and Conditions", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
+  "permlevel": 0, 
   "read": 1, 
-  "doctype": "DocPerm", 
-  "parenttype": "DocType", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Terms and Conditions", 
-  "doctype": "DocType"
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Sales Master Manager", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "amend": 0, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 1, 
   "report": 1, 
-  "role": "Sales Master Manager", 
-  "cancel": 1, 
-  "permlevel": 0
+  "submit": 0
  }, 
  {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Sales User", 
-  "cancel": 0, 
-  "permlevel": 1
+  "doctype": "DocType", 
+  "name": "Terms and Conditions"
  }, 
  {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "report": 1, 
-  "role": "Sales User", 
-  "cancel": 0, 
-  "permlevel": 0
- }, 
- {
-  "role": "All", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "cancel": 1, 
-  "role": "System Manager", 
-  "report": 1, 
-  "permlevel": 0
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "cancel": 1, 
-  "role": "Accounts User", 
-  "report": 1, 
-  "permlevel": 0
- }, 
- {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Trash Reason", 
-  "oldfieldname": "trash_reason", 
   "fieldname": "trash_reason", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Trash Reason", 
+  "oldfieldname": "trash_reason", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1
  }, 
  {
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "Title", 
-  "oldfieldname": "title", 
   "fieldname": "title", 
   "fieldtype": "Data", 
+  "in_filter": 1, 
+  "label": "Title", 
+  "oldfieldname": "title", 
   "oldfieldtype": "Data", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 0
  }, 
  {
-  "oldfieldtype": "Text Editor", 
   "doctype": "DocField", 
-  "label": "Terms and Conditions", 
-  "oldfieldname": "terms", 
   "fieldname": "terms", 
   "fieldtype": "Text Editor", 
-  "permlevel": 0
+  "label": "Terms and Conditions", 
+  "oldfieldname": "terms", 
+  "oldfieldtype": "Text Editor"
+ }, 
+ {
+  "amend": 0, 
+  "cancel": 1, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "role": "Sales Master Manager", 
+  "write": 1
+ }, 
+ {
+  "amend": 0, 
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "role": "Sales User", 
+  "write": 0
+ }, 
+ {
+  "cancel": 1, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "role": "System Manager", 
+  "write": 1
+ }, 
+ {
+  "cancel": 1, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "role": "Accounts User", 
+  "write": 1
  }
 ]
\ No newline at end of file
diff --git a/setup/doctype/territory/territory.txt b/setup/doctype/territory/territory.txt
index 220d832..6536066 100644
--- a/setup/doctype/territory/territory.txt
+++ b/setup/doctype/territory/territory.txt
@@ -1,235 +1,192 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:24", 
   "docstatus": 0, 
-  "creation": "2012-07-12 23:29:44", 
+  "modified": "2013-01-22 14:57:26", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-06 10:29:39"
+  "owner": "Administrator"
  }, 
  {
+  "allow_rename": 1, 
+  "autoname": "field:territory_name", 
   "description": "Classification of Customers by region", 
-  "search_fields": "name,parent_territory,territory_manager", 
-  "module": "Setup", 
+  "doctype": "DocType", 
   "document_type": "Master", 
   "in_create": 1, 
+  "module": "Setup", 
+  "name": "__common__", 
+  "name_case": "Title Case", 
   "read_only": 1, 
-  "autoname": "field:territory_name", 
-  "name": "__common__", 
-  "allow_rename": 1, 
-  "doctype": "DocType", 
-  "name_case": "Title Case"
+  "search_fields": "name,parent_territory,territory_manager"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Territory", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
-  "name": "__common__", 
-  "parent": "Territory", 
-  "amend": 0, 
-  "submit": 0, 
-  "doctype": "DocPerm", 
-  "read": 1, 
-  "parenttype": "DocType", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Territory", 
-  "doctype": "DocType"
- }, 
- {
-  "oldfieldtype": "Small Text", 
-  "doctype": "DocField", 
-  "label": "Trash Reason", 
-  "oldfieldname": "trash_reason", 
-  "fieldname": "trash_reason", 
-  "fieldtype": "Small Text", 
-  "permlevel": 1
- }, 
- {
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
-  "doctype": "DocField", 
-  "label": "Territory Name", 
-  "oldfieldname": "territory_name", 
-  "fieldname": "territory_name", 
-  "fieldtype": "Data", 
-  "reqd": 1, 
   "permlevel": 0
  }, 
  {
-  "oldfieldtype": "Link", 
-  "doctype": "DocField", 
-  "label": "Parent Territory", 
-  "oldfieldname": "parent_territory", 
+  "amend": 0, 
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Territory", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
   "permlevel": 0, 
-  "trigger": "Client", 
+  "read": 1, 
+  "report": 1, 
+  "submit": 0
+ }, 
+ {
+  "doctype": "DocType", 
+  "name": "Territory"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "trash_reason", 
+  "fieldtype": "Small Text", 
+  "label": "Trash Reason", 
+  "oldfieldname": "trash_reason", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "territory_name", 
+  "fieldtype": "Data", 
+  "label": "Territory Name", 
+  "no_copy": 1, 
+  "oldfieldname": "territory_name", 
+  "oldfieldtype": "Data", 
+  "reqd": 1
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "parent_territory", 
   "fieldtype": "Link", 
-  "reqd": 1, 
-  "options": "Territory"
+  "label": "Parent Territory", 
+  "oldfieldname": "parent_territory", 
+  "oldfieldtype": "Link", 
+  "options": "Territory", 
+  "reqd": 1
  }, 
  {
   "description": "Only leaf nodes are allowed in transaction", 
-  "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Has Child Node", 
-  "oldfieldname": "is_group", 
-  "permlevel": 0, 
   "fieldname": "is_group", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "options": "\nYes\nNo"
+  "label": "Has Child Node", 
+  "oldfieldname": "is_group", 
+  "oldfieldtype": "Select", 
+  "options": "\nYes\nNo", 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "cb0", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
   "description": "For reference", 
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Territory Manager", 
-  "oldfieldname": "territory_manager", 
-  "options": "Sales Person", 
   "fieldname": "territory_manager", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Territory Manager", 
+  "oldfieldname": "territory_manager", 
+  "oldfieldtype": "Link", 
+  "options": "Sales Person", 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Int", 
   "doctype": "DocField", 
-  "label": "lft", 
-  "oldfieldname": "lft", 
   "fieldname": "lft", 
   "fieldtype": "Int", 
-  "search_index": 1, 
   "hidden": 1, 
-  "permlevel": 0, 
+  "in_filter": 1, 
+  "label": "lft", 
+  "no_copy": 1, 
+  "oldfieldname": "lft", 
+  "oldfieldtype": "Int", 
+  "print_hide": 1, 
   "report_hide": 0, 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Int", 
   "doctype": "DocField", 
-  "label": "rgt", 
-  "oldfieldname": "rgt", 
   "fieldname": "rgt", 
   "fieldtype": "Int", 
-  "search_index": 1, 
   "hidden": 1, 
-  "permlevel": 0, 
+  "in_filter": 1, 
+  "label": "rgt", 
+  "no_copy": 1, 
+  "oldfieldname": "rgt", 
+  "oldfieldtype": "Int", 
+  "print_hide": 1, 
   "report_hide": 0, 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "old_parent", 
-  "oldfieldname": "old_parent", 
-  "options": "Territory", 
   "fieldname": "old_parent", 
   "fieldtype": "Link", 
   "hidden": 1, 
-  "permlevel": 0, 
+  "label": "old_parent", 
+  "no_copy": 1, 
+  "oldfieldname": "old_parent", 
+  "oldfieldtype": "Data", 
+  "options": "Territory", 
+  "print_hide": 1, 
   "report_hide": 1
  }, 
  {
   "description": "Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.", 
-  "oldfieldtype": "Section Break", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Territory Targets", 
   "fieldname": "target_details_section_break", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Territory Targets", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "Target Details", 
-  "oldfieldname": "target_details", 
-  "permlevel": 0, 
   "fieldname": "target_details", 
   "fieldtype": "Table", 
+  "label": "Target Details", 
+  "oldfieldname": "target_details", 
+  "oldfieldtype": "Table", 
   "options": "Target Detail"
  }, 
  {
   "description": "Select Budget Distribution to unevenly distribute targets across months.", 
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Target Distribution", 
-  "oldfieldname": "distribution_id", 
-  "permlevel": 0, 
   "fieldname": "distribution_id", 
   "fieldtype": "Link", 
+  "label": "Target Distribution", 
+  "oldfieldname": "distribution_id", 
+  "oldfieldtype": "Link", 
   "options": "Budget Distribution"
  }, 
  {
+  "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "write": 0, 
   "role": "Sales Manager", 
-  "cancel": 0, 
-  "permlevel": 1
+  "write": 0
  }, 
  {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "report": 1, 
-  "role": "Sales Manager", 
   "cancel": 0, 
-  "permlevel": 0
- }, 
- {
   "create": 0, 
   "doctype": "DocPerm", 
-  "write": 0, 
-  "role": "Sales Master Manager", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
   "role": "Sales User", 
-  "cancel": 0, 
-  "permlevel": 1
+  "write": 0
  }, 
  {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "report": 1, 
-  "role": "Sales User", 
-  "cancel": 0, 
-  "permlevel": 0
- }, 
- {
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "report": 1, 
   "role": "Sales Master Manager", 
-  "cancel": 1, 
-  "permlevel": 0
+  "write": 1
  }
 ]
\ No newline at end of file
diff --git a/setup/doctype/uom/uom.txt b/setup/doctype/uom/uom.txt
index 45ab99e..733eb65 100644
--- a/setup/doctype/uom/uom.txt
+++ b/setup/doctype/uom/uom.txt
@@ -1,114 +1,86 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:24", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:36:26", 
+  "modified": "2013-01-22 14:57:26", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:36:26"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Tabbed", 
-  "module": "Setup", 
-  "server_code_error": " ", 
-  "allow_trash": 1, 
   "autoname": "field:uom_name", 
-  "document_type": "Master", 
-  "_last_update": "1307707462", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
   "doctype": "DocType", 
-  "show_in_menu": 0, 
-  "version": 5
+  "document_type": "Master", 
+  "module": "Setup", 
+  "name": "__common__"
  }, 
  {
-  "name": "__common__", 
-  "parent": "UOM", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "UOM", 
-  "read": 1, 
-  "submit": 0, 
-  "doctype": "DocPerm", 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
   "amend": 0, 
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "UOM", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "UOM", 
-  "doctype": "DocType"
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
+  "permlevel": 0, 
+  "read": 1, 
   "report": 1, 
-  "role": "Material Master Manager", 
-  "cancel": 1, 
-  "permlevel": 0
+  "submit": 0
  }, 
  {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "role": "Material Manager", 
-  "cancel": 0, 
-  "permlevel": 1
+  "doctype": "DocType", 
+  "name": "UOM"
  }, 
  {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "report": 1, 
-  "role": "Material Manager", 
-  "cancel": 0, 
-  "permlevel": 0
- }, 
- {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "role": "Material User", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "report": 1, 
-  "role": "Material User", 
-  "cancel": 0, 
-  "permlevel": 0
- }, 
- {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Trash Reason", 
-  "oldfieldname": "trash_reason", 
   "fieldname": "trash_reason", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Trash Reason", 
+  "oldfieldname": "trash_reason", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "UOM Details", 
   "fieldname": "uom_details", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "UOM Details", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "UOM Name", 
-  "oldfieldname": "uom_name", 
   "fieldname": "uom_name", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "UOM Name", 
+  "oldfieldname": "uom_name", 
+  "oldfieldtype": "Data", 
+  "reqd": 1
+ }, 
+ {
+  "cancel": 1, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "role": "Material Master Manager", 
+  "write": 1
+ }, 
+ {
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "role": "Material Manager", 
+  "write": 0
+ }, 
+ {
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "role": "Material User", 
+  "write": 0
  }
 ]
\ No newline at end of file
diff --git a/setup/doctype/warehouse_type/warehouse_type.txt b/setup/doctype/warehouse_type/warehouse_type.txt
index 522b555..a431221 100644
--- a/setup/doctype/warehouse_type/warehouse_type.txt
+++ b/setup/doctype/warehouse_type/warehouse_type.txt
@@ -1,107 +1,81 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:24", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:36:26", 
+  "modified": "2013-01-22 14:57:27", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:36:26"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
+  "autoname": "field:warehouse_type", 
+  "doctype": "DocType", 
   "istable": 0, 
   "module": "Setup", 
-  "doctype": "DocType", 
-  "allow_trash": 1, 
-  "autoname": "field:warehouse_type", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "server_code_error": " ", 
-  "show_in_menu": 0, 
-  "version": 6
+  "name": "__common__"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Warehouse Type", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Warehouse Type", 
-  "read": 1, 
-  "submit": 0, 
-  "doctype": "DocPerm", 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
   "amend": 0, 
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Warehouse Type", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Warehouse Type", 
-  "doctype": "DocType"
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
+  "permlevel": 0, 
+  "read": 1, 
   "report": 1, 
-  "role": "Material Master Manager", 
-  "cancel": 1, 
-  "permlevel": 0
+  "submit": 0
  }, 
  {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "role": "Material Manager", 
-  "cancel": 0, 
-  "permlevel": 1
+  "doctype": "DocType", 
+  "name": "Warehouse Type"
  }, 
  {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "report": 1, 
-  "role": "Material Manager", 
-  "cancel": 0, 
-  "permlevel": 0
- }, 
- {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "role": "Material User", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "report": 1, 
-  "role": "Material User", 
-  "cancel": 0, 
-  "permlevel": 0
- }, 
- {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Trash Reason", 
-  "oldfieldname": "trash_reason", 
   "fieldname": "trash_reason", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Trash Reason", 
+  "oldfieldname": "trash_reason", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1
  }, 
  {
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "Warehouse Type", 
-  "oldfieldname": "warehouse_type", 
   "fieldname": "warehouse_type", 
   "fieldtype": "Data", 
+  "in_filter": 1, 
+  "label": "Warehouse Type", 
+  "oldfieldname": "warehouse_type", 
   "oldfieldtype": "Data", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 1
+ }, 
+ {
+  "cancel": 1, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "role": "Material Master Manager", 
+  "write": 1
+ }, 
+ {
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "role": "Material Manager", 
+  "write": 0
+ }, 
+ {
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "role": "Material User", 
+  "write": 0
  }
 ]
\ No newline at end of file
diff --git a/stock/doctype/batch/batch.txt b/stock/doctype/batch/batch.txt
index 51206a5..429644a 100644
--- a/stock/doctype/batch/batch.txt
+++ b/stock/doctype/batch/batch.txt
@@ -1,121 +1,108 @@
 [
  {
-  "owner": "harshada@webnotestech.com", 
+  "creation": "2013-01-10 16:34:25", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:36:26", 
+  "modified": "2013-01-22 14:55:57", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:36:26"
+  "owner": "harshada@webnotestech.com"
  }, 
  {
-  "section_style": "Simple", 
-  "module": "Stock", 
-  "doctype": "DocType", 
-  "allow_trash": 1, 
-  "document_type": "Master", 
   "autoname": "field:batch_id", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "server_code_error": " ", 
-  "version": 12
+  "doctype": "DocType", 
+  "document_type": "Master", 
+  "module": "Stock", 
+  "name": "__common__"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Batch", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Batch", 
-  "read": 1, 
-  "doctype": "DocPerm", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "role": "Material Master Manager", 
-  "parentfield": "permissions"
+  "permlevel": 0
  }, 
  {
-  "name": "Batch", 
-  "doctype": "DocType"
- }, 
- {
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "cancel": 1, 
+  "name": "__common__", 
+  "parent": "Batch", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
+  "permlevel": 0, 
+  "read": 1, 
   "report": 1, 
-  "permlevel": 0
+  "role": "Material Master Manager", 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "permlevel": 1, 
-  "doctype": "DocPerm"
+  "doctype": "DocType", 
+  "name": "Batch"
  }, 
  {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Trash Reason", 
-  "oldfieldname": "trash_reason", 
   "fieldname": "trash_reason", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Trash Reason", 
+  "oldfieldname": "trash_reason", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Batch ID", 
-  "oldfieldname": "batch_id", 
   "fieldname": "batch_id", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Batch ID", 
+  "no_copy": 1, 
+  "oldfieldname": "batch_id", 
+  "oldfieldtype": "Data", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Description", 
-  "oldfieldname": "description", 
-  "width": "300px", 
   "fieldname": "description", 
   "fieldtype": "Small Text", 
-  "permlevel": 0
+  "label": "Description", 
+  "oldfieldname": "description", 
+  "oldfieldtype": "Small Text", 
+  "width": "300px"
  }, 
  {
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Batch Started Date", 
-  "oldfieldname": "start_date", 
   "fieldname": "start_date", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "Batch Started Date", 
+  "oldfieldname": "start_date", 
+  "oldfieldtype": "Date"
  }, 
  {
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Batch Finished Date", 
-  "oldfieldname": "finished_date", 
   "fieldname": "finished_date", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "Batch Finished Date", 
+  "oldfieldname": "finished_date", 
+  "oldfieldtype": "Date"
  }, 
  {
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Expiry Date", 
-  "oldfieldname": "expiry_date", 
   "fieldname": "expiry_date", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "Expiry Date", 
+  "oldfieldname": "expiry_date", 
+  "oldfieldtype": "Date"
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Item", 
-  "oldfieldname": "item", 
-  "options": "Item", 
   "fieldname": "item", 
   "fieldtype": "Link", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Item", 
+  "oldfieldname": "item", 
+  "oldfieldtype": "Link", 
+  "options": "Item", 
+  "reqd": 1
+ }, 
+ {
+  "doctype": "DocPerm"
  }
 ]
\ No newline at end of file
diff --git a/stock/doctype/bin/bin.txt b/stock/doctype/bin/bin.txt
index a4ecad3..ff8d431 100644
--- a/stock/doctype/bin/bin.txt
+++ b/stock/doctype/bin/bin.txt
@@ -1,224 +1,202 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:25", 
   "docstatus": 0, 
-  "creation": "2012-05-15 12:15:04", 
+  "modified": "2013-01-22 13:50:19", 
   "modified_by": "Administrator", 
-  "modified": "2012-07-31 17:23:42"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
-  "in_create": 1, 
-  "search_fields": "item_code,warehouse", 
-  "module": "Stock", 
-  "server_code_error": " ", 
   "autoname": "BIN/.#######", 
-  "read_only": 0, 
-  "_last_update": "1322549701", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
   "doctype": "DocType", 
-  "show_in_menu": 0, 
-  "version": 1, 
-  "hide_toolbar": 1
+  "hide_toolbar": 1, 
+  "in_create": 1, 
+  "module": "Stock", 
+  "name": "__common__", 
+  "read_only": 0, 
+  "search_fields": "item_code,warehouse"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Bin", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
   "permlevel": 0, 
-  "parentfield": "fields"
+  "read_only": 1
  }, 
  {
+  "doctype": "DocPerm", 
   "name": "__common__", 
   "parent": "Bin", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
+  "permlevel": 0, 
   "read": 1, 
-  "doctype": "DocPerm", 
-  "parenttype": "DocType", 
   "report": 1, 
-  "permlevel": 0, 
-  "parentfield": "permissions"
+  "submit": 0
  }, 
  {
-  "name": "Bin", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Bin"
  }, 
  {
-  "role": "Sales Manager", 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "Sales User", 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "Purchase Manager", 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "Purchase User", 
-  "doctype": "DocPerm"
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Material User", 
-  "cancel": 0
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Material Manager", 
-  "cancel": 0
- }, 
- {
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "Warehouse", 
-  "oldfieldname": "warehouse", 
   "fieldname": "warehouse", 
   "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Warehouse", 
+  "oldfieldname": "warehouse", 
   "oldfieldtype": "Link", 
   "options": "Warehouse", 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
+  "fieldname": "warehouse_type", 
+  "fieldtype": "Data", 
   "label": "Warehouse Type", 
   "oldfieldname": "warehouse_type", 
-  "fieldname": "warehouse_type", 
-  "fieldtype": "Data"
+  "oldfieldtype": "Data"
  }, 
  {
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "Item Code", 
-  "oldfieldname": "item_code", 
   "fieldname": "item_code", 
   "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Item Code", 
+  "oldfieldname": "item_code", 
   "oldfieldtype": "Link", 
   "options": "Item", 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
   "default": "0.00", 
-  "search_index": 0, 
   "doctype": "DocField", 
+  "fieldname": "reserved_qty", 
+  "fieldtype": "Float", 
+  "in_filter": 0, 
   "label": "Reserved Quantity", 
   "oldfieldname": "reserved_qty", 
-  "fieldname": "reserved_qty", 
-  "fieldtype": "Currency", 
   "oldfieldtype": "Currency", 
-  "in_filter": 0
+  "search_index": 0
  }, 
  {
   "default": "0.00", 
-  "search_index": 0, 
   "doctype": "DocField", 
+  "fieldname": "actual_qty", 
+  "fieldtype": "Float", 
+  "in_filter": 1, 
   "label": "Actual Quantity", 
   "oldfieldname": "actual_qty", 
-  "fieldname": "actual_qty", 
-  "fieldtype": "Currency", 
   "oldfieldtype": "Currency", 
-  "in_filter": 1
+  "search_index": 0
  }, 
  {
   "default": "0.00", 
-  "search_index": 0, 
   "doctype": "DocField", 
+  "fieldname": "ordered_qty", 
+  "fieldtype": "Float", 
+  "in_filter": 0, 
   "label": "Ordered Quantity", 
   "oldfieldname": "ordered_qty", 
-  "fieldname": "ordered_qty", 
-  "fieldtype": "Currency", 
   "oldfieldtype": "Currency", 
-  "in_filter": 0
+  "search_index": 0
  }, 
  {
   "default": "0.00", 
-  "search_index": 0, 
   "doctype": "DocField", 
+  "fieldname": "indented_qty", 
+  "fieldtype": "Float", 
+  "in_filter": 0, 
   "label": "Quantity Requested for Purchase", 
   "oldfieldname": "indented_qty", 
-  "fieldname": "indented_qty", 
-  "fieldtype": "Currency", 
   "oldfieldtype": "Currency", 
-  "in_filter": 0
+  "search_index": 0
  }, 
  {
-  "search_index": 0, 
   "doctype": "DocField", 
+  "fieldname": "planned_qty", 
+  "fieldtype": "Float", 
+  "in_filter": 0, 
   "label": "Planned Qty", 
   "oldfieldname": "planned_qty", 
-  "fieldname": "planned_qty", 
-  "fieldtype": "Currency", 
   "oldfieldtype": "Currency", 
-  "in_filter": 0
+  "search_index": 0
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "projected_qty", 
+  "fieldtype": "Float", 
+  "in_filter": 0, 
   "label": "Projected Qty", 
   "oldfieldname": "projected_qty", 
-  "fieldname": "projected_qty", 
-  "fieldtype": "Currency", 
-  "in_filter": 0
+  "oldfieldtype": "Currency"
  }, 
  {
-  "print_hide": 1, 
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "Moving Average Rate", 
-  "oldfieldname": "ma_rate", 
   "fieldname": "ma_rate", 
   "fieldtype": "Currency", 
-  "oldfieldtype": "Currency", 
   "hidden": 1, 
+  "in_filter": 0, 
+  "label": "Moving Average Rate", 
+  "oldfieldname": "ma_rate", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
   "report_hide": 1, 
-  "in_filter": 0
+  "search_index": 0
  }, 
  {
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "UOM", 
-  "oldfieldname": "stock_uom", 
   "fieldname": "stock_uom", 
   "fieldtype": "Data", 
+  "in_filter": 1, 
+  "label": "UOM", 
+  "oldfieldname": "stock_uom", 
   "oldfieldtype": "Data", 
-  "in_filter": 1
+  "search_index": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "FCFS Rate", 
-  "oldfieldname": "fcfs_rate", 
   "fieldname": "fcfs_rate", 
   "fieldtype": "Currency", 
   "hidden": 1, 
+  "label": "FCFS Rate", 
+  "oldfieldname": "fcfs_rate", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
   "report_hide": 1
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "valuation_rate", 
+  "fieldtype": "Currency", 
   "label": "Valuation Rate", 
   "oldfieldname": "valuation_rate", 
-  "fieldname": "valuation_rate", 
-  "fieldtype": "Currency"
+  "oldfieldtype": "Currency"
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "stock_value", 
+  "fieldtype": "Currency", 
   "label": "Stock Value", 
   "oldfieldname": "stock_value", 
-  "fieldname": "stock_value", 
-  "fieldtype": "Currency"
+  "oldfieldtype": "Currency"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "Sales User"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "Purchase User"
+ }, 
+ {
+  "amend": 0, 
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "role": "Material User", 
+  "write": 0
  }
 ]
\ No newline at end of file
diff --git a/stock/doctype/delivery_note/delivery_note.txt b/stock/doctype/delivery_note/delivery_note.txt
index 1e54b42..3a7d9bf 100644
--- a/stock/doctype/delivery_note/delivery_note.txt
+++ b/stock/doctype/delivery_note/delivery_note.txt
@@ -1,1221 +1,1178 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:25", 
   "docstatus": 0, 
-  "creation": "2012-12-03 17:26:43", 
+  "modified": "2013-01-22 14:56:00", 
   "modified_by": "Administrator", 
-  "modified": "2013-01-09 12:52:30"
+  "owner": "Administrator"
  }, 
  {
-  "is_submittable": 1, 
-  "in_create": 0, 
-  "search_fields": "status,customer,customer_name, territory,grand_total", 
-  "module": "Stock", 
-  "read_only_onload": 1, 
-  "document_type": "Transaction", 
   "allow_attach": 1, 
   "autoname": "naming_series:", 
+  "doctype": "DocType", 
+  "document_type": "Transaction", 
+  "in_create": 0, 
+  "is_submittable": 1, 
+  "module": "Stock", 
   "name": "__common__", 
-  "doctype": "DocType"
+  "read_only_onload": 1, 
+  "search_fields": "status,customer,customer_name, territory,grand_total"
  }, 
  {
-  "read_only": 0, 
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Delivery Note", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
-  "name": "__common__", 
-  "parent": "Delivery Note", 
-  "read": 1, 
-  "doctype": "DocPerm", 
-  "parenttype": "DocType", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Delivery Note", 
-  "doctype": "DocType"
- }, 
- {
-  "print_width": "50%", 
-  "oldfieldtype": "Column Break", 
-  "doctype": "DocField", 
-  "width": "50%", 
-  "fieldname": "column_break0", 
-  "fieldtype": "Column Break", 
   "permlevel": 0
  }, 
  {
-  "print_hide": 1, 
-  "description": "To manage multiple series please go to Setup > Manage Series", 
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Delivery Note", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
+  "read": 1, 
+  "report": 1
+ }, 
+ {
+  "doctype": "DocType", 
+  "name": "Delivery Note"
+ }, 
+ {
   "doctype": "DocField", 
-  "label": "Series", 
-  "oldfieldname": "naming_series", 
-  "permlevel": 0, 
+  "fieldname": "column_break0", 
+  "fieldtype": "Column Break", 
+  "oldfieldtype": "Column Break", 
+  "print_width": "50%", 
+  "read_only": 0, 
+  "width": "50%"
+ }, 
+ {
+  "description": "To manage multiple series please go to Setup > Manage Series", 
+  "doctype": "DocField", 
   "fieldname": "naming_series", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "options": "DN"
+  "label": "Series", 
+  "no_copy": 1, 
+  "oldfieldname": "naming_series", 
+  "oldfieldtype": "Select", 
+  "options": "DN", 
+  "print_hide": 1, 
+  "read_only": 0, 
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Customer", 
-  "oldfieldname": "customer", 
-  "permlevel": 0, 
   "fieldname": "customer", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Customer", 
+  "oldfieldname": "customer", 
+  "oldfieldtype": "Link", 
   "options": "Customer", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "read_only": 0, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Customer Name", 
   "fieldname": "customer_name", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Customer Name", 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
   "depends_on": "customer", 
   "doctype": "DocField", 
-  "label": "Select Shipping Address", 
-  "permlevel": 0, 
   "fieldname": "customer_address", 
   "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Select Shipping Address", 
   "options": "Address", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Shipping Address", 
   "fieldname": "address_display", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Shipping Address", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Contact", 
   "fieldname": "contact_display", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Contact", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Mobile No", 
   "fieldname": "contact_mobile", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Mobile No", 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Contact Email", 
   "fieldname": "contact_email", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Contact Email", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "read_only": 0
  }, 
  {
-  "print_hide": 0, 
-  "permlevel": 0, 
-  "description": "The date at which current entry will get or has actually executed.", 
-  "print_width": "100px", 
   "default": "Today", 
-  "oldfieldtype": "Date", 
+  "description": "The date at which current entry will get or has actually executed.", 
   "doctype": "DocField", 
-  "label": "Posting Date", 
-  "oldfieldname": "posting_date", 
-  "no_copy": 1, 
   "fieldname": "posting_date", 
   "fieldtype": "Date", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Posting Date", 
+  "no_copy": 1, 
+  "oldfieldname": "posting_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 0, 
+  "print_width": "100px", 
+  "read_only": 0, 
   "reqd": 1, 
-  "width": "100px", 
-  "in_filter": 1
+  "search_index": 1, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Challan No", 
-  "oldfieldname": "challan_no", 
   "fieldname": "challan_no", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Challan No", 
+  "oldfieldname": "challan_no", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Challan Date", 
-  "oldfieldname": "challan_date", 
   "fieldname": "challan_date", 
   "fieldtype": "Date", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Challan Date", 
+  "oldfieldname": "challan_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
+  "read_only": 0
  }, 
  {
-  "print_hide": 1, 
-  "print_width": "100px", 
-  "no_copy": 0, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "P.O. No", 
-  "oldfieldname": "po_no", 
-  "width": "100px", 
   "fieldname": "po_no", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1
- }, 
- {
+  "label": "P.O. No", 
+  "no_copy": 0, 
+  "oldfieldname": "po_no", 
+  "oldfieldtype": "Data", 
   "print_hide": 1, 
   "print_width": "100px", 
-  "no_copy": 0, 
-  "oldfieldtype": "Data", 
+  "read_only": 1, 
+  "width": "100px"
+ }, 
+ {
+  "depends_on": "eval:doc.po_no", 
   "doctype": "DocField", 
-  "label": "P.O. Date", 
-  "oldfieldname": "po_date", 
-  "width": "100px", 
   "fieldname": "po_date", 
   "fieldtype": "Data", 
-  "depends_on": "eval:doc.po_no", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "P.O. Date", 
+  "no_copy": 0, 
+  "oldfieldname": "po_date", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "print_width": "100px", 
+  "read_only": 1, 
+  "width": "100px"
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Items", 
   "fieldname": "items", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Items", 
+  "oldfieldtype": "Section Break", 
+  "read_only": 0
  }, 
  {
-  "print_hide": 0, 
-  "no_copy": 0, 
-  "oldfieldtype": "Table", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Delivery Note Items", 
-  "oldfieldname": "delivery_note_details", 
-  "options": "Delivery Note Item", 
   "fieldname": "delivery_note_details", 
   "fieldtype": "Table", 
-  "permlevel": 0
+  "label": "Delivery Note Items", 
+  "no_copy": 0, 
+  "oldfieldname": "delivery_note_details", 
+  "oldfieldtype": "Table", 
+  "options": "Delivery Note Item", 
+  "print_hide": 0, 
+  "read_only": 0
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Sales BOM Help", 
   "fieldname": "sales_bom_help", 
   "fieldtype": "HTML", 
-  "permlevel": 0
+  "label": "Sales BOM Help", 
+  "print_hide": 1, 
+  "read_only": 0
  }, 
  {
   "doctype": "DocField", 
-  "permlevel": 0, 
   "fieldname": "section_break0", 
   "fieldtype": "Section Break", 
-  "options": "Simple"
+  "options": "Simple", 
+  "read_only": 0
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "col_break24", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "read_only": 0
  }, 
  {
-  "print_hide": 0, 
-  "print_width": "150px", 
-  "no_copy": 0, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Net Total*", 
-  "oldfieldname": "net_total", 
-  "width": "150px", 
   "fieldname": "net_total", 
   "fieldtype": "Currency", 
+  "label": "Net Total*", 
+  "no_copy": 0, 
+  "oldfieldname": "net_total", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 0, 
+  "print_width": "150px", 
+  "read_only": 1, 
   "reqd": 0, 
-  "permlevel": 1
+  "width": "150px"
  }, 
  {
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Re-Calculate Values", 
   "fieldname": "recalculate_values", 
   "fieldtype": "Button", 
-  "permlevel": 0
+  "label": "Re-Calculate Values", 
+  "oldfieldtype": "Button", 
+  "read_only": 0
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "col_break28", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "read_only": 0
  }, 
  {
-  "print_hide": 0, 
   "description": "You can make a delivery note from multiple sales orders. Select sales orders one by one and click on the button below.", 
-  "no_copy": 0, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Sales Order No", 
-  "oldfieldname": "sales_order_no", 
-  "options": "Sales Order", 
   "fieldname": "sales_order_no", 
   "fieldtype": "Link", 
-  "permlevel": 0
+  "label": "Sales Order No", 
+  "no_copy": 0, 
+  "oldfieldname": "sales_order_no", 
+  "oldfieldtype": "Link", 
+  "options": "Sales Order", 
+  "print_hide": 0, 
+  "read_only": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Get Items", 
-  "permlevel": 0, 
   "fieldname": "get_items", 
   "fieldtype": "Button", 
   "hidden": 0, 
-  "options": "pull_sales_order_details"
+  "label": "Get Items", 
+  "oldfieldtype": "Button", 
+  "options": "pull_sales_order_details", 
+  "print_hide": 1, 
+  "read_only": 0
  }, 
  {
   "doctype": "DocField", 
-  "label": "Price List and Currency", 
   "fieldname": "sec_break25", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Price List and Currency", 
+  "read_only": 0
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "col_break23", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "read_only": 0
  }, 
  {
-  "print_hide": 1, 
   "description": "Select the price list as entered in \"Price List\" master. This will pull the reference rates of items against this price list as specified in \"Item\" master.", 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Price List", 
-  "oldfieldname": "price_list_name", 
-  "options": "link:Price List", 
   "fieldname": "price_list_name", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Price List", 
+  "oldfieldname": "price_list_name", 
+  "oldfieldtype": "Select", 
+  "options": "link:Price List", 
+  "print_hide": 1, 
+  "read_only": 0, 
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "Select the currency in which price list is maintained", 
   "doctype": "DocField", 
-  "label": "Price List Currency", 
-  "permlevel": 0, 
   "fieldname": "price_list_currency", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "options": "link:Currency"
+  "label": "Price List Currency", 
+  "options": "link:Currency", 
+  "print_hide": 1, 
+  "read_only": 0, 
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "Rate at which Price list currency is converted to company's base currency", 
   "doctype": "DocField", 
-  "label": "Price List Currency Conversion Rate", 
   "fieldname": "plc_conversion_rate", 
   "fieldtype": "Float", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Price List Currency Conversion Rate", 
+  "print_hide": 1, 
+  "read_only": 0, 
+  "reqd": 1
  }, 
  {
-  "print_width": "50%", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break2", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "print_width": "50%", 
+  "read_only": 0, 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
   "description": "Customer's Currency", 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Currency", 
-  "oldfieldname": "currency", 
-  "options": "link:Currency", 
   "fieldname": "currency", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Currency", 
+  "oldfieldname": "currency", 
+  "oldfieldtype": "Select", 
+  "options": "link:Currency", 
+  "print_hide": 1, 
+  "read_only": 0, 
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
-  "description": "Rate at which customer's currency is converted to company's base currency", 
-  "no_copy": 0, 
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Conversion Rate", 
-  "oldfieldname": "conversion_rate", 
   "default": "1.00", 
+  "description": "Rate at which customer's currency is converted to company's base currency", 
+  "doctype": "DocField", 
   "fieldname": "conversion_rate", 
   "fieldtype": "Float", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Conversion Rate", 
+  "no_copy": 0, 
+  "oldfieldname": "conversion_rate", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 0, 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Taxes", 
   "fieldname": "taxes", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Taxes", 
+  "oldfieldtype": "Section Break", 
+  "read_only": 0
  }, 
  {
-  "print_hide": 1, 
   "description": "If you have created a standard template in Sales Taxes and Charges Master, select one and click on the button below.", 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Taxes and Charges", 
-  "oldfieldname": "charge", 
-  "permlevel": 0, 
   "fieldname": "charge", 
   "fieldtype": "Link", 
-  "options": "Sales Taxes and Charges Master"
+  "label": "Taxes and Charges", 
+  "oldfieldname": "charge", 
+  "oldfieldtype": "Link", 
+  "options": "Sales Taxes and Charges Master", 
+  "print_hide": 1, 
+  "read_only": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Get Taxes and Charges", 
   "fieldname": "get_charges", 
   "fieldtype": "Button", 
-  "permlevel": 0
+  "label": "Get Taxes and Charges", 
+  "oldfieldtype": "Button", 
+  "print_hide": 1, 
+  "read_only": 0
  }, 
  {
-  "no_copy": 0, 
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "Sales Taxes and Charges", 
-  "oldfieldname": "other_charges", 
-  "permlevel": 0, 
   "fieldname": "other_charges", 
   "fieldtype": "Table", 
-  "options": "Sales Taxes and Charges"
+  "label": "Sales Taxes and Charges", 
+  "no_copy": 0, 
+  "oldfieldname": "other_charges", 
+  "oldfieldtype": "Table", 
+  "options": "Sales Taxes and Charges", 
+  "read_only": 0
  }, 
  {
-  "print_hide": 1, 
-  "print_width": "150px", 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Taxes and Charges Total", 
-  "oldfieldname": "other_charges_total", 
-  "width": "150px", 
   "fieldname": "other_charges_total", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Taxes and Charges Total", 
+  "oldfieldname": "other_charges_total", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "print_width": "150px", 
+  "read_only": 1, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Calculate Charges", 
   "fieldname": "calculate_charges", 
   "fieldtype": "Button", 
-  "permlevel": 0
+  "label": "Calculate Charges", 
+  "oldfieldtype": "Button", 
+  "print_hide": 1, 
+  "read_only": 0
  }, 
  {
-  "oldfieldtype": "HTML", 
   "doctype": "DocField", 
-  "label": "Taxes and Charges Calculation", 
   "fieldname": "other_charges_calculation", 
   "fieldtype": "HTML", 
-  "permlevel": 0
+  "label": "Taxes and Charges Calculation", 
+  "oldfieldtype": "HTML", 
+  "read_only": 0
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Totals", 
   "fieldname": "totals", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Totals", 
+  "oldfieldtype": "Section Break", 
+  "print_hide": 0, 
+  "read_only": 0
  }, 
  {
-  "print_hide": 1, 
-  "print_width": "150px", 
-  "no_copy": 0, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Grand Total", 
-  "oldfieldname": "grand_total", 
-  "width": "150px", 
   "fieldname": "grand_total", 
   "fieldtype": "Currency", 
-  "reqd": 0, 
-  "permlevel": 1
- }, 
- {
+  "label": "Grand Total", 
+  "no_copy": 0, 
+  "oldfieldname": "grand_total", 
+  "oldfieldtype": "Currency", 
   "print_hide": 1, 
   "print_width": "150px", 
-  "no_copy": 0, 
-  "oldfieldtype": "Currency", 
+  "read_only": 1, 
+  "reqd": 0, 
+  "width": "150px"
+ }, 
+ {
   "doctype": "DocField", 
-  "label": "Rounded Total", 
-  "oldfieldname": "rounded_total", 
-  "width": "150px", 
   "fieldname": "rounded_total", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Rounded Total", 
+  "no_copy": 0, 
+  "oldfieldname": "rounded_total", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "print_width": "150px", 
+  "read_only": 1, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
   "description": "In Words will be visible once you save the Delivery Note.", 
-  "print_width": "200px", 
-  "no_copy": 0, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "In Words", 
-  "oldfieldname": "in_words", 
-  "width": "200px", 
   "fieldname": "in_words", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "In Words", 
+  "no_copy": 0, 
+  "oldfieldname": "in_words", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "print_width": "200px", 
+  "read_only": 1, 
+  "width": "200px"
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
   "fieldname": "column_break3", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "read_only": 0
  }, 
  {
-  "print_hide": 0, 
-  "print_width": "150px", 
-  "no_copy": 0, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Grand Total (Export)", 
-  "oldfieldname": "grand_total_export", 
-  "width": "150px", 
   "fieldname": "grand_total_export", 
   "fieldtype": "Currency", 
-  "reqd": 0, 
-  "permlevel": 1
- }, 
- {
+  "label": "Grand Total (Export)", 
+  "no_copy": 0, 
+  "oldfieldname": "grand_total_export", 
+  "oldfieldtype": "Currency", 
   "print_hide": 0, 
   "print_width": "150px", 
-  "no_copy": 0, 
-  "oldfieldtype": "Currency", 
+  "read_only": 1, 
+  "reqd": 0, 
+  "width": "150px"
+ }, 
+ {
   "doctype": "DocField", 
-  "label": "Rounded Total (Export)", 
-  "oldfieldname": "rounded_total_export", 
-  "width": "150px", 
   "fieldname": "rounded_total_export", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Rounded Total (Export)", 
+  "no_copy": 0, 
+  "oldfieldname": "rounded_total_export", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 0, 
+  "print_width": "150px", 
+  "read_only": 1, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 0, 
   "description": "In Words (Export) will be visible once you save the Delivery Note.", 
-  "print_width": "150px", 
-  "no_copy": 0, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "In Words (Export)", 
-  "oldfieldname": "in_words_export", 
-  "width": "150px", 
   "fieldname": "in_words_export", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "In Words (Export)", 
+  "no_copy": 0, 
+  "oldfieldname": "in_words_export", 
+  "oldfieldtype": "Data", 
+  "print_hide": 0, 
+  "print_width": "150px", 
+  "read_only": 1, 
+  "width": "150px"
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Terms and Conditions", 
   "fieldname": "terms_section_break", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Terms and Conditions", 
+  "oldfieldtype": "Section Break", 
+  "read_only": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Select Terms and Conditions", 
-  "oldfieldname": "tc_name", 
-  "permlevel": 0, 
   "fieldname": "tc_name", 
   "fieldtype": "Link", 
-  "options": "Terms and Conditions"
+  "label": "Select Terms and Conditions", 
+  "oldfieldname": "tc_name", 
+  "oldfieldtype": "Link", 
+  "options": "Terms and Conditions", 
+  "print_hide": 1, 
+  "read_only": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Get Terms and Conditions", 
-  "permlevel": 0, 
   "fieldname": "get_terms", 
   "fieldtype": "Button", 
-  "options": "get_tc_details"
+  "label": "Get Terms and Conditions", 
+  "oldfieldtype": "Button", 
+  "options": "get_tc_details", 
+  "print_hide": 1, 
+  "read_only": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "HTML", 
   "doctype": "DocField", 
-  "label": "Terms and Conditions HTML", 
-  "permlevel": 0, 
   "fieldname": "terms_html", 
   "fieldtype": "HTML", 
-  "options": "You can add Terms and Notes that will be printed in the Transaction"
+  "label": "Terms and Conditions HTML", 
+  "oldfieldtype": "HTML", 
+  "options": "You can add Terms and Notes that will be printed in the Transaction", 
+  "print_hide": 1, 
+  "read_only": 0
  }, 
  {
-  "oldfieldtype": "Text Editor", 
   "doctype": "DocField", 
-  "label": "Terms and Conditions Details", 
-  "oldfieldname": "terms", 
   "fieldname": "terms", 
   "fieldtype": "Text Editor", 
-  "permlevel": 0
+  "label": "Terms and Conditions Details", 
+  "oldfieldname": "terms", 
+  "oldfieldtype": "Text Editor", 
+  "read_only": 0
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Transporter Info", 
   "fieldname": "transporter_info", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Transporter Info", 
+  "print_hide": 1, 
+  "read_only": 0
  }, 
  {
-  "print_hide": 1, 
-  "print_width": "50%", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break4", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "print_hide": 1, 
+  "print_width": "50%", 
+  "read_only": 0, 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
-  "print_width": "150px", 
-  "no_copy": 0, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Transporter Name", 
-  "oldfieldname": "transporter_name", 
-  "width": "150px", 
   "fieldname": "transporter_name", 
   "fieldtype": "Data", 
+  "label": "Transporter Name", 
+  "no_copy": 0, 
+  "oldfieldname": "transporter_name", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "print_width": "150px", 
+  "read_only": 0, 
   "reqd": 0, 
-  "permlevel": 0
+  "width": "150px"
  }, 
  {
-  "print_width": "50%", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "col_break34", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "print_width": "50%", 
+  "read_only": 0, 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
   "description": "Transporter lorry number", 
-  "print_width": "100px", 
-  "no_copy": 0, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "LR No", 
-  "oldfieldname": "lr_no", 
-  "width": "100px", 
   "fieldname": "lr_no", 
   "fieldtype": "Data", 
+  "label": "LR No", 
+  "no_copy": 0, 
+  "oldfieldname": "lr_no", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "print_width": "100px", 
+  "read_only": 0, 
   "reqd": 0, 
-  "permlevel": 0
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
-  "permlevel": 0, 
-  "description": "Date on which lorry started from your warehouse", 
-  "print_width": "100px", 
   "default": "Today", 
-  "oldfieldtype": "Date", 
+  "description": "Date on which lorry started from your warehouse", 
   "doctype": "DocField", 
-  "label": "LR Date", 
-  "oldfieldname": "lr_date", 
-  "no_copy": 0, 
   "fieldname": "lr_date", 
   "fieldtype": "Date", 
+  "label": "LR Date", 
+  "no_copy": 0, 
+  "oldfieldname": "lr_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
+  "print_width": "100px", 
+  "read_only": 0, 
   "width": "100px"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Contact Info", 
   "fieldname": "contact_info", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Contact Info", 
+  "read_only": 0
  }, 
  {
-  "print_width": "50%", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "col_break20", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "print_width": "50%", 
+  "read_only": 0, 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Contact Person", 
-  "permlevel": 0, 
   "fieldname": "contact_person", 
   "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Contact Person", 
   "options": "Contact", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "read_only": 0
  }, 
  {
-  "print_width": "50%", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "col_break21", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "print_width": "50%", 
+  "read_only": 0, 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "Territory", 
-  "options": "Territory", 
   "fieldname": "territory", 
   "fieldtype": "Link", 
-  "reqd": 1, 
   "hidden": 0, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Territory", 
+  "options": "Territory", 
+  "print_hide": 1, 
+  "read_only": 0, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "Customer Group", 
-  "permlevel": 0, 
   "fieldname": "customer_group", 
   "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Customer Group", 
   "options": "Customer Group", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "read_only": 0, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "Filling in Additional Information about the Delivery Note will help you analyze your data better.", 
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "More Info", 
   "fieldname": "more_info", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "More Info", 
+  "oldfieldtype": "Section Break", 
+  "print_hide": 1, 
+  "read_only": 0
  }, 
  {
-  "print_hide": 1, 
   "description": "Time at which items were delivered from warehouse", 
-  "print_width": "100px", 
-  "oldfieldtype": "Time", 
   "doctype": "DocField", 
-  "label": "Posting Time", 
-  "oldfieldname": "posting_time", 
-  "width": "100px", 
   "fieldname": "posting_time", 
   "fieldtype": "Time", 
-  "search_index": 0, 
+  "in_filter": 0, 
+  "label": "Posting Time", 
+  "oldfieldname": "posting_time", 
+  "oldfieldtype": "Time", 
+  "print_hide": 1, 
+  "print_width": "100px", 
+  "read_only": 0, 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 0
+  "search_index": 0, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
-  "permlevel": 1, 
-  "print_width": "150px", 
   "default": "Draft", 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Status", 
-  "oldfieldname": "status", 
-  "no_copy": 1, 
-  "options": "\nDraft\nSubmitted\nCancelled", 
   "fieldname": "status", 
   "fieldtype": "Select", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Status", 
+  "no_copy": 1, 
+  "oldfieldname": "status", 
+  "oldfieldtype": "Select", 
+  "options": "\nDraft\nSubmitted\nCancelled", 
+  "print_hide": 1, 
+  "print_width": "150px", 
+  "read_only": 1, 
   "reqd": 1, 
-  "width": "150px", 
-  "in_filter": 1
+  "search_index": 1, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Letter Head", 
-  "oldfieldname": "letter_head", 
-  "permlevel": 0, 
   "fieldname": "letter_head", 
   "fieldtype": "Select", 
-  "options": "link:Letter Head"
+  "label": "Letter Head", 
+  "oldfieldname": "letter_head", 
+  "oldfieldtype": "Link", 
+  "options": "link:Letter Head", 
+  "print_hide": 1, 
+  "read_only": 0
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Select Print Heading", 
-  "oldfieldname": "select_print_heading", 
-  "permlevel": 0, 
   "fieldname": "select_print_heading", 
   "fieldtype": "Link", 
+  "label": "Select Print Heading", 
+  "no_copy": 1, 
+  "oldfieldname": "select_print_heading", 
+  "oldfieldtype": "Link", 
   "options": "Print Heading", 
+  "print_hide": 1, 
+  "read_only": 0, 
   "report_hide": 1
  }, 
  {
   "description": "Track this Delivery Note against any Project", 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Project Name", 
-  "oldfieldname": "project_name", 
-  "options": "Project", 
   "fieldname": "project_name", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Project Name", 
+  "oldfieldname": "project_name", 
+  "oldfieldtype": "Link", 
+  "options": "Project", 
+  "read_only": 0, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Source", 
-  "oldfieldname": "source", 
-  "permlevel": 0, 
   "fieldname": "source", 
   "fieldtype": "Select", 
-  "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign"
+  "label": "Source", 
+  "oldfieldname": "source", 
+  "oldfieldtype": "Select", 
+  "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign", 
+  "print_hide": 1, 
+  "read_only": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
+  "depends_on": "eval:doc.source == 'Campaign'", 
   "doctype": "DocField", 
-  "label": "Campaign", 
-  "oldfieldname": "campaign", 
-  "permlevel": 0, 
   "fieldname": "campaign", 
   "fieldtype": "Link", 
-  "depends_on": "eval:doc.source == 'Campaign'", 
-  "options": "Campaign"
+  "label": "Campaign", 
+  "oldfieldname": "campaign", 
+  "oldfieldtype": "Link", 
+  "options": "Campaign", 
+  "print_hide": 1, 
+  "read_only": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Check", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Print Without Amount", 
-  "oldfieldname": "print_without_amount", 
   "fieldname": "print_without_amount", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "Print Without Amount", 
+  "oldfieldname": "print_without_amount", 
+  "oldfieldtype": "Check", 
+  "print_hide": 1, 
+  "read_only": 0
  }, 
  {
-  "print_hide": 1, 
-  "print_width": "50%", 
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break5", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "print_hide": 1, 
+  "print_width": "50%", 
+  "read_only": 0, 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
-  "doctype": "DocField", 
+  "depends_on": "eval:!doc.__islocal", 
   "description": "% of materials billed against this Delivery Note", 
-  "no_copy": 1, 
-  "search_index": 1, 
-  "oldfieldtype": "Currency", 
-  "label": "% Amount Billed", 
-  "oldfieldname": "per_billed", 
+  "doctype": "DocField", 
   "fieldname": "per_billed", 
   "fieldtype": "Currency", 
-  "depends_on": "eval:!doc.__islocal", 
-  "permlevel": 1, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "% Amount Billed", 
+  "no_copy": 1, 
+  "oldfieldname": "per_billed", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Billing Status", 
-  "permlevel": 0, 
   "fieldname": "billing_status", 
   "fieldtype": "Select", 
   "hidden": 1, 
-  "options": "\nNot Billed\nPartly Billed\nFully Billed"
- }, 
- {
-  "print_hide": 1, 
-  "doctype": "DocField", 
-  "description": "% of materials delivered against this Delivery Note", 
+  "label": "Billing Status", 
   "no_copy": 1, 
-  "search_index": 1, 
-  "oldfieldtype": "Currency", 
-  "label": "% Installed", 
-  "oldfieldname": "per_installed", 
-  "fieldname": "per_installed", 
-  "fieldtype": "Currency", 
-  "depends_on": "eval:!doc.__islocal", 
-  "permlevel": 1, 
-  "in_filter": 1
+  "options": "\nNot Billed\nPartly Billed\nFully Billed", 
+  "print_hide": 1, 
+  "read_only": 0
  }, 
  {
-  "print_hide": 1, 
+  "depends_on": "eval:!doc.__islocal", 
+  "description": "% of materials delivered against this Delivery Note", 
   "doctype": "DocField", 
-  "label": "Installation Status", 
+  "fieldname": "per_installed", 
+  "fieldtype": "Float", 
+  "in_filter": 1, 
+  "label": "% Installed", 
+  "no_copy": 1, 
+  "oldfieldname": "per_installed", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "search_index": 1
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "installation_status", 
   "fieldtype": "Select", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Installation Status", 
+  "print_hide": 1, 
+  "read_only": 0
  }, 
  {
-  "print_hide": 1, 
-  "print_width": "150px", 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "allow_on_submit": 0, 
   "doctype": "DocField", 
-  "label": "Amended From", 
-  "oldfieldname": "amended_from", 
-  "width": "150px", 
   "fieldname": "amended_from", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Amended From", 
+  "no_copy": 1, 
+  "oldfieldname": "amended_from", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "print_width": "150px", 
+  "read_only": 1, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
   "description": "The date at which current entry is corrected in the system.", 
-  "print_width": "100px", 
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Amendment Date", 
-  "oldfieldname": "amendment_date", 
-  "width": "100px", 
   "fieldname": "amendment_date", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "Amendment Date", 
+  "no_copy": 1, 
+  "oldfieldname": "amendment_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
+  "print_width": "100px", 
+  "read_only": 0, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
   "description": "Required only for sample item.", 
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "To Warehouse", 
-  "oldfieldname": "to_warehouse", 
-  "permlevel": 0, 
   "fieldname": "to_warehouse", 
   "fieldtype": "Link", 
   "hidden": 0, 
-  "options": "Warehouse"
+  "label": "To Warehouse", 
+  "no_copy": 1, 
+  "oldfieldname": "to_warehouse", 
+  "oldfieldtype": "Link", 
+  "options": "Warehouse", 
+  "print_hide": 1, 
+  "read_only": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Excise Page Number", 
-  "oldfieldname": "excise_page", 
   "fieldname": "excise_page", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Excise Page Number", 
+  "oldfieldname": "excise_page", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 0
  }, 
  {
-  "oldfieldtype": "Text", 
   "doctype": "DocField", 
-  "label": "Instructions", 
-  "oldfieldname": "instructions", 
   "fieldname": "instructions", 
   "fieldtype": "Text", 
-  "permlevel": 0
+  "label": "Instructions", 
+  "oldfieldname": "instructions", 
+  "oldfieldtype": "Text", 
+  "read_only": 0
  }, 
  {
-  "print_hide": 1, 
   "description": "Select the relevant company name if you have multiple companies", 
-  "print_width": "150px", 
-  "permlevel": 0, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Company", 
-  "oldfieldname": "company", 
-  "width": "150px", 
   "fieldname": "company", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Company", 
+  "oldfieldname": "company", 
+  "oldfieldtype": "Link", 
   "options": "Company", 
-  "in_filter": 1
- }, 
- {
   "print_hide": 1, 
   "print_width": "150px", 
-  "permlevel": 0, 
-  "oldfieldtype": "Select", 
+  "read_only": 0, 
+  "reqd": 1, 
+  "search_index": 1, 
+  "width": "150px"
+ }, 
+ {
   "doctype": "DocField", 
-  "label": "Fiscal Year", 
-  "oldfieldname": "fiscal_year", 
-  "width": "150px", 
   "fieldname": "fiscal_year", 
   "fieldtype": "Select", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Fiscal Year", 
+  "oldfieldname": "fiscal_year", 
+  "oldfieldtype": "Select", 
   "options": "link:Fiscal Year", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "print_width": "150px", 
+  "read_only": 0, 
+  "reqd": 1, 
+  "search_index": 1, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
+  "depends_on": "eval:!doc.__islocal", 
   "doctype": "DocField", 
-  "label": "Cancel Reason", 
-  "oldfieldname": "cancel_reason", 
   "fieldname": "cancel_reason", 
   "fieldtype": "Data", 
-  "depends_on": "eval:!doc.__islocal", 
   "hidden": 0, 
-  "permlevel": 1
+  "label": "Cancel Reason", 
+  "no_copy": 1, 
+  "oldfieldname": "cancel_reason", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Packing List", 
   "fieldname": "packing_list", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Packing List", 
+  "oldfieldtype": "Section Break", 
+  "print_hide": 1, 
+  "read_only": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "Packing Details", 
-  "oldfieldname": "packing_details", 
-  "permlevel": 1, 
   "fieldname": "packing_details", 
   "fieldtype": "Table", 
-  "options": "Delivery Note Packing Item"
+  "label": "Packing Details", 
+  "oldfieldname": "packing_details", 
+  "oldfieldtype": "Table", 
+  "options": "Delivery Note Packing Item", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Sales Team", 
   "fieldname": "sales_team_section_break", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Sales Team", 
+  "oldfieldtype": "Section Break", 
+  "print_hide": 1, 
+  "read_only": 0
  }, 
  {
-  "print_hide": 1, 
-  "print_width": "50%", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break6", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
- }, 
- {
-  "print_hide": 1, 
-  "permlevel": 0, 
-  "print_width": "150px", 
-  "no_copy": 0, 
-  "oldfieldtype": "Link", 
-  "doctype": "DocField", 
-  "label": "Sales Partner", 
-  "oldfieldname": "sales_partner", 
-  "width": "150px", 
-  "fieldname": "sales_partner", 
-  "fieldtype": "Link", 
-  "options": "Sales Partner"
- }, 
- {
   "print_hide": 1, 
   "print_width": "50%", 
+  "read_only": 0, 
+  "width": "50%"
+ }, 
+ {
   "doctype": "DocField", 
-  "width": "50%", 
+  "fieldname": "sales_partner", 
+  "fieldtype": "Link", 
+  "label": "Sales Partner", 
+  "no_copy": 0, 
+  "oldfieldname": "sales_partner", 
+  "oldfieldtype": "Link", 
+  "options": "Sales Partner", 
+  "print_hide": 1, 
+  "print_width": "150px", 
+  "read_only": 0, 
+  "width": "150px"
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "column_break7", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "print_hide": 1, 
+  "print_width": "50%", 
+  "read_only": 0, 
+  "width": "50%"
  }, 
  {
+  "doctype": "DocField", 
+  "fieldname": "commission_rate", 
+  "fieldtype": "Float", 
+  "label": "Commission Rate (%)", 
+  "no_copy": 0, 
+  "oldfieldname": "commission_rate", 
+  "oldfieldtype": "Currency", 
   "print_hide": 1, 
   "print_width": "100px", 
-  "no_copy": 0, 
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Commission Rate (%)", 
-  "oldfieldname": "commission_rate", 
-  "width": "100px", 
-  "fieldname": "commission_rate", 
-  "fieldtype": "Currency", 
-  "permlevel": 0
+  "read_only": 0, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 0, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Total Commission", 
-  "oldfieldname": "total_commission", 
   "fieldname": "total_commission", 
   "fieldtype": "Currency", 
-  "permlevel": 0
+  "label": "Total Commission", 
+  "no_copy": 0, 
+  "oldfieldname": "total_commission", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 0
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "options": "Simple", 
   "fieldname": "section_break1", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "options": "Simple", 
+  "print_hide": 1, 
+  "read_only": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "Sales Team1", 
-  "oldfieldname": "sales_team", 
-  "permlevel": 0, 
   "fieldname": "sales_team", 
   "fieldtype": "Table", 
-  "options": "Sales Team"
+  "label": "Sales Team1", 
+  "oldfieldname": "sales_team", 
+  "oldfieldtype": "Table", 
+  "options": "Sales Team", 
+  "print_hide": 1, 
+  "read_only": 0
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "File List", 
   "fieldname": "file_list", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "File List", 
+  "no_copy": 1, 
+  "print_hide": 1, 
+  "read_only": 0
  }, 
  {
+  "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "cancel": 0, 
-  "role": "Accounts User", 
-  "report": 1, 
-  "permlevel": 0
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "role": "Accounts User", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "amend": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "report": 1, 
-  "role": "Sales User", 
-  "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Sales User", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "doctype": "DocPerm", 
-  "role": "Customer", 
-  "report": 1, 
   "permlevel": 0, 
-  "match": "customer_name"
+  "role": "Accounts User", 
+  "submit": 0, 
+  "write": 0
+ }, 
+ {
+  "amend": 1, 
+  "cancel": 1, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "permlevel": 0, 
+  "role": "Sales User", 
+  "submit": 1, 
+  "write": 1
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "match": "customer_name", 
+  "permlevel": 0, 
+  "role": "Customer"
  }, 
  {
   "amend": 0, 
+  "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 1, 
+  "permlevel": 2, 
   "role": "All", 
-  "cancel": 0, 
-  "permlevel": 2
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
   "submit": 0, 
-  "write": 0, 
-  "role": "Material Manager", 
-  "cancel": 0, 
-  "permlevel": 1
+  "write": 1
  }, 
  {
   "amend": 1, 
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "report": 1, 
+  "permlevel": 0, 
   "role": "Material Manager", 
-  "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Material User", 
-  "cancel": 0, 
-  "permlevel": 1
+  "submit": 1, 
+  "write": 1
  }, 
  {
   "amend": 1, 
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "report": 1, 
+  "permlevel": 0, 
   "role": "Material User", 
-  "cancel": 1, 
-  "permlevel": 0
+  "submit": 1, 
+  "write": 1
  }
 ]
\ No newline at end of file
diff --git a/stock/doctype/delivery_note_item/delivery_note_item.txt b/stock/doctype/delivery_note_item/delivery_note_item.txt
index a251823..282747e 100644
--- a/stock/doctype/delivery_note_item/delivery_note_item.txt
+++ b/stock/doctype/delivery_note_item/delivery_note_item.txt
@@ -1,390 +1,361 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:26", 
   "docstatus": 0, 
-  "creation": "2012-06-08 16:08:01", 
+  "modified": "2013-01-22 14:26:18", 
   "modified_by": "Administrator", 
-  "modified": "2012-07-09 11:06:26"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Tray", 
+  "autoname": "DND/.#######", 
+  "doctype": "DocType", 
   "istable": 1, 
   "module": "Stock", 
-  "_last_update": "1311621379", 
-  "doctype": "DocType", 
-  "autoname": "DND/.#######", 
-  "show_in_menu": 0, 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "server_code_error": " ", 
-  "version": 1
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Delivery Note Item", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
-  "name": "Delivery Note Item", 
-  "doctype": "DocType"
- }, 
- {
-  "print_hide": 1, 
-  "doctype": "DocField", 
-  "label": "Barcode", 
-  "fieldname": "barcode", 
-  "fieldtype": "Data", 
   "permlevel": 0
  }, 
  {
-  "permlevel": 0, 
-  "oldfieldtype": "Link", 
-  "doctype": "DocField", 
-  "label": "Item Code", 
-  "oldfieldname": "item_code", 
-  "width": "150px", 
-  "trigger": "Client", 
-  "fieldname": "item_code", 
-  "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
-  "options": "Item", 
-  "in_filter": 1
+  "doctype": "DocType", 
+  "name": "Delivery Note Item"
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Customer's Item Code", 
+  "fieldname": "barcode", 
+  "fieldtype": "Data", 
+  "label": "Barcode", 
+  "print_hide": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "item_code", 
+  "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Item Code", 
+  "oldfieldname": "item_code", 
+  "oldfieldtype": "Link", 
+  "options": "Item", 
+  "reqd": 1, 
+  "search_index": 1, 
+  "width": "150px"
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "customer_item_code", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Customer's Item Code", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Data", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Item Name", 
-  "oldfieldname": "item_name", 
-  "width": "150px", 
   "fieldname": "item_name", 
   "fieldtype": "Data", 
+  "label": "Item Name", 
+  "oldfieldname": "item_name", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
   "reqd": 1, 
-  "permlevel": 0
+  "width": "150px"
  }, 
  {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Description", 
-  "oldfieldname": "description", 
-  "width": "300px", 
   "fieldname": "description", 
   "fieldtype": "Small Text", 
+  "label": "Description", 
+  "oldfieldname": "description", 
+  "oldfieldtype": "Small Text", 
   "reqd": 1, 
-  "permlevel": 0
+  "width": "300px"
  }, 
  {
   "default": "0.00", 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "qty", 
+  "fieldtype": "Float", 
   "label": "Quantity", 
   "oldfieldname": "qty", 
-  "width": "100px", 
-  "trigger": "Client", 
-  "fieldname": "qty", 
-  "fieldtype": "Currency", 
+  "oldfieldtype": "Currency", 
   "reqd": 1, 
-  "permlevel": 0
+  "width": "100px"
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "UOM", 
-  "oldfieldname": "stock_uom", 
-  "width": "50px", 
   "fieldname": "stock_uom", 
   "fieldtype": "Data", 
+  "label": "UOM", 
+  "oldfieldname": "stock_uom", 
+  "oldfieldtype": "Data", 
+  "print_hide": 0, 
+  "read_only": 1, 
   "reqd": 1, 
-  "permlevel": 1
+  "width": "50px"
  }, 
  {
-  "print_hide": 1, 
-  "width": "100px", 
   "default": "0.00", 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Price List Rate", 
-  "oldfieldname": "ref_rate", 
-  "no_copy": 0, 
-  "trigger": "Client", 
   "fieldname": "ref_rate", 
   "fieldtype": "Currency", 
+  "label": "Price List Rate", 
+  "no_copy": 0, 
+  "oldfieldname": "ref_rate", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
   "reqd": 0, 
-  "permlevel": 0
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
   "default": "0.00", 
-  "oldfieldtype": "Float", 
   "doctype": "DocField", 
-  "label": "Discount (%)", 
-  "oldfieldname": "adj_rate", 
-  "width": "100px", 
-  "trigger": "Client", 
   "fieldname": "adj_rate", 
   "fieldtype": "Float", 
-  "permlevel": 0
+  "label": "Discount (%)", 
+  "oldfieldname": "adj_rate", 
+  "oldfieldtype": "Float", 
+  "print_hide": 1, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Rate", 
-  "oldfieldname": "export_rate", 
-  "width": "150px", 
-  "trigger": "Client", 
   "fieldname": "export_rate", 
   "fieldtype": "Currency", 
+  "label": "Rate", 
+  "oldfieldname": "export_rate", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 0, 
   "reqd": 0, 
-  "permlevel": 0
+  "width": "150px"
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Amount", 
-  "oldfieldname": "export_amount", 
-  "width": "100px", 
   "fieldname": "export_amount", 
   "fieldtype": "Currency", 
+  "label": "Amount", 
+  "oldfieldname": "export_amount", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 0, 
+  "read_only": 1, 
   "reqd": 0, 
-  "permlevel": 1
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Price List Rate*", 
-  "oldfieldname": "base_ref_rate", 
-  "width": "100px", 
   "fieldname": "base_ref_rate", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Price List Rate*", 
+  "oldfieldname": "base_ref_rate", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
   "default": "0.00", 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Rate*", 
-  "oldfieldname": "basic_rate", 
-  "width": "150px", 
-  "trigger": "Client", 
   "fieldname": "basic_rate", 
   "fieldtype": "Currency", 
+  "label": "Rate*", 
+  "oldfieldname": "basic_rate", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
   "reqd": 0, 
-  "permlevel": 0
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Amount*", 
-  "oldfieldname": "amount", 
-  "width": "100px", 
   "fieldname": "amount", 
   "fieldtype": "Currency", 
+  "label": "Amount*", 
+  "oldfieldname": "amount", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
   "reqd": 0, 
-  "permlevel": 1
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Warehouse", 
-  "oldfieldname": "warehouse", 
-  "width": "100px", 
-  "trigger": "Client", 
   "fieldname": "warehouse", 
   "fieldtype": "Link", 
+  "label": "Warehouse", 
+  "oldfieldname": "warehouse", 
+  "oldfieldtype": "Link", 
   "options": "Warehouse", 
-  "permlevel": 0
+  "print_hide": 1, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 0, 
-  "no_copy": 1, 
-  "oldfieldtype": "Text", 
   "doctype": "DocField", 
-  "label": "Serial No", 
-  "oldfieldname": "serial_no", 
-  "trigger": "Client", 
   "fieldname": "serial_no", 
   "fieldtype": "Text", 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Serial No", 
+  "no_copy": 1, 
+  "oldfieldname": "serial_no", 
+  "oldfieldtype": "Text", 
+  "print_hide": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Batch No", 
-  "oldfieldname": "batch_no", 
-  "permlevel": 0, 
   "fieldname": "batch_no", 
   "fieldtype": "Link", 
-  "options": "Batch"
+  "label": "Batch No", 
+  "oldfieldname": "batch_no", 
+  "oldfieldtype": "Link", 
+  "options": "Batch", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Item Group", 
-  "oldfieldname": "item_group", 
-  "permlevel": 1, 
   "fieldname": "item_group", 
   "fieldtype": "Link", 
   "hidden": 1, 
-  "options": "Item Group"
+  "label": "Item Group", 
+  "oldfieldname": "item_group", 
+  "oldfieldtype": "Link", 
+  "options": "Item Group", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Brand Name", 
-  "oldfieldname": "brand", 
-  "width": "150px", 
-  "options": "Brand", 
   "fieldname": "brand", 
   "fieldtype": "Link", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Brand Name", 
+  "oldfieldname": "brand", 
+  "oldfieldtype": "Link", 
+  "options": "Brand", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Available Qty at Warehouse", 
-  "oldfieldname": "actual_qty", 
-  "width": "150px", 
   "fieldname": "actual_qty", 
-  "fieldtype": "Currency", 
-  "permlevel": 1
+  "fieldtype": "Float", 
+  "label": "Available Qty at Warehouse", 
+  "no_copy": 1, 
+  "oldfieldname": "actual_qty", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Billed Amt", 
-  "width": "100px", 
   "fieldname": "billed_amt", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Billed Amt", 
+  "no_copy": 1, 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Installed Qty", 
-  "oldfieldname": "installed_qty", 
-  "width": "150px", 
   "fieldname": "installed_qty", 
-  "fieldtype": "Currency", 
-  "permlevel": 1
- }, 
- {
-  "print_hide": 1, 
+  "fieldtype": "Float", 
+  "label": "Installed Qty", 
   "no_copy": 1, 
-  "colour": "White:FFF", 
-  "allow_on_submit": 1, 
-  "doctype": "DocField", 
-  "label": "Packed Quantity", 
-  "default": "0", 
-  "fieldname": "packed_qty", 
-  "fieldtype": "Currency", 
-  "permlevel": 1
+  "oldfieldname": "installed_qty", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
-  "search_index": 1, 
+  "allow_on_submit": 1, 
+  "default": "0", 
   "doctype": "DocField", 
-  "label": "Document Type", 
-  "oldfieldname": "prevdoc_doctype", 
-  "width": "150px", 
+  "fieldname": "packed_qty", 
+  "fieldtype": "Float", 
+  "label": "Packed Quantity", 
+  "no_copy": 1, 
+  "print_hide": 1, 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "prevdoc_doctype", 
   "fieldtype": "Data", 
-  "oldfieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Document Type", 
+  "oldfieldname": "prevdoc_doctype", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "search_index": 1, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Against Document No", 
-  "oldfieldname": "prevdoc_docname", 
-  "width": "150px", 
   "fieldname": "prevdoc_docname", 
   "fieldtype": "Data", 
-  "search_index": 1, 
   "hidden": 0, 
-  "permlevel": 1, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Against Document No", 
+  "no_copy": 1, 
+  "oldfieldname": "prevdoc_docname", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "search_index": 1, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Against Document Date", 
-  "oldfieldname": "prevdoc_date", 
   "fieldname": "prevdoc_date", 
   "fieldtype": "Date", 
   "hidden": 1, 
-  "permlevel": 1, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Against Document Date", 
+  "oldfieldname": "prevdoc_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "Against Document Detail No", 
-  "oldfieldname": "prevdoc_detail_docname", 
-  "width": "150px", 
   "fieldname": "prevdoc_detail_docname", 
   "fieldtype": "Data", 
-  "oldfieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Against Document Detail No", 
+  "oldfieldname": "prevdoc_detail_docname", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "search_index": 0, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Item Tax Rate", 
-  "oldfieldname": "item_tax_rate", 
   "fieldname": "item_tax_rate", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Item Tax Rate", 
+  "oldfieldname": "item_tax_rate", 
+  "oldfieldtype": "Small Text", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Check", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Page Break", 
-  "oldfieldname": "page_break", 
   "fieldname": "page_break", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "Page Break", 
+  "oldfieldname": "page_break", 
+  "oldfieldtype": "Check", 
+  "print_hide": 1
  }
 ]
\ No newline at end of file
diff --git a/stock/doctype/delivery_note_packing_item/delivery_note_packing_item.txt b/stock/doctype/delivery_note_packing_item/delivery_note_packing_item.txt
index 625d223..853e94e 100644
--- a/stock/doctype/delivery_note_packing_item/delivery_note_packing_item.txt
+++ b/stock/doctype/delivery_note_packing_item/delivery_note_packing_item.txt
@@ -1,171 +1,162 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:27", 
   "docstatus": 0, 
-  "creation": "2012-06-11 12:10:10", 
+  "modified": "2013-01-22 14:46:40", 
   "modified_by": "Administrator", 
-  "modified": "2012-07-10 12:05:31"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Tray", 
+  "doctype": "DocType", 
   "istable": 1, 
-  "name": "__common__", 
-  "colour": "White:FFF", 
   "module": "Stock", 
-  "show_in_menu": 0, 
-  "version": 1, 
-  "server_code_error": " ", 
-  "doctype": "DocType"
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Delivery Note Packing Item", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "name": "Delivery Note Packing Item", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Delivery Note Packing Item"
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Parent Item", 
-  "oldfieldname": "parent_item", 
-  "permlevel": 1, 
   "fieldname": "parent_item", 
   "fieldtype": "Link", 
-  "options": "Item"
+  "label": "Parent Item", 
+  "oldfieldname": "parent_item", 
+  "oldfieldtype": "Link", 
+  "options": "Item", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Item Code", 
-  "oldfieldname": "item_code", 
-  "permlevel": 1, 
   "fieldname": "item_code", 
   "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Item Code", 
+  "oldfieldname": "item_code", 
+  "oldfieldtype": "Link", 
   "options": "Item", 
-  "in_filter": 1
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Item Name", 
-  "oldfieldname": "item_name", 
   "fieldname": "item_name", 
   "fieldtype": "Data", 
-  "permlevel": 1, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Item Name", 
+  "oldfieldname": "item_name", 
+  "oldfieldtype": "Data", 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Parent Detail docname", 
-  "oldfieldname": "parent_detail_docname", 
   "fieldname": "parent_detail_docname", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Parent Detail docname", 
+  "no_copy": 1, 
+  "oldfieldname": "parent_detail_docname", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Text", 
   "doctype": "DocField", 
-  "label": "Description", 
-  "oldfieldname": "description", 
-  "width": "300px", 
   "fieldname": "description", 
   "fieldtype": "Text", 
-  "permlevel": 1
+  "label": "Description", 
+  "oldfieldname": "description", 
+  "oldfieldtype": "Text", 
+  "read_only": 1, 
+  "width": "300px"
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Warehouse", 
-  "oldfieldname": "warehouse", 
-  "permlevel": 0, 
   "fieldname": "warehouse", 
   "fieldtype": "Link", 
+  "label": "Warehouse", 
+  "oldfieldname": "warehouse", 
+  "oldfieldtype": "Link", 
   "options": "Warehouse"
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "qty", 
+  "fieldtype": "Float", 
   "label": "Qty", 
   "oldfieldname": "qty", 
-  "fieldname": "qty", 
-  "fieldtype": "Currency", 
-  "permlevel": 1
+  "oldfieldtype": "Currency", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Serial No", 
   "fieldname": "serial_no", 
   "fieldtype": "Text", 
-  "permlevel": 0
+  "label": "Serial No"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Batch No", 
   "fieldname": "batch_no", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Batch No"
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Actual Qty", 
-  "oldfieldname": "actual_qty", 
   "fieldname": "actual_qty", 
-  "fieldtype": "Currency", 
-  "permlevel": 1
- }, 
- {
+  "fieldtype": "Float", 
+  "label": "Actual Qty", 
   "no_copy": 1, 
+  "oldfieldname": "actual_qty", 
   "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Projected Qty", 
-  "oldfieldname": "projected_qty", 
-  "fieldname": "projected_qty", 
-  "fieldtype": "Currency", 
-  "permlevel": 1
+  "read_only": 1
  }, 
  {
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "UOM", 
-  "oldfieldname": "uom", 
-  "permlevel": 1, 
+  "fieldname": "projected_qty", 
+  "fieldtype": "Float", 
+  "label": "Projected Qty", 
+  "no_copy": 1, 
+  "oldfieldname": "projected_qty", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "uom", 
   "fieldtype": "Link", 
+  "label": "UOM", 
+  "oldfieldname": "uom", 
   "oldfieldtype": "Link", 
-  "options": "UOM"
+  "options": "UOM", 
+  "read_only": 1, 
+  "search_index": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Data", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Prevdoc DocType", 
-  "oldfieldname": "prevdoc_doctype", 
   "fieldname": "prevdoc_doctype", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Prevdoc DocType", 
+  "oldfieldname": "prevdoc_doctype", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Check", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Page Break", 
-  "oldfieldname": "page_break", 
   "fieldname": "page_break", 
   "fieldtype": "Check", 
-  "permlevel": 1
+  "label": "Page Break", 
+  "oldfieldname": "page_break", 
+  "oldfieldtype": "Check", 
+  "read_only": 1
  }
 ]
\ No newline at end of file
diff --git a/stock/doctype/item/item.txt b/stock/doctype/item/item.txt
index c7e88cc..e2903ba 100644
--- a/stock/doctype/item/item.txt
+++ b/stock/doctype/item/item.txt
@@ -1,892 +1,813 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-21 18:19:22", 
   "docstatus": 0, 
-  "creation": "2013-01-17 10:57:15", 
+  "modified": "2013-01-22 14:47:00", 
   "modified_by": "Administrator", 
-  "modified": "2013-01-17 11:22:07"
+  "owner": "Administrator"
  }, 
  {
   "allow_attach": 1, 
-  "search_fields": "item_name,description,item_group,customer_code", 
-  "module": "Stock", 
-  "doctype": "DocType", 
-  "autoname": "field:item_code", 
-  "document_type": "Master", 
-  "description": "A Product or a Service that is bought, sold or kept in stock.", 
-  "name": "__common__", 
-  "default_print_format": "Standard", 
   "allow_rename": 1, 
-  "max_attachments": 1
+  "autoname": "field:item_code", 
+  "default_print_format": "Standard", 
+  "description": "A Product or a Service that is bought, sold or kept in stock.", 
+  "doctype": "DocType", 
+  "document_type": "Master", 
+  "max_attachments": 1, 
+  "module": "Stock", 
+  "name": "__common__", 
+  "search_fields": "item_name,description,item_group,customer_code"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Item", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Item", 
-  "read": 1, 
-  "submit": 0, 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
   "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Item", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "report": 1, 
   "permlevel": 0, 
-  "amend": 0, 
-  "parentfield": "permissions"
+  "read": 1, 
+  "report": 1, 
+  "submit": 0
  }, 
  {
-  "name": "Item", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Item"
  }, 
  {
-  "no_copy": 0, 
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Item", 
   "fieldname": "item", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Item", 
+  "no_copy": 0, 
+  "oldfieldtype": "Section Break"
  }, 
  {
   "description": "Item will be saved by this name in the data base.", 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Item Code", 
-  "oldfieldname": "item_code", 
   "fieldname": "item_code", 
   "fieldtype": "Data", 
-  "search_index": 0, 
+  "in_filter": 0, 
+  "label": "Item Code", 
+  "oldfieldname": "item_code", 
+  "oldfieldtype": "Data", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 0
+  "search_index": 0
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Item Name", 
-  "oldfieldname": "item_name", 
   "fieldname": "item_name", 
   "fieldtype": "Data", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Item Name", 
+  "oldfieldname": "item_name", 
+  "oldfieldtype": "Data", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
   "description": "<a href=\"#!Sales Browser/Item Group\">Manage Item Groups</a>", 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Item Group", 
-  "oldfieldname": "item_group", 
-  "options": "Item Group", 
   "fieldname": "item_group", 
   "fieldtype": "Link", 
-  "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Item Group", 
+  "oldfieldname": "item_group", 
+  "oldfieldtype": "Link", 
+  "options": "Item Group", 
+  "reqd": 1
  }, 
  {
   "description": "Unit of measurement of this item (e.g. Kg, Unit, No, Pair).", 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Default Unit of Measure", 
-  "oldfieldname": "stock_uom", 
-  "options": "UOM", 
   "fieldname": "stock_uom", 
   "fieldtype": "Link", 
-  "reqd": 0, 
-  "permlevel": 0
+  "label": "Default Unit of Measure", 
+  "oldfieldname": "stock_uom", 
+  "oldfieldtype": "Link", 
+  "options": "UOM", 
+  "reqd": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Brand", 
-  "oldfieldname": "brand", 
-  "options": "Brand", 
   "fieldname": "brand", 
   "fieldtype": "Link", 
-  "reqd": 0, 
   "hidden": 0, 
-  "permlevel": 0
+  "label": "Brand", 
+  "oldfieldname": "brand", 
+  "oldfieldtype": "Link", 
+  "options": "Brand", 
+  "print_hide": 1, 
+  "reqd": 0
  }, 
  {
   "doctype": "DocField", 
-  "label": "Barcode", 
   "fieldname": "barcode", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Barcode"
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "column_break0", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Image", 
-  "options": "attach_files:", 
   "fieldname": "image", 
   "fieldtype": "Select", 
-  "permlevel": 0
+  "label": "Image", 
+  "options": "attach_files:"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Image View", 
-  "options": "image", 
   "fieldname": "image_view", 
   "fieldtype": "Image", 
-  "permlevel": 0
+  "label": "Image View", 
+  "options": "image"
  }, 
  {
-  "oldfieldtype": "Text", 
   "doctype": "DocField", 
-  "label": "Description", 
-  "oldfieldname": "description", 
   "fieldname": "description", 
   "fieldtype": "Small Text", 
-  "search_index": 0, 
+  "in_filter": 0, 
+  "label": "Description", 
+  "oldfieldname": "description", 
+  "oldfieldtype": "Text", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 0
+  "search_index": 0
  }, 
  {
   "doctype": "DocField", 
-  "label": "Description HTML", 
   "fieldname": "description_html", 
   "fieldtype": "Small Text", 
-  "permlevel": 0
+  "label": "Description HTML"
  }, 
  {
   "description": "Generates HTML to include selected image in the description", 
   "doctype": "DocField", 
-  "label": "Generate Description HTML", 
   "fieldname": "add_image", 
   "fieldtype": "Button", 
-  "permlevel": 0
+  "label": "Generate Description HTML"
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Inventory", 
   "fieldname": "inventory", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Inventory", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "description": "Select \"Yes\" if you are maintaining stock of this item in your Inventory.", 
   "default": "Yes", 
-  "oldfieldtype": "Select", 
+  "description": "Select \"Yes\" if you are maintaining stock of this item in your Inventory.", 
   "doctype": "DocField", 
-  "label": "Is Stock Item", 
-  "oldfieldname": "is_stock_item", 
-  "options": "\nYes\nNo", 
   "fieldname": "is_stock_item", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Is Stock Item", 
+  "oldfieldname": "is_stock_item", 
+  "oldfieldtype": "Select", 
+  "options": "\nYes\nNo", 
+  "reqd": 1
  }, 
  {
+  "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
   "description": "Mandatory if Stock Item is \"Yes\"", 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Default Reserved Warehouse", 
-  "oldfieldname": "default_warehouse", 
-  "options": "Warehouse", 
   "fieldname": "default_warehouse", 
   "fieldtype": "Link", 
-  "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
-  "permlevel": 0
+  "label": "Default Reserved Warehouse", 
+  "oldfieldname": "default_warehouse", 
+  "oldfieldtype": "Link", 
+  "options": "Warehouse"
  }, 
  {
+  "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
   "description": "Percentage variation in quantity to be allowed while receiving or delivering this item.", 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "tolerance", 
+  "fieldtype": "Float", 
   "label": "Allowance Percent", 
   "oldfieldname": "tolerance", 
-  "fieldname": "tolerance", 
-  "fieldtype": "Currency", 
-  "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
-  "permlevel": 0
+  "oldfieldtype": "Currency"
  }, 
  {
+  "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
   "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", 
   "doctype": "DocField", 
+  "fieldname": "re_order_level", 
+  "fieldtype": "Float", 
   "label": "Re-Order Level", 
   "oldfieldname": "re_order_level", 
-  "fieldname": "re_order_level", 
-  "fieldtype": "Currency", 
-  "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
-  "permlevel": 0
+  "oldfieldtype": "Currency"
  }, 
  {
+  "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
   "description": "The quantity for the Purchase Request when the stock goes below re-order level.", 
-  "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
   "doctype": "DocField", 
-  "label": "Re-Order Qty", 
   "fieldname": "re_order_qty", 
-  "fieldtype": "Currency", 
-  "permlevel": 0
+  "fieldtype": "Float", 
+  "label": "Re-Order Qty"
  }, 
  {
-  "description": "Send an email to users of role \"Material Manager\" and \"Purchase Manager\" when re-order level is crossed.", 
   "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
+  "description": "Send an email to users of role \"Material Manager\" and \"Purchase Manager\" when re-order level is crossed.", 
   "doctype": "DocField", 
-  "label": "Notify by Email on Re-order", 
   "fieldname": "email_notify", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "Notify by Email on Re-order"
  }, 
  {
   "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
   "doctype": "DocField", 
-  "label": "Valuation Method", 
-  "options": "\nFIFO\nMoving Average", 
   "fieldname": "valuation_method", 
   "fieldtype": "Select", 
-  "permlevel": 0
+  "label": "Valuation Method", 
+  "options": "\nFIFO\nMoving Average"
  }, 
  {
-  "description": "You can enter the minimum quantity of this item to be ordered.", 
   "default": "0.00", 
-  "oldfieldtype": "Currency", 
+  "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
+  "description": "You can enter the minimum quantity of this item to be ordered.", 
   "doctype": "DocField", 
+  "fieldname": "min_order_qty", 
+  "fieldtype": "Float", 
+  "hidden": 0, 
   "label": "Minimum Order Qty", 
   "oldfieldname": "min_order_qty", 
-  "fieldname": "min_order_qty", 
-  "fieldtype": "Currency", 
-  "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
-  "hidden": 0, 
-  "permlevel": 0
+  "oldfieldtype": "Currency"
  }, 
  {
-  "oldfieldtype": "Column Break", 
+  "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
-  "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
-  "description": "Select \"Yes\" if this item is used for some internal purpose in your company.", 
   "default": "No", 
-  "oldfieldtype": "Select", 
+  "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
+  "description": "Select \"Yes\" if this item is used for some internal purpose in your company.", 
   "doctype": "DocField", 
-  "label": "Is Asset Item", 
-  "oldfieldname": "is_asset_item", 
-  "permlevel": 0, 
   "fieldname": "is_asset_item", 
   "fieldtype": "Select", 
-  "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
-  "reqd": 1, 
-  "options": "\nYes\nNo"
+  "label": "Is Asset Item", 
+  "oldfieldname": "is_asset_item", 
+  "oldfieldtype": "Select", 
+  "options": "\nYes\nNo", 
+  "reqd": 1
  }, 
  {
   "default": "No", 
-  "oldfieldtype": "Select", 
+  "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
   "doctype": "DocField", 
-  "label": "Has Batch No", 
-  "oldfieldname": "has_batch_no", 
-  "options": "\nYes\nNo", 
   "fieldname": "has_batch_no", 
   "fieldtype": "Select", 
-  "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Has Batch No", 
+  "oldfieldname": "has_batch_no", 
+  "oldfieldtype": "Select", 
+  "options": "\nYes\nNo", 
+  "reqd": 1
  }, 
  {
-  "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", 
+  "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
+  "description": "Selecting \"Yes\" will give a unique identity to each entity of this item which can be viewed in the Serial No master.", 
   "doctype": "DocField", 
-  "label": "Has Serial No", 
-  "oldfieldname": "has_serial_no", 
-  "permlevel": 0, 
   "fieldname": "has_serial_no", 
   "fieldtype": "Select", 
-  "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
-  "reqd": 1, 
   "in_filter": 1, 
-  "options": "\nYes\nNo"
+  "label": "Has Serial No", 
+  "oldfieldname": "has_serial_no", 
+  "oldfieldtype": "Select", 
+  "options": "\nYes\nNo", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Data", 
+  "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
   "doctype": "DocField", 
-  "label": "Warranty Period (in days)", 
-  "oldfieldname": "warranty_period", 
   "fieldname": "warranty_period", 
   "fieldtype": "Data", 
-  "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
-  "permlevel": 0
+  "label": "Warranty Period (in days)", 
+  "oldfieldname": "warranty_period", 
+  "oldfieldtype": "Data"
  }, 
  {
-  "oldfieldtype": "Date", 
+  "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
   "doctype": "DocField", 
-  "label": "End of Life", 
-  "oldfieldname": "end_of_life", 
   "fieldname": "end_of_life", 
   "fieldtype": "Date", 
-  "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
-  "permlevel": 0
+  "label": "End of Life", 
+  "oldfieldname": "end_of_life", 
+  "oldfieldtype": "Date"
  }, 
  {
-  "description": "Net Weight of each Item", 
   "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
+  "description": "Net Weight of each Item", 
   "doctype": "DocField", 
-  "label": "Net Weight", 
   "fieldname": "net_weight", 
   "fieldtype": "Float", 
-  "permlevel": 0
+  "label": "Net Weight"
  }, 
  {
   "depends_on": "eval:doc.is_stock_item==\"Yes\"", 
   "doctype": "DocField", 
-  "label": "Weight UOM", 
-  "options": "UOM", 
   "fieldname": "weight_uom", 
   "fieldtype": "Link", 
-  "permlevel": 0
+  "label": "Weight UOM", 
+  "options": "UOM"
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Purchase Details", 
   "fieldname": "purchase_details", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Purchase Details", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "description": "Selecting \"Yes\" will allow this item to appear in Purchase Order , Purchase Receipt.", 
   "default": "Yes", 
-  "oldfieldtype": "Select", 
+  "description": "Selecting \"Yes\" will allow this item to appear in Purchase Order , Purchase Receipt.", 
   "doctype": "DocField", 
-  "label": "Is Purchase Item", 
-  "oldfieldname": "is_purchase_item", 
-  "options": "\nYes\nNo", 
   "fieldname": "is_purchase_item", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Is Purchase Item", 
+  "oldfieldname": "is_purchase_item", 
+  "oldfieldtype": "Select", 
+  "options": "\nYes\nNo", 
+  "reqd": 1
  }, 
  {
+  "depends_on": "eval:doc.is_purchase_item==\"Yes\"", 
   "description": "Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Purchase Request when you select this item.", 
-  "no_copy": 1, 
-  "oldfieldtype": "Int", 
   "doctype": "DocField", 
-  "label": "Lead Time Days", 
-  "oldfieldname": "lead_time_days", 
   "fieldname": "lead_time_days", 
   "fieldtype": "Int", 
-  "depends_on": "eval:doc.is_purchase_item==\"Yes\"", 
-  "permlevel": 0
+  "label": "Lead Time Days", 
+  "no_copy": 1, 
+  "oldfieldname": "lead_time_days", 
+  "oldfieldtype": "Int"
  }, 
  {
+  "depends_on": "eval:doc.is_purchase_item==\"Yes\"", 
   "description": "Default Purchase Account in which cost of the item will be debited.", 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Default Expense Account", 
-  "oldfieldname": "purchase_account", 
-  "options": "Account", 
   "fieldname": "purchase_account", 
   "fieldtype": "Link", 
-  "depends_on": "eval:doc.is_purchase_item==\"Yes\"", 
-  "permlevel": 0
+  "label": "Default Expense Account", 
+  "oldfieldname": "purchase_account", 
+  "oldfieldtype": "Link", 
+  "options": "Account"
  }, 
  {
+  "depends_on": "eval:doc.is_purchase_item==\"Yes\"", 
   "description": "Default Cost Center for tracking expense for this item.", 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Default Cost Center", 
-  "oldfieldname": "cost_center", 
-  "options": "Cost Center", 
   "fieldname": "cost_center", 
   "fieldtype": "Link", 
-  "depends_on": "eval:doc.is_purchase_item==\"Yes\"", 
-  "permlevel": 0
+  "label": "Default Cost Center", 
+  "oldfieldname": "cost_center", 
+  "oldfieldtype": "Link", 
+  "options": "Cost Center"
  }, 
  {
+  "depends_on": "eval:doc.is_purchase_item==\"Yes\"", 
   "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", 
   "doctype": "DocField", 
-  "label": "Buying Cost", 
-  "oldfieldname": "buying_cost", 
   "fieldname": "buying_cost", 
   "fieldtype": "Currency", 
-  "depends_on": "eval:doc.is_purchase_item==\"Yes\"", 
-  "permlevel": 1
+  "label": "Buying Cost", 
+  "no_copy": 1, 
+  "oldfieldname": "buying_cost", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1
  }, 
  {
-  "read_only": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
+  "depends_on": "eval:doc.is_purchase_item==\"Yes\"", 
   "doctype": "DocField", 
-  "label": "Last Purchase Rate", 
-  "oldfieldname": "last_purchase_rate", 
   "fieldname": "last_purchase_rate", 
   "fieldtype": "Currency", 
-  "depends_on": "eval:doc.is_purchase_item==\"Yes\"", 
-  "permlevel": 0
+  "label": "Last Purchase Rate", 
+  "no_copy": 1, 
+  "oldfieldname": "last_purchase_rate", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Currency", 
+  "depends_on": "eval:doc.is_purchase_item==\"Yes\"", 
   "doctype": "DocField", 
-  "label": "Standard Rate", 
-  "oldfieldname": "standard_rate", 
   "fieldname": "standard_rate", 
   "fieldtype": "Currency", 
-  "depends_on": "eval:doc.is_purchase_item==\"Yes\"", 
-  "permlevel": 0
+  "label": "Standard Rate", 
+  "oldfieldname": "standard_rate", 
+  "oldfieldtype": "Currency"
  }, 
  {
-  "oldfieldtype": "Column Break", 
+  "depends_on": "eval:doc.is_purchase_item==\"Yes\"", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break2", 
   "fieldtype": "Column Break", 
-  "depends_on": "eval:doc.is_purchase_item==\"Yes\"", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Table", 
+  "depends_on": "eval:doc.is_purchase_item==\"Yes\"", 
   "doctype": "DocField", 
-  "label": "UOM Conversion Details", 
-  "oldfieldname": "uom_conversion_details", 
-  "options": "UOM Conversion Detail", 
   "fieldname": "uom_conversion_details", 
   "fieldtype": "Table", 
-  "depends_on": "eval:doc.is_purchase_item==\"Yes\"", 
-  "permlevel": 0
+  "label": "UOM Conversion Details", 
+  "no_copy": 1, 
+  "oldfieldname": "uom_conversion_details", 
+  "oldfieldtype": "Table", 
+  "options": "UOM Conversion Detail"
  }, 
  {
   "depends_on": "eval:doc.is_purchase_item==\"Yes\"", 
   "doctype": "DocField", 
-  "label": "Manufacturer", 
   "fieldname": "manufacturer", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Manufacturer"
  }, 
  {
   "depends_on": "eval:doc.is_purchase_item==\"Yes\"", 
   "doctype": "DocField", 
-  "label": "Manufacturer Part Number", 
   "fieldname": "manufacturer_part_no", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Manufacturer Part Number"
  }, 
  {
   "depends_on": "eval:doc.is_purchase_item==\"Yes\"", 
   "doctype": "DocField", 
-  "label": "Item Supplier Details", 
-  "options": "Item Supplier", 
   "fieldname": "item_supplier_details", 
   "fieldtype": "Table", 
-  "permlevel": 0
+  "label": "Item Supplier Details", 
+  "options": "Item Supplier"
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Sales Details", 
   "fieldname": "sales_details", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Sales Details", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "description": "Selecting \"Yes\" will allow this item to figure in Sales Order, Delivery Note", 
   "default": "Yes", 
-  "oldfieldtype": "Select", 
+  "description": "Selecting \"Yes\" will allow this item to figure in Sales Order, Delivery Note", 
   "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"
+  "label": "Is Sales Item", 
+  "oldfieldname": "is_sales_item", 
+  "oldfieldtype": "Select", 
+  "options": "\nYes\nNo", 
+  "reqd": 1
  }, 
  {
-  "description": "Select \"Yes\" if this item represents some work like training, designing, consulting etc.", 
   "default": "No", 
-  "oldfieldtype": "Select", 
+  "depends_on": "eval:doc.is_sales_item==\"Yes\"", 
+  "description": "Select \"Yes\" if this item represents some work like training, designing, consulting etc.", 
   "doctype": "DocField", 
-  "label": "Is Service Item", 
-  "oldfieldname": "is_service_item", 
-  "permlevel": 0, 
   "fieldname": "is_service_item", 
   "fieldtype": "Select", 
-  "depends_on": "eval:doc.is_sales_item==\"Yes\"", 
-  "reqd": 1, 
   "in_filter": 1, 
-  "options": "\nYes\nNo"
+  "label": "Is Service Item", 
+  "oldfieldname": "is_service_item", 
+  "oldfieldtype": "Select", 
+  "options": "\nYes\nNo", 
+  "reqd": 1
  }, 
  {
-  "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", 
+  "depends_on": "eval:doc.is_sales_item==\"Yes\"", 
+  "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.", 
   "doctype": "DocField", 
-  "label": "Allow Samples", 
-  "oldfieldname": "is_sample_item", 
-  "permlevel": 0, 
   "fieldname": "is_sample_item", 
   "fieldtype": "Select", 
-  "depends_on": "eval:doc.is_sales_item==\"Yes\"", 
-  "reqd": 1, 
-  "options": "\nYes\nNo"
+  "label": "Allow Samples", 
+  "oldfieldname": "is_sample_item", 
+  "oldfieldtype": "Select", 
+  "options": "\nYes\nNo", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Currency", 
+  "depends_on": "eval:doc.is_sales_item==\"Yes\"", 
   "doctype": "DocField", 
+  "fieldname": "max_discount", 
+  "fieldtype": "Float", 
   "label": "Max Discount (%)", 
   "oldfieldname": "max_discount", 
-  "fieldname": "max_discount", 
-  "fieldtype": "Currency", 
-  "depends_on": "eval:doc.is_sales_item==\"Yes\"", 
-  "permlevel": 0
+  "oldfieldtype": "Currency"
  }, 
  {
   "depends_on": "eval:doc.is_sales_item==\"Yes\"", 
   "doctype": "DocField", 
-  "label": "Default Income Account", 
-  "options": "Account", 
   "fieldname": "default_income_account", 
   "fieldtype": "Link", 
-  "permlevel": 0
+  "label": "Default Income Account", 
+  "options": "Account"
  }, 
  {
   "depends_on": "eval:doc.is_sales_item==\"Yes\"", 
   "doctype": "DocField", 
-  "label": "Cost Center", 
-  "options": "Cost Center", 
   "fieldname": "default_sales_cost_center", 
   "fieldtype": "Link", 
-  "permlevel": 0
+  "label": "Cost Center", 
+  "options": "Cost Center"
  }, 
  {
-  "oldfieldtype": "Currency", 
+  "depends_on": "eval:doc.is_sales_item==\"Yes\"", 
   "doctype": "DocField", 
-  "label": "Sales Rate", 
-  "oldfieldname": "sales_rate", 
   "fieldname": "sales_rate", 
   "fieldtype": "Currency", 
-  "depends_on": "eval:doc.is_sales_item==\"Yes\"", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Sales Rate", 
+  "oldfieldname": "sales_rate", 
+  "oldfieldtype": "Currency"
  }, 
  {
-  "oldfieldtype": "Column Break", 
+  "depends_on": "eval:doc.is_sales_item==\"Yes\"", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break3", 
   "fieldtype": "Column Break", 
-  "depends_on": "eval:doc.is_sales_item==\"Yes\"", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
-  "description": "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes", 
   "depends_on": "eval:doc.is_sales_item==\"Yes\"", 
+  "description": "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes", 
   "doctype": "DocField", 
-  "label": "Customer Codes", 
-  "options": "Item Customer Detail", 
   "fieldname": "item_customer_details", 
   "fieldtype": "Table", 
-  "permlevel": 0
+  "label": "Customer Codes", 
+  "options": "Item Customer Detail"
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Item Tax", 
   "fieldname": "item_tax_section_break", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Item Tax", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "Item Tax1", 
-  "oldfieldname": "item_tax", 
-  "options": "Item Tax", 
   "fieldname": "item_tax", 
   "fieldtype": "Table", 
-  "permlevel": 0
+  "label": "Item Tax1", 
+  "oldfieldname": "item_tax", 
+  "oldfieldtype": "Table", 
+  "options": "Item Tax"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Price Lists and Rates", 
   "fieldname": "price_list_section", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Price Lists and Rates"
  }, 
  {
+  "depends_on": "eval:doc.is_sales_item==\"Yes\"", 
   "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", 
   "doctype": "DocField", 
-  "label": "Item Prices", 
-  "oldfieldname": "ref_rate_details", 
-  "options": "Item Price", 
   "fieldname": "ref_rate_details", 
   "fieldtype": "Table", 
-  "depends_on": "eval:doc.is_sales_item==\"Yes\"", 
-  "permlevel": 0
+  "label": "Item Prices", 
+  "oldfieldname": "ref_rate_details", 
+  "oldfieldtype": "Table", 
+  "options": "Item Price"
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Inspection Criteria", 
   "fieldname": "inspection_criteria", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Inspection Criteria", 
+  "oldfieldtype": "Section Break"
  }, 
  {
   "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
+  "label": "Inspection Required", 
+  "no_copy": 0, 
+  "oldfieldname": "inspection_required", 
+  "oldfieldtype": "Select", 
+  "options": "\nYes\nNo", 
+  "reqd": 1
  }, 
  {
+  "depends_on": "eval:doc.inspection_required==\"Yes\"", 
   "description": "Quality Inspection Parameters", 
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "Item Quality Inspection Parameter", 
-  "oldfieldname": "item_specification_details", 
-  "options": "Item Quality Inspection Parameter", 
   "fieldname": "item_specification_details", 
   "fieldtype": "Table", 
-  "depends_on": "eval:doc.inspection_required==\"Yes\"", 
-  "permlevel": 0
+  "label": "Item Quality Inspection Parameter", 
+  "oldfieldname": "item_specification_details", 
+  "oldfieldtype": "Table", 
+  "options": "Item Quality Inspection Parameter"
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Manufacturing", 
   "fieldname": "manufacturing", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Manufacturing", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "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", 
+  "description": "Selecting \"Yes\" will allow you to create Bill of Material showing raw material and operational costs incurred to manufacture this item.", 
   "doctype": "DocField", 
-  "label": "Allow Bill of Materials", 
-  "oldfieldname": "is_manufactured_item", 
-  "options": "\nYes\nNo", 
   "fieldname": "is_manufactured_item", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Allow Bill of Materials", 
+  "oldfieldname": "is_manufactured_item", 
+  "oldfieldtype": "Select", 
+  "options": "\nYes\nNo", 
+  "reqd": 1
  }, 
  {
-  "read_only": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
+  "depends_on": "eval:doc.is_manufactured_item==\"Yes\"", 
   "doctype": "DocField", 
-  "label": "Default BOM", 
-  "oldfieldname": "default_bom", 
-  "options": "BOM", 
   "fieldname": "default_bom", 
   "fieldtype": "Link", 
-  "depends_on": "eval:doc.is_manufactured_item==\"Yes\"", 
-  "permlevel": 0
+  "label": "Default BOM", 
+  "no_copy": 1, 
+  "oldfieldname": "default_bom", 
+  "oldfieldtype": "Link", 
+  "options": "BOM", 
+  "read_only": 1
  }, 
  {
-  "description": "Selecting \"Yes\" will allow you to make a Production Order for this item.", 
   "default": "No", 
-  "oldfieldtype": "Select", 
+  "depends_on": "eval:doc.is_manufactured_item==\"Yes\"", 
+  "description": "Selecting \"Yes\" will allow you to make a Production Order for this item.", 
   "doctype": "DocField", 
-  "label": "Allow Production Order", 
-  "oldfieldname": "is_pro_applicable", 
-  "permlevel": 0, 
   "fieldname": "is_pro_applicable", 
   "fieldtype": "Select", 
-  "depends_on": "eval:doc.is_manufactured_item==\"Yes\"", 
-  "reqd": 1, 
-  "options": "\nYes\nNo"
+  "label": "Allow Production Order", 
+  "oldfieldname": "is_pro_applicable", 
+  "oldfieldtype": "Select", 
+  "options": "\nYes\nNo", 
+  "reqd": 1
  }, 
  {
-  "description": "Select \"Yes\" if you supply raw materials to your supplier to manufacture this item.", 
   "default": "No", 
-  "oldfieldtype": "Select", 
+  "description": "Select \"Yes\" if you supply raw materials to your supplier to manufacture this item.", 
   "doctype": "DocField", 
-  "label": "Is Sub Contracted Item", 
-  "oldfieldname": "is_sub_contracted_item", 
-  "options": "\nYes\nNo", 
   "fieldname": "is_sub_contracted_item", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Is Sub Contracted Item", 
+  "oldfieldname": "is_sub_contracted_item", 
+  "oldfieldtype": "Select", 
+  "options": "\nYes\nNo", 
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "File List", 
   "fieldname": "file_list", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "File List", 
+  "no_copy": 1, 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Customer Code", 
   "fieldname": "customer_code", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Customer Code", 
+  "no_copy": 1, 
+  "print_hide": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Website", 
   "fieldname": "website_section", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Website"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Show in Website", 
   "fieldname": "show_in_website", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "Show in Website"
  }, 
  {
-  "read_only": 1, 
-  "description": "website page link", 
   "depends_on": "show_in_website", 
+  "description": "website page link", 
   "doctype": "DocField", 
-  "label": "Page Name", 
   "fieldname": "page_name", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Page Name", 
+  "read_only": 1
  }, 
  {
-  "description": "Products will be sorted by weight-age in default searches. More the weight-age, higher the product will appear in the list.", 
   "depends_on": "show_in_website", 
+  "description": "Products will be sorted by weight-age in default searches. More the weight-age, higher the product will appear in the list.", 
   "doctype": "DocField", 
-  "label": "Weightage", 
   "fieldname": "weightage", 
   "fieldtype": "Int", 
-  "search_index": 1, 
-  "permlevel": 0
+  "label": "Weightage", 
+  "search_index": 1
  }, 
  {
-  "description": "Show a slideshow at the top of the page", 
   "depends_on": "show_in_website", 
+  "description": "Show a slideshow at the top of the page", 
   "doctype": "DocField", 
-  "label": "Slideshow", 
-  "options": "Website Slideshow", 
   "fieldname": "slideshow", 
   "fieldtype": "Link", 
-  "permlevel": 0
+  "label": "Slideshow", 
+  "options": "Website Slideshow"
  }, 
  {
-  "description": "Item Image (if not slideshow)", 
   "depends_on": "show_in_website", 
+  "description": "Item Image (if not slideshow)", 
   "doctype": "DocField", 
-  "label": "Image", 
-  "options": "attach_files:", 
   "fieldname": "website_image", 
   "fieldtype": "Select", 
-  "permlevel": 0
+  "label": "Image", 
+  "options": "attach_files:"
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "cb72", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
-  "description": "Show Price in Website (if set)", 
   "depends_on": "show_in_website", 
+  "description": "Show Price in Website (if set)", 
   "doctype": "DocField", 
-  "label": "Website Price List", 
-  "options": "Price List", 
   "fieldname": "website_price_list", 
   "fieldtype": "Link", 
-  "permlevel": 0
+  "label": "Website Price List", 
+  "options": "Price List"
  }, 
  {
-  "description": "Show \"In Stock\" or \"Not in Stock\" based on stock available in this warehouse.", 
   "depends_on": "show_in_website", 
+  "description": "Show \"In Stock\" or \"Not in Stock\" based on stock available in this warehouse.", 
   "doctype": "DocField", 
-  "label": "Website Warehouse", 
-  "options": "Warehouse", 
   "fieldname": "website_warehouse", 
   "fieldtype": "Link", 
-  "permlevel": 0
+  "label": "Website Warehouse", 
+  "options": "Warehouse"
  }, 
  {
-  "description": "List this Item in multiple groups on the website.", 
   "depends_on": "show_in_website", 
+  "description": "List this Item in multiple groups on the website.", 
   "doctype": "DocField", 
-  "label": "Website Item Groups", 
-  "options": "Website Item Group", 
   "fieldname": "website_item_groups", 
   "fieldtype": "Table", 
-  "permlevel": 0
+  "label": "Website Item Groups", 
+  "options": "Website Item Group"
  }, 
  {
   "depends_on": "show_in_website", 
   "doctype": "DocField", 
   "fieldname": "sb72", 
-  "fieldtype": "Section Break", 
-  "permlevel": 0
+  "fieldtype": "Section Break"
  }, 
  {
   "depends_on": "show_in_website", 
   "doctype": "DocField", 
-  "label": "Item Website Specifications", 
-  "options": "Item Website Specification", 
   "fieldname": "item_website_specifications", 
   "fieldtype": "Table", 
-  "permlevel": 0
+  "label": "Item Website Specifications", 
+  "options": "Item Website Specification"
  }, 
  {
   "depends_on": "show_in_website", 
   "doctype": "DocField", 
-  "label": "Website Description", 
   "fieldname": "web_long_description", 
   "fieldtype": "Text Editor", 
-  "permlevel": 0
+  "label": "Website Description"
  }, 
  {
   "amend": 0, 
+  "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "write": 0, 
   "role": "Material Manager", 
-  "cancel": 0
+  "write": 0
  }, 
  {
   "amend": 0, 
+  "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "write": 0, 
   "role": "Material User", 
-  "cancel": 0
+  "write": 0
  }, 
  {
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
   "role": "Material Master Manager", 
-  "cancel": 1
+  "write": 1
  }
 ]
\ No newline at end of file
diff --git a/stock/doctype/landed_cost_master/landed_cost_master.txt b/stock/doctype/landed_cost_master/landed_cost_master.txt
index 09f1f5d..63b102c 100644
--- a/stock/doctype/landed_cost_master/landed_cost_master.txt
+++ b/stock/doctype/landed_cost_master/landed_cost_master.txt
@@ -1,120 +1,86 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:27", 
   "docstatus": 0, 
-  "creation": "2012-07-03 13:29:45", 
+  "modified": "2013-01-22 14:56:03", 
   "modified_by": "Administrator", 
-  "modified": "2012-09-17 10:53:26"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
-  "module": "Stock", 
+  "autoname": "field:title", 
   "doctype": "DocType", 
   "document_type": "Master", 
-  "_last_update": "1309508838", 
-  "autoname": "field:title", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "server_code_error": " ", 
-  "version": 1
+  "module": "Stock", 
+  "name": "__common__"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Landed Cost Master", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Landed Cost Master", 
-  "read": 1, 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
+  "create": 1, 
   "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Landed Cost Master", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
+  "permlevel": 0, 
+  "read": 1, 
+  "report": 1, 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "name": "Landed Cost Master", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Landed Cost Master"
  }, 
  {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Trash Reason", 
-  "oldfieldname": "trash_reason", 
   "fieldname": "trash_reason", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Trash Reason", 
+  "oldfieldname": "trash_reason", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Title", 
-  "oldfieldname": "title", 
   "fieldname": "title", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Title", 
+  "oldfieldname": "title", 
+  "oldfieldtype": "Data"
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Landed Cost Items", 
   "fieldname": "landed_cost_details", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Landed Cost Items", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "Landed Cost", 
-  "oldfieldname": "landed_cost", 
-  "options": "Landed Cost Master Detail", 
   "fieldname": "landed_cost", 
   "fieldtype": "Table", 
-  "permlevel": 0
+  "label": "Landed Cost", 
+  "oldfieldname": "landed_cost", 
+  "oldfieldtype": "Table", 
+  "options": "Landed Cost Master Detail"
  }, 
  {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "Purchase Manager", 
-  "report": 1, 
-  "permlevel": 0
+  "role": "Purchase Manager"
  }, 
  {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "System Manager", 
-  "report": 1, 
-  "permlevel": 0
+  "role": "System Manager"
  }, 
  {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "Purchase User", 
-  "report": 1, 
-  "permlevel": 0
- }, 
- {
-  "role": "All", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "System Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "Purchase User", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "Purchase Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
+  "role": "Purchase User"
  }
 ]
\ No newline at end of file
diff --git a/stock/doctype/landed_cost_wizard/landed_cost_wizard.txt b/stock/doctype/landed_cost_wizard/landed_cost_wizard.txt
index 3bb48b5..fb4483f 100644
--- a/stock/doctype/landed_cost_wizard/landed_cost_wizard.txt
+++ b/stock/doctype/landed_cost_wizard/landed_cost_wizard.txt
@@ -1,48 +1,47 @@
 [
  {
-  "owner": "wasim@webnotestech.com", 
+  "creation": "2013-01-10 16:34:28", 
   "docstatus": 0, 
-  "creation": "2012-07-03 13:29:45", 
+  "modified": "2013-01-22 14:56:03", 
   "modified_by": "Administrator", 
-  "modified": "2012-09-17 10:54:21"
+  "owner": "wasim@webnotestech.com"
  }, 
  {
-  "section_style": "Simple", 
-  "module": "Stock", 
-  "server_code_error": " ", 
   "doctype": "DocType", 
   "issingle": 1, 
-  "_last_update": "1321441191", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "show_in_menu": 1, 
-  "version": 1
+  "module": "Stock", 
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Landed Cost Wizard", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Landed Cost Wizard", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
   "permlevel": 0, 
-  "parentfield": "fields"
- }, 
- {
-  "name": "__common__", 
-  "parent": "Landed Cost Wizard", 
   "read": 1, 
-  "doctype": "DocPerm", 
-  "parenttype": "DocType", 
-  "parentfield": "permissions"
+  "report": 1, 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "name": "Landed Cost Wizard", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Landed Cost Wizard"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Process", 
   "fieldname": "process", 
   "fieldtype": "HTML", 
+  "label": "Process", 
   "options": "<div class=\"field_description\"><b>Process:</b><br>1. Fetch and select Purchase Receipt<br>2. Enter extra costs<br>3. Click on Update Landed Cost button<br> 4. Cost will be added into other charges table of selected PR proportionately based on net total<br>5. Item Valuation Rate will be recalculated</div>"
  }, 
  {
@@ -53,38 +52,38 @@
  }, 
  {
   "doctype": "DocField", 
-  "label": "From PR Date", 
   "fieldname": "from_pr_date", 
   "fieldtype": "Date", 
+  "label": "From PR Date", 
   "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "To PR Date", 
   "fieldname": "to_pr_date", 
   "fieldtype": "Date", 
+  "label": "To PR Date", 
   "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Currency", 
   "fieldname": "currency", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "options": "link:Currency"
+  "label": "Currency", 
+  "options": "link:Currency", 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Get Purchase Receipt", 
   "fieldname": "get_purchase_receipt", 
   "fieldtype": "Button", 
+  "label": "Get Purchase Receipt", 
   "options": "get_purchase_receipts"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Landed Cost Purchase Receipts", 
   "fieldname": "lc_pr_details", 
   "fieldtype": "Table", 
+  "label": "Landed Cost Purchase Receipts", 
   "options": "Landed Cost Purchase Receipt"
  }, 
  {
@@ -95,75 +94,44 @@
  }, 
  {
   "doctype": "DocField", 
-  "label": "Select Landed Cost Items Master", 
   "fieldname": "landed_cost", 
   "fieldtype": "Link", 
+  "label": "Select Landed Cost Items Master", 
   "options": "Landed Cost Master"
  }, 
  {
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Get Details", 
   "fieldname": "get_details", 
   "fieldtype": "Button", 
+  "label": "Get Details", 
   "options": "get_landed_cost_master_details"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Landed Cost Items", 
   "fieldname": "landed_cost_details", 
   "fieldtype": "Table", 
+  "label": "Landed Cost Items", 
   "options": "Landed Cost Item"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Update PR", 
   "fieldname": "update_pr", 
   "fieldtype": "Button", 
+  "label": "Update PR", 
   "options": "update_landed_cost"
  }, 
  {
   "amend": 0, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 1, 
-  "role": "Purchase Manager", 
   "cancel": 0, 
-  "permlevel": 0
- }, 
- {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "System Manager", 
-  "permlevel": 0
+  "role": "Purchase Manager"
  }, 
  {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "Purchase User", 
-  "permlevel": 0
+  "role": "System Manager"
  }, 
  {
-  "role": "All", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "System Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "Purchase User", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "Purchase Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
+  "doctype": "DocPerm", 
+  "role": "Purchase User"
  }
 ]
\ No newline at end of file
diff --git a/stock/doctype/packing_slip/packing_slip.txt b/stock/doctype/packing_slip/packing_slip.txt
index a706228..ac25189 100644
--- a/stock/doctype/packing_slip/packing_slip.txt
+++ b/stock/doctype/packing_slip/packing_slip.txt
@@ -1,285 +1,219 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:28", 
   "docstatus": 0, 
-  "creation": "2012-05-15 12:15:08", 
+  "modified": "2013-01-22 14:56:40", 
   "modified_by": "Administrator", 
-  "modified": "2012-06-29 12:24:16"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
-  "is_submittable": 1, 
-  "description": "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.", 
-  "search_fields": "delivery_note", 
-  "module": "Stock", 
-  "read_only_onload": 1, 
   "autoname": "PS.#######", 
-  "document_type": "Transaction", 
-  "subject": "[%(delivery_note)s] Case Nos: %(from_case_no)s - %(to_case_no)s  |  Net Weight: %(net_weight_pkg)s %(net_weight_uom)s  |  Gross Weight: %(gross_weight_pkg)s %(gross_weight_uom)s", 
-  "_last_update": "1328091392", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "is_transaction_doc": 1, 
+  "description": "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.", 
   "doctype": "DocType", 
-  "show_in_menu": 0, 
-  "version": 1
+  "document_type": "Transaction", 
+  "is_submittable": 1, 
+  "module": "Stock", 
+  "name": "__common__", 
+  "read_only_onload": 1, 
+  "search_fields": "delivery_note"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Packing Slip", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Packing Slip", 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
+  "amend": 1, 
+  "cancel": 1, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Packing Slip", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
+  "permlevel": 0, 
   "read": 1, 
-  "doctype": "DocPerm", 
-  "parenttype": "DocType", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Packing Slip", 
-  "doctype": "DocType"
- }, 
- {
-  "amend": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
   "report": 1, 
-  "role": "Material User", 
-  "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "amend": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
   "submit": 1, 
-  "write": 1, 
-  "report": 1, 
-  "role": "Sales User", 
-  "cancel": 1, 
-  "permlevel": 0
+  "write": 1
  }, 
  {
-  "amend": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "report": 1, 
-  "role": "Material Master Manager", 
-  "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "amend": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "report": 1, 
-  "role": "Material Manager", 
-  "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "amend": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "report": 1, 
-  "role": "Sales Manager", 
-  "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "role": "All", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
+  "doctype": "DocType", 
+  "name": "Packing Slip"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Packing Slip Items", 
   "fieldname": "packing_slip_details", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Packing Slip Items"
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "column_break0", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
   "description": "Indicates that the package is a part of this delivery", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Delivery Note", 
-  "options": "Delivery Note", 
   "fieldname": "delivery_note", 
   "fieldtype": "Link", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Delivery Note", 
+  "options": "Delivery Note", 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "column_break1", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 0, 
   "doctype": "DocField", 
-  "label": "Series", 
-  "options": "PS", 
   "fieldname": "naming_series", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Series", 
+  "no_copy": 0, 
+  "options": "PS", 
+  "print_hide": 1, 
+  "reqd": 1
  }, 
  {
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "fieldname": "section_break0", 
-  "fieldtype": "Section Break", 
-  "permlevel": 0
+  "fieldtype": "Section Break"
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "column_break2", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
   "description": "Identification of the package for the delivery (for print)", 
-  "no_copy": 1, 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "From Package No.", 
-  "width": "50px", 
   "fieldname": "from_case_no", 
   "fieldtype": "Data", 
+  "label": "From Package No.", 
+  "no_copy": 1, 
   "reqd": 1, 
-  "permlevel": 0
+  "width": "50px"
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "column_break3", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
   "description": "If more than one package of the same type (for print)", 
-  "no_copy": 1, 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "To Package No.", 
-  "width": "50px", 
   "fieldname": "to_case_no", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "To Package No.", 
+  "no_copy": 1, 
+  "width": "50px"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Package Item Details", 
   "fieldname": "package_item_details", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Package Item Details"
  }, 
  {
   "doctype": "DocField", 
-  "options": "Packing Slip Item", 
   "fieldname": "item_details", 
   "fieldtype": "Table", 
   "label": "Items", 
-  "permlevel": 0
+  "options": "Packing Slip Item"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Package Weight Details", 
   "fieldname": "package_weight_details", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Package Weight Details"
  }, 
  {
   "description": "The net weight of this package. (calculated automatically as sum of net weight of items)", 
-  "no_copy": 1, 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Net Weight", 
   "fieldname": "net_weight_pkg", 
-  "fieldtype": "Currency", 
-  "permlevel": 1
+  "fieldtype": "Float", 
+  "label": "Net Weight", 
+  "no_copy": 1, 
+  "read_only": 1
  }, 
  {
-  "no_copy": 1, 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Net Weight UOM", 
   "fieldname": "net_weight_uom", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Net Weight UOM", 
+  "no_copy": 1, 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "column_break4", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
   "description": "The gross weight of the package. Usually net weight + packaging material weight. (for print)", 
-  "no_copy": 1, 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Gross Weight", 
   "fieldname": "gross_weight_pkg", 
-  "fieldtype": "Currency", 
-  "permlevel": 0
+  "fieldtype": "Float", 
+  "label": "Gross Weight", 
+  "no_copy": 1
  }, 
  {
-  "no_copy": 1, 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Gross Weight UOM", 
-  "options": "UOM", 
   "fieldname": "gross_weight_uom", 
   "fieldtype": "Link", 
-  "permlevel": 0
+  "label": "Gross Weight UOM", 
+  "no_copy": 1, 
+  "options": "UOM"
  }, 
  {
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Misc Details", 
   "fieldname": "misc_details", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Misc Details"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Amended From", 
-  "options": "Packing Slip", 
   "fieldname": "amended_from", 
   "fieldtype": "Link", 
-  "permlevel": 1
+  "label": "Amended From", 
+  "no_copy": 1, 
+  "options": "Packing Slip", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "description": "The date at which current entry is corrected in the system.", 
-  "no_copy": 1, 
   "depends_on": "eval:doc.amended_from", 
+  "description": "The date at which current entry is corrected in the system.", 
   "doctype": "DocField", 
-  "label": "Amendment Date", 
   "fieldname": "amendment_date", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "Amendment Date", 
+  "no_copy": 1, 
+  "print_hide": 1
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "Material User"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "Sales User"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "Material Master Manager"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "Material Manager"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "Sales Manager"
  }
 ]
\ No newline at end of file
diff --git a/stock/doctype/packing_slip_item/packing_slip_item.txt b/stock/doctype/packing_slip_item/packing_slip_item.txt
index 5c85431..c1e6abb 100644
--- a/stock/doctype/packing_slip_item/packing_slip_item.txt
+++ b/stock/doctype/packing_slip_item/packing_slip_item.txt
@@ -1,90 +1,84 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:28", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:36:34", 
+  "modified": "2013-01-22 14:47:04", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:36:34"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
-  "istable": 1, 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "module": "Stock", 
-  "doctype": "DocType", 
-  "version": 9, 
   "autoname": "PSD/.#######", 
-  "show_in_menu": 0
+  "doctype": "DocType", 
+  "istable": 1, 
+  "module": "Stock", 
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Packing Slip Item", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "name": "Packing Slip Item", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Packing Slip Item"
  }, 
  {
-  "permlevel": 0, 
   "doctype": "DocField", 
-  "label": "Item Code", 
-  "width": "100px", 
   "fieldname": "item_code", 
   "fieldtype": "Link", 
+  "label": "Item Code", 
+  "options": "Item", 
   "reqd": 1, 
-  "options": "Item"
+  "width": "100px"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Item Name", 
-  "width": "200px", 
   "fieldname": "item_name", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Item Name", 
+  "read_only": 1, 
+  "width": "200px"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Quantity", 
-  "width": "100px", 
   "fieldname": "qty", 
-  "fieldtype": "Currency", 
+  "fieldtype": "Float", 
+  "label": "Quantity", 
   "reqd": 1, 
-  "permlevel": 0
+  "width": "100px"
  }, 
  {
   "doctype": "DocField", 
-  "label": "UOM", 
-  "width": "100px", 
   "fieldname": "stock_uom", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "UOM", 
+  "read_only": 1, 
+  "width": "100px"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Net Weight", 
-  "width": "100px", 
   "fieldname": "net_weight", 
   "fieldtype": "Float", 
-  "permlevel": 1
+  "label": "Net Weight", 
+  "read_only": 1, 
+  "width": "100px"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Weight UOM", 
-  "width": "100px", 
-  "options": "UOM", 
   "fieldname": "weight_uom", 
   "fieldtype": "Link", 
-  "permlevel": 1
+  "label": "Weight UOM", 
+  "options": "UOM", 
+  "read_only": 1, 
+  "width": "100px"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Page Break", 
   "fieldname": "page_break", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "Page Break"
  }
 ]
\ No newline at end of file
diff --git a/stock/doctype/purchase_receipt/purchase_receipt.txt b/stock/doctype/purchase_receipt/purchase_receipt.txt
index 4d5f2e9..d70b14c 100755
--- a/stock/doctype/purchase_receipt/purchase_receipt.txt
+++ b/stock/doctype/purchase_receipt/purchase_receipt.txt
@@ -1,1013 +1,925 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-21 18:19:24", 
   "docstatus": 0, 
-  "creation": "2013-01-18 12:47:03", 
+  "modified": "2013-01-22 14:56:43", 
   "modified_by": "Administrator", 
-  "modified": "2013-01-18 13:25:36"
+  "owner": "Administrator"
  }, 
  {
-  "document_type": "Transaction", 
-  "is_submittable": 1, 
   "allow_attach": 1, 
   "autoname": "naming_series:", 
-  "module": "Stock", 
   "doctype": "DocType", 
+  "document_type": "Transaction", 
+  "is_submittable": 1, 
+  "module": "Stock", 
+  "name": "__common__", 
   "read_only_onload": 1, 
-  "search_fields": "status, posting_date, supplier", 
-  "name": "__common__"
+  "search_fields": "status, posting_date, supplier"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Purchase Receipt", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Purchase Receipt", 
-  "read": 1, 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
   "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Purchase Receipt", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
+  "read": 1, 
+  "report": 1
  }, 
  {
-  "name": "Purchase Receipt", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Purchase Receipt"
  }, 
  {
-  "print_width": "50%", 
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break0", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "print_width": "50%", 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
   "description": "To manage multiple series please go to Setup > Manage Series", 
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Series", 
-  "oldfieldname": "naming_series", 
-  "options": "\nGRN", 
   "fieldname": "naming_series", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Series", 
+  "no_copy": 1, 
+  "oldfieldname": "naming_series", 
+  "oldfieldtype": "Select", 
+  "options": "\nGRN", 
+  "print_hide": 1, 
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
-  "print_width": "150px", 
-  "permlevel": 0, 
-  "oldfieldtype": "Link", 
   "allow_on_submit": 0, 
   "doctype": "DocField", 
-  "label": "Supplier", 
-  "oldfieldname": "supplier", 
-  "width": "150px", 
   "fieldname": "supplier", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Supplier", 
+  "oldfieldname": "supplier", 
+  "oldfieldtype": "Link", 
   "options": "Supplier", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "print_width": "150px", 
+  "reqd": 1, 
+  "search_index": 1, 
+  "width": "150px"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Name", 
   "fieldname": "supplier_name", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Name", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Address", 
   "fieldname": "address_display", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Address", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Contact", 
   "fieldname": "contact_display", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Contact", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Mobile No", 
   "fieldname": "contact_mobile", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Mobile No", 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Contact Email", 
   "fieldname": "contact_email", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Contact Email", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_width": "50%", 
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "print_width": "50%", 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
   "description": "The date at which current entry will get or has actually executed.", 
-  "print_width": "100px", 
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Posting Date", 
-  "oldfieldname": "posting_date", 
-  "width": "100px", 
   "fieldname": "posting_date", 
   "fieldtype": "Date", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Posting Date", 
+  "no_copy": 1, 
+  "oldfieldname": "posting_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
+  "print_width": "100px", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 1, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
   "description": "Time at which materials were received", 
-  "print_width": "100px", 
-  "no_copy": 1, 
-  "oldfieldtype": "Time", 
   "doctype": "DocField", 
-  "label": "Posting Time", 
-  "oldfieldname": "posting_time", 
-  "width": "100px", 
   "fieldname": "posting_time", 
   "fieldtype": "Time", 
-  "search_index": 0, 
+  "in_filter": 0, 
+  "label": "Posting Time", 
+  "no_copy": 1, 
+  "oldfieldname": "posting_time", 
+  "oldfieldtype": "Time", 
+  "print_hide": 1, 
+  "print_width": "100px", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 0
+  "search_index": 0, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 0, 
-  "print_width": "100px", 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Challan No", 
-  "oldfieldname": "challan_no", 
-  "width": "100px", 
   "fieldname": "challan_no", 
   "fieldtype": "Data", 
-  "reqd": 0, 
   "hidden": 1, 
-  "permlevel": 0
- }, 
- {
+  "label": "Challan No", 
+  "no_copy": 1, 
+  "oldfieldname": "challan_no", 
+  "oldfieldtype": "Data", 
   "print_hide": 0, 
   "print_width": "100px", 
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
+  "reqd": 0, 
+  "width": "100px"
+ }, 
+ {
   "doctype": "DocField", 
-  "label": "Challan Date", 
-  "oldfieldname": "challan_date", 
-  "width": "100px", 
   "fieldname": "challan_date", 
   "fieldtype": "Date", 
-  "reqd": 0, 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Challan Date", 
+  "no_copy": 1, 
+  "oldfieldname": "challan_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 0, 
+  "print_width": "100px", 
+  "reqd": 0, 
+  "width": "100px"
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Items", 
   "fieldname": "items", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Items", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Table", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Purchase Receipt Items", 
-  "oldfieldname": "purchase_receipt_details", 
-  "permlevel": 0, 
   "fieldname": "purchase_receipt_details", 
   "fieldtype": "Table", 
-  "reqd": 0, 
-  "options": "Purchase Receipt Item"
+  "label": "Purchase Receipt Items", 
+  "oldfieldname": "purchase_receipt_details", 
+  "oldfieldtype": "Table", 
+  "options": "Purchase Receipt Item", 
+  "print_hide": 0, 
+  "reqd": 0
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "options": "Simple", 
   "fieldname": "section_break0", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "oldfieldtype": "Section Break", 
+  "options": "Simple"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Get Current Stock", 
-  "permlevel": 0, 
   "fieldname": "get_current_stock", 
   "fieldtype": "Button", 
-  "options": "get_current_stock"
+  "label": "Get Current Stock", 
+  "oldfieldtype": "Button", 
+  "options": "get_current_stock", 
+  "print_hide": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "column_break_18", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Re-Calculate Values", 
   "fieldname": "recalculate_values", 
   "fieldtype": "Button", 
-  "permlevel": 0
+  "label": "Re-Calculate Values", 
+  "oldfieldtype": "Button"
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "section_break_20", 
-  "fieldtype": "Section Break", 
-  "permlevel": 0
+  "fieldtype": "Section Break"
  }, 
  {
-  "print_hide": 0, 
   "description": "You can make a purchase receipt from multiple purchase orders. Select purchase orders one by one and click on the button below.", 
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Purchase Order", 
-  "oldfieldname": "purchase_order_no", 
-  "permlevel": 0, 
   "fieldname": "purchase_order_no", 
   "fieldtype": "Link", 
-  "options": "Purchase Order"
+  "label": "Purchase Order", 
+  "no_copy": 1, 
+  "oldfieldname": "purchase_order_no", 
+  "oldfieldtype": "Link", 
+  "options": "Purchase Order", 
+  "print_hide": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Pull Purchase Order Details", 
-  "permlevel": 0, 
   "fieldname": "pull_purchase_order_details", 
   "fieldtype": "Button", 
-  "options": "get_po_details"
+  "label": "Pull Purchase Order Details", 
+  "oldfieldtype": "Button", 
+  "options": "get_po_details", 
+  "print_hide": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Currency & Price List", 
   "fieldname": "currency_price_list", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Currency & Price List"
  }, 
  {
-  "print_hide": 1, 
   "description": "Supplier's currency", 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Currency", 
-  "oldfieldname": "currency", 
-  "permlevel": 0, 
   "fieldname": "currency", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "options": "link:Currency"
+  "label": "Currency", 
+  "oldfieldname": "currency", 
+  "oldfieldtype": "Select", 
+  "options": "link:Currency", 
+  "print_hide": 1, 
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
-  "description": "Rate at which supplier's currency is converted to company's base currency", 
   "default": "1.00", 
-  "oldfieldtype": "Currency", 
+  "description": "Rate at which supplier's currency is converted to company's base currency", 
   "doctype": "DocField", 
-  "label": "Exchange Rate", 
-  "oldfieldname": "conversion_rate", 
   "fieldname": "conversion_rate", 
   "fieldtype": "Float", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Exchange Rate", 
+  "oldfieldname": "conversion_rate", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "reqd": 1
  }, 
  {
-  "print_width": "50%", 
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break2", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "print_width": "50%", 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
   "description": "Consider this Price List for fetching rate. (only which have \"For Buying\" as checked)", 
   "doctype": "DocField", 
-  "label": "Price List", 
-  "permlevel": 0, 
   "fieldname": "price_list_name", 
   "fieldtype": "Link", 
-  "options": "Price List"
+  "label": "Price List", 
+  "options": "Price List", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "depends_on": "price_list_name", 
   "doctype": "DocField", 
-  "label": "Price List Currency", 
-  "permlevel": 0, 
   "fieldname": "price_list_currency", 
   "fieldtype": "Link", 
   "hidden": 0, 
-  "options": "Currency"
+  "label": "Price List Currency", 
+  "options": "Currency", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "depends_on": "price_list_name", 
   "doctype": "DocField", 
-  "label": "Price List Exchange Rate", 
   "fieldname": "plc_conversion_rate", 
   "fieldtype": "Float", 
-  "permlevel": 0
+  "label": "Price List Exchange Rate", 
+  "print_hide": 1
  }, 
  {
   "description": "Add / Edit Taxes and Charges", 
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Taxes", 
   "fieldname": "taxes", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Taxes", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "print_hide": 1, 
   "description": "If you have created a standard template in Purchase Taxes and Charges Master, select one and click on the button below.", 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Purchase Taxes and Charges", 
-  "oldfieldname": "purchase_other_charges", 
-  "permlevel": 0, 
   "fieldname": "purchase_other_charges", 
   "fieldtype": "Link", 
-  "options": "Purchase Taxes and Charges Master"
+  "label": "Purchase Taxes and Charges", 
+  "oldfieldname": "purchase_other_charges", 
+  "oldfieldtype": "Link", 
+  "options": "Purchase Taxes and Charges Master", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Get Tax Detail", 
-  "permlevel": 0, 
   "fieldname": "get_tax_detail", 
   "fieldtype": "Button", 
-  "options": "get_purchase_tax_details"
+  "label": "Get Tax Detail", 
+  "oldfieldtype": "Button", 
+  "options": "get_purchase_tax_details", 
+  "print_hide": 1
  }, 
  {
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "Purchase Taxes and Charges", 
-  "oldfieldname": "purchase_tax_details", 
-  "permlevel": 0, 
   "fieldname": "purchase_tax_details", 
   "fieldtype": "Table", 
+  "label": "Purchase Taxes and Charges", 
+  "oldfieldname": "purchase_tax_details", 
+  "oldfieldtype": "Table", 
   "options": "Purchase Taxes and Charges"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Calculate Tax", 
   "fieldname": "calculate_tax", 
   "fieldtype": "Button", 
-  "permlevel": 0
+  "label": "Calculate Tax", 
+  "oldfieldtype": "Button", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "HTML", 
   "doctype": "DocField", 
-  "label": "Tax Calculation", 
   "fieldname": "tax_calculation", 
   "fieldtype": "HTML", 
-  "permlevel": 0
+  "label": "Tax Calculation", 
+  "oldfieldtype": "HTML", 
+  "print_hide": 1
  }, 
  {
   "description": "Detailed Breakup of the totals", 
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Totals", 
   "fieldname": "totals", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Totals", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Net Total (Import)", 
-  "oldfieldname": "net_total_import", 
   "fieldname": "net_total_import", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Net Total (Import)", 
+  "oldfieldname": "net_total_import", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Taxes and Charges Added (Import)", 
-  "oldfieldname": "other_charges_added_import", 
   "fieldname": "other_charges_added_import", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Taxes and Charges Added (Import)", 
+  "oldfieldname": "other_charges_added_import", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Taxes and Charges Deducted (Import)", 
-  "oldfieldname": "other_charges_deducted_import", 
   "fieldname": "other_charges_deducted_import", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Taxes and Charges Deducted (Import)", 
+  "oldfieldname": "other_charges_deducted_import", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Grand Total (Import)", 
-  "oldfieldname": "grand_total_import", 
   "fieldname": "grand_total_import", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Grand Total (Import)", 
+  "oldfieldname": "grand_total_import", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "In Words (Import)", 
-  "oldfieldname": "in_words_import", 
   "fieldname": "in_words_import", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "In Words (Import)", 
+  "oldfieldname": "in_words_import", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_width": "50%", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break3", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "print_width": "50%", 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
-  "print_width": "150px", 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Net Total", 
-  "oldfieldname": "net_total", 
-  "width": "150px", 
   "fieldname": "net_total", 
   "fieldtype": "Currency", 
+  "label": "Net Total", 
+  "oldfieldname": "net_total", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "print_width": "150px", 
+  "read_only": 1, 
   "reqd": 1, 
-  "permlevel": 1
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Taxes and Charges Added", 
-  "oldfieldname": "other_charges_added", 
   "fieldname": "other_charges_added", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Taxes and Charges Added", 
+  "oldfieldname": "other_charges_added", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Taxes and Charges Deducted", 
-  "oldfieldname": "other_charges_deducted", 
   "fieldname": "other_charges_deducted", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Taxes and Charges Deducted", 
+  "oldfieldname": "other_charges_deducted", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Total Tax", 
-  "oldfieldname": "total_tax", 
   "fieldname": "total_tax", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Total Tax", 
+  "oldfieldname": "total_tax", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Grand Total", 
-  "oldfieldname": "grand_total", 
   "fieldname": "grand_total", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Grand Total", 
+  "oldfieldname": "grand_total", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Rounded Total", 
-  "oldfieldname": "rounded_total", 
   "fieldname": "rounded_total", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Rounded Total", 
+  "oldfieldname": "rounded_total", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
   "description": "In Words will be visible once you save the Purchase Receipt.", 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "In Words", 
-  "oldfieldname": "in_words", 
   "fieldname": "in_words", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "In Words", 
+  "oldfieldname": "in_words", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
   "description": "Add Terms and Conditions for the Purchase Receipt. You can also prepare a Terms and Conditions Master and use the Template.", 
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Terms and Conditions", 
   "fieldname": "terms_section_break", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Terms and Conditions", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Select Terms and Conditions", 
-  "oldfieldname": "tc_name", 
-  "permlevel": 0, 
   "fieldname": "tc_name", 
   "fieldtype": "Link", 
-  "options": "Terms and Conditions"
+  "label": "Select Terms and Conditions", 
+  "oldfieldname": "tc_name", 
+  "oldfieldtype": "Link", 
+  "options": "Terms and Conditions", 
+  "print_hide": 1
  }, 
  {
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Get Terms and Conditions", 
-  "permlevel": 0, 
   "fieldname": "get_terms", 
   "fieldtype": "Button", 
+  "label": "Get Terms and Conditions", 
+  "oldfieldtype": "Button", 
   "options": "get_tc_details"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "HTML", 
   "doctype": "DocField", 
-  "label": "Terms and Conditions HTML", 
-  "permlevel": 0, 
   "fieldname": "terms_html", 
   "fieldtype": "HTML", 
-  "options": "You can add Terms and Notes that will be printed in the Transaction"
+  "label": "Terms and Conditions HTML", 
+  "oldfieldtype": "HTML", 
+  "options": "You can add Terms and Notes that will be printed in the Transaction", 
+  "print_hide": 1
  }, 
  {
-  "oldfieldtype": "Text Editor", 
   "doctype": "DocField", 
-  "label": "Terms and Conditions1", 
-  "oldfieldname": "terms", 
   "fieldname": "terms", 
   "fieldtype": "Text Editor", 
-  "permlevel": 0
+  "label": "Terms and Conditions1", 
+  "oldfieldname": "terms", 
+  "oldfieldtype": "Text Editor"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Contact Info", 
   "fieldname": "contact_section", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Contact Info"
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Supplier Address", 
-  "permlevel": 0, 
   "fieldname": "supplier_address", 
   "fieldtype": "Link", 
-  "options": "Address"
+  "label": "Supplier Address", 
+  "options": "Address", 
+  "print_hide": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "column_break_57", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Contact Person", 
-  "permlevel": 0, 
   "fieldname": "contact_person", 
   "fieldtype": "Link", 
-  "options": "Contact"
+  "label": "Contact Person", 
+  "options": "Contact", 
+  "print_hide": 1
  }, 
  {
   "description": "Filing in Additional Information about the Purchase Receipt will help you analyze your data better.", 
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "More Info", 
   "fieldname": "more_info", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "More Info", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "print_hide": 1, 
-  "permlevel": 1, 
-  "print_width": "150px", 
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Status", 
-  "oldfieldname": "status", 
-  "width": "150px", 
   "fieldname": "status", 
   "fieldtype": "Select", 
-  "search_index": 1, 
-  "reqd": 1, 
-  "options": "\nDraft\nSubmitted\nCancelled", 
-  "in_filter": 1
- }, 
- {
-  "print_hide": 1, 
-  "description": "% of materials billed against this Purchase Receipt", 
+  "in_filter": 1, 
+  "label": "Status", 
   "no_copy": 1, 
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "% Billed", 
-  "oldfieldname": "per_billed", 
-  "fieldname": "per_billed", 
-  "fieldtype": "Currency", 
-  "depends_on": "eval:!doc.__islocal", 
-  "permlevel": 1
+  "oldfieldname": "status", 
+  "oldfieldtype": "Select", 
+  "options": "\nDraft\nSubmitted\nCancelled", 
+  "print_hide": 1, 
+  "print_width": "150px", 
+  "read_only": 1, 
+  "reqd": 1, 
+  "search_index": 1, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
-  "description": "Select \"Yes\" for sub - contracting items", 
-  "default": "No", 
-  "oldfieldtype": "Select", 
+  "depends_on": "eval:!doc.__islocal", 
+  "description": "% of materials billed against this Purchase Receipt", 
   "doctype": "DocField", 
-  "label": "Is Subcontracted", 
-  "oldfieldname": "is_subcontracted", 
-  "permlevel": 0, 
+  "fieldname": "per_billed", 
+  "fieldtype": "Float", 
+  "label": "% Billed", 
+  "no_copy": 1, 
+  "oldfieldname": "per_billed", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "read_only": 1
+ }, 
+ {
+  "default": "No", 
+  "description": "Select \"Yes\" for sub - contracting items", 
+  "doctype": "DocField", 
   "fieldname": "is_subcontracted", 
   "fieldtype": "Select", 
-  "options": "\nYes\nNo"
+  "label": "Is Subcontracted", 
+  "oldfieldname": "is_subcontracted", 
+  "oldfieldtype": "Select", 
+  "options": "\nYes\nNo", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "permlevel": 1, 
-  "print_width": "150px", 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Amended From", 
-  "oldfieldname": "amended_from", 
-  "width": "150px", 
   "fieldname": "amended_from", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "options": "Purchase Receipt"
+  "label": "Amended From", 
+  "no_copy": 1, 
+  "oldfieldname": "amended_from", 
+  "oldfieldtype": "Data", 
+  "options": "Purchase Receipt", 
+  "print_hide": 1, 
+  "print_width": "150px", 
+  "read_only": 1, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Range", 
-  "oldfieldname": "range", 
   "fieldname": "range", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Range", 
+  "oldfieldname": "range", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Bill No", 
-  "oldfieldname": "bill_no", 
   "fieldname": "bill_no", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Bill No", 
+  "oldfieldname": "bill_no", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Bill Date", 
-  "oldfieldname": "bill_date", 
   "fieldname": "bill_date", 
   "fieldtype": "Date", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Bill Date", 
+  "oldfieldname": "bill_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
-  "label": "Select Print Heading", 
-  "oldfieldname": "select_print_heading", 
-  "options": "Print Heading", 
   "fieldname": "select_print_heading", 
   "fieldtype": "Link", 
-  "permlevel": 0, 
+  "label": "Select Print Heading", 
+  "no_copy": 1, 
+  "oldfieldname": "select_print_heading", 
+  "oldfieldtype": "Link", 
+  "options": "Print Heading", 
+  "print_hide": 1, 
   "report_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "permlevel": 0, 
   "description": "Select the relevant company name if you have multiple companies", 
-  "print_width": "150px", 
-  "no_copy": 0, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Company", 
-  "oldfieldname": "company", 
-  "width": "150px", 
   "fieldname": "company", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
   "hidden": 0, 
+  "in_filter": 1, 
+  "label": "Company", 
+  "no_copy": 0, 
+  "oldfieldname": "company", 
+  "oldfieldtype": "Link", 
   "options": "Company", 
-  "in_filter": 1
- }, 
- {
   "print_hide": 1, 
   "print_width": "150px", 
-  "permlevel": 0, 
-  "oldfieldtype": "Select", 
+  "reqd": 1, 
+  "search_index": 1, 
+  "width": "150px"
+ }, 
+ {
   "doctype": "DocField", 
-  "label": "Fiscal Year", 
-  "oldfieldname": "fiscal_year", 
-  "width": "150px", 
   "fieldname": "fiscal_year", 
   "fieldtype": "Select", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Fiscal Year", 
+  "oldfieldname": "fiscal_year", 
+  "oldfieldtype": "Select", 
   "options": "link:Fiscal Year", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "print_width": "150px", 
+  "reqd": 1, 
+  "search_index": 1, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
-  "print_width": "50%", 
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break4", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "print_hide": 1, 
+  "print_width": "50%", 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
-  "print_width": "30%", 
-  "oldfieldtype": "HTML", 
   "doctype": "DocField", 
-  "label": "Other Details", 
-  "width": "30%", 
-  "options": "<div class='columnHeading'>Other Details</div>", 
   "fieldname": "other_details", 
   "fieldtype": "HTML", 
-  "reqd": 0, 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Other Details", 
+  "oldfieldtype": "HTML", 
+  "options": "<div class='columnHeading'>Other Details</div>", 
+  "print_hide": 1, 
+  "print_width": "30%", 
+  "reqd": 0, 
+  "width": "30%"
  }, 
  {
-  "print_hide": 1, 
   "description": "Warehouse where you are maintaining stock of rejected items", 
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Rejected Warehouse", 
-  "oldfieldname": "rejected_warehouse", 
-  "options": "Warehouse", 
   "fieldname": "rejected_warehouse", 
   "fieldtype": "Link", 
-  "reqd": 0, 
-  "permlevel": 0
+  "label": "Rejected Warehouse", 
+  "no_copy": 1, 
+  "oldfieldname": "rejected_warehouse", 
+  "oldfieldtype": "Link", 
+  "options": "Warehouse", 
+  "print_hide": 1, 
+  "reqd": 0
  }, 
  {
-  "print_hide": 1, 
-  "permlevel": 0, 
   "description": "Supplier warehouse where you have issued raw materials for sub - contracting", 
-  "print_width": "50px", 
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Supplier Warehouse", 
-  "oldfieldname": "supplier_warehouse", 
-  "width": "50px", 
   "fieldname": "supplier_warehouse", 
   "fieldtype": "Link", 
-  "options": "Warehouse"
+  "label": "Supplier Warehouse", 
+  "no_copy": 1, 
+  "oldfieldname": "supplier_warehouse", 
+  "oldfieldtype": "Link", 
+  "options": "Warehouse", 
+  "print_hide": 1, 
+  "print_width": "50px", 
+  "width": "50px"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
+  "depends_on": "eval:!doc.__islocal", 
   "doctype": "DocField", 
-  "label": "Cancel Reason", 
-  "oldfieldname": "cancel_reason", 
   "fieldname": "cancel_reason", 
   "fieldtype": "Data", 
-  "depends_on": "eval:!doc.__islocal", 
   "hidden": 0, 
-  "permlevel": 1
+  "label": "Cancel Reason", 
+  "no_copy": 1, 
+  "oldfieldname": "cancel_reason", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Text", 
   "doctype": "DocField", 
-  "label": "Instructions", 
-  "oldfieldname": "instructions", 
   "fieldname": "instructions", 
   "fieldtype": "Small Text", 
-  "permlevel": 0
+  "label": "Instructions", 
+  "oldfieldname": "instructions", 
+  "oldfieldtype": "Text"
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Remarks", 
   "fieldname": "remarks", 
   "fieldtype": "Small Text", 
-  "permlevel": 0
+  "label": "Remarks", 
+  "print_hide": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Transporter Info", 
   "fieldname": "transporter_info", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Transporter Info"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Transporter Name", 
-  "oldfieldname": "transporter_name", 
   "fieldname": "transporter_name", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Transporter Name", 
+  "oldfieldname": "transporter_name", 
+  "oldfieldtype": "Data"
  }, 
  {
-  "print_hide": 0, 
   "description": "Transporter lorry number", 
-  "print_width": "100px", 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "LR No", 
-  "oldfieldname": "lr_no", 
-  "width": "100px", 
   "fieldname": "lr_no", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "LR No", 
+  "no_copy": 1, 
+  "oldfieldname": "lr_no", 
+  "oldfieldtype": "Data", 
+  "print_hide": 0, 
+  "print_width": "100px", 
+  "width": "100px"
  }, 
  {
-  "print_hide": 0, 
   "description": "Date on which lorry started from supplier warehouse", 
-  "print_width": "100px", 
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "LR Date", 
-  "oldfieldname": "lr_date", 
-  "width": "100px", 
   "fieldname": "lr_date", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "LR Date", 
+  "no_copy": 1, 
+  "oldfieldname": "lr_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 0, 
+  "print_width": "100px", 
+  "width": "100px"
  }, 
  {
-  "print_width": "50%", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break5", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "print_width": "50%", 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
   "description": "Following table will show values if items are sub - contracted. These values will be fetched from the master of \"Bill of Materials\" of sub - contracted items.", 
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Raw Material Details", 
   "fieldname": "raw_material_details", 
   "fieldtype": "Section Break", 
-  "permlevel": 1
+  "label": "Raw Material Details", 
+  "oldfieldtype": "Section Break", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "Purchase Receipt Item Supplieds", 
-  "oldfieldname": "pr_raw_material_details", 
-  "permlevel": 1, 
   "fieldname": "pr_raw_material_details", 
   "fieldtype": "Table", 
-  "options": "Purchase Receipt Item Supplied"
+  "label": "Purchase Receipt Item Supplieds", 
+  "no_copy": 1, 
+  "oldfieldname": "pr_raw_material_details", 
+  "oldfieldtype": "Table", 
+  "options": "Purchase Receipt Item Supplied", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "File List", 
   "fieldname": "file_list", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "File List", 
+  "no_copy": 1, 
+  "print_hide": 1
  }, 
  {
   "amend": 1, 
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "report": 1, 
-  "role": "Purchase User", 
-  "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "role": "Purchase User", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "doctype": "DocPerm", 
-  "role": "Supplier", 
-  "report": 1, 
   "permlevel": 0, 
-  "match": "supplier"
+  "role": "Purchase User", 
+  "submit": 1, 
+  "write": 1
  }, 
  {
-  "write": 1, 
-  "role": "All", 
+  "doctype": "DocPerm", 
+  "match": "supplier", 
+  "permlevel": 0, 
+  "role": "Supplier"
+ }, 
+ {
+  "doctype": "DocPerm", 
   "permlevel": 2, 
-  "doctype": "DocPerm"
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Material Manager", 
-  "cancel": 0, 
-  "permlevel": 1
+  "role": "All", 
+  "write": 1
  }, 
  {
   "amend": 1, 
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "report": 1, 
+  "permlevel": 0, 
   "role": "Material Manager", 
-  "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Material User", 
-  "cancel": 0, 
-  "permlevel": 1
+  "submit": 1, 
+  "write": 1
  }, 
  {
   "amend": 1, 
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "report": 1, 
+  "permlevel": 0, 
   "role": "Material User", 
-  "cancel": 1, 
-  "permlevel": 0
+  "submit": 1, 
+  "write": 1
  }
 ]
\ No newline at end of file
diff --git a/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt b/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
index 6d085f1..d015700 100755
--- a/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
+++ b/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
@@ -1,497 +1,474 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:28", 
   "docstatus": 0, 
-  "creation": "2012-12-03 10:25:00", 
+  "modified": "2013-01-22 15:02:34", 
   "modified_by": "Administrator", 
-  "modified": "2013-01-04 13:14:40"
+  "owner": "Administrator"
  }, 
  {
-  "istable": 1, 
   "autoname": "GRND/.#######", 
-  "name": "__common__", 
   "doctype": "DocType", 
-  "module": "Stock"
+  "istable": 1, 
+  "module": "Stock", 
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Purchase Receipt Item", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "name": "Purchase Receipt Item", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Purchase Receipt Item"
  }, 
  {
-  "print_width": "100px", 
-  "permlevel": 0, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Item Code", 
-  "oldfieldname": "item_code", 
-  "width": "100px", 
   "fieldname": "item_code", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Item Code", 
+  "oldfieldname": "item_code", 
+  "oldfieldtype": "Link", 
   "options": "Item", 
-  "in_filter": 1
- }, 
- {
-  "print_hide": 1, 
-  "oldfieldtype": "Data", 
-  "doctype": "DocField", 
-  "label": "Item Name", 
-  "oldfieldname": "item_name", 
-  "fieldname": "item_name", 
-  "fieldtype": "Data", 
-  "search_index": 0, 
+  "print_width": "100px", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 0
- }, 
- {
-  "print_width": "300px", 
-  "oldfieldtype": "Text", 
-  "doctype": "DocField", 
-  "label": "Description", 
-  "oldfieldname": "description", 
-  "width": "300px", 
-  "fieldname": "description", 
-  "fieldtype": "Text", 
-  "reqd": 1, 
-  "permlevel": 0
- }, 
- {
-  "print_hide": 1, 
-  "print_width": "100px", 
-  "default": "0.00", 
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Recd Quantity", 
-  "oldfieldname": "received_qty", 
-  "width": "100px", 
-  "fieldname": "received_qty", 
-  "fieldtype": "Currency", 
-  "reqd": 1, 
-  "permlevel": 0
- }, 
- {
-  "print_width": "100px", 
-  "default": "0.00", 
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Accepted Quantity", 
-  "oldfieldname": "qty", 
-  "width": "100px", 
-  "fieldname": "qty", 
-  "fieldtype": "Currency", 
-  "permlevel": 0
- }, 
- {
-  "print_hide": 1, 
-  "print_width": "100px", 
-  "default": "0.00", 
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Rejected Quantity", 
-  "oldfieldname": "rejected_qty", 
-  "width": "100px", 
-  "fieldname": "rejected_qty", 
-  "fieldtype": "Currency", 
-  "search_index": 0, 
-  "permlevel": 0, 
-  "in_filter": 0
- }, 
- {
-  "print_hide": 1, 
-  "print_width": "100px", 
-  "permlevel": 0, 
-  "oldfieldtype": "Link", 
-  "doctype": "DocField", 
-  "label": "UOM", 
-  "oldfieldname": "uom", 
-  "width": "100px", 
-  "fieldname": "uom", 
-  "fieldtype": "Link", 
-  "reqd": 1, 
-  "options": "UOM"
- }, 
- {
-  "print_hide": 1, 
-  "doctype": "DocField", 
-  "label": "Ref Rate ", 
-  "fieldname": "import_ref_rate", 
-  "fieldtype": "Currency", 
-  "permlevel": 0
- }, 
- {
-  "print_hide": 1, 
-  "doctype": "DocField", 
-  "label": "Discount  %", 
-  "fieldname": "discount_rate", 
-  "fieldtype": "Currency", 
-  "permlevel": 0
- }, 
- {
-  "print_hide": 0, 
-  "print_width": "100px", 
-  "default": "0.00", 
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Rate", 
-  "oldfieldname": "import_rate", 
-  "width": "100px", 
-  "fieldname": "import_rate", 
-  "fieldtype": "Currency", 
-  "permlevel": 0
- }, 
- {
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Amount", 
-  "oldfieldname": "import_amount", 
-  "fieldname": "import_amount", 
-  "fieldtype": "Currency", 
-  "permlevel": 1
- }, 
- {
-  "print_hide": 1, 
-  "doctype": "DocField", 
-  "label": "Ref Rate *", 
-  "fieldname": "purchase_ref_rate", 
-  "fieldtype": "Currency", 
-  "permlevel": 0
- }, 
- {
-  "print_hide": 1, 
-  "print_width": "100px", 
-  "default": "0.00", 
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Rate *(Default Curr.)", 
-  "oldfieldname": "purchase_rate", 
-  "width": "100px", 
-  "fieldname": "purchase_rate", 
-  "fieldtype": "Currency", 
-  "reqd": 1, 
-  "permlevel": 0
- }, 
- {
-  "print_hide": 1, 
-  "print_width": "100px", 
-  "default": "0.00", 
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Amount (Default Curr.)", 
-  "oldfieldname": "amount", 
-  "width": "100px", 
-  "fieldname": "amount", 
-  "fieldtype": "Currency", 
-  "reqd": 0, 
-  "permlevel": 0
- }, 
- {
-  "print_hide": 1, 
-  "print_width": "100px", 
-  "permlevel": 0, 
-  "oldfieldtype": "Link", 
-  "doctype": "DocField", 
-  "label": "Accepted Warehouse", 
-  "oldfieldname": "warehouse", 
-  "width": "100px", 
-  "fieldname": "warehouse", 
-  "fieldtype": "Link", 
-  "hidden": 0, 
-  "options": "Warehouse"
- }, 
- {
-  "print_hide": 1, 
-  "print_width": "100px", 
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Conversion Factor", 
-  "oldfieldname": "conversion_factor", 
-  "width": "100px", 
-  "fieldname": "conversion_factor", 
-  "fieldtype": "Currency", 
-  "reqd": 1, 
-  "permlevel": 0
- }, 
- {
-  "print_hide": 1, 
-  "print_width": "100px", 
-  "oldfieldtype": "Data", 
-  "doctype": "DocField", 
-  "label": "Stock UOM", 
-  "oldfieldname": "stock_uom", 
-  "width": "100px", 
-  "fieldname": "stock_uom", 
-  "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 1
- }, 
- {
-  "print_hide": 0, 
-  "no_copy": 1, 
-  "oldfieldtype": "Text", 
-  "doctype": "DocField", 
-  "label": "Serial No", 
-  "oldfieldname": "serial_no", 
-  "fieldname": "serial_no", 
-  "fieldtype": "Text", 
-  "permlevel": 0, 
-  "report_hide": 0, 
-  "in_filter": 1
- }, 
- {
-  "print_hide": 1, 
-  "doctype": "DocField", 
-  "label": "Rejected Serial No", 
-  "fieldname": "rejected_serial_no", 
-  "fieldtype": "Text", 
-  "permlevel": 0
- }, 
- {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
-  "doctype": "DocField", 
-  "label": "Batch No", 
-  "oldfieldname": "batch_no", 
-  "options": "Batch", 
-  "fieldname": "batch_no", 
-  "fieldtype": "Link", 
-  "permlevel": 0
- }, 
- {
-  "print_hide": 1, 
-  "permlevel": 1, 
-  "print_width": "100px", 
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
-  "doctype": "DocField", 
-  "label": "Rejected Warehouse", 
-  "oldfieldname": "rejected_warehouse", 
-  "width": "100px", 
-  "fieldname": "rejected_warehouse", 
-  "fieldtype": "Link", 
-  "hidden": 1, 
-  "options": "Warehouse"
- }, 
- {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
-  "doctype": "DocField", 
-  "label": "Required By", 
-  "oldfieldname": "schedule_date", 
-  "fieldname": "schedule_date", 
-  "fieldtype": "Date", 
-  "reqd": 0, 
-  "permlevel": 0, 
-  "report_hide": 0
- }, 
- {
-  "print_hide": 1, 
-  "doctype": "DocField", 
-  "label": "Project Name", 
-  "options": "Project", 
-  "fieldname": "project_name", 
-  "fieldtype": "Link", 
-  "permlevel": 0, 
-  "in_filter": 1
- }, 
- {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
-  "doctype": "DocField", 
-  "label": "QA No", 
-  "oldfieldname": "qa_no", 
-  "options": "Quality Inspection", 
-  "fieldname": "qa_no", 
-  "fieldtype": "Link", 
-  "permlevel": 0
- }, 
- {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
-  "doctype": "DocField", 
-  "label": "Brand", 
-  "oldfieldname": "brand", 
-  "options": "Brand", 
-  "fieldname": "brand", 
-  "fieldtype": "Link", 
-  "hidden": 1, 
-  "permlevel": 1
- }, 
- {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
-  "doctype": "DocField", 
-  "label": "Item Group", 
-  "oldfieldname": "item_group", 
-  "permlevel": 1, 
-  "fieldname": "item_group", 
-  "fieldtype": "Link", 
   "search_index": 1, 
-  "hidden": 1, 
-  "options": "Item Group", 
-  "in_filter": 1
- }, 
- {
-  "print_hide": 1, 
-  "print_width": "100px", 
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Stock Qty", 
-  "oldfieldname": "stock_qty", 
-  "width": "100px", 
-  "fieldname": "stock_qty", 
-  "fieldtype": "Currency", 
-  "permlevel": 0
- }, 
- {
-  "print_hide": 1, 
-  "oldfieldtype": "Data", 
-  "doctype": "DocField", 
-  "label": "Prevdoc Doctype", 
-  "oldfieldname": "prevdoc_doctype", 
-  "fieldname": "prevdoc_doctype", 
-  "fieldtype": "Data", 
-  "hidden": 1, 
-  "permlevel": 0
- }, 
- {
-  "print_hide": 1, 
-  "permlevel": 1, 
-  "print_width": "150px", 
-  "no_copy": 0, 
-  "oldfieldtype": "Link", 
-  "doctype": "DocField", 
-  "label": "PO No", 
-  "oldfieldname": "prevdoc_docname", 
-  "width": "150px", 
-  "fieldname": "prevdoc_docname", 
-  "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 0, 
-  "hidden": 0, 
-  "options": "Purchase Order", 
-  "in_filter": 1
- }, 
- {
-  "print_hide": 1, 
-  "oldfieldtype": "Date", 
-  "doctype": "DocField", 
-  "label": "PO Date", 
-  "oldfieldname": "prevdoc_date", 
-  "fieldname": "prevdoc_date", 
-  "fieldtype": "Date", 
-  "hidden": 1, 
-  "permlevel": 1, 
-  "in_filter": 1
- }, 
- {
-  "print_hide": 1, 
-  "print_width": "150px", 
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Raw Materials Supplied Cost", 
-  "oldfieldname": "rm_supp_cost", 
-  "width": "150px", 
-  "fieldname": "rm_supp_cost", 
-  "fieldtype": "Currency", 
-  "hidden": 1, 
-  "permlevel": 2, 
-  "in_filter": 0
- }, 
- {
-  "print_hide": 1, 
-  "print_width": "150px", 
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Item Tax Amount", 
-  "oldfieldname": "item_tax_amount", 
-  "width": "150px", 
-  "fieldname": "item_tax_amount", 
-  "fieldtype": "Currency", 
-  "search_index": 1, 
-  "reqd": 0, 
-  "hidden": 1, 
-  "permlevel": 1
- }, 
- {
-  "print_hide": 1, 
-  "print_width": "150px", 
-  "no_copy": 0, 
-  "oldfieldtype": "Data", 
-  "doctype": "DocField", 
-  "label": "Purchase Order Item No", 
-  "oldfieldname": "prevdoc_detail_docname", 
-  "width": "150px", 
-  "fieldname": "prevdoc_detail_docname", 
-  "fieldtype": "Data", 
-  "search_index": 1, 
-  "hidden": 1, 
-  "permlevel": 1, 
-  "in_filter": 1
- }, 
- {
-  "print_hide": 1, 
-  "permlevel": 1, 
-  "print_width": "100px", 
-  "default": "0.00", 
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Billed Quantity", 
-  "oldfieldname": "billed_qty", 
-  "no_copy": 1, 
-  "fieldname": "billed_qty", 
-  "fieldtype": "Currency", 
   "width": "100px"
  }, 
  {
-  "print_hide": 1, 
-  "print_width": "80px", 
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Valuation Rate", 
-  "oldfieldname": "valuation_rate", 
-  "width": "80px", 
+  "fieldname": "item_name", 
+  "fieldtype": "Data", 
+  "in_filter": 0, 
+  "label": "Item Name", 
+  "oldfieldname": "item_name", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "description", 
+  "fieldtype": "Text", 
+  "label": "Description", 
+  "oldfieldname": "description", 
+  "oldfieldtype": "Text", 
+  "print_width": "300px", 
+  "reqd": 1, 
+  "width": "300px"
+ }, 
+ {
+  "default": "0.00", 
+  "doctype": "DocField", 
+  "fieldname": "received_qty", 
+  "fieldtype": "Float", 
+  "label": "Recd Quantity", 
+  "oldfieldname": "received_qty", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "print_width": "100px", 
+  "reqd": 1, 
+  "width": "100px"
+ }, 
+ {
+  "default": "0.00", 
+  "doctype": "DocField", 
+  "fieldname": "qty", 
+  "fieldtype": "Float", 
+  "label": "Accepted Quantity", 
+  "oldfieldname": "qty", 
+  "oldfieldtype": "Currency", 
+  "print_width": "100px", 
+  "width": "100px"
+ }, 
+ {
+  "default": "0.00", 
+  "doctype": "DocField", 
+  "fieldname": "rejected_qty", 
+  "fieldtype": "Float", 
+  "in_filter": 0, 
+  "label": "Rejected Quantity", 
+  "oldfieldname": "rejected_qty", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "print_width": "100px", 
+  "search_index": 0, 
+  "width": "100px"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "uom", 
+  "fieldtype": "Link", 
+  "label": "UOM", 
+  "oldfieldname": "uom", 
+  "oldfieldtype": "Link", 
+  "options": "UOM", 
+  "print_hide": 1, 
+  "print_width": "100px", 
+  "reqd": 1, 
+  "width": "100px"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "import_ref_rate", 
+  "fieldtype": "Currency", 
+  "label": "Ref Rate ", 
+  "print_hide": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "discount_rate", 
+  "fieldtype": "Float", 
+  "label": "Discount  %", 
+  "print_hide": 1
+ }, 
+ {
+  "default": "0.00", 
+  "doctype": "DocField", 
+  "fieldname": "import_rate", 
+  "fieldtype": "Currency", 
+  "label": "Rate", 
+  "oldfieldname": "import_rate", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 0, 
+  "print_width": "100px", 
+  "width": "100px"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "import_amount", 
+  "fieldtype": "Currency", 
+  "label": "Amount", 
+  "oldfieldname": "import_amount", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "purchase_ref_rate", 
+  "fieldtype": "Currency", 
+  "label": "Ref Rate *", 
+  "print_hide": 1
+ }, 
+ {
+  "default": "0.00", 
+  "doctype": "DocField", 
+  "fieldname": "purchase_rate", 
+  "fieldtype": "Currency", 
+  "label": "Rate *(Default Curr.)", 
+  "oldfieldname": "purchase_rate", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "print_width": "100px", 
+  "reqd": 1, 
+  "width": "100px"
+ }, 
+ {
+  "default": "0.00", 
+  "doctype": "DocField", 
+  "fieldname": "amount", 
+  "fieldtype": "Currency", 
+  "label": "Amount (Default Curr.)", 
+  "oldfieldname": "amount", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "print_width": "100px", 
+  "reqd": 0, 
+  "width": "100px"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "warehouse", 
+  "fieldtype": "Link", 
+  "hidden": 0, 
+  "label": "Accepted Warehouse", 
+  "oldfieldname": "warehouse", 
+  "oldfieldtype": "Link", 
+  "options": "Warehouse", 
+  "print_hide": 1, 
+  "print_width": "100px", 
+  "width": "100px"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "conversion_factor", 
+  "fieldtype": "Float", 
+  "label": "Conversion Factor", 
+  "oldfieldname": "conversion_factor", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "print_width": "100px", 
+  "reqd": 1, 
+  "width": "100px"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "stock_uom", 
+  "fieldtype": "Data", 
+  "label": "Stock UOM", 
+  "oldfieldname": "stock_uom", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "print_width": "100px", 
+  "read_only": 1, 
+  "reqd": 1, 
+  "width": "100px"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "serial_no", 
+  "fieldtype": "Text", 
+  "in_filter": 1, 
+  "label": "Serial No", 
+  "no_copy": 1, 
+  "oldfieldname": "serial_no", 
+  "oldfieldtype": "Text", 
+  "print_hide": 0, 
+  "report_hide": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "rejected_serial_no", 
+  "fieldtype": "Text", 
+  "label": "Rejected Serial No", 
+  "print_hide": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "batch_no", 
+  "fieldtype": "Link", 
+  "label": "Batch No", 
+  "oldfieldname": "batch_no", 
+  "oldfieldtype": "Link", 
+  "options": "Batch", 
+  "print_hide": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "rejected_warehouse", 
+  "fieldtype": "Link", 
+  "hidden": 1, 
+  "label": "Rejected Warehouse", 
+  "no_copy": 1, 
+  "oldfieldname": "rejected_warehouse", 
+  "oldfieldtype": "Link", 
+  "options": "Warehouse", 
+  "print_hide": 1, 
+  "print_width": "100px", 
+  "read_only": 1, 
+  "width": "100px"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "schedule_date", 
+  "fieldtype": "Date", 
+  "label": "Required By", 
+  "no_copy": 1, 
+  "oldfieldname": "schedule_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
+  "report_hide": 0, 
+  "reqd": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "project_name", 
+  "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Project Name", 
+  "options": "Project", 
+  "print_hide": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "qa_no", 
+  "fieldtype": "Link", 
+  "label": "QA No", 
+  "no_copy": 1, 
+  "oldfieldname": "qa_no", 
+  "oldfieldtype": "Link", 
+  "options": "Quality Inspection", 
+  "print_hide": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "brand", 
+  "fieldtype": "Link", 
+  "hidden": 1, 
+  "label": "Brand", 
+  "oldfieldname": "brand", 
+  "oldfieldtype": "Link", 
+  "options": "Brand", 
+  "print_hide": 1, 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "item_group", 
+  "fieldtype": "Link", 
+  "hidden": 1, 
+  "in_filter": 1, 
+  "label": "Item Group", 
+  "oldfieldname": "item_group", 
+  "oldfieldtype": "Link", 
+  "options": "Item Group", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "search_index": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "stock_qty", 
+  "fieldtype": "Float", 
+  "label": "Stock Qty", 
+  "oldfieldname": "stock_qty", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "print_width": "100px", 
+  "width": "100px"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "prevdoc_doctype", 
+  "fieldtype": "Data", 
+  "hidden": 1, 
+  "label": "Prevdoc Doctype", 
+  "oldfieldname": "prevdoc_doctype", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "prevdoc_docname", 
+  "fieldtype": "Link", 
+  "hidden": 0, 
+  "in_filter": 1, 
+  "label": "PO No", 
+  "no_copy": 0, 
+  "oldfieldname": "prevdoc_docname", 
+  "oldfieldtype": "Link", 
+  "options": "Purchase Order", 
+  "print_hide": 1, 
+  "print_width": "150px", 
+  "read_only": 1, 
+  "reqd": 0, 
+  "search_index": 1, 
+  "width": "150px"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "prevdoc_date", 
+  "fieldtype": "Date", 
+  "hidden": 1, 
+  "in_filter": 1, 
+  "label": "PO Date", 
+  "oldfieldname": "prevdoc_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "rm_supp_cost", 
+  "fieldtype": "Currency", 
+  "hidden": 1, 
+  "in_filter": 0, 
+  "label": "Raw Materials Supplied Cost", 
+  "oldfieldname": "rm_supp_cost", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "print_width": "150px", 
+  "read_only": 1, 
+  "width": "150px"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "item_tax_amount", 
+  "fieldtype": "Currency", 
+  "hidden": 1, 
+  "label": "Item Tax Amount", 
+  "no_copy": 1, 
+  "oldfieldname": "item_tax_amount", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "print_width": "150px", 
+  "read_only": 1, 
+  "reqd": 0, 
+  "search_index": 1, 
+  "width": "150px"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "prevdoc_detail_docname", 
+  "fieldtype": "Data", 
+  "hidden": 1, 
+  "in_filter": 1, 
+  "label": "Purchase Order Item No", 
+  "no_copy": 0, 
+  "oldfieldname": "prevdoc_detail_docname", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "print_width": "150px", 
+  "read_only": 1, 
+  "search_index": 1, 
+  "width": "150px"
+ }, 
+ {
+  "default": "0.00", 
+  "doctype": "DocField", 
+  "fieldname": "billed_qty", 
+  "fieldtype": "Float", 
+  "label": "Billed Quantity", 
+  "no_copy": 1, 
+  "oldfieldname": "billed_qty", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "print_width": "100px", 
+  "read_only": 1, 
+  "width": "100px"
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "valuation_rate", 
   "fieldtype": "Currency", 
   "hidden": 1, 
-  "permlevel": 1, 
-  "in_filter": 0
+  "in_filter": 0, 
+  "label": "Valuation Rate", 
+  "no_copy": 1, 
+  "oldfieldname": "valuation_rate", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
+  "print_width": "80px", 
+  "read_only": 1, 
+  "width": "80px"
  }, 
  {
-  "print_hide": 1, 
   "description": "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges", 
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Item Tax Rate", 
-  "oldfieldname": "item_tax_rate", 
   "fieldname": "item_tax_rate", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
   "in_filter": 0, 
-  "permlevel": 1, 
+  "label": "Item Tax Rate", 
+  "oldfieldname": "item_tax_rate", 
+  "oldfieldtype": "Small Text", 
+  "print_hide": 1, 
+  "read_only": 1, 
   "report_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "allow_on_submit": 1, 
-  "oldfieldtype": "Check", 
   "doctype": "DocField", 
-  "label": "Page Break", 
-  "oldfieldname": "page_break", 
   "fieldname": "page_break", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "Page Break", 
+  "oldfieldname": "page_break", 
+  "oldfieldtype": "Check", 
+  "print_hide": 1
  }
 ]
\ No newline at end of file
diff --git a/stock/doctype/sales_and_purchase_return_tool/sales_and_purchase_return_tool.txt b/stock/doctype/sales_and_purchase_return_tool/sales_and_purchase_return_tool.txt
index ae3d83f..27a9191 100644
--- a/stock/doctype/sales_and_purchase_return_tool/sales_and_purchase_return_tool.txt
+++ b/stock/doctype/sales_and_purchase_return_tool/sales_and_purchase_return_tool.txt
@@ -1,240 +1,198 @@
 [
  {
-  "owner": "wasim@webnotestech.com", 
+  "creation": "2013-01-10 16:34:29", 
   "docstatus": 0, 
-  "creation": "2012-09-19 12:24:41", 
+  "modified": "2013-01-22 14:57:23", 
   "modified_by": "Administrator", 
-  "modified": "2012-10-02 10:40:14"
+  "owner": "wasim@webnotestech.com"
  }, 
  {
-  "section_style": "Simple", 
-  "istable": 0, 
-  "module": "Stock", 
   "doctype": "DocType", 
   "issingle": 1, 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "is_transaction_doc": 0, 
-  "server_code_error": " ", 
-  "show_in_menu": 1, 
-  "version": 1, 
-  "menu_index": 1, 
-  "parent_node": "Materials"
+  "istable": 0, 
+  "module": "Stock", 
+  "name": "__common__"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Sales and Purchase Return Tool", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Sales and Purchase Return Tool", 
-  "read": 1, 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
+  "create": 1, 
   "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Sales and Purchase Return Tool", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
+  "permlevel": 0, 
+  "read": 1, 
+  "report": 1, 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "name": "Sales and Purchase Return Tool", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Sales and Purchase Return Tool"
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Return Date", 
-  "oldfieldname": "return_date", 
   "fieldname": "return_date", 
   "fieldtype": "Date", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Return Date", 
+  "no_copy": 1, 
+  "oldfieldname": "return_date", 
+  "oldfieldtype": "Date", 
+  "reqd": 1
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Return Type", 
-  "oldfieldname": "return_type", 
-  "trigger": "Client", 
   "fieldname": "return_type", 
   "fieldtype": "Select", 
-  "reqd": 1, 
+  "label": "Return Type", 
+  "no_copy": 1, 
+  "oldfieldname": "return_type", 
+  "oldfieldtype": "Select", 
   "options": "\nSales Return\nPurchase Return", 
-  "permlevel": 0
+  "reqd": 1
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Delivery Note No", 
-  "oldfieldname": "delivery_note_no", 
-  "options": "Delivery Note", 
   "fieldname": "delivery_note_no", 
   "fieldtype": "Link", 
-  "reqd": 0, 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Delivery Note No", 
+  "no_copy": 1, 
+  "oldfieldname": "delivery_note_no", 
+  "oldfieldtype": "Link", 
+  "options": "Delivery Note", 
+  "reqd": 0
  }, 
  {
   "doctype": "DocField", 
-  "label": "Sales Invoice No", 
-  "permlevel": 0, 
   "fieldname": "sales_invoice_no", 
   "fieldtype": "Link", 
   "hidden": 1, 
+  "label": "Sales Invoice No", 
   "options": "Sales Invoice"
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Purchase Receipt No", 
-  "oldfieldname": "purchase_receipt_no", 
-  "permlevel": 0, 
   "fieldname": "purchase_receipt_no", 
   "fieldtype": "Link", 
   "hidden": 1, 
+  "label": "Purchase Receipt No", 
+  "no_copy": 1, 
+  "oldfieldname": "purchase_receipt_no", 
+  "oldfieldtype": "Link", 
   "options": "Purchase Receipt"
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Customer/Supplier", 
   "fieldname": "cust_supp", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Customer/Supplier", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Cust/Supp Name", 
   "fieldname": "cust_supp_name", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Cust/Supp Name", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Cust/Supp Address", 
   "fieldname": "cust_supp_address", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Cust/Supp Address", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Button", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Get Items", 
-  "trigger": "Client", 
   "fieldname": "get_items", 
   "fieldtype": "Button", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Get Items", 
+  "oldfieldtype": "Button"
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "Sales and Purchase Return Items", 
-  "oldfieldname": "return_details", 
-  "permlevel": 1, 
   "fieldname": "return_details", 
   "fieldtype": "Table", 
   "hidden": 1, 
-  "options": "Sales and Purchase Return Item"
+  "label": "Sales and Purchase Return Items", 
+  "no_copy": 1, 
+  "oldfieldname": "return_details", 
+  "oldfieldtype": "Table", 
+  "options": "Sales and Purchase Return Item", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Make Stock Entry", 
-  "trigger": "Client", 
   "fieldname": "make_stock_entry", 
   "fieldtype": "Button", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Make Stock Entry", 
+  "oldfieldtype": "Button"
  }, 
  {
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Make Excise Invoice", 
-  "trigger": "Client", 
   "fieldname": "make_excise_invoice", 
   "fieldtype": "Button", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Make Excise Invoice", 
+  "oldfieldtype": "Button"
  }, 
  {
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Make Credit Note", 
-  "trigger": "Client", 
   "fieldname": "make_credit_note", 
   "fieldtype": "Button", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Make Credit Note", 
+  "oldfieldtype": "Button"
  }, 
  {
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Make Debit Note", 
-  "trigger": "Client", 
   "fieldname": "make_debit_note", 
   "fieldtype": "Button", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Make Debit Note", 
+  "oldfieldtype": "Button"
  }, 
  {
   "amend": 0, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 1, 
-  "role": "Material User", 
   "cancel": 0, 
-  "permlevel": 0
+  "doctype": "DocPerm", 
+  "role": "Material User"
  }, 
  {
   "amend": 0, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 1, 
-  "role": "Material Manager", 
   "cancel": 0, 
-  "permlevel": 0
+  "doctype": "DocPerm", 
+  "role": "Material Manager"
  }, 
  {
   "amend": 0, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 1, 
-  "role": "System Manager", 
   "cancel": 0, 
-  "permlevel": 0
- }, 
- {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "Accounts Manager", 
-  "permlevel": 0
+  "role": "System Manager"
  }, 
  {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "Accounts User", 
-  "permlevel": 0
+  "role": "Accounts Manager"
  }, 
  {
-  "role": "All", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
+  "doctype": "DocPerm", 
+  "role": "Accounts User"
  }
 ]
\ No newline at end of file
diff --git a/stock/doctype/sales_bom/sales_bom.txt b/stock/doctype/sales_bom/sales_bom.txt
index d7b6225..031f255 100644
--- a/stock/doctype/sales_bom/sales_bom.txt
+++ b/stock/doctype/sales_bom/sales_bom.txt
@@ -1,98 +1,42 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:29", 
   "docstatus": 0, 
-  "creation": "2012-07-03 13:30:44", 
+  "modified": "2013-01-22 14:57:23", 
   "modified_by": "Administrator", 
-  "modified": "2012-07-12 18:00:16"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
-  "is_submittable": 0, 
   "description": "Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. \n\nThe package **Item** will have \"Is Stock Item\" as \"No\" and \"Is Sales Item\" as \"Yes\".\n\nFor Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Sales BOM Item.\n\nNote: BOM = Bill of Materials", 
-  "module": "Stock", 
-  "server_code_error": " ", 
-  "allow_trash": 1, 
-  "document_type": "Master", 
-  "_last_update": "1322549701", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
   "doctype": "DocType", 
-  "show_in_menu": 0, 
-  "version": 1
+  "document_type": "Master", 
+  "is_submittable": 0, 
+  "module": "Stock", 
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Sales BOM", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
+  "amend": 0, 
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Sales BOM", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
   "permlevel": 0, 
-  "parentfield": "fields"
- }, 
- {
-  "name": "__common__", 
-  "parent": "Sales BOM", 
   "read": 1, 
-  "submit": 0, 
-  "doctype": "DocPerm", 
-  "amend": 0, 
-  "parenttype": "DocType", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Sales BOM", 
-  "doctype": "DocType"
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "Material Manager", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
   "report": 1, 
-  "role": "Material Manager", 
-  "cancel": 1, 
-  "permlevel": 0
+  "submit": 0
  }, 
  {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "role": "Material User", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "report": 1, 
-  "role": "Material User", 
-  "cancel": 0, 
-  "permlevel": 0
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "report": 1, 
-  "role": "Sales User", 
-  "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "role": "Sales User", 
-  "cancel": 0, 
-  "permlevel": 1
+  "doctype": "DocType", 
+  "name": "Sales BOM"
  }, 
  {
   "doctype": "DocField", 
@@ -102,33 +46,52 @@
  }, 
  {
   "description": "The Item that represents the Package. This Item must have \"Is Stock Item\" as \"No\" and \"Is Sales Item\" as \"Yes\"", 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Parent Item", 
-  "oldfieldname": "new_item_code", 
   "fieldname": "new_item_code", 
   "fieldtype": "Link", 
-  "reqd": 1, 
-  "options": "Item"
+  "label": "Parent Item", 
+  "no_copy": 1, 
+  "oldfieldname": "new_item_code", 
+  "oldfieldtype": "Data", 
+  "options": "Item", 
+  "reqd": 1
  }, 
  {
   "description": "List items that form the package.", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Package Items", 
   "fieldname": "item_section", 
-  "fieldtype": "Section Break"
+  "fieldtype": "Section Break", 
+  "label": "Package Items"
  }, 
  {
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "Sales BOM Items", 
-  "oldfieldname": "sales_bom_items", 
   "fieldname": "sales_bom_items", 
   "fieldtype": "Table", 
-  "reqd": 1, 
-  "options": "Sales BOM Item"
+  "label": "Sales BOM Items", 
+  "oldfieldname": "sales_bom_items", 
+  "oldfieldtype": "Table", 
+  "options": "Sales BOM Item", 
+  "reqd": 1
+ }, 
+ {
+  "cancel": 1, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "role": "Material Manager", 
+  "write": 1
+ }, 
+ {
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "role": "Material User", 
+  "write": 0
+ }, 
+ {
+  "cancel": 1, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "role": "Sales User", 
+  "write": 1
  }
 ]
\ No newline at end of file
diff --git a/stock/doctype/sales_bom_item/sales_bom_item.txt b/stock/doctype/sales_bom_item/sales_bom_item.txt
index 1e9cb3c..6384b46 100644
--- a/stock/doctype/sales_bom_item/sales_bom_item.txt
+++ b/stock/doctype/sales_bom_item/sales_bom_item.txt
@@ -1,83 +1,74 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:29", 
   "docstatus": 0, 
-  "creation": "2012-07-03 13:30:46", 
+  "modified": "2013-01-22 14:47:59", 
   "modified_by": "Administrator", 
-  "modified": "2012-07-11 18:56:27"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Tray", 
+  "doctype": "DocType", 
   "istable": 1, 
-  "name": "__common__", 
-  "colour": "White:FFF", 
   "module": "Stock", 
-  "show_in_menu": 0, 
-  "version": 1, 
-  "server_code_error": " ", 
-  "doctype": "DocType"
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Sales BOM Item", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "name": "Sales BOM Item", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Sales BOM Item"
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Item", 
-  "oldfieldname": "item_code", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "item_code", 
   "fieldtype": "Link", 
-  "reqd": 1, 
-  "options": "Item"
+  "label": "Item", 
+  "oldfieldname": "item_code", 
+  "oldfieldtype": "Link", 
+  "options": "Item", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "qty", 
+  "fieldtype": "Float", 
   "label": "Qty", 
   "oldfieldname": "qty", 
-  "fieldname": "qty", 
-  "fieldtype": "Currency", 
-  "reqd": 1, 
-  "permlevel": 0
+  "oldfieldtype": "Currency", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Text", 
   "doctype": "DocField", 
-  "label": "Description", 
-  "oldfieldname": "description", 
-  "width": "300px", 
   "fieldname": "description", 
   "fieldtype": "Text", 
-  "permlevel": 0
+  "label": "Description", 
+  "oldfieldname": "description", 
+  "oldfieldtype": "Text", 
+  "width": "300px"
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Rate", 
-  "oldfieldname": "rate", 
   "fieldname": "rate", 
   "fieldtype": "Currency", 
-  "permlevel": 0
+  "label": "Rate", 
+  "oldfieldname": "rate", 
+  "oldfieldtype": "Currency"
  }, 
  {
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "UOM", 
-  "oldfieldname": "uom", 
-  "permlevel": 1, 
   "fieldname": "uom", 
   "fieldtype": "Link", 
+  "label": "UOM", 
+  "oldfieldname": "uom", 
   "oldfieldtype": "Link", 
-  "options": "UOM"
+  "options": "UOM", 
+  "read_only": 1, 
+  "search_index": 0
  }
 ]
\ No newline at end of file
diff --git a/stock/doctype/serial_no/serial_no.js b/stock/doctype/serial_no/serial_no.js
index dad50d3..af62c72 100644
--- a/stock/doctype/serial_no/serial_no.js
+++ b/stock/doctype/serial_no/serial_no.js
@@ -24,7 +24,7 @@
   if(!doc.__islocal) {
     flds = ['item_code', 'warehouse', 'purchase_document_type', 'purchase_document_no', 'purchase_date', 'purchase_time', 'purchase_rate', 'supplier']
     for(i=0;i<flds.length;i++) 
-      set_field_permlevel(flds[i], 1);
+      cur_frm.set_df_property(flds[i], 'read_only', 1);
   }
 }
 
diff --git a/stock/doctype/serial_no/serial_no.txt b/stock/doctype/serial_no/serial_no.txt
index 5018f82..144fcc8 100644
--- a/stock/doctype/serial_no/serial_no.txt
+++ b/stock/doctype/serial_no/serial_no.txt
@@ -1,601 +1,515 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:29", 
   "docstatus": 0, 
-  "creation": "2012-07-03 13:30:43", 
+  "modified": "2013-01-22 14:50:06", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-03 11:39:34"
+  "owner": "Administrator"
  }, 
  {
-  "document_type": "Master", 
-  "description": "Distinct unit of an Item", 
-  "autoname": "field:serial_no", 
+  "allow_attach": 1, 
   "allow_rename": 1, 
-  "name": "__common__", 
-  "module": "Stock", 
+  "autoname": "field:serial_no", 
+  "description": "Distinct unit of an Item", 
   "doctype": "DocType", 
-  "search_fields": "item_code,status", 
-  "allow_attach": 1
+  "document_type": "Master", 
+  "module": "Stock", 
+  "name": "__common__", 
+  "search_fields": "item_code,status"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Serial No", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Serial No", 
-  "read": 1, 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
   "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Serial No", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
+  "permlevel": 0, 
+  "read": 1
  }, 
  {
-  "name": "Serial No", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Serial No"
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Details", 
   "fieldname": "details", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Details", 
+  "oldfieldtype": "Section Break"
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "column_break0", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
-  "permlevel": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
-  "doctype": "DocField", 
-  "label": "Status", 
-  "oldfieldname": "status", 
   "default": "In Store", 
+  "doctype": "DocField", 
   "fieldname": "status", 
   "fieldtype": "Select", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Status", 
+  "no_copy": 1, 
+  "oldfieldname": "status", 
+  "oldfieldtype": "Select", 
   "options": "\nIn Store\nDelivered\nNot in Use\nPurchase Returned", 
-  "in_filter": 1
+  "read_only": 1, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Serial No", 
-  "oldfieldname": "serial_no", 
   "fieldname": "serial_no", 
   "fieldtype": "Data", 
-  "search_index": 1, 
+  "in_filter": 0, 
+  "label": "Serial No", 
+  "no_copy": 1, 
+  "oldfieldname": "serial_no", 
+  "oldfieldtype": "Data", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 0
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Item Code", 
-  "oldfieldname": "item_code", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "item_code", 
   "fieldtype": "Link", 
-  "search_index": 0, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Item Code", 
+  "oldfieldname": "item_code", 
+  "oldfieldtype": "Link", 
   "options": "Item", 
-  "in_filter": 1
+  "reqd": 1, 
+  "search_index": 0
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "column_break1", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Item Name", 
   "fieldname": "item_name", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Item Name", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Text", 
   "doctype": "DocField", 
-  "label": "Description", 
-  "oldfieldname": "description", 
-  "width": "300px", 
   "fieldname": "description", 
   "fieldtype": "Text", 
+  "in_filter": 1, 
+  "label": "Description", 
+  "oldfieldname": "description", 
+  "oldfieldtype": "Text", 
+  "read_only": 1, 
   "search_index": 0, 
-  "permlevel": 1, 
-  "in_filter": 1
+  "width": "300px"
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Item Group", 
-  "oldfieldname": "item_group", 
-  "permlevel": 1, 
   "fieldname": "item_group", 
   "fieldtype": "Link", 
-  "search_index": 0, 
-  "reqd": 1, 
+  "in_filter": 0, 
+  "label": "Item Group", 
+  "oldfieldname": "item_group", 
+  "oldfieldtype": "Link", 
   "options": "Item Group", 
-  "in_filter": 0
+  "read_only": 1, 
+  "reqd": 1, 
+  "search_index": 0
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Brand", 
-  "oldfieldname": "brand", 
-  "permlevel": 1, 
   "fieldname": "brand", 
   "fieldtype": "Link", 
-  "search_index": 0, 
-  "reqd": 0, 
+  "in_filter": 0, 
+  "label": "Brand", 
+  "oldfieldname": "brand", 
+  "oldfieldtype": "Link", 
   "options": "Brand", 
-  "in_filter": 0
+  "read_only": 1, 
+  "reqd": 0, 
+  "search_index": 0
  }, 
  {
   "doctype": "DocField", 
-  "label": "Purchase Details", 
   "fieldname": "purchase_details", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Purchase Details"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break2", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Purchase Document Type", 
-  "permlevel": 0, 
   "fieldname": "purchase_document_type", 
   "fieldtype": "Select", 
+  "label": "Purchase Document Type", 
+  "no_copy": 1, 
   "options": "\nPurchase Receipt\nStock Entry"
  }, 
  {
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Purchase Document No", 
   "fieldname": "purchase_document_no", 
   "fieldtype": "Data", 
   "hidden": 0, 
-  "permlevel": 0
+  "label": "Purchase Document No", 
+  "no_copy": 1
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Purchase Date", 
-  "oldfieldname": "purchase_date", 
-  "trigger": "Client", 
   "fieldname": "purchase_date", 
   "fieldtype": "Date", 
-  "search_index": 0, 
+  "in_filter": 1, 
+  "label": "Purchase Date", 
+  "no_copy": 1, 
+  "oldfieldname": "purchase_date", 
+  "oldfieldtype": "Date", 
   "reqd": 0, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 0
  }, 
  {
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Incoming Time", 
   "fieldname": "purchase_time", 
   "fieldtype": "Time", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Incoming Time", 
+  "no_copy": 1, 
+  "reqd": 1
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Incoming Rate", 
-  "oldfieldname": "purchase_rate", 
   "fieldname": "purchase_rate", 
   "fieldtype": "Currency", 
-  "search_index": 0, 
+  "in_filter": 0, 
+  "label": "Incoming Rate", 
+  "no_copy": 1, 
+  "oldfieldname": "purchase_rate", 
+  "oldfieldtype": "Currency", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 0
+  "search_index": 0
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break3", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Warehouse", 
-  "oldfieldname": "warehouse", 
-  "options": "Warehouse", 
   "fieldname": "warehouse", 
   "fieldtype": "Link", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Warehouse", 
+  "no_copy": 1, 
+  "oldfieldname": "warehouse", 
+  "oldfieldtype": "Link", 
+  "options": "Warehouse", 
   "reqd": 0, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Supplier", 
-  "permlevel": 0, 
   "fieldname": "supplier", 
   "fieldtype": "Link", 
-  "options": "Supplier", 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Supplier", 
+  "no_copy": 1, 
+  "options": "Supplier"
  }, 
  {
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Supplier Name", 
   "fieldname": "supplier_name", 
   "fieldtype": "Data", 
-  "permlevel": 1, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Supplier Name", 
+  "no_copy": 1, 
+  "read_only": 1
  }, 
  {
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Supplier Address", 
   "fieldname": "address_display", 
   "fieldtype": "Text", 
-  "permlevel": 1
+  "label": "Supplier Address", 
+  "no_copy": 1, 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "label": "Delivery Details", 
   "fieldname": "delivery_details", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Delivery Details", 
+  "oldfieldtype": "Column Break"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break4", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Delivery Document Type", 
-  "permlevel": 1, 
   "fieldname": "delivery_document_type", 
   "fieldtype": "Select", 
+  "in_filter": 1, 
+  "label": "Delivery Document Type", 
+  "no_copy": 1, 
   "options": "\nDelivery Note\nSales Invoice\nStock Entry", 
-  "in_filter": 1
+  "read_only": 1
  }, 
  {
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Delivery Document No", 
   "fieldname": "delivery_document_no", 
   "fieldtype": "Data", 
-  "permlevel": 1, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Delivery Document No", 
+  "no_copy": 1, 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Text", 
   "doctype": "DocField", 
-  "label": "Customer Address", 
-  "oldfieldname": "customer_address", 
   "fieldname": "customer_address", 
   "fieldtype": "Text", 
-  "permlevel": 1
+  "label": "Customer Address", 
+  "oldfieldname": "customer_address", 
+  "oldfieldtype": "Text", 
+  "read_only": 1
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Delivery Date", 
-  "oldfieldname": "delivery_date", 
   "fieldname": "delivery_date", 
   "fieldtype": "Date", 
-  "search_index": 0, 
-  "permlevel": 1
+  "label": "Delivery Date", 
+  "no_copy": 1, 
+  "oldfieldname": "delivery_date", 
+  "oldfieldtype": "Date", 
+  "read_only": 1, 
+  "search_index": 0
  }, 
  {
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Delivery Time", 
   "fieldname": "delivery_time", 
   "fieldtype": "Time", 
-  "permlevel": 1
+  "label": "Delivery Time", 
+  "no_copy": 1, 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Is Cancelled", 
-  "oldfieldname": "is_cancelled", 
-  "permlevel": 0, 
   "fieldname": "is_cancelled", 
   "fieldtype": "Select", 
   "hidden": 1, 
+  "label": "Is Cancelled", 
+  "oldfieldname": "is_cancelled", 
+  "oldfieldtype": "Select", 
   "options": "\nYes\nNo", 
   "report_hide": 1
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break5", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Customer", 
-  "oldfieldname": "customer", 
-  "permlevel": 1, 
-  "trigger": "Client", 
   "fieldname": "customer", 
   "fieldtype": "Link", 
-  "search_index": 0, 
+  "in_filter": 1, 
+  "label": "Customer", 
+  "no_copy": 1, 
+  "oldfieldname": "customer", 
+  "oldfieldtype": "Link", 
   "options": "Customer", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "read_only": 1, 
+  "search_index": 0
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Customer Name", 
-  "oldfieldname": "customer_name", 
   "fieldname": "customer_name", 
   "fieldtype": "Data", 
-  "search_index": 0, 
-  "permlevel": 1, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Customer Name", 
+  "no_copy": 1, 
+  "oldfieldname": "customer_name", 
+  "oldfieldtype": "Data", 
+  "read_only": 1, 
+  "search_index": 0
  }, 
  {
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Delivery Address", 
   "fieldname": "delivery_address", 
   "fieldtype": "Text", 
-  "permlevel": 1
+  "label": "Delivery Address", 
+  "no_copy": 1, 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Territory", 
-  "oldfieldname": "territory", 
-  "options": "Territory", 
   "fieldname": "territory", 
   "fieldtype": "Link", 
-  "permlevel": 1, 
-  "report_hide": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Territory", 
+  "no_copy": 1, 
+  "oldfieldname": "territory", 
+  "oldfieldtype": "Link", 
+  "options": "Territory", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "report_hide": 0
  }, 
  {
   "doctype": "DocField", 
-  "label": "Warranty / AMC Details", 
   "fieldname": "warranty_amc_details", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Warranty / AMC Details"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break6", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "no_copy": 0, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Maintenance Status", 
-  "oldfieldname": "maintenance_status", 
-  "width": "150px", 
-  "options": "\nUnder Warranty\nOut of Warranty\nUnder AMC\nOut of AMC", 
   "fieldname": "maintenance_status", 
   "fieldtype": "Select", 
+  "in_filter": 1, 
+  "label": "Maintenance Status", 
+  "no_copy": 0, 
+  "oldfieldname": "maintenance_status", 
+  "oldfieldtype": "Select", 
+  "options": "\nUnder Warranty\nOut of Warranty\nUnder AMC\nOut of AMC", 
   "search_index": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "width": "150px"
  }, 
  {
-  "oldfieldtype": "Int", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Warranty Period (Days)", 
-  "oldfieldname": "warranty_period", 
-  "width": "150px", 
-  "trigger": "Client", 
   "fieldname": "warranty_period", 
   "fieldtype": "Int", 
-  "permlevel": 0
+  "label": "Warranty Period (Days)", 
+  "oldfieldname": "warranty_period", 
+  "oldfieldtype": "Int", 
+  "width": "150px"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break7", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Warranty Expiry Date", 
-  "oldfieldname": "warranty_expiry_date", 
-  "width": "150px", 
   "fieldname": "warranty_expiry_date", 
   "fieldtype": "Date", 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Warranty Expiry Date", 
+  "oldfieldname": "warranty_expiry_date", 
+  "oldfieldtype": "Date", 
+  "width": "150px"
  }, 
  {
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "AMC Expiry Date", 
-  "oldfieldname": "amc_expiry_date", 
-  "width": "150px", 
   "fieldname": "amc_expiry_date", 
   "fieldtype": "Date", 
+  "in_filter": 1, 
+  "label": "AMC Expiry Date", 
+  "oldfieldname": "amc_expiry_date", 
+  "oldfieldtype": "Date", 
   "search_index": 0, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "width": "150px"
  }, 
  {
   "doctype": "DocField", 
-  "label": "More Info", 
   "fieldname": "more_info", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "More Info"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Serial No Details", 
   "fieldname": "serial_no_details", 
   "fieldtype": "Text Editor", 
-  "permlevel": 0
+  "label": "Serial No Details"
  }, 
  {
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "Company", 
-  "permlevel": 0, 
   "fieldname": "company", 
   "fieldtype": "Select", 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Company", 
   "options": "link:Company", 
-  "in_filter": 1
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "Fiscal Year", 
-  "permlevel": 0, 
   "fieldname": "fiscal_year", 
   "fieldtype": "Select", 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Fiscal Year", 
   "options": "link:Fiscal Year", 
-  "in_filter": 1
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Trash Reason", 
-  "oldfieldname": "trash_reason", 
   "fieldname": "trash_reason", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Trash Reason", 
+  "oldfieldname": "trash_reason", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "File List", 
   "fieldname": "file_list", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "File List", 
+  "no_copy": 1, 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "SLE Exists", 
   "fieldname": "sle_exists", 
   "fieldtype": "Check", 
   "hidden": 1, 
-  "permlevel": 1, 
+  "label": "SLE Exists", 
+  "no_copy": 1, 
+  "print_hide": 1, 
+  "read_only": 1, 
   "report_hide": 1
  }, 
  {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Material Manager", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "report": 1, 
-  "role": "Material Manager", 
-  "cancel": 0, 
-  "permlevel": 0
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Material User", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "report": 1, 
-  "role": "Material User", 
-  "cancel": 0, 
-  "permlevel": 0
- }, 
- {
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "cancel": 1, 
-  "role": "System Manager", 
   "report": 1, 
-  "permlevel": 0
+  "role": "Material User", 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "cancel": 1, 
-  "role": "Material Master Manager", 
-  "report": 1, 
-  "permlevel": 0
+  "role": "Sales User"
  }, 
  {
-  "role": "System Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
+  "doctype": "DocPerm", 
+  "role": "Purchase User"
  }, 
  {
-  "role": "Sales Master Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
+  "doctype": "DocPerm", 
+  "role": "Accounts User"
  }
 ]
\ No newline at end of file
diff --git a/stock/doctype/stock_entry/stock_entry.txt b/stock/doctype/stock_entry/stock_entry.txt
index be6eb88..1ebbae6 100644
--- a/stock/doctype/stock_entry/stock_entry.txt
+++ b/stock/doctype/stock_entry/stock_entry.txt
@@ -1,690 +1,603 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-14 16:33:34", 
   "docstatus": 0, 
-  "creation": "2012-12-24 18:32:32", 
+  "modified": "2013-01-22 14:57:24", 
   "modified_by": "Administrator", 
-  "modified": "2013-01-11 11:54:51"
+  "owner": "Administrator"
  }, 
  {
-  "is_submittable": 1, 
-  "in_create": 0, 
-  "allow_print": 0, 
-  "search_fields": "transfer_date, from_warehouse, to_warehouse, purpose, remarks", 
-  "module": "Stock", 
-  "autoname": "naming_series:", 
-  "read_only_onload": 0, 
-  "doctype": "DocType", 
-  "in_dialog": 0, 
   "allow_attach": 0, 
-  "read_only": 0, 
+  "allow_copy": 0, 
   "allow_email": 0, 
-  "hide_heading": 0, 
-  "issingle": 0, 
-  "name": "__common__", 
+  "allow_print": 0, 
   "allow_rename": 0, 
-  "max_attachments": 0, 
+  "autoname": "naming_series:", 
+  "doctype": "DocType", 
+  "hide_heading": 0, 
   "hide_toolbar": 0, 
-  "allow_copy": 0
+  "in_create": 0, 
+  "in_dialog": 0, 
+  "is_submittable": 1, 
+  "issingle": 0, 
+  "max_attachments": 0, 
+  "module": "Stock", 
+  "name": "__common__", 
+  "read_only": 0, 
+  "read_only_onload": 0, 
+  "search_fields": "transfer_date, from_warehouse, to_warehouse, purpose, remarks"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Stock Entry", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Stock Entry", 
-  "read": 1, 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
   "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Stock Entry", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
+  "read": 1, 
+  "report": 1, 
+  "write": 1
  }, 
  {
-  "name": "Stock Entry", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Stock Entry"
  }, 
  {
-  "print_width": "50%", 
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "col1", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "print_width": "50%", 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
-  "description": "To manage multiple series please go to Setup > Manage Series", 
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
   "allow_on_submit": 0, 
+  "description": "To manage multiple series please go to Setup > Manage Series", 
   "doctype": "DocField", 
-  "label": "Series", 
-  "oldfieldname": "naming_series", 
-  "permlevel": 0, 
   "fieldname": "naming_series", 
   "fieldtype": "Select", 
-  "search_index": 0, 
-  "reqd": 1, 
   "hidden": 0, 
+  "in_filter": 0, 
+  "label": "Series", 
+  "no_copy": 1, 
+  "oldfieldname": "naming_series", 
+  "oldfieldtype": "Select", 
   "options": "\nSTE", 
+  "print_hide": 1, 
   "report_hide": 0, 
-  "in_filter": 0
+  "reqd": 1, 
+  "search_index": 0
  }, 
  {
-  "print_hide": 0, 
-  "permlevel": 0, 
-  "no_copy": 0, 
-  "oldfieldtype": "Select", 
   "allow_on_submit": 0, 
-  "doctype": "DocField", 
-  "label": "Purpose", 
-  "oldfieldname": "purpose", 
   "default": "Material Issue", 
+  "doctype": "DocField", 
   "fieldname": "purpose", 
   "fieldtype": "Select", 
-  "search_index": 0, 
-  "reqd": 1, 
   "hidden": 0, 
+  "in_filter": 1, 
+  "label": "Purpose", 
+  "no_copy": 0, 
+  "oldfieldname": "purpose", 
+  "oldfieldtype": "Select", 
   "options": "Material Issue\nMaterial Receipt\nMaterial Transfer\nManufacture/Repack\nSubcontract\nSales Return\nPurchase Return", 
+  "print_hide": 0, 
   "report_hide": 0, 
-  "in_filter": 1
+  "reqd": 1, 
+  "search_index": 0
  }, 
  {
-  "print_width": "50%", 
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "col2", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "print_width": "50%", 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
-  "description": "The date at which current entry will get or has actually executed.", 
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
   "allow_on_submit": 0, 
-  "doctype": "DocField", 
-  "label": "Posting Date", 
-  "oldfieldname": "posting_date", 
   "default": "Today", 
+  "description": "The date at which current entry will get or has actually executed.", 
+  "doctype": "DocField", 
   "fieldname": "posting_date", 
   "fieldtype": "Date", 
-  "search_index": 1, 
-  "reqd": 1, 
   "hidden": 0, 
-  "permlevel": 0, 
+  "in_filter": 1, 
+  "label": "Posting Date", 
+  "no_copy": 1, 
+  "oldfieldname": "posting_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
   "report_hide": 0, 
-  "in_filter": 1
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Time", 
   "allow_on_submit": 0, 
   "doctype": "DocField", 
-  "label": "Posting Time", 
-  "oldfieldname": "posting_time", 
   "fieldname": "posting_time", 
   "fieldtype": "Time", 
-  "search_index": 0, 
-  "reqd": 1, 
   "hidden": 0, 
-  "permlevel": 0, 
+  "in_filter": 0, 
+  "label": "Posting Time", 
+  "no_copy": 1, 
+  "oldfieldname": "posting_time", 
+  "oldfieldtype": "Time", 
+  "print_hide": 1, 
   "report_hide": 0, 
-  "in_filter": 0
+  "reqd": 1, 
+  "search_index": 0
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Items", 
   "fieldname": "items_section", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Items", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
   "allow_on_submit": 0, 
   "doctype": "DocField", 
-  "label": "Default Source Warehouse", 
-  "oldfieldname": "from_warehouse", 
-  "permlevel": 0, 
   "fieldname": "from_warehouse", 
   "fieldtype": "Link", 
-  "search_index": 0, 
-  "reqd": 0, 
   "hidden": 0, 
+  "in_filter": 0, 
+  "label": "Default Source Warehouse", 
+  "no_copy": 1, 
+  "oldfieldname": "from_warehouse", 
+  "oldfieldtype": "Link", 
   "options": "Warehouse", 
+  "print_hide": 1, 
   "report_hide": 0, 
-  "in_filter": 0
+  "reqd": 0, 
+  "search_index": 0
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "cb0", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
   "allow_on_submit": 0, 
   "doctype": "DocField", 
-  "label": "Default Target Warehouse", 
-  "oldfieldname": "to_warehouse", 
-  "permlevel": 0, 
   "fieldname": "to_warehouse", 
   "fieldtype": "Link", 
-  "search_index": 0, 
-  "reqd": 0, 
   "hidden": 0, 
+  "in_filter": 0, 
+  "label": "Default Target Warehouse", 
+  "no_copy": 1, 
+  "oldfieldname": "to_warehouse", 
+  "oldfieldtype": "Link", 
   "options": "Warehouse", 
+  "print_hide": 1, 
   "report_hide": 0, 
-  "in_filter": 0
+  "reqd": 0, 
+  "search_index": 0
  }, 
  {
   "doctype": "DocField", 
-  "permlevel": 0, 
   "fieldname": "sb0", 
   "fieldtype": "Section Break", 
   "options": "Simple"
  }, 
  {
-  "print_hide": 0, 
-  "no_copy": 0, 
-  "oldfieldtype": "Table", 
   "allow_on_submit": 0, 
   "doctype": "DocField", 
-  "label": "MTN Details", 
-  "oldfieldname": "mtn_details", 
-  "permlevel": 0, 
   "fieldname": "mtn_details", 
   "fieldtype": "Table", 
-  "search_index": 0, 
-  "reqd": 0, 
   "hidden": 0, 
+  "in_filter": 0, 
+  "label": "MTN Details", 
+  "no_copy": 0, 
+  "oldfieldname": "mtn_details", 
+  "oldfieldtype": "Table", 
   "options": "Stock Entry Detail", 
+  "print_hide": 0, 
   "report_hide": 0, 
-  "in_filter": 0
+  "reqd": 0, 
+  "search_index": 0
  }, 
  {
-  "print_hide": 1, 
   "description": "Get valuation rate and available stock at source/target warehouse on mentioned posting date-time. If serialized item, please press this button after entering serial nos.", 
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Get Stock and Rate", 
-  "permlevel": 0, 
   "fieldname": "get_stock_and_rate", 
   "fieldtype": "Button", 
-  "options": "get_stock_and_rate"
+  "label": "Get Stock and Rate", 
+  "oldfieldtype": "Button", 
+  "options": "get_stock_and_rate", 
+  "print_hide": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Reference", 
   "fieldname": "sb1", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Reference"
  }, 
  {
-  "print_hide": 1, 
-  "doctype": "DocField", 
-  "no_copy": 0, 
-  "search_index": 1, 
   "allow_on_submit": 0, 
-  "oldfieldtype": "Link", 
-  "label": "Production Order", 
-  "oldfieldname": "production_order", 
-  "permlevel": 0, 
+  "depends_on": "eval:inList([\"Material Transfer\", \"Manufacture/Repack\"], doc.purpose)", 
+  "doctype": "DocField", 
   "fieldname": "production_order", 
   "fieldtype": "Link", 
-  "depends_on": "eval:inList([\"Material Transfer\", \"Manufacture/Repack\"], doc.purpose)", 
-  "reqd": 0, 
   "hidden": 1, 
+  "in_filter": 1, 
+  "label": "Production Order", 
+  "no_copy": 0, 
+  "oldfieldname": "production_order", 
+  "oldfieldtype": "Link", 
   "options": "Production Order", 
+  "print_hide": 1, 
   "report_hide": 0, 
-  "in_filter": 1
+  "reqd": 0, 
+  "search_index": 1
  }, 
  {
   "depends_on": "eval:!inList([\"Sales Return\", \"Purchase Return\"], doc.purpose)", 
   "doctype": "DocField", 
-  "label": "BOM No", 
-  "permlevel": 0, 
   "fieldname": "bom_no", 
   "fieldtype": "Link", 
+  "label": "BOM No", 
   "options": "BOM"
  }, 
  {
-  "print_hide": 1, 
-  "doctype": "DocField", 
-  "description": "As per Stock UOM", 
-  "no_copy": 0, 
-  "search_index": 0, 
   "allow_on_submit": 0, 
-  "oldfieldtype": "Currency", 
-  "label": "Manufacturing Quantity", 
-  "oldfieldname": "fg_completed_qty", 
-  "fieldname": "fg_completed_qty", 
-  "fieldtype": "Currency", 
   "depends_on": "eval:!inList([\"Sales Return\", \"Purchase Return\"], doc.purpose)", 
-  "reqd": 0, 
+  "description": "As per Stock UOM", 
+  "doctype": "DocField", 
+  "fieldname": "fg_completed_qty", 
+  "fieldtype": "Float", 
   "hidden": 0, 
-  "permlevel": 0, 
+  "in_filter": 0, 
+  "label": "Manufacturing Quantity", 
+  "no_copy": 0, 
+  "oldfieldname": "fg_completed_qty", 
+  "oldfieldtype": "Currency", 
+  "print_hide": 1, 
   "report_hide": 0, 
-  "in_filter": 0
+  "reqd": 0, 
+  "search_index": 0
  }, 
  {
-  "print_hide": 1, 
-  "doctype": "DocField", 
-  "no_copy": 1, 
-  "search_index": 1, 
   "allow_on_submit": 0, 
-  "oldfieldtype": "Link", 
-  "label": "Delivery Note No", 
-  "oldfieldname": "delivery_note_no", 
-  "permlevel": 0, 
+  "depends_on": "eval:doc.purpose==\"Sales Return\"", 
+  "doctype": "DocField", 
   "fieldname": "delivery_note_no", 
   "fieldtype": "Link", 
-  "depends_on": "eval:doc.purpose==\"Sales Return\"", 
-  "reqd": 0, 
   "hidden": 1, 
+  "in_filter": 0, 
+  "label": "Delivery Note No", 
+  "no_copy": 1, 
+  "oldfieldname": "delivery_note_no", 
+  "oldfieldtype": "Link", 
   "options": "Delivery Note", 
+  "print_hide": 1, 
   "report_hide": 0, 
-  "in_filter": 0
+  "reqd": 0, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "doctype": "DocField", 
-  "no_copy": 1, 
-  "search_index": 1, 
   "allow_on_submit": 0, 
-  "oldfieldtype": "Link", 
-  "label": "Purchase Receipt No", 
-  "oldfieldname": "purchase_receipt_no", 
-  "permlevel": 0, 
+  "depends_on": "eval:doc.purpose==\"Purchase Return\"", 
+  "doctype": "DocField", 
   "fieldname": "purchase_receipt_no", 
   "fieldtype": "Link", 
-  "depends_on": "eval:doc.purpose==\"Purchase Return\"", 
-  "reqd": 0, 
   "hidden": 1, 
+  "in_filter": 0, 
+  "label": "Purchase Receipt No", 
+  "no_copy": 1, 
+  "oldfieldname": "purchase_receipt_no", 
+  "oldfieldtype": "Link", 
   "options": "Purchase Receipt", 
+  "print_hide": 1, 
   "report_hide": 0, 
-  "in_filter": 0
+  "reqd": 0, 
+  "search_index": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "cb1", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
-  "description": "If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.", 
   "default": "1", 
   "depends_on": "eval:!inList([\"Sales Return\", \"Purchase Return\"], doc.purpose)", 
+  "description": "If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.", 
   "doctype": "DocField", 
-  "label": "Use Multi-Level BOM", 
   "fieldname": "use_multi_level_bom", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "Use Multi-Level BOM"
  }, 
  {
-  "print_hide": 1, 
-  "doctype": "DocField", 
-  "no_copy": 0, 
-  "search_index": 0, 
   "allow_on_submit": 0, 
-  "oldfieldtype": "Button", 
-  "label": "Get Items", 
+  "depends_on": "eval:!inList([\"Sales Return\", \"Purchase Return\"], doc.purpose)", 
+  "doctype": "DocField", 
   "fieldname": "get_items", 
   "fieldtype": "Button", 
-  "depends_on": "eval:!inList([\"Sales Return\", \"Purchase Return\"], doc.purpose)", 
-  "reqd": 0, 
   "hidden": 0, 
-  "permlevel": 0, 
+  "in_filter": 0, 
+  "label": "Get Items", 
+  "no_copy": 0, 
+  "oldfieldtype": "Button", 
+  "print_hide": 1, 
   "report_hide": 0, 
-  "in_filter": 0
+  "reqd": 0, 
+  "search_index": 0
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "depends_on": "eval:doc.purpose==\"Sales Return\"", 
   "doctype": "DocField", 
-  "label": "Sales Invoice No", 
-  "permlevel": 0, 
   "fieldname": "sales_invoice_no", 
   "fieldtype": "Link", 
   "hidden": 1, 
-  "options": "Sales Invoice"
+  "label": "Sales Invoice No", 
+  "no_copy": 1, 
+  "options": "Sales Invoice", 
+  "print_hide": 1
  }, 
  {
   "depends_on": "eval:(doc.purpose==\"Sales Return\" || doc.purpose==\"Purchase Return\")", 
   "doctype": "DocField", 
-  "label": "Contact Info", 
   "fieldname": "contact_section", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Contact Info"
  }, 
  {
-  "print_hide": 1, 
-  "doctype": "DocField", 
-  "no_copy": 1, 
-  "search_index": 0, 
   "allow_on_submit": 0, 
-  "oldfieldtype": "Link", 
-  "label": "Supplier", 
-  "oldfieldname": "supplier", 
-  "permlevel": 0, 
+  "depends_on": "eval:doc.purpose==\"Purchase Return\"", 
+  "doctype": "DocField", 
   "fieldname": "supplier", 
   "fieldtype": "Link", 
-  "depends_on": "eval:doc.purpose==\"Purchase Return\"", 
-  "reqd": 0, 
   "hidden": 0, 
+  "in_filter": 0, 
+  "label": "Supplier", 
+  "no_copy": 1, 
+  "oldfieldname": "supplier", 
+  "oldfieldtype": "Link", 
   "options": "Supplier", 
+  "print_hide": 1, 
   "report_hide": 0, 
-  "in_filter": 0
+  "reqd": 0, 
+  "search_index": 0
  }, 
  {
-  "print_hide": 0, 
-  "doctype": "DocField", 
-  "no_copy": 1, 
-  "search_index": 0, 
   "allow_on_submit": 0, 
-  "oldfieldtype": "Data", 
-  "label": "Supplier Name", 
-  "oldfieldname": "supplier_name", 
+  "depends_on": "eval:doc.purpose==\"Purchase Return\"", 
+  "doctype": "DocField", 
   "fieldname": "supplier_name", 
   "fieldtype": "Data", 
-  "depends_on": "eval:doc.purpose==\"Purchase Return\"", 
-  "reqd": 0, 
   "hidden": 0, 
-  "permlevel": 1, 
+  "in_filter": 0, 
+  "label": "Supplier Name", 
+  "no_copy": 1, 
+  "oldfieldname": "supplier_name", 
+  "oldfieldtype": "Data", 
+  "print_hide": 0, 
+  "read_only": 1, 
   "report_hide": 0, 
-  "in_filter": 0
+  "reqd": 0, 
+  "search_index": 0
  }, 
  {
-  "print_hide": 0, 
-  "doctype": "DocField", 
-  "no_copy": 1, 
-  "search_index": 0, 
   "allow_on_submit": 0, 
-  "oldfieldtype": "Small Text", 
-  "label": "Supplier Address", 
-  "oldfieldname": "supplier_address", 
+  "depends_on": "eval:doc.purpose==\"Purchase Return\"", 
+  "doctype": "DocField", 
   "fieldname": "supplier_address", 
   "fieldtype": "Small Text", 
-  "depends_on": "eval:doc.purpose==\"Purchase Return\"", 
-  "reqd": 0, 
   "hidden": 0, 
-  "permlevel": 0, 
+  "in_filter": 0, 
+  "label": "Supplier Address", 
+  "no_copy": 1, 
+  "oldfieldname": "supplier_address", 
+  "oldfieldtype": "Small Text", 
+  "print_hide": 0, 
   "report_hide": 0, 
-  "in_filter": 0
+  "reqd": 0, 
+  "search_index": 0
  }, 
  {
-  "print_hide": 1, 
-  "doctype": "DocField", 
-  "no_copy": 1, 
-  "search_index": 0, 
   "allow_on_submit": 0, 
-  "oldfieldtype": "Link", 
-  "label": "Customer", 
-  "oldfieldname": "customer", 
-  "permlevel": 0, 
+  "depends_on": "eval:doc.purpose==\"Sales Return\"", 
+  "doctype": "DocField", 
   "fieldname": "customer", 
   "fieldtype": "Link", 
-  "depends_on": "eval:doc.purpose==\"Sales Return\"", 
-  "reqd": 0, 
   "hidden": 0, 
+  "in_filter": 0, 
+  "label": "Customer", 
+  "no_copy": 1, 
+  "oldfieldname": "customer", 
+  "oldfieldtype": "Link", 
   "options": "Customer", 
+  "print_hide": 1, 
   "report_hide": 0, 
-  "in_filter": 0
+  "reqd": 0, 
+  "search_index": 0
  }, 
  {
-  "print_hide": 0, 
-  "doctype": "DocField", 
-  "no_copy": 1, 
-  "search_index": 0, 
   "allow_on_submit": 0, 
-  "oldfieldtype": "Data", 
-  "label": "Customer Name", 
-  "oldfieldname": "customer_name", 
+  "depends_on": "eval:doc.purpose==\"Sales Return\"", 
+  "doctype": "DocField", 
   "fieldname": "customer_name", 
   "fieldtype": "Data", 
-  "depends_on": "eval:doc.purpose==\"Sales Return\"", 
-  "reqd": 0, 
   "hidden": 0, 
-  "permlevel": 1, 
+  "in_filter": 0, 
+  "label": "Customer Name", 
+  "no_copy": 1, 
+  "oldfieldname": "customer_name", 
+  "oldfieldtype": "Data", 
+  "print_hide": 0, 
+  "read_only": 1, 
   "report_hide": 0, 
-  "in_filter": 0
+  "reqd": 0, 
+  "search_index": 0
  }, 
  {
-  "print_hide": 0, 
-  "doctype": "DocField", 
-  "no_copy": 1, 
-  "search_index": 0, 
   "allow_on_submit": 0, 
-  "oldfieldtype": "Small Text", 
-  "label": "Customer Address", 
-  "oldfieldname": "customer_address", 
+  "depends_on": "eval:doc.purpose==\"Sales Return\"", 
+  "doctype": "DocField", 
   "fieldname": "customer_address", 
   "fieldtype": "Small Text", 
-  "depends_on": "eval:doc.purpose==\"Sales Return\"", 
-  "reqd": 0, 
   "hidden": 0, 
-  "permlevel": 0, 
+  "in_filter": 0, 
+  "label": "Customer Address", 
+  "no_copy": 1, 
+  "oldfieldname": "customer_address", 
+  "oldfieldtype": "Small Text", 
+  "print_hide": 0, 
   "report_hide": 0, 
-  "in_filter": 0
+  "reqd": 0, 
+  "search_index": 0
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "More Info", 
   "fieldname": "more_info", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "More Info", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "print_width": "50%", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "col4", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "print_width": "50%", 
+  "width": "50%"
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Project Name", 
-  "oldfieldname": "project_name", 
-  "permlevel": 0, 
   "fieldname": "project_name", 
   "fieldtype": "Link", 
-  "options": "Project", 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Project Name", 
+  "oldfieldname": "project_name", 
+  "oldfieldtype": "Link", 
+  "options": "Project"
  }, 
  {
-  "print_hide": 0, 
-  "no_copy": 0, 
-  "oldfieldtype": "Link", 
   "allow_on_submit": 0, 
   "doctype": "DocField", 
-  "label": "Select Print Heading", 
-  "oldfieldname": "select_print_heading", 
-  "permlevel": 0, 
   "fieldname": "select_print_heading", 
   "fieldtype": "Link", 
-  "search_index": 0, 
-  "reqd": 0, 
   "hidden": 0, 
+  "in_filter": 0, 
+  "label": "Select Print Heading", 
+  "no_copy": 0, 
+  "oldfieldname": "select_print_heading", 
+  "oldfieldtype": "Link", 
   "options": "Print Heading", 
+  "print_hide": 0, 
   "report_hide": 0, 
-  "in_filter": 0
+  "reqd": 0, 
+  "search_index": 0
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 0, 
-  "oldfieldtype": "Link", 
   "allow_on_submit": 0, 
   "doctype": "DocField", 
-  "label": "Company", 
-  "oldfieldname": "company", 
-  "permlevel": 0, 
   "fieldname": "company", 
   "fieldtype": "Link", 
-  "search_index": 0, 
-  "reqd": 1, 
   "hidden": 0, 
+  "in_filter": 1, 
+  "label": "Company", 
+  "no_copy": 0, 
+  "oldfieldname": "company", 
+  "oldfieldtype": "Link", 
   "options": "Company", 
+  "print_hide": 1, 
   "report_hide": 0, 
-  "in_filter": 1
+  "reqd": 1, 
+  "search_index": 0
  }, 
  {
-  "print_width": "50%", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "col5", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "print_width": "50%", 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
   "allow_on_submit": 0, 
   "doctype": "DocField", 
-  "label": "Amended From", 
-  "oldfieldname": "amended_from", 
-  "permlevel": 1, 
   "fieldname": "amended_from", 
   "fieldtype": "Link", 
-  "search_index": 0, 
-  "reqd": 0, 
   "hidden": 0, 
+  "in_filter": 0, 
+  "label": "Amended From", 
+  "no_copy": 1, 
+  "oldfieldname": "amended_from", 
+  "oldfieldtype": "Link", 
   "options": "Stock Entry", 
+  "print_hide": 1, 
+  "read_only": 1, 
   "report_hide": 0, 
-  "in_filter": 0
+  "reqd": 0, 
+  "search_index": 0
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Text", 
   "allow_on_submit": 0, 
   "doctype": "DocField", 
-  "label": "Remarks", 
-  "oldfieldname": "remarks", 
   "fieldname": "remarks", 
   "fieldtype": "Text", 
-  "search_index": 0, 
-  "reqd": 0, 
   "hidden": 0, 
-  "permlevel": 0, 
+  "in_filter": 0, 
+  "label": "Remarks", 
+  "no_copy": 1, 
+  "oldfieldname": "remarks", 
+  "oldfieldtype": "Text", 
+  "print_hide": 1, 
   "report_hide": 0, 
-  "in_filter": 0
+  "reqd": 0, 
+  "search_index": 0
  }, 
  {
   "amend": 1, 
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "report": 1, 
+  "permlevel": 0, 
   "role": "Material User", 
-  "cancel": 1, 
-  "permlevel": 0
+  "submit": 1
  }, 
  {
-  "amend": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Material User", 
-  "cancel": 0, 
-  "permlevel": 1
+  "permlevel": 2, 
+  "role": "Manufacturing User"
  }, 
  {
-  "amend": 0, 
-  "create": 0, 
   "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 1, 
-  "role": "Manufacturing User", 
-  "cancel": 0, 
-  "permlevel": 2
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 1, 
-  "role": "Manufacturing Manager", 
-  "cancel": 0, 
-  "permlevel": 2
+  "permlevel": 2, 
+  "role": "Manufacturing Manager"
  }, 
  {
   "amend": 1, 
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "report": 1, 
+  "permlevel": 0, 
   "role": "Manufacturing User", 
-  "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "role": "Manufacturing User", 
-  "cancel": 0, 
-  "permlevel": 1
+  "submit": 1
  }, 
  {
   "amend": 1, 
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "report": 1, 
+  "permlevel": 0, 
   "role": "Manufacturing Manager", 
+  "submit": 1
+ }, 
+ {
+  "amend": 1, 
   "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
+  "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 0, 
-  "role": "Manufacturing Manager", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
+  "permlevel": 0, 
   "role": "Material Manager", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "amend": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "report": 1, 
-  "role": "Material Manager", 
-  "cancel": 1, 
-  "permlevel": 0
+  "submit": 1
  }
 ]
\ No newline at end of file
diff --git a/stock/doctype/stock_entry_detail/stock_entry_detail.txt b/stock/doctype/stock_entry_detail/stock_entry_detail.txt
index a6b9521..8d2779a 100644
--- a/stock/doctype/stock_entry_detail/stock_entry_detail.txt
+++ b/stock/doctype/stock_entry_detail/stock_entry_detail.txt
@@ -1,197 +1,197 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-14 16:33:34", 
   "docstatus": 0, 
-  "creation": "2012-12-20 14:31:18", 
+  "modified": "2013-01-22 14:50:07", 
   "modified_by": "Administrator", 
-  "modified": "2013-01-11 11:59:10"
+  "owner": "Administrator"
  }, 
  {
-  "istable": 1, 
   "autoname": "MTND/.######", 
-  "name": "__common__", 
   "doctype": "DocType", 
-  "module": "Stock"
+  "istable": 1, 
+  "module": "Stock", 
+  "name": "__common__"
  }, 
  {
-  "read_only": 0, 
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Stock Entry Detail", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "name": "Stock Entry Detail", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Stock Entry Detail"
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Source Warehouse", 
-  "oldfieldname": "s_warehouse", 
-  "options": "Warehouse", 
   "fieldname": "s_warehouse", 
   "fieldtype": "Link", 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Source Warehouse", 
+  "no_copy": 1, 
+  "oldfieldname": "s_warehouse", 
+  "oldfieldtype": "Link", 
+  "options": "Warehouse", 
+  "read_only": 0
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Target Warehouse", 
-  "oldfieldname": "t_warehouse", 
-  "options": "Warehouse", 
   "fieldname": "t_warehouse", 
   "fieldtype": "Link", 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Target Warehouse", 
+  "no_copy": 1, 
+  "oldfieldname": "t_warehouse", 
+  "oldfieldtype": "Link", 
+  "options": "Warehouse", 
+  "read_only": 0
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Item Code", 
-  "oldfieldname": "item_code", 
-  "permlevel": 0, 
   "fieldname": "item_code", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Item Code", 
+  "oldfieldname": "item_code", 
+  "oldfieldtype": "Link", 
   "options": "Item", 
-  "in_filter": 1
+  "read_only": 0, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "print_width": "300px", 
-  "oldfieldtype": "Text", 
   "doctype": "DocField", 
-  "label": "Description", 
-  "oldfieldname": "description", 
-  "width": "300px", 
   "fieldname": "description", 
   "fieldtype": "Text", 
-  "permlevel": 0
+  "label": "Description", 
+  "oldfieldname": "description", 
+  "oldfieldtype": "Text", 
+  "print_width": "300px", 
+  "read_only": 0, 
+  "width": "300px"
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "qty", 
+  "fieldtype": "Float", 
   "label": "Qty", 
   "oldfieldname": "qty", 
-  "fieldname": "qty", 
-  "fieldtype": "Currency", 
-  "reqd": 1, 
-  "permlevel": 0
+  "oldfieldtype": "Currency", 
+  "read_only": 0, 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "UOM", 
-  "oldfieldname": "uom", 
-  "options": "UOM", 
   "fieldname": "uom", 
   "fieldtype": "Link", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "UOM", 
+  "oldfieldname": "uom", 
+  "oldfieldtype": "Link", 
+  "options": "UOM", 
+  "read_only": 0, 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Valuation Rate", 
-  "oldfieldname": "incoming_rate", 
   "fieldname": "incoming_rate", 
   "fieldtype": "Currency", 
-  "reqd": 0, 
-  "permlevel": 0
+  "label": "Valuation Rate", 
+  "oldfieldname": "incoming_rate", 
+  "oldfieldtype": "Currency", 
+  "read_only": 0, 
+  "reqd": 0
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
-  "label": "Amount", 
-  "oldfieldname": "amount", 
   "fieldname": "amount", 
   "fieldtype": "Currency", 
-  "permlevel": 1
+  "label": "Amount", 
+  "oldfieldname": "amount", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Text", 
   "doctype": "DocField", 
-  "label": "Serial No", 
-  "oldfieldname": "serial_no", 
   "fieldname": "serial_no", 
   "fieldtype": "Text", 
-  "reqd": 0, 
-  "permlevel": 0
+  "label": "Serial No", 
+  "no_copy": 1, 
+  "oldfieldname": "serial_no", 
+  "oldfieldtype": "Text", 
+  "read_only": 0, 
+  "reqd": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Batch No", 
-  "oldfieldname": "batch_no", 
-  "options": "Batch", 
   "fieldname": "batch_no", 
   "fieldtype": "Link", 
-  "permlevel": 0
- }, 
- {
+  "label": "Batch No", 
+  "oldfieldname": "batch_no", 
+  "oldfieldtype": "Link", 
+  "options": "Batch", 
   "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Read Only", 
-  "doctype": "DocField", 
-  "label": "Actual Qty (at source/target)", 
-  "oldfieldname": "actual_qty", 
-  "fieldname": "actual_qty", 
-  "fieldtype": "Read Only", 
-  "search_index": 1, 
-  "reqd": 0, 
-  "permlevel": 1, 
-  "in_filter": 1
+  "read_only": 0
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "actual_qty", 
+  "fieldtype": "Float", 
+  "in_filter": 1, 
+  "label": "Actual Qty (at source/target)", 
+  "no_copy": 1, 
+  "oldfieldname": "actual_qty", 
+  "oldfieldtype": "Read Only", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "reqd": 0, 
+  "search_index": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "conversion_factor", 
+  "fieldtype": "Float", 
   "label": "Conversion Factor", 
   "oldfieldname": "conversion_factor", 
-  "fieldname": "conversion_factor", 
-  "fieldtype": "Currency", 
-  "reqd": 1, 
-  "permlevel": 1
+  "oldfieldtype": "Currency", 
+  "read_only": 1, 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "transfer_qty", 
+  "fieldtype": "Float", 
   "label": "Qty as per Stock UOM", 
   "oldfieldname": "transfer_qty", 
-  "fieldname": "transfer_qty", 
-  "fieldtype": "Currency", 
-  "reqd": 1, 
-  "permlevel": 1
+  "oldfieldtype": "Currency", 
+  "read_only": 1, 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Stock UOM", 
-  "oldfieldname": "stock_uom", 
-  "permlevel": 1, 
   "fieldname": "stock_uom", 
   "fieldtype": "Link", 
-  "search_index": 0, 
-  "reqd": 1, 
+  "in_filter": 0, 
+  "label": "Stock UOM", 
+  "oldfieldname": "stock_uom", 
+  "oldfieldtype": "Link", 
   "options": "UOM", 
-  "in_filter": 0
+  "read_only": 1, 
+  "reqd": 1, 
+  "search_index": 0
  }, 
  {
-  "print_hide": 1, 
   "description": "BOM No. for a Finished Good Item", 
-  "no_copy": 0, 
   "doctype": "DocField", 
-  "label": "BOM No", 
-  "options": "BOM", 
   "fieldname": "bom_no", 
   "fieldtype": "Link", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "BOM No", 
+  "no_copy": 0, 
+  "options": "BOM", 
+  "print_hide": 1, 
+  "read_only": 0
  }
 ]
\ No newline at end of file
diff --git a/stock/doctype/stock_ledger/stock_ledger.txt b/stock/doctype/stock_ledger/stock_ledger.txt
index 31b35e3..1da37c6 100644
--- a/stock/doctype/stock_ledger/stock_ledger.txt
+++ b/stock/doctype/stock_ledger/stock_ledger.txt
@@ -1,44 +1,22 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:30", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:36:38", 
+  "modified": "2013-01-22 14:57:24", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:36:38"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
-  "in_create": 1, 
-  "module": "Stock", 
-  "server_code_error": " ", 
-  "read_only": 1, 
-  "issingle": 1, 
-  "name": "__common__", 
-  "colour": "White:FFF", 
   "doctype": "DocType", 
-  "show_in_menu": 0, 
-  "version": 10, 
-  "hide_toolbar": 1
- }, 
- {
+  "hide_toolbar": 1, 
+  "in_create": 1, 
+  "issingle": 1, 
+  "module": "Stock", 
   "name": "__common__", 
-  "parent": "Stock Ledger", 
-  "read": 1, 
-  "doctype": "DocPerm", 
-  "parenttype": "DocType", 
-  "permlevel": 1, 
-  "parentfield": "permissions"
+  "read_only": 1
  }, 
  {
-  "name": "Stock Ledger", 
-  "doctype": "DocType"
- }, 
- {
-  "role": "All", 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "Material User", 
-  "doctype": "DocPerm"
+  "doctype": "DocType", 
+  "name": "Stock Ledger"
  }
 ]
\ No newline at end of file
diff --git a/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt b/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt
index f56f63a..6d308c9 100644
--- a/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt
+++ b/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt
@@ -1,291 +1,278 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-14 16:33:26", 
   "docstatus": 0, 
-  "creation": "2012-05-03 17:35:06", 
+  "modified": "2013-01-22 14:57:24", 
   "modified_by": "Administrator", 
-  "modified": "2013-01-07 14:15:47"
+  "owner": "Administrator"
  }, 
  {
-  "in_create": 1, 
-  "allow_print": 1, 
-  "module": "Stock", 
-  "document_type": "Other", 
+  "allow_copy": 1, 
   "allow_email": 1, 
+  "allow_print": 1, 
   "autoname": "SLE/.########", 
-  "name": "__common__", 
   "doctype": "DocType", 
+  "document_type": "Other", 
   "hide_toolbar": 1, 
-  "allow_copy": 1
+  "in_create": 1, 
+  "module": "Stock", 
+  "name": "__common__"
  }, 
  {
-  "read_only": 1, 
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Stock Ledger Entry", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
   "permlevel": 0, 
-  "parentfield": "fields"
+  "read_only": 1
  }, 
  {
-  "name": "__common__", 
-  "parent": "Stock Ledger Entry", 
-  "read": 1, 
+  "amend": 0, 
+  "cancel": 0, 
+  "create": 0, 
   "doctype": "DocPerm", 
-  "report": 1, 
+  "name": "__common__", 
+  "parent": "Stock Ledger Entry", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
   "permlevel": 0, 
-  "parentfield": "permissions"
+  "read": 1, 
+  "report": 1, 
+  "role": "Material User", 
+  "submit": 0, 
+  "write": 0
  }, 
  {
-  "name": "Stock Ledger Entry", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Stock Ledger Entry"
  }, 
  {
-  "print_width": "100px", 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Item Code", 
-  "oldfieldname": "item_code", 
-  "width": "100px", 
   "fieldname": "item_code", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 0, 
+  "in_filter": 1, 
+  "label": "Item Code", 
+  "oldfieldname": "item_code", 
+  "oldfieldtype": "Link", 
   "options": "Item", 
-  "in_filter": 1
+  "print_width": "100px", 
+  "reqd": 0, 
+  "search_index": 1, 
+  "width": "100px"
  }, 
  {
-  "print_width": "100px", 
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "Serial No", 
-  "width": "100px", 
   "fieldname": "serial_no", 
   "fieldtype": "Text", 
-  "in_filter": 0
+  "in_filter": 0, 
+  "label": "Serial No", 
+  "print_width": "100px", 
+  "search_index": 0, 
+  "width": "100px"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
+  "fieldname": "batch_no", 
+  "fieldtype": "Data", 
   "label": "Batch No", 
   "oldfieldname": "batch_no", 
-  "fieldname": "batch_no", 
-  "fieldtype": "Data"
+  "oldfieldtype": "Data"
  }, 
  {
-  "print_width": "100px", 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Warehouse", 
-  "oldfieldname": "warehouse", 
-  "width": "100px", 
   "fieldname": "warehouse", 
   "fieldtype": "Link", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Warehouse", 
+  "oldfieldname": "warehouse", 
+  "oldfieldtype": "Link", 
   "options": "Warehouse", 
-  "in_filter": 1
+  "print_width": "100px", 
+  "search_index": 1, 
+  "width": "100px"
  }, 
  {
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Warehouse Type", 
-  "oldfieldname": "warehouse_type", 
   "fieldname": "warehouse_type", 
   "fieldtype": "Select", 
-  "search_index": 0, 
+  "in_filter": 1, 
+  "label": "Warehouse Type", 
+  "oldfieldname": "warehouse_type", 
+  "oldfieldtype": "Select", 
   "options": "link:Warehouse Type", 
-  "in_filter": 1
+  "search_index": 0
  }, 
  {
   "description": "The date at which current entry will get or has actually executed.", 
-  "print_width": "100px", 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Posting Date", 
-  "oldfieldname": "posting_date", 
-  "width": "100px", 
   "fieldname": "posting_date", 
   "fieldtype": "Date", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Posting Date", 
+  "oldfieldname": "posting_date", 
+  "oldfieldtype": "Date", 
+  "print_width": "100px", 
   "reqd": 0, 
-  "in_filter": 1
+  "search_index": 1, 
+  "width": "100px"
  }, 
  {
-  "print_width": "100px", 
-  "oldfieldtype": "Time", 
   "doctype": "DocField", 
-  "label": "Posting Time", 
-  "oldfieldname": "posting_time", 
-  "width": "100px", 
   "fieldname": "posting_time", 
   "fieldtype": "Time", 
+  "in_filter": 0, 
+  "label": "Posting Time", 
+  "oldfieldname": "posting_time", 
+  "oldfieldtype": "Time", 
+  "print_width": "100px", 
   "search_index": 0, 
-  "in_filter": 0
+  "width": "100px"
  }, 
  {
-  "print_width": "150px", 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Voucher Type", 
-  "oldfieldname": "voucher_type", 
-  "width": "150px", 
   "fieldname": "voucher_type", 
   "fieldtype": "Data", 
+  "in_filter": 1, 
+  "label": "Voucher Type", 
+  "oldfieldname": "voucher_type", 
+  "oldfieldtype": "Data", 
+  "print_width": "150px", 
   "search_index": 0, 
-  "in_filter": 1
+  "width": "150px"
  }, 
  {
-  "print_width": "150px", 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Voucher No", 
-  "oldfieldname": "voucher_no", 
-  "width": "150px", 
   "fieldname": "voucher_no", 
   "fieldtype": "Data", 
+  "in_filter": 1, 
+  "label": "Voucher No", 
+  "oldfieldname": "voucher_no", 
+  "oldfieldtype": "Data", 
+  "print_width": "150px", 
   "search_index": 0, 
-  "in_filter": 1
+  "width": "150px"
  }, 
  {
-  "print_width": "150px", 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
+  "fieldname": "voucher_detail_no", 
+  "fieldtype": "Data", 
   "label": "Voucher Detail No", 
   "oldfieldname": "voucher_detail_no", 
-  "width": "150px", 
-  "fieldname": "voucher_detail_no", 
-  "fieldtype": "Data"
+  "oldfieldtype": "Data", 
+  "print_width": "150px", 
+  "width": "150px"
  }, 
  {
-  "print_width": "150px", 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "actual_qty", 
+  "fieldtype": "Float", 
+  "in_filter": 1, 
   "label": "Actual Quantity", 
   "oldfieldname": "actual_qty", 
-  "width": "150px", 
-  "fieldname": "actual_qty", 
-  "fieldtype": "Currency", 
-  "in_filter": 1
+  "oldfieldtype": "Currency", 
+  "print_width": "150px", 
+  "width": "150px"
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "incoming_rate", 
+  "fieldtype": "Currency", 
   "label": "Incoming Rate", 
   "oldfieldname": "incoming_rate", 
-  "fieldname": "incoming_rate", 
-  "fieldtype": "Currency"
+  "oldfieldtype": "Currency"
  }, 
  {
-  "print_width": "150px", 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
+  "fieldname": "stock_uom", 
+  "fieldtype": "Data", 
   "label": "Stock UOM", 
   "oldfieldname": "stock_uom", 
-  "width": "150px", 
-  "fieldname": "stock_uom", 
-  "fieldtype": "Data"
+  "oldfieldtype": "Data", 
+  "print_width": "150px", 
+  "width": "150px"
  }, 
  {
-  "print_width": "150px", 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "qty_after_transaction", 
+  "fieldtype": "Float", 
+  "in_filter": 1, 
   "label": "Actual Qty After Transaction", 
   "oldfieldname": "bin_aqat", 
-  "width": "150px", 
-  "fieldname": "qty_after_transaction", 
-  "fieldtype": "Currency", 
-  "in_filter": 1
+  "oldfieldtype": "Currency", 
+  "print_width": "150px", 
+  "width": "150px"
  }, 
  {
-  "print_width": "150px", 
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "valuation_rate", 
+  "fieldtype": "Currency", 
   "label": "Valuation Rate", 
   "oldfieldname": "valuation_rate", 
-  "width": "150px", 
-  "fieldname": "valuation_rate", 
-  "fieldtype": "Currency"
+  "oldfieldtype": "Currency", 
+  "print_width": "150px", 
+  "width": "150px"
  }, 
  {
-  "oldfieldtype": "Currency", 
   "doctype": "DocField", 
+  "fieldname": "stock_value", 
+  "fieldtype": "Currency", 
   "label": "Stock Value", 
   "oldfieldname": "stock_value", 
-  "fieldname": "stock_value", 
-  "fieldtype": "Currency"
+  "oldfieldtype": "Currency"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Text", 
   "doctype": "DocField", 
-  "label": "Stock Queue (FIFO)", 
-  "oldfieldname": "fcfs_stack", 
   "fieldname": "stock_queue", 
   "fieldtype": "Text", 
-  "search_index": 0, 
   "hidden": 1, 
+  "in_filter": 0, 
+  "label": "Stock Queue (FIFO)", 
+  "oldfieldname": "fcfs_stack", 
+  "oldfieldtype": "Text", 
+  "print_hide": 1, 
   "report_hide": 1, 
-  "in_filter": 0
+  "search_index": 0
  }, 
  {
-  "print_width": "150px", 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Company", 
-  "oldfieldname": "company", 
-  "width": "150px", 
   "fieldname": "company", 
   "fieldtype": "Select", 
-  "search_index": 0, 
+  "in_filter": 1, 
+  "label": "Company", 
+  "oldfieldname": "company", 
+  "oldfieldtype": "Data", 
   "options": "link:Company", 
-  "in_filter": 1
+  "print_width": "150px", 
+  "search_index": 0, 
+  "width": "150px"
  }, 
  {
-  "print_width": "150px", 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Fiscal Year", 
-  "oldfieldname": "fiscal_year", 
-  "width": "150px", 
   "fieldname": "fiscal_year", 
   "fieldtype": "Data", 
+  "in_filter": 1, 
+  "label": "Fiscal Year", 
+  "oldfieldname": "fiscal_year", 
+  "oldfieldtype": "Data", 
+  "print_width": "150px", 
   "search_index": 0, 
-  "in_filter": 1
+  "width": "150px"
  }, 
  {
-  "print_width": "100px", 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Is Cancelled", 
-  "oldfieldname": "is_cancelled", 
-  "width": "100px", 
   "fieldname": "is_cancelled", 
   "fieldtype": "Select", 
-  "search_index": 0, 
+  "in_filter": 1, 
+  "label": "Is Cancelled", 
+  "oldfieldname": "is_cancelled", 
+  "oldfieldtype": "Select", 
   "options": "\nYes\nNo", 
-  "in_filter": 1
+  "print_width": "100px", 
+  "search_index": 0, 
+  "width": "100px"
  }, 
  {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Sales User", 
-  "cancel": 0
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Material User", 
-  "cancel": 0
- }, 
- {
-  "role": "Accounts Manager", 
   "doctype": "DocPerm"
  }
 ]
\ No newline at end of file
diff --git a/stock/doctype/stock_reconciliation/stock_reconciliation.txt b/stock/doctype/stock_reconciliation/stock_reconciliation.txt
index 145d6fa..094e903 100644
--- a/stock/doctype/stock_reconciliation/stock_reconciliation.txt
+++ b/stock/doctype/stock_reconciliation/stock_reconciliation.txt
@@ -1,85 +1,83 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-19 10:23:35", 
   "docstatus": 0, 
-  "creation": "2013-01-15 12:28:57", 
+  "modified": "2013-01-22 14:57:24", 
   "modified_by": "Administrator", 
-  "modified": "2013-01-16 13:59:28"
+  "owner": "Administrator"
  }, 
  {
   "allow_attach": 0, 
-  "is_submittable": 1, 
+  "allow_copy": 1, 
+  "allow_email": 1, 
   "allow_print": 1, 
-  "search_fields": "posting_date", 
-  "module": "Stock", 
-  "doctype": "DocType", 
-  "read_only_onload": 0, 
   "autoname": "SR/.######", 
   "description": "This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.", 
-  "allow_email": 1, 
-  "name": "__common__", 
+  "doctype": "DocType", 
+  "is_submittable": 1, 
   "max_attachments": 1, 
-  "allow_copy": 1
+  "module": "Stock", 
+  "name": "__common__", 
+  "read_only_onload": 0, 
+  "search_fields": "posting_date"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Stock Reconciliation", 
   "doctype": "DocField", 
+  "name": "__common__", 
+  "parent": "Stock Reconciliation", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "permlevel": 0, 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "parent": "Stock Reconciliation", 
-  "read": 1, 
   "cancel": 1, 
-  "name": "__common__", 
-  "amend": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
+  "name": "__common__", 
+  "parent": "Stock Reconciliation", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "role": "Material Manager", 
-  "report": 1, 
   "permlevel": 0, 
-  "parentfield": "permissions"
+  "read": 1, 
+  "report": 1, 
+  "submit": 1, 
+  "write": 1
  }, 
  {
-  "name": "Stock Reconciliation", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Stock Reconciliation"
  }, 
  {
-  "read_only": 0, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Posting Date", 
-  "oldfieldname": "reconciliation_date", 
   "fieldname": "posting_date", 
   "fieldtype": "Date", 
-  "reqd": 1, 
-  "in_filter": 0
+  "in_filter": 0, 
+  "label": "Posting Date", 
+  "oldfieldname": "reconciliation_date", 
+  "oldfieldtype": "Date", 
+  "read_only": 0, 
+  "reqd": 1
  }, 
  {
-  "read_only": 0, 
-  "oldfieldtype": "Time", 
   "doctype": "DocField", 
-  "label": "Posting Time", 
-  "oldfieldname": "reconciliation_time", 
   "fieldname": "posting_time", 
   "fieldtype": "Time", 
-  "reqd": 1, 
-  "in_filter": 0
+  "in_filter": 0, 
+  "label": "Posting Time", 
+  "oldfieldname": "reconciliation_time", 
+  "oldfieldtype": "Time", 
+  "read_only": 0, 
+  "reqd": 1
  }, 
  {
-  "read_only": 1, 
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Amended From", 
   "fieldname": "amended_from", 
   "fieldtype": "Link", 
-  "options": "Stock Reconciliation"
+  "label": "Amended From", 
+  "no_copy": 1, 
+  "options": "Stock Reconciliation", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
@@ -87,40 +85,46 @@
   "fieldtype": "Column Break"
  }, 
  {
-  "read_only": 1, 
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Upload HTML", 
   "fieldname": "upload_html", 
-  "fieldtype": "HTML"
+  "fieldtype": "HTML", 
+  "label": "Upload HTML", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
   "depends_on": "reconciliation_json", 
   "doctype": "DocField", 
-  "label": "Reconciliation Data", 
   "fieldname": "sb2", 
-  "fieldtype": "Section Break"
+  "fieldtype": "Section Break", 
+  "label": "Reconciliation Data"
  }, 
  {
-  "read_only": 1, 
-  "print_hide": 0, 
   "doctype": "DocField", 
-  "label": "Reconciliation HTML", 
   "fieldname": "reconciliation_html", 
   "fieldtype": "HTML", 
-  "hidden": 0
+  "hidden": 0, 
+  "label": "Reconciliation HTML", 
+  "print_hide": 0, 
+  "read_only": 1
  }, 
  {
-  "read_only": 1, 
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Reconciliation JSON", 
   "fieldname": "reconciliation_json", 
   "fieldtype": "Long Text", 
-  "hidden": 1
+  "hidden": 1, 
+  "label": "Reconciliation JSON", 
+  "no_copy": 1, 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "doctype": "DocPerm"
+  "amend": 0, 
+  "doctype": "DocPerm", 
+  "role": "Material Manager"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "System Manager"
  }
 ]
\ No newline at end of file
diff --git a/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.txt b/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.txt
index 0e3c5a0..1efac09 100644
--- a/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.txt
+++ b/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.txt
@@ -1,118 +1,85 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:30", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:36:40", 
+  "modified": "2013-01-22 13:57:23", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:36:40"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
-  "in_create": 0, 
-  "module": "Stock", 
-  "server_code_error": " ", 
   "doctype": "DocType", 
+  "in_create": 0, 
   "issingle": 1, 
-  "read_only": 0, 
+  "module": "Stock", 
   "name": "__common__", 
-  "colour": "White:FFF", 
-  "version": 25
+  "read_only": 0
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Stock UOM Replace Utility", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
+  "create": 1, 
+  "doctype": "DocPerm", 
   "name": "__common__", 
   "parent": "Stock UOM Replace Utility", 
-  "read": 1, 
-  "doctype": "DocPerm", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Stock UOM Replace Utility", 
-  "doctype": "DocType"
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "System Manager", 
-  "permlevel": 0
- }, 
- {
-  "write": 0, 
-  "role": "System Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "Material Master Manager", 
-  "permlevel": 0
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "Material Manager", 
-  "permlevel": 0
- }, 
- {
-  "role": "Material Master Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "Material Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "colour": "White:FFF", 
-  "doctype": "DocField", 
-  "label": "Item", 
   "permlevel": 0, 
-  "trigger": "Client", 
+  "read": 1, 
+  "report": 0, 
+  "submit": 0, 
+  "write": 1
+ }, 
+ {
+  "doctype": "DocType", 
+  "name": "Stock UOM Replace Utility"
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "item_code", 
   "fieldtype": "Link", 
+  "label": "Item", 
   "options": "Item"
  }, 
  {
   "doctype": "DocField", 
-  "options": "UOM", 
   "fieldname": "current_stock_uom", 
   "fieldtype": "Link", 
   "label": "Current Stock UOM", 
-  "permlevel": 1
+  "options": "UOM", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "options": "UOM", 
   "fieldname": "new_stock_uom", 
   "fieldtype": "Link", 
   "label": "New Stock UOM", 
-  "permlevel": 0
+  "options": "UOM"
  }, 
  {
   "doctype": "DocField", 
-  "options": "update_stock_uom", 
   "fieldname": "update", 
   "fieldtype": "Button", 
   "label": "Update", 
-  "permlevel": 0
+  "options": "update_stock_uom"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Conversion Factor", 
   "fieldname": "conversion_factor", 
-  "fieldtype": "Currency", 
-  "permlevel": 0
+  "fieldtype": "Float", 
+  "label": "Conversion Factor"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "Material Master Manager"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "Material Manager"
  }
 ]
\ No newline at end of file
diff --git a/stock/doctype/warehouse/warehouse.txt b/stock/doctype/warehouse/warehouse.txt
index 294c2d3..58c3bb1 100644
--- a/stock/doctype/warehouse/warehouse.txt
+++ b/stock/doctype/warehouse/warehouse.txt
@@ -1,299 +1,239 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:30", 
   "docstatus": 0, 
-  "creation": "2012-10-26 14:47:52", 
+  "modified": "2013-01-22 15:07:00", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-03 11:24:31"
+  "owner": "Administrator"
  }, 
  {
-  "document_type": "Master", 
-  "description": "A logical Warehouse against which stock entries are made.", 
-  "autoname": "field:warehouse_name", 
   "allow_rename": 1, 
-  "module": "Stock", 
+  "autoname": "field:warehouse_name", 
+  "description": "A logical Warehouse against which stock entries are made.", 
   "doctype": "DocType", 
-  "search_fields": "warehouse_type", 
-  "name": "__common__"
+  "document_type": "Master", 
+  "module": "Stock", 
+  "name": "__common__", 
+  "search_fields": "warehouse_type"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Warehouse", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Warehouse", 
-  "read": 1, 
+  "parentfield": "fields", 
+  "parenttype": "DocType"
+ }, 
+ {
   "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Warehouse", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
+  "read": 1, 
+  "report": 1, 
+  "submit": 0
  }, 
  {
-  "name": "Warehouse", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Warehouse"
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Warehouse Detail", 
   "fieldname": "warehouse_detail", 
   "fieldtype": "Section Break", 
+  "label": "Warehouse Detail", 
+  "oldfieldtype": "Section Break", 
   "permlevel": 0
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Warehouse Name", 
-  "oldfieldname": "warehouse_name", 
   "fieldname": "warehouse_name", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Warehouse Name", 
+  "oldfieldname": "warehouse_name", 
+  "oldfieldtype": "Data", 
+  "permlevel": 0, 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Warehouse Type", 
-  "oldfieldname": "warehouse_type", 
-  "permlevel": 0, 
   "fieldname": "warehouse_type", 
   "fieldtype": "Link", 
-  "reqd": 1, 
-  "options": "Warehouse Type"
+  "label": "Warehouse Type", 
+  "oldfieldname": "warehouse_type", 
+  "oldfieldtype": "Link", 
+  "options": "Warehouse Type", 
+  "permlevel": 0, 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Company", 
-  "oldfieldname": "company", 
-  "permlevel": 0, 
   "fieldname": "company", 
   "fieldtype": "Link", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Company", 
+  "oldfieldname": "company", 
+  "oldfieldtype": "Link", 
   "options": "Company", 
-  "in_filter": 1
+  "permlevel": 0, 
+  "search_index": 1
  }, 
  {
   "description": "For Reference Only.", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Warehouse Contact Info", 
   "fieldname": "warehouse_contact_info", 
   "fieldtype": "Section Break", 
+  "label": "Warehouse Contact Info", 
   "permlevel": 0
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Email Id", 
-  "oldfieldname": "email_id", 
   "fieldname": "email_id", 
   "fieldtype": "Data", 
   "hidden": 1, 
+  "label": "Email Id", 
+  "oldfieldname": "email_id", 
+  "oldfieldtype": "Data", 
+  "permlevel": 0, 
+  "print_hide": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "phone_no", 
+  "fieldtype": "Data", 
+  "label": "Phone No", 
+  "oldfieldname": "phone_no", 
+  "oldfieldtype": "Int", 
+  "options": "Phone", 
   "permlevel": 0
  }, 
  {
-  "oldfieldtype": "Int", 
   "doctype": "DocField", 
-  "label": "Phone No", 
-  "oldfieldname": "phone_no", 
-  "permlevel": 0, 
-  "fieldname": "phone_no", 
-  "fieldtype": "Data", 
-  "options": "Phone"
- }, 
- {
-  "oldfieldtype": "Int", 
-  "doctype": "DocField", 
-  "label": "Mobile No", 
-  "oldfieldname": "mobile_no", 
-  "permlevel": 0, 
   "fieldname": "mobile_no", 
   "fieldtype": "Data", 
-  "options": "Phone"
+  "label": "Mobile No", 
+  "oldfieldname": "mobile_no", 
+  "oldfieldtype": "Int", 
+  "options": "Phone", 
+  "permlevel": 0
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
   "fieldname": "column_break0", 
   "fieldtype": "Column Break", 
+  "oldfieldtype": "Column Break", 
   "permlevel": 0
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Address Line 1", 
-  "oldfieldname": "address_line_1", 
   "fieldname": "address_line_1", 
   "fieldtype": "Data", 
+  "label": "Address Line 1", 
+  "oldfieldname": "address_line_1", 
+  "oldfieldtype": "Data", 
   "permlevel": 0
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Address Line 2", 
-  "oldfieldname": "address_line_2", 
   "fieldname": "address_line_2", 
   "fieldtype": "Data", 
+  "label": "Address Line 2", 
+  "oldfieldname": "address_line_2", 
+  "oldfieldtype": "Data", 
   "permlevel": 0
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "City", 
-  "oldfieldname": "city", 
   "fieldname": "city", 
   "fieldtype": "Data", 
-  "reqd": 0, 
+  "label": "City", 
+  "oldfieldname": "city", 
+  "oldfieldtype": "Data", 
+  "permlevel": 0, 
+  "reqd": 0
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "state", 
+  "fieldtype": "Data", 
+  "label": "State", 
+  "oldfieldname": "state", 
+  "oldfieldtype": "Select", 
+  "options": "Suggest", 
   "permlevel": 0
  }, 
  {
-  "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "State", 
-  "oldfieldname": "state", 
-  "permlevel": 0, 
-  "fieldname": "state", 
-  "fieldtype": "Data", 
-  "options": "Suggest"
- }, 
- {
-  "oldfieldtype": "Int", 
-  "doctype": "DocField", 
-  "label": "PIN", 
-  "oldfieldname": "pin", 
   "fieldname": "pin", 
   "fieldtype": "Int", 
+  "label": "PIN", 
+  "oldfieldname": "pin", 
+  "oldfieldtype": "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", 
+  "label": "Merge Warehouses", 
   "permlevel": 2
  }, 
  {
   "doctype": "DocField", 
-  "options": "Warehouse", 
   "fieldname": "merge_with", 
   "fieldtype": "Link", 
   "label": "Merge With", 
+  "options": "Warehouse", 
   "permlevel": 2
  }, 
  {
   "doctype": "DocField", 
-  "label": "Merge", 
   "fieldname": "merge", 
   "fieldtype": "Button", 
+  "label": "Merge", 
   "permlevel": 2
  }, 
  {
   "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Material User", 
-  "cancel": 0, 
-  "permlevel": 2
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "report": 1, 
-  "role": "Material User", 
-  "cancel": 0, 
-  "permlevel": 0
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Material User", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Material Manager", 
-  "cancel": 0, 
-  "permlevel": 2
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "report": 1, 
-  "role": "Material Manager", 
-  "cancel": 0, 
-  "permlevel": 0
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "role": "Material Manager", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "role": "All", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "amend": 0, 
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 1, 
-  "report": 1, 
+  "permlevel": 0, 
   "role": "Material Master Manager", 
+  "write": 1
+ }, 
+ {
+  "amend": 0, 
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "permlevel": 0, 
+  "role": "Material User", 
+  "write": 0
+ }, 
+ {
+  "amend": 0, 
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "permlevel": 2, 
+  "role": "Material User", 
+  "write": 0
+ }, 
+ {
   "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "role": "Material Master Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "cancel": 1, 
+  "permlevel": 0, 
   "role": "System Manager", 
-  "report": 1, 
-  "permlevel": 0
+  "write": 1
  }, 
  {
   "create": 0, 
   "doctype": "DocPerm", 
-  "write": 1, 
+  "permlevel": 2, 
   "role": "System Manager", 
-  "permlevel": 2
+  "write": 1
  }
 ]
\ No newline at end of file
diff --git a/support/doctype/customer_issue/customer_issue.txt b/support/doctype/customer_issue/customer_issue.txt
index 1b01803..00d0dee 100644
--- a/support/doctype/customer_issue/customer_issue.txt
+++ b/support/doctype/customer_issue/customer_issue.txt
@@ -1,493 +1,436 @@
 [
  {
-  "owner": "harshada@webnotestech.com", 
-  "docstatus": 0, 
   "creation": "2013-01-10 16:34:30", 
+  "docstatus": 0, 
+  "modified": "2013-01-22 14:55:59", 
   "modified_by": "Administrator", 
-  "modified": "2013-01-14 12:41:48"
+  "owner": "harshada@webnotestech.com"
  }, 
  {
-  "is_submittable": 1, 
   "autoname": "naming_series:", 
-  "name": "__common__", 
-  "search_fields": "status,customer,customer_name,allocated_to,allocated_on, territory", 
+  "doctype": "DocType", 
+  "is_submittable": 1, 
   "module": "Support", 
-  "doctype": "DocType"
+  "name": "__common__", 
+  "search_fields": "status,customer,customer_name,allocated_to,allocated_on, territory"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Customer Issue", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Customer Issue", 
-  "read": 1, 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
+  "create": 1, 
   "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Customer Issue", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "report": 1, 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Customer Issue", 
-  "doctype": "DocType"
- }, 
- {
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
-  "doctype": "DocField", 
-  "label": "Naming Series", 
-  "oldfieldname": "naming_series", 
   "permlevel": 0, 
+  "read": 1, 
+  "report": 1, 
+  "write": 1
+ }, 
+ {
+  "doctype": "DocType", 
+  "name": "Customer Issue"
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "naming_series", 
   "fieldtype": "Select", 
-  "search_index": 0, 
-  "reqd": 1, 
+  "in_filter": 0, 
+  "label": "Naming Series", 
+  "no_copy": 1, 
+  "oldfieldname": "naming_series", 
+  "oldfieldtype": "Select", 
   "options": "\nCI/2010-2011/", 
-  "in_filter": 0
+  "reqd": 1, 
+  "search_index": 0
  }, 
  {
-  "permlevel": 0, 
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
-  "doctype": "DocField", 
-  "label": "Status", 
-  "oldfieldname": "status", 
   "default": "Open", 
+  "doctype": "DocField", 
   "fieldname": "status", 
   "fieldtype": "Select", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Status", 
+  "no_copy": 1, 
+  "oldfieldname": "status", 
+  "oldfieldtype": "Select", 
   "options": "\nOpen\nClosed\nWork In Progress\nCancelled", 
-  "in_filter": 1
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
   "default": "Today", 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Issue Date", 
-  "oldfieldname": "complaint_date", 
   "fieldname": "complaint_date", 
   "fieldtype": "Date", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Issue Date", 
+  "oldfieldname": "complaint_date", 
+  "oldfieldtype": "Date", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break0", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Customer", 
-  "oldfieldname": "customer", 
-  "permlevel": 0, 
   "fieldname": "customer", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Customer", 
+  "oldfieldname": "customer", 
+  "oldfieldtype": "Link", 
   "options": "Customer", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Customer Address", 
-  "options": "Address", 
   "fieldname": "customer_address", 
   "fieldtype": "Link", 
-  "permlevel": 0
+  "label": "Customer Address", 
+  "options": "Address", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Contact Person", 
-  "options": "Contact", 
   "fieldname": "contact_person", 
   "fieldtype": "Link", 
-  "permlevel": 0
+  "label": "Contact Person", 
+  "options": "Contact", 
+  "print_hide": 1
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Issue Details", 
-  "options": "Simple", 
   "fieldname": "issue_details", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Issue Details", 
+  "oldfieldtype": "Section Break", 
+  "options": "Simple"
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Issue", 
-  "oldfieldname": "complaint", 
   "fieldname": "complaint", 
   "fieldtype": "Small Text", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Issue", 
+  "no_copy": 1, 
+  "oldfieldname": "complaint", 
+  "oldfieldtype": "Small Text", 
+  "reqd": 1
  }, 
  {
   "description": "Item, Warranty, AMC (Annual Maintenance Contract) details will be automatically fetched when Serial Number is selected.", 
   "doctype": "DocField", 
-  "label": "Serial No", 
-  "options": "Serial No", 
   "fieldname": "serial_no", 
   "fieldtype": "Link", 
-  "permlevel": 0
+  "label": "Serial No", 
+  "options": "Serial No"
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Item Code", 
-  "oldfieldname": "item_code", 
-  "options": "Item", 
   "fieldname": "item_code", 
   "fieldtype": "Link", 
-  "search_index": 1, 
+  "in_filter": 1, 
+  "label": "Item Code", 
+  "oldfieldname": "item_code", 
+  "oldfieldtype": "Link", 
+  "options": "Item", 
   "reqd": 0, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
-  "oldfieldtype": "Data", 
+  "depends_on": "eval:doc.item_code", 
   "doctype": "DocField", 
-  "label": "Item Name", 
-  "oldfieldname": "item_name", 
   "fieldname": "item_name", 
   "fieldtype": "Data", 
-  "depends_on": "eval:doc.item_code", 
-  "permlevel": 1
+  "label": "Item Name", 
+  "oldfieldname": "item_name", 
+  "oldfieldtype": "Data", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Small Text", 
+  "depends_on": "eval:doc.item_code", 
   "doctype": "DocField", 
-  "label": "Description", 
-  "oldfieldname": "description", 
-  "width": "300px", 
   "fieldname": "description", 
   "fieldtype": "Small Text", 
-  "depends_on": "eval:doc.item_code", 
-  "permlevel": 1
+  "label": "Description", 
+  "oldfieldname": "description", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1, 
+  "width": "300px"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Warranty / AMC Status", 
-  "options": "\nUnder Warranty\nOut of Warranty\nUnder AMC\nOut of AMC", 
   "fieldname": "warranty_amc_status", 
   "fieldtype": "Select", 
   "hidden": 0, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Warranty / AMC Status", 
+  "options": "\nUnder Warranty\nOut of Warranty\nUnder AMC\nOut of AMC"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Warranty Expiry Date", 
   "fieldname": "warranty_expiry_date", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "Warranty Expiry Date"
  }, 
  {
   "doctype": "DocField", 
-  "label": "AMC Expiry Date", 
   "fieldname": "amc_expiry_date", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "AMC Expiry Date"
  }, 
  {
   "description": "To assign this issue, use the \"Assign\" button in the sidebar.", 
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Resolution", 
-  "options": "Simple", 
   "fieldname": "resolution_section", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Resolution", 
+  "oldfieldtype": "Section Break", 
+  "options": "Simple"
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Resolution Date", 
-  "oldfieldname": "resolution_date", 
   "fieldname": "resolution_date", 
   "fieldtype": "Datetime", 
-  "search_index": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Resolution Date", 
+  "no_copy": 1, 
+  "oldfieldname": "resolution_date", 
+  "oldfieldtype": "Date", 
+  "search_index": 1
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Resolved By", 
-  "oldfieldname": "resolved_by", 
-  "options": "Profile", 
   "fieldname": "resolved_by", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Resolved By", 
+  "no_copy": 1, 
+  "oldfieldname": "resolved_by", 
+  "oldfieldtype": "Link", 
+  "options": "Profile", 
+  "search_index": 1
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Text", 
   "doctype": "DocField", 
-  "label": "Resolution Details", 
-  "oldfieldname": "resolution_details", 
   "fieldname": "resolution_details", 
   "fieldtype": "Text", 
-  "permlevel": 0
+  "label": "Resolution Details", 
+  "no_copy": 1, 
+  "oldfieldname": "resolution_details", 
+  "oldfieldtype": "Text"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Contact Info", 
   "fieldname": "contact_info", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Contact Info"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "col_break3", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Customer Name", 
   "fieldname": "customer_name", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Customer Name", 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Customer Group", 
-  "options": "Customer Group", 
   "fieldname": "customer_group", 
   "fieldtype": "Link", 
-  "reqd": 0, 
-  "permlevel": 0
+  "label": "Customer Group", 
+  "options": "Customer Group", 
+  "print_hide": 1, 
+  "reqd": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Territory", 
-  "oldfieldname": "territory", 
-  "permlevel": 0, 
   "fieldname": "territory", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 0, 
+  "in_filter": 1, 
+  "label": "Territory", 
+  "oldfieldname": "territory", 
+  "oldfieldtype": "Link", 
   "options": "Territory", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "reqd": 0, 
+  "search_index": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Address", 
   "fieldname": "address_display", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Address", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "col_break4", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Contact", 
   "fieldname": "contact_display", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Contact", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Mobile No", 
   "fieldname": "contact_mobile", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Mobile No", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Contact Email", 
   "fieldname": "contact_email", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Contact Email", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Service Address", 
-  "oldfieldname": "service_address", 
   "fieldname": "service_address", 
   "fieldtype": "Small Text", 
-  "permlevel": 0
+  "label": "Service Address", 
+  "oldfieldname": "service_address", 
+  "oldfieldtype": "Small Text"
  }, 
  {
   "doctype": "DocField", 
-  "label": "More Info", 
   "fieldname": "more_info", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "More Info"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "col_break5", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Company", 
-  "oldfieldname": "company", 
-  "permlevel": 0, 
   "fieldname": "company", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Company", 
+  "oldfieldname": "company", 
+  "oldfieldtype": "Link", 
   "options": "Company", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Fiscal Year", 
-  "oldfieldname": "fiscal_year", 
-  "permlevel": 0, 
   "fieldname": "fiscal_year", 
   "fieldtype": "Select", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Fiscal Year", 
+  "oldfieldname": "fiscal_year", 
+  "oldfieldtype": "Select", 
   "options": "link:Fiscal Year", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "col_break6", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "width": "50%"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Raised By", 
-  "oldfieldname": "complaint_raised_by", 
   "fieldname": "complaint_raised_by", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Raised By", 
+  "oldfieldname": "complaint_raised_by", 
+  "oldfieldtype": "Data"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "From Company", 
-  "oldfieldname": "from_company", 
   "fieldname": "from_company", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "From Company", 
+  "oldfieldname": "from_company", 
+  "oldfieldtype": "Data"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Amended From", 
-  "oldfieldname": "amended_from", 
-  "width": "150px", 
   "fieldname": "amended_from", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Amended From", 
+  "no_copy": 1, 
+  "oldfieldname": "amended_from", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Amendment Date", 
-  "oldfieldname": "amendment_date", 
-  "width": "100px", 
   "fieldname": "amendment_date", 
   "fieldtype": "Date", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Amendment Date", 
+  "no_copy": 1, 
+  "oldfieldname": "amendment_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
+  "width": "100px"
  }, 
  {
   "amend": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "role": "System Manager", 
   "cancel": 1, 
-  "permlevel": 0
- }, 
- {
   "doctype": "DocPerm", 
   "role": "System Manager", 
-  "permlevel": 1
+  "submit": 1
  }, 
  {
   "amend": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "role": "Maintenance Manager", 
   "cancel": 1, 
-  "permlevel": 0
- }, 
- {
   "doctype": "DocPerm", 
   "role": "Maintenance Manager", 
-  "permlevel": 1
+  "submit": 1
  }, 
  {
   "amend": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "role": "Maintenance User", 
   "cancel": 1, 
-  "permlevel": 0
- }, 
- {
   "doctype": "DocPerm", 
   "role": "Maintenance User", 
-  "permlevel": 1
+  "submit": 1
  }, 
  {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "Guest", 
-  "permlevel": 0
+  "role": "Guest"
  }
 ]
\ No newline at end of file
diff --git a/support/doctype/maintenance_schedule/maintenance_schedule.txt b/support/doctype/maintenance_schedule/maintenance_schedule.txt
index a97c907..c763755 100644
--- a/support/doctype/maintenance_schedule/maintenance_schedule.txt
+++ b/support/doctype/maintenance_schedule/maintenance_schedule.txt
@@ -1,331 +1,285 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:30", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:36:41", 
+  "modified": "2013-01-22 14:56:04", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:45:49"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
-  "is_submittable": 1, 
-  "search_fields": "status,customer,customer_name, sales_order_no", 
-  "module": "Support", 
-  "server_code_error": " ", 
   "autoname": "MS.#####", 
-  "_last_update": "1322549701", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
   "doctype": "DocType", 
-  "show_in_menu": 0, 
-  "version": 156
+  "is_submittable": 1, 
+  "module": "Support", 
+  "name": "__common__", 
+  "search_fields": "status,customer,customer_name, sales_order_no"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Maintenance Schedule", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Maintenance Schedule", 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
+  "amend": 1, 
+  "cancel": 1, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Maintenance Schedule", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
+  "permlevel": 0, 
   "read": 1, 
-  "doctype": "DocPerm", 
-  "parenttype": "DocType", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Maintenance Schedule", 
-  "doctype": "DocType"
- }, 
- {
-  "amend": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
   "report": 1, 
-  "role": "System Manager", 
-  "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "role": "System Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "amend": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
   "submit": 1, 
-  "write": 1, 
-  "report": 1, 
-  "role": "Maintenance Manager", 
-  "cancel": 1, 
-  "permlevel": 0
+  "write": 1
  }, 
  {
-  "role": "Maintenance Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
+  "doctype": "DocType", 
+  "name": "Maintenance Schedule"
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Customer Details", 
-  "options": "Simple", 
   "fieldname": "customer_details", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Customer Details", 
+  "oldfieldtype": "Section Break", 
+  "options": "Simple"
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
   "fieldname": "column_break0", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Customer", 
-  "oldfieldname": "customer", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "customer", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Customer", 
+  "oldfieldname": "customer", 
+  "oldfieldtype": "Link", 
   "options": "Customer", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Customer Address", 
-  "permlevel": 0, 
   "fieldname": "customer_address", 
   "fieldtype": "Link", 
-  "options": "Address"
+  "label": "Customer Address", 
+  "options": "Address", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Contact Person", 
-  "permlevel": 0, 
   "fieldname": "contact_person", 
   "fieldtype": "Link", 
-  "options": "Contact"
+  "label": "Contact Person", 
+  "options": "Contact", 
+  "print_hide": 1
  }, 
  {
-  "search_index": 0, 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Name", 
-  "oldfieldname": "customer_name", 
   "fieldname": "customer_name", 
   "fieldtype": "Data", 
+  "in_filter": 1, 
+  "label": "Name", 
+  "oldfieldname": "customer_name", 
   "oldfieldtype": "Data", 
+  "read_only": 1, 
   "reqd": 0, 
-  "permlevel": 1, 
-  "in_filter": 1
+  "search_index": 0
  }, 
  {
   "doctype": "DocField", 
-  "label": "Address", 
   "fieldname": "address_display", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Address", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Contact", 
   "fieldname": "contact_display", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Contact", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Mobile No", 
   "fieldname": "contact_mobile", 
   "fieldtype": "Text", 
-  "permlevel": 1
+  "label": "Mobile No", 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Contact Email", 
   "fieldname": "contact_email", 
   "fieldtype": "Text", 
-  "permlevel": 1
+  "label": "Contact Email", 
+  "print_hide": 1, 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break"
  }, 
  {
-  "search_index": 0, 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Transaction Date", 
-  "oldfieldname": "transaction_date", 
   "fieldname": "transaction_date", 
   "fieldtype": "Date", 
+  "in_filter": 1, 
+  "label": "Transaction Date", 
+  "oldfieldname": "transaction_date", 
   "oldfieldtype": "Date", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 0
  }, 
  {
-  "permlevel": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
-  "doctype": "DocField", 
-  "label": "Status", 
-  "oldfieldname": "status", 
   "default": "Draft", 
+  "doctype": "DocField", 
   "fieldname": "status", 
   "fieldtype": "Select", 
-  "search_index": 0, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Status", 
+  "no_copy": 1, 
+  "oldfieldname": "status", 
+  "oldfieldtype": "Select", 
   "options": "\nDraft\nSubmitted\nCancelled", 
-  "in_filter": 1
+  "read_only": 1, 
+  "reqd": 1, 
+  "search_index": 0
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Amended From", 
-  "oldfieldname": "amended_from", 
   "fieldname": "amended_from", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Amended From", 
+  "no_copy": 1, 
+  "oldfieldname": "amended_from", 
+  "oldfieldtype": "Data", 
+  "read_only": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Amendment Date", 
-  "oldfieldname": "amendment_date", 
   "fieldname": "amendment_date", 
   "fieldtype": "Date", 
   "hidden": 1, 
-  "permlevel": 1, 
+  "label": "Amendment Date", 
+  "no_copy": 1, 
+  "oldfieldname": "amendment_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
+  "read_only": 1, 
   "report_hide": 1
  }, 
  {
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "Company", 
-  "oldfieldname": "company", 
-  "permlevel": 0, 
   "fieldname": "company", 
   "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Company", 
+  "oldfieldname": "company", 
   "oldfieldtype": "Link", 
-  "reqd": 1, 
   "options": "Company", 
-  "in_filter": 1
+  "reqd": 1, 
+  "search_index": 0
  }, 
  {
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "Territory", 
-  "oldfieldname": "territory", 
-  "permlevel": 0, 
   "fieldname": "territory", 
   "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Territory", 
+  "oldfieldname": "territory", 
   "oldfieldtype": "Link", 
-  "reqd": 1, 
   "options": "Territory", 
-  "in_filter": 1
+  "reqd": 1, 
+  "search_index": 0
  }, 
  {
   "doctype": "DocField", 
-  "label": "Customer Group", 
-  "permlevel": 0, 
   "fieldname": "customer_group", 
   "fieldtype": "Link", 
-  "reqd": 1, 
-  "options": "Customer Group"
+  "label": "Customer Group", 
+  "options": "Customer Group", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Items", 
-  "options": "Simple", 
   "fieldname": "items", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Items", 
+  "oldfieldtype": "Section Break", 
+  "options": "Simple"
  }, 
  {
-  "search_index": 1, 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Sales Order No", 
-  "oldfieldname": "sales_order_no", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "sales_order_no", 
   "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Sales Order No", 
+  "oldfieldname": "sales_order_no", 
   "oldfieldtype": "Link", 
   "options": "Sales Order", 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Get Items", 
-  "options": "pull_sales_order_detail", 
   "fieldname": "get_items", 
   "fieldtype": "Button", 
-  "permlevel": 0, 
+  "label": "Get Items", 
+  "oldfieldtype": "Button", 
+  "options": "pull_sales_order_detail", 
   "report_hide": 1
  }, 
  {
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "Maintenance Schedule Item", 
-  "oldfieldname": "item_maintenance_detail", 
-  "options": "Maintenance Schedule Item", 
   "fieldname": "item_maintenance_detail", 
   "fieldtype": "Table", 
-  "permlevel": 0
+  "label": "Maintenance Schedule Item", 
+  "oldfieldname": "item_maintenance_detail", 
+  "oldfieldtype": "Table", 
+  "options": "Maintenance Schedule Item"
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Schedule", 
-  "options": "Simple", 
   "fieldname": "schedule", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Schedule", 
+  "oldfieldtype": "Section Break", 
+  "options": "Simple"
  }, 
  {
-  "oldfieldtype": "Button", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Generate Schedule", 
-  "trigger": "Client", 
   "fieldname": "generate_schedule", 
   "fieldtype": "Button", 
-  "permlevel": 0
+  "label": "Generate Schedule", 
+  "oldfieldtype": "Button"
  }, 
  {
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "Maintenance Schedule Detail", 
-  "oldfieldname": "maintenance_schedule_detail", 
-  "options": "Maintenance Schedule Detail", 
   "fieldname": "maintenance_schedule_detail", 
   "fieldtype": "Table", 
-  "permlevel": 1
+  "label": "Maintenance Schedule Detail", 
+  "oldfieldname": "maintenance_schedule_detail", 
+  "oldfieldtype": "Table", 
+  "options": "Maintenance Schedule Detail", 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "System Manager"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "Maintenance Manager"
  }
 ]
\ No newline at end of file
diff --git a/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt b/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt
index f969515..41b83be 100644
--- a/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt
+++ b/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt
@@ -1,107 +1,101 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:31", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:36:42", 
+  "modified": "2013-01-22 14:47:02", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:36:42"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
+  "autoname": "MSD.#####", 
+  "doctype": "DocType", 
   "istable": 1, 
   "module": "Support", 
-  "server_code_error": " ", 
-  "doctype": "DocType", 
-  "autoname": "MSD.#####", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "show_in_menu": 0, 
-  "version": 13
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Maintenance Schedule Detail", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "name": "Maintenance Schedule Detail", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Maintenance Schedule Detail"
  }, 
  {
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "Item Code", 
-  "oldfieldname": "item_code", 
-  "options": "Item", 
   "fieldname": "item_code", 
   "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Item Code", 
+  "oldfieldname": "item_code", 
   "oldfieldtype": "Link", 
+  "options": "Item", 
+  "read_only": 1, 
   "reqd": 0, 
-  "permlevel": 1, 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "Item Name", 
-  "oldfieldname": "item_name", 
   "fieldname": "item_name", 
   "fieldtype": "Data", 
+  "in_filter": 0, 
+  "label": "Item Name", 
+  "oldfieldname": "item_name", 
   "oldfieldtype": "Data", 
-  "permlevel": 1, 
-  "in_filter": 0
+  "read_only": 1, 
+  "search_index": 0
  }, 
  {
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "Scheduled Date", 
-  "oldfieldname": "scheduled_date", 
   "fieldname": "scheduled_date", 
   "fieldtype": "Date", 
+  "in_filter": 1, 
+  "label": "Scheduled Date", 
+  "oldfieldname": "scheduled_date", 
   "oldfieldtype": "Date", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Actual Date", 
-  "oldfieldname": "actual_date", 
   "fieldname": "actual_date", 
   "fieldtype": "Date", 
   "hidden": 1, 
-  "permlevel": 1, 
+  "label": "Actual Date", 
+  "no_copy": 1, 
+  "oldfieldname": "actual_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
+  "read_only": 1, 
   "report_hide": 1
  }, 
  {
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "Incharge Name", 
-  "oldfieldname": "incharge_name", 
-  "options": "Sales Person", 
   "fieldname": "incharge_name", 
   "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Incharge Name", 
+  "oldfieldname": "incharge_name", 
   "oldfieldtype": "Link", 
+  "options": "Sales Person", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 0
  }, 
  {
-  "no_copy": 0, 
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "Serial No", 
-  "oldfieldname": "serial_no", 
-  "width": "160px", 
   "fieldname": "serial_no", 
   "fieldtype": "Small Text", 
+  "in_filter": 1, 
+  "label": "Serial No", 
+  "no_copy": 0, 
+  "oldfieldname": "serial_no", 
   "oldfieldtype": "Small Text", 
-  "permlevel": 1, 
-  "in_filter": 1
+  "read_only": 1, 
+  "search_index": 0, 
+  "width": "160px"
  }
 ]
\ No newline at end of file
diff --git a/support/doctype/maintenance_schedule_item/maintenance_schedule_item.txt b/support/doctype/maintenance_schedule_item/maintenance_schedule_item.txt
index 4d594ba..490eb72 100644
--- a/support/doctype/maintenance_schedule_item/maintenance_schedule_item.txt
+++ b/support/doctype/maintenance_schedule_item/maintenance_schedule_item.txt
@@ -1,146 +1,133 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:31", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:36:41", 
+  "modified": "2013-01-22 14:47:03", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:36:41"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
+  "autoname": "IMD.#####", 
+  "doctype": "DocType", 
   "istable": 1, 
   "module": "Support", 
-  "server_code_error": " ", 
-  "doctype": "DocType", 
-  "autoname": "IMD.#####", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "show_in_menu": 0, 
-  "version": 9
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Maintenance Schedule Item", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "name": "Maintenance Schedule Item", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Maintenance Schedule Item"
  }, 
  {
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Item Code", 
-  "oldfieldname": "item_code", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "item_code", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Item Code", 
+  "oldfieldname": "item_code", 
+  "oldfieldtype": "Link", 
   "options": "Item", 
-  "in_filter": 1
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Item Name", 
-  "oldfieldname": "item_name", 
   "fieldname": "item_name", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Item Name", 
+  "oldfieldname": "item_name", 
+  "oldfieldtype": "Data", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Description", 
-  "oldfieldname": "description", 
-  "width": "300px", 
   "fieldname": "description", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Description", 
+  "oldfieldname": "description", 
+  "oldfieldtype": "Data", 
+  "read_only": 1, 
+  "width": "300px"
  }, 
  {
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "Start Date", 
-  "oldfieldname": "start_date", 
   "fieldname": "start_date", 
   "fieldtype": "Date", 
+  "in_filter": 1, 
+  "label": "Start Date", 
+  "oldfieldname": "start_date", 
   "oldfieldtype": "Date", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "End Date", 
-  "oldfieldname": "end_date", 
   "fieldname": "end_date", 
   "fieldtype": "Date", 
+  "in_filter": 1, 
+  "label": "End Date", 
+  "oldfieldname": "end_date", 
   "oldfieldtype": "Date", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Periodicity", 
-  "oldfieldname": "periodicity", 
-  "permlevel": 0, 
   "fieldname": "periodicity", 
   "fieldtype": "Select", 
+  "label": "Periodicity", 
+  "oldfieldname": "periodicity", 
+  "oldfieldtype": "Select", 
   "options": "\nWeekly\nMonthly\nQuarterly\nHalf Yearly\nYearly\nRandom"
  }, 
  {
-  "oldfieldtype": "Int", 
   "doctype": "DocField", 
-  "label": "No of Visits", 
-  "oldfieldname": "no_of_visits", 
   "fieldname": "no_of_visits", 
   "fieldtype": "Int", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "No of Visits", 
+  "oldfieldname": "no_of_visits", 
+  "oldfieldtype": "Int", 
+  "reqd": 1
  }, 
  {
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "Incharge Name", 
-  "oldfieldname": "incharge_name", 
-  "options": "Sales Person", 
   "fieldname": "incharge_name", 
   "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Incharge Name", 
+  "oldfieldname": "incharge_name", 
   "oldfieldtype": "Link", 
+  "options": "Sales Person", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 0
  }, 
  {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Serial No", 
-  "oldfieldname": "serial_no", 
   "fieldname": "serial_no", 
   "fieldtype": "Small Text", 
-  "permlevel": 0
+  "label": "Serial No", 
+  "oldfieldname": "serial_no", 
+  "oldfieldtype": "Small Text"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "Against Docname", 
-  "oldfieldname": "prevdoc_docname", 
-  "width": "150px", 
   "fieldname": "prevdoc_docname", 
   "fieldtype": "Data", 
+  "in_filter": 1, 
+  "label": "Against Docname", 
+  "no_copy": 1, 
+  "oldfieldname": "prevdoc_docname", 
   "oldfieldtype": "Data", 
-  "permlevel": 1, 
-  "in_filter": 1
+  "print_hide": 1, 
+  "read_only": 1, 
+  "search_index": 1, 
+  "width": "150px"
  }
 ]
\ No newline at end of file
diff --git a/support/doctype/maintenance_visit/maintenance_visit.txt b/support/doctype/maintenance_visit/maintenance_visit.txt
index fbbfdd7..6dd6d73 100644
--- a/support/doctype/maintenance_visit/maintenance_visit.txt
+++ b/support/doctype/maintenance_visit/maintenance_visit.txt
@@ -1,440 +1,369 @@
 [
  {
-  "owner": "ashwini@webnotestech.com", 
+  "creation": "2013-01-10 16:34:31", 
   "docstatus": 0, 
-  "creation": "2012-06-11 12:10:15", 
+  "modified": "2013-01-22 14:56:04", 
   "modified_by": "Administrator", 
-  "modified": "2012-06-27 12:50:00"
+  "owner": "ashwini@webnotestech.com"
  }, 
  {
-  "section_style": "Simple", 
-  "is_submittable": 1, 
-  "tag_fields": "completion_status,maintenance_type", 
-  "search_fields": "status,maintenance_type,customer,customer_name, address,mntc_date,company,fiscal_year", 
-  "module": "Support", 
-  "server_code_error": " ", 
   "autoname": "MV.#####", 
-  "subject": "To %(customer_name)s on %(mntc_date)s", 
-  "_last_update": "1322549701", 
-  "name": "__common__", 
-  "colour": "White:FFF", 
   "doctype": "DocType", 
-  "show_in_menu": 0, 
-  "version": 1
+  "is_submittable": 1, 
+  "module": "Support", 
+  "name": "__common__", 
+  "search_fields": "status,maintenance_type,customer,customer_name, address,mntc_date,company,fiscal_year"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Maintenance Visit", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Maintenance Visit", 
+  "parentfield": "fields", 
+  "parenttype": "DocType", 
+  "permlevel": 0
+ }, 
+ {
+  "amend": 1, 
+  "cancel": 1, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Maintenance Visit", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
+  "permlevel": 0, 
   "read": 1, 
-  "doctype": "DocPerm", 
-  "parenttype": "DocType", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Maintenance Visit", 
-  "doctype": "DocType"
- }, 
- {
-  "amend": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
   "report": 1, 
-  "role": "System Manager", 
-  "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "role": "System Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "amend": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
   "submit": 1, 
-  "write": 1, 
-  "report": 1, 
-  "role": "Maintenance Manager", 
-  "cancel": 1, 
-  "permlevel": 0
+  "write": 1
  }, 
  {
-  "role": "Maintenance Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
+  "doctype": "DocType", 
+  "name": "Maintenance Visit"
  }, 
  {
-  "amend": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "report": 1, 
-  "role": "Maintenance User", 
-  "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "role": "Maintenance User", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Customer Details", 
-  "options": "Simple", 
   "fieldname": "customer_details", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Customer Details", 
+  "oldfieldtype": "Section Break", 
+  "options": "Simple"
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
   "fieldname": "column_break0", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Customer", 
-  "oldfieldname": "customer", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "customer", 
   "fieldtype": "Link", 
-  "search_index": 0, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Customer", 
+  "oldfieldname": "customer", 
+  "oldfieldtype": "Link", 
   "options": "Customer", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 0
  }, 
  {
   "doctype": "DocField", 
-  "label": "Customer Name", 
   "fieldname": "customer_name", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Customer Name", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Address", 
   "fieldname": "address_display", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Address", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Contact", 
   "fieldname": "contact_display", 
   "fieldtype": "Small Text", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Contact", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Mobile No", 
   "fieldname": "contact_mobile", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Mobile No", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Contact Email", 
   "fieldname": "contact_email", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Contact Email", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
   "default": "Today", 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Maintenance Date", 
-  "oldfieldname": "mntc_date", 
-  "no_copy": 1, 
   "fieldname": "mntc_date", 
   "fieldtype": "Date", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Maintenance Date", 
+  "no_copy": 1, 
+  "oldfieldname": "mntc_date", 
+  "oldfieldtype": "Date", 
+  "reqd": 1
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Time", 
   "doctype": "DocField", 
-  "label": "Maintenance Time", 
-  "oldfieldname": "mntc_time", 
   "fieldname": "mntc_time", 
   "fieldtype": "Time", 
-  "permlevel": 0
+  "label": "Maintenance Time", 
+  "no_copy": 1, 
+  "oldfieldname": "mntc_time", 
+  "oldfieldtype": "Time"
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "Maintenance Details", 
-  "options": "Simple", 
   "fieldname": "maintenance_details", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Maintenance Details", 
+  "oldfieldtype": "Section Break", 
+  "options": "Simple"
  }, 
  {
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Completion Status", 
-  "oldfieldname": "completion_status", 
-  "options": "\nPartially Completed\nFully Completed", 
   "fieldname": "completion_status", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Completion Status", 
+  "oldfieldname": "completion_status", 
+  "oldfieldtype": "Select", 
+  "options": "\nPartially Completed\nFully Completed", 
+  "reqd": 1
  }, 
  {
   "default": "Unscheduled", 
-  "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Maintenance Type", 
-  "oldfieldname": "maintenance_type", 
-  "permlevel": 0, 
   "fieldname": "maintenance_type", 
   "fieldtype": "Select", 
-  "search_index": 0, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Maintenance Type", 
+  "oldfieldname": "maintenance_type", 
+  "oldfieldtype": "Select", 
   "options": "\nScheduled\nUnscheduled\nBreakdown", 
-  "in_filter": 1
+  "reqd": 1, 
+  "search_index": 0
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break2", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
-  "search_index": 1, 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Sales Order No", 
-  "oldfieldname": "sales_order_no", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "sales_order_no", 
   "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Sales Order No", 
+  "oldfieldname": "sales_order_no", 
   "oldfieldtype": "Link", 
   "options": "Sales Order", 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "search_index": 1, 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Customer Issue No", 
-  "oldfieldname": "customer_issue_no", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "customer_issue_no", 
   "fieldtype": "Link", 
+  "in_filter": 1, 
+  "label": "Customer Issue No", 
+  "oldfieldname": "customer_issue_no", 
   "oldfieldtype": "Link", 
   "options": "Customer Issue", 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
   "doctype": "DocField", 
-  "permlevel": 0, 
   "fieldname": "maintenance_schedule", 
   "fieldtype": "Link", 
+  "in_filter": 1, 
   "label": "Maintenance Schedule", 
-  "options": "Maintenance Schedule", 
-  "in_filter": 1
+  "options": "Maintenance Schedule"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Button", 
   "doctype": "DocField", 
-  "label": "Get Items", 
-  "options": "fetch_items", 
   "fieldname": "get_items", 
   "fieldtype": "Button", 
-  "permlevel": 0, 
+  "label": "Get Items", 
+  "oldfieldtype": "Button", 
+  "options": "fetch_items", 
+  "print_hide": 1, 
   "report_hide": 1
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "options": "Simple", 
   "fieldname": "section_break0", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "oldfieldtype": "Section Break", 
+  "options": "Simple"
  }, 
  {
-  "oldfieldtype": "Table", 
   "doctype": "DocField", 
-  "label": "Maintenance Visit Purpose", 
-  "oldfieldname": "maintenance_visit_details", 
-  "options": "Maintenance Visit Purpose", 
   "fieldname": "maintenance_visit_details", 
   "fieldtype": "Table", 
-  "permlevel": 0
+  "label": "Maintenance Visit Purpose", 
+  "oldfieldname": "maintenance_visit_details", 
+  "oldfieldtype": "Table", 
+  "options": "Maintenance Visit Purpose"
  }, 
  {
-  "oldfieldtype": "Section Break", 
   "doctype": "DocField", 
-  "label": "More Info", 
   "fieldname": "more_info", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "More Info", 
+  "oldfieldtype": "Section Break"
  }, 
  {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Customer Feedback", 
-  "oldfieldname": "customer_feedback", 
   "fieldname": "customer_feedback", 
   "fieldtype": "Small Text", 
-  "permlevel": 0
+  "label": "Customer Feedback", 
+  "oldfieldname": "customer_feedback", 
+  "oldfieldtype": "Small Text"
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "col_break3", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
-  "permlevel": 1, 
   "default": "Draft", 
-  "oldfieldtype": "Data", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Status", 
-  "oldfieldname": "status", 
-  "no_copy": 1, 
   "fieldname": "status", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "options": "\nDraft\nCancelled\nSubmitted"
+  "label": "Status", 
+  "no_copy": 1, 
+  "oldfieldname": "status", 
+  "oldfieldtype": "Data", 
+  "options": "\nDraft\nCancelled\nSubmitted", 
+  "read_only": 1, 
+  "reqd": 1
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Amended From", 
-  "oldfieldname": "amended_from", 
-  "width": "150px", 
   "fieldname": "amended_from", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Amended From", 
+  "no_copy": 1, 
+  "oldfieldname": "amended_from", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "width": "150px"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Amendment Date", 
-  "oldfieldname": "amendment_date", 
-  "width": "100px", 
   "fieldname": "amendment_date", 
   "fieldtype": "Date", 
-  "permlevel": 0
+  "label": "Amendment Date", 
+  "no_copy": 1, 
+  "oldfieldname": "amendment_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 1, 
+  "width": "100px"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Company", 
-  "oldfieldname": "company", 
-  "permlevel": 0, 
   "fieldname": "company", 
   "fieldtype": "Select", 
-  "search_index": 0, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Company", 
+  "oldfieldname": "company", 
+  "oldfieldtype": "Select", 
   "options": "link:Company", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 0
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Select", 
   "doctype": "DocField", 
-  "label": "Fiscal Year", 
-  "oldfieldname": "fiscal_year", 
-  "permlevel": 0, 
   "fieldname": "fiscal_year", 
   "fieldtype": "Select", 
-  "search_index": 0, 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Fiscal Year", 
+  "oldfieldname": "fiscal_year", 
+  "oldfieldtype": "Select", 
   "options": "link:Fiscal Year", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "reqd": 1, 
+  "search_index": 0
  }, 
  {
   "doctype": "DocField", 
-  "label": "Contact Info", 
   "fieldname": "contact_info_section", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Contact Info"
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Customer Address", 
-  "permlevel": 0, 
   "fieldname": "customer_address", 
   "fieldtype": "Link", 
-  "options": "Address"
+  "label": "Customer Address", 
+  "options": "Address", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Contact Person", 
-  "permlevel": 0, 
   "fieldname": "contact_person", 
   "fieldtype": "Link", 
-  "options": "Contact"
+  "label": "Contact Person", 
+  "options": "Contact", 
+  "print_hide": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "col_break4", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Territory", 
-  "permlevel": 0, 
   "fieldname": "territory", 
   "fieldtype": "Link", 
-  "options": "Territory"
+  "label": "Territory", 
+  "options": "Territory", 
+  "print_hide": 1
  }, 
  {
-  "print_hide": 1, 
   "doctype": "DocField", 
-  "label": "Customer Group", 
-  "permlevel": 0, 
   "fieldname": "customer_group", 
   "fieldtype": "Link", 
-  "options": "Customer Group"
+  "label": "Customer Group", 
+  "options": "Customer Group", 
+  "print_hide": 1
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "System Manager"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "Maintenance Manager"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "Maintenance User"
  }
 ]
\ No newline at end of file
diff --git a/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.txt b/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.txt
index d4c8094..131076c 100644
--- a/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.txt
+++ b/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.txt
@@ -1,136 +1,125 @@
 [
  {
-  "owner": "ashwini@webnotestech.com", 
+  "creation": "2013-01-10 16:34:31", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:36:43", 
+  "modified": "2013-01-22 14:47:03", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:36:43"
+  "owner": "ashwini@webnotestech.com"
  }, 
  {
-  "section_style": "Simple", 
-  "istable": 1, 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "module": "Support", 
-  "server_code_error": " ", 
-  "version": 13, 
+  "autoname": "MVD.#####", 
   "doctype": "DocType", 
-  "autoname": "MVD.#####"
+  "istable": 1, 
+  "module": "Support", 
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Maintenance Visit Purpose", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "name": "Maintenance Visit Purpose", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Maintenance Visit Purpose"
  }, 
  {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Description", 
-  "oldfieldname": "description", 
-  "width": "300px", 
   "fieldname": "description", 
   "fieldtype": "Small Text", 
+  "label": "Description", 
+  "oldfieldname": "description", 
+  "oldfieldtype": "Small Text", 
   "reqd": 1, 
-  "permlevel": 0
+  "width": "300px"
  }, 
  {
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Service Person", 
-  "oldfieldname": "service_person", 
-  "permlevel": 0, 
   "fieldname": "service_person", 
   "fieldtype": "Link", 
-  "reqd": 1, 
-  "options": "Sales Person"
+  "label": "Service Person", 
+  "oldfieldname": "service_person", 
+  "oldfieldtype": "Link", 
+  "options": "Sales Person", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Work Done", 
-  "oldfieldname": "work_done", 
   "fieldname": "work_done", 
   "fieldtype": "Small Text", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Work Done", 
+  "oldfieldname": "work_done", 
+  "oldfieldtype": "Small Text", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Item Code", 
-  "oldfieldname": "item_code", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "item_code", 
   "fieldtype": "Link", 
+  "label": "Item Code", 
+  "oldfieldname": "item_code", 
+  "oldfieldtype": "Link", 
   "options": "Item"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Item Name", 
-  "oldfieldname": "item_name", 
   "fieldname": "item_name", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Item Name", 
+  "oldfieldname": "item_name", 
+  "oldfieldtype": "Data", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Serial No", 
-  "oldfieldname": "serial_no", 
   "fieldname": "serial_no", 
   "fieldtype": "Small Text", 
-  "permlevel": 0
+  "label": "Serial No", 
+  "oldfieldname": "serial_no", 
+  "oldfieldtype": "Small Text"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Against Document No", 
-  "oldfieldname": "prevdoc_docname", 
-  "width": "160px", 
   "fieldname": "prevdoc_docname", 
   "fieldtype": "Data", 
   "hidden": 0, 
-  "permlevel": 1, 
-  "report_hide": 1
+  "label": "Against Document No", 
+  "no_copy": 1, 
+  "oldfieldname": "prevdoc_docname", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "report_hide": 1, 
+  "width": "160px"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Against Document Detail No", 
-  "oldfieldname": "prevdoc_detail_docname", 
-  "width": "160px", 
   "fieldname": "prevdoc_detail_docname", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1, 
-  "report_hide": 1
+  "label": "Against Document Detail No", 
+  "no_copy": 1, 
+  "oldfieldname": "prevdoc_detail_docname", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "report_hide": 1, 
+  "width": "160px"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Document Type", 
-  "oldfieldname": "prevdoc_doctype", 
-  "width": "150px", 
   "fieldname": "prevdoc_doctype", 
   "fieldtype": "Data", 
   "hidden": 0, 
-  "permlevel": 1, 
-  "report_hide": 1
+  "label": "Document Type", 
+  "no_copy": 1, 
+  "oldfieldname": "prevdoc_doctype", 
+  "oldfieldtype": "Data", 
+  "print_hide": 1, 
+  "read_only": 1, 
+  "report_hide": 1, 
+  "width": "150px"
  }
 ]
\ No newline at end of file
diff --git a/support/doctype/newsletter/newsletter.txt b/support/doctype/newsletter/newsletter.txt
index 020c031..0a7c76a 100644
--- a/support/doctype/newsletter/newsletter.txt
+++ b/support/doctype/newsletter/newsletter.txt
@@ -1,202 +1,172 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:31", 
   "docstatus": 0, 
-  "creation": "2013-01-01 13:46:34", 
+  "modified": "2013-01-22 14:56:40", 
   "modified_by": "Administrator", 
-  "modified": "2013-01-02 13:47:36"
+  "owner": "Administrator"
  }, 
  {
-  "description": "Create and Send Newsletters", 
   "autoname": "naming_series:", 
-  "module": "Support", 
+  "description": "Create and Send Newsletters", 
   "doctype": "DocType", 
   "document_type": "Other", 
+  "module": "Support", 
   "name": "__common__"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Newsletter", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
   "name": "__common__", 
   "parent": "Newsletter", 
-  "read": 1, 
-  "doctype": "DocPerm", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
+  "permlevel": 0
  }, 
  {
-  "name": "Newsletter", 
-  "doctype": "DocType"
+  "cancel": 1, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Newsletter", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
+  "permlevel": 0, 
+  "read": 1, 
+  "report": 1, 
+  "submit": 0, 
+  "write": 1
+ }, 
+ {
+  "doctype": "DocType", 
+  "name": "Newsletter"
  }, 
  {
   "description": "Select who you want to send this newsletter to", 
   "doctype": "DocField", 
-  "label": "Send To", 
   "fieldname": "send_to", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Send To"
  }, 
  {
   "default": "NL-", 
   "doctype": "DocField", 
-  "label": "Naming Series", 
-  "permlevel": 0, 
   "fieldname": "naming_series", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "options": "NL-"
+  "label": "Naming Series", 
+  "options": "NL-", 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "All Contacts", 
   "fieldname": "contacts", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "All Contacts"
  }, 
  {
   "doctype": "DocField", 
-  "label": "All Customer Contacts", 
   "fieldname": "customer_contacts", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "All Customer Contacts"
  }, 
  {
   "doctype": "DocField", 
-  "label": "All Leads", 
   "fieldname": "leads", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "All Leads"
  }, 
  {
   "doctype": "DocField", 
-  "label": "All Active Leads", 
   "fieldname": "active_leads", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "All Active Leads"
  }, 
  {
   "doctype": "DocField", 
-  "label": "All Blog Subscribers", 
   "fieldname": "blog_subscribers", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "All Blog Subscribers"
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "column_break1", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
   "description": "Comma separated list of email addresses", 
   "doctype": "DocField", 
-  "label": "Send to this list", 
   "fieldname": "email_list", 
   "fieldtype": "Text", 
-  "permlevel": 0
+  "label": "Send to this list"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Newsletter Content", 
   "fieldname": "newsletter_content", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Newsletter Content"
  }, 
  {
   "description": "If specified, send the newsletter using this email address", 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Send From", 
   "fieldname": "send_from", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Send From", 
+  "no_copy": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Subject", 
   "fieldname": "subject", 
   "fieldtype": "Small Text", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Subject", 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Message", 
   "fieldname": "message", 
   "fieldtype": "Text Editor", 
-  "reqd": 0, 
-  "permlevel": 0
+  "label": "Message", 
+  "reqd": 0
  }, 
  {
   "description": "Check how the newsletter looks in an email by sending it to your email.", 
   "doctype": "DocField", 
-  "label": "Test the Newsletter", 
   "fieldname": "test_the_newsletter", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Test the Newsletter"
  }, 
  {
   "description": "A Lead with this email id should exist", 
   "doctype": "DocField", 
-  "label": "Test Email Id", 
   "fieldname": "test_email_id", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Test Email Id"
  }, 
  {
   "doctype": "DocField", 
-  "options": "test_send", 
   "fieldname": "test_send", 
   "fieldtype": "Button", 
   "label": "Test", 
-  "permlevel": 0
+  "options": "test_send"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Newsletter Status", 
   "fieldname": "newsletter_status", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Newsletter Status"
  }, 
  {
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "Email Sent?", 
   "fieldname": "email_sent", 
   "fieldtype": "Check", 
-  "permlevel": 1
+  "label": "Email Sent?", 
+  "no_copy": 1, 
+  "read_only": 1
  }, 
  {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "cancel": 1, 
-  "role": "Sales Manager", 
-  "report": 1, 
-  "permlevel": 0
+  "role": "Sales Manager"
  }, 
  {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "cancel": 1, 
-  "role": "Support Manager", 
-  "report": 1, 
-  "permlevel": 0
- }, 
- {
-  "role": "Sales Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
- }, 
- {
-  "role": "Support Manager", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
+  "role": "Support Manager"
  }
 ]
\ No newline at end of file
diff --git a/support/doctype/support_ticket/support_ticket.js b/support/doctype/support_ticket/support_ticket.js
index 9abdff0..3da81d9 100644
--- a/support/doctype/support_ticket/support_ticket.js
+++ b/support/doctype/support_ticket/support_ticket.js
@@ -33,14 +33,13 @@
 		      if(doc.status!='Closed') cur_frm.add_custom_button('Close Ticket', cur_frm.cscript['Close Ticket']);	
 			  if(doc.status=='Closed') cur_frm.add_custom_button('Re-Open Ticket', cur_frm.cscript['Re-Open Ticket']);		
 			}else if(doc.allocated_to) {
-			  set_field_permlevel('status',2);
+			  cur_frm.set_df_property('status','read_only', 1);
 			  if(user==doc.allocated_to && doc.status!='Closed') cur_frm.add_custom_button('Close Ticket', cur_frm.cscript['Close Ticket']);
 			}
 			
-			// can't change the main message & subject once set  
-			set_field_permlevel('subject',2);
-			set_field_permlevel('description',2);
-			set_field_permlevel('raised_by',2);
+			cur_frm.set_df_property('subject','read_only', 1);
+			cur_frm.set_df_property('description','hidden', 1);
+			cur_frm.set_df_property('raised_by','read_only', 1);
 		}
 		refresh_field('status');
 	},
diff --git a/support/doctype/support_ticket/support_ticket.txt b/support/doctype/support_ticket/support_ticket.txt
index b475db5..e76c1ee 100644
--- a/support/doctype/support_ticket/support_ticket.txt
+++ b/support/doctype/support_ticket/support_ticket.txt
@@ -1,295 +1,277 @@
 [
  {
-  "owner": "Administrator", 
-  "docstatus": 0, 
   "creation": "2013-01-10 16:34:31", 
+  "docstatus": 0, 
+  "modified": "2013-01-22 14:57:25", 
   "modified_by": "Administrator", 
-  "modified": "2013-01-14 14:15:37"
+  "owner": "Administrator"
  }, 
  {
-  "autoname": "naming_series:", 
   "allow_attach": 1, 
-  "search_fields": "status,customer,allocated_to,subject,raised_by", 
-  "module": "Support", 
+  "autoname": "naming_series:", 
   "doctype": "DocType", 
-  "name": "__common__"
+  "module": "Support", 
+  "name": "__common__", 
+  "search_fields": "status,customer,allocated_to,subject,raised_by"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Support Ticket", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
-  "name": "__common__", 
-  "parent": "Support Ticket", 
-  "amend": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "read": 1, 
-  "parenttype": "DocType", 
-  "report": 1, 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Support Ticket", 
-  "doctype": "DocType"
- }, 
- {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "search_index": 0, 
-  "doctype": "DocField", 
-  "label": "Naming Series", 
-  "options": "SUP", 
-  "fieldname": "naming_series", 
-  "fieldtype": "Select", 
-  "reqd": 0, 
-  "hidden": 0, 
   "permlevel": 0
  }, 
  {
-  "permlevel": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Select", 
-  "doctype": "DocField", 
-  "label": "Status", 
-  "oldfieldname": "status", 
-  "default": "Open", 
-  "fieldname": "status", 
-  "fieldtype": "Select", 
-  "search_index": 1, 
-  "reqd": 0, 
-  "options": "\nOpen\nTo Reply\nWaiting for Customer\nHold\nClosed", 
-  "in_filter": 0
+  "amend": 0, 
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Support Ticket", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
+  "read": 1, 
+  "report": 1, 
+  "submit": 0
+ }, 
+ {
+  "doctype": "DocType", 
+  "name": "Support Ticket"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Subject", 
+  "fieldname": "naming_series", 
+  "fieldtype": "Select", 
+  "hidden": 0, 
+  "label": "Naming Series", 
+  "no_copy": 1, 
+  "options": "SUP", 
+  "print_hide": 1, 
+  "reqd": 0, 
+  "search_index": 0
+ }, 
+ {
+  "default": "Open", 
+  "doctype": "DocField", 
+  "fieldname": "status", 
+  "fieldtype": "Select", 
+  "in_filter": 0, 
+  "label": "Status", 
+  "no_copy": 1, 
+  "oldfieldname": "status", 
+  "oldfieldtype": "Select", 
+  "options": "\nOpen\nTo Reply\nWaiting for Customer\nHold\nClosed", 
+  "read_only": 1, 
+  "reqd": 0, 
+  "search_index": 1
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "subject", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Subject", 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "cb00", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
-  "oldfieldtype": "Data", 
+  "depends_on": "eval:doc.__islocal", 
   "doctype": "DocField", 
-  "label": "Raised By (Email)", 
-  "oldfieldname": "raised_by", 
   "fieldname": "raised_by", 
   "fieldtype": "Data", 
-  "depends_on": "eval:doc.__islocal", 
-  "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Raised By (Email)", 
+  "oldfieldname": "raised_by", 
+  "oldfieldtype": "Data", 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "sb00", 
-  "fieldtype": "Section Break", 
-  "permlevel": 0
+  "fieldtype": "Section Break"
  }, 
  {
-  "oldfieldtype": "Text", 
+  "depends_on": "eval:doc.__islocal", 
   "doctype": "DocField", 
-  "label": "Description", 
-  "oldfieldname": "problem_description", 
   "fieldname": "description", 
   "fieldtype": "Text", 
-  "depends_on": "eval:doc.__islocal", 
-  "reqd": 0, 
-  "permlevel": 0
+  "label": "Description", 
+  "oldfieldname": "problem_description", 
+  "oldfieldtype": "Text", 
+  "reqd": 0
  }, 
  {
   "depends_on": "eval:!doc.__islocal", 
   "doctype": "DocField", 
-  "label": "Thread HTML", 
   "fieldname": "thread_html", 
   "fieldtype": "HTML", 
-  "permlevel": 1
+  "label": "Thread HTML", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Additional Info", 
   "fieldname": "additional_info", 
   "fieldtype": "Section Break", 
-  "permlevel": 1
+  "label": "Additional Info", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Column Break", 
+  "depends_on": "eval:!doc.__islocal", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break0", 
   "fieldtype": "Column Break", 
-  "depends_on": "eval:!doc.__islocal", 
-  "permlevel": 1
+  "oldfieldtype": "Column Break", 
+  "read_only": 1, 
+  "width": "50%"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Lead", 
-  "options": "Lead", 
   "fieldname": "lead", 
   "fieldtype": "Link", 
-  "permlevel": 0
+  "label": "Lead", 
+  "options": "Lead"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Contact", 
-  "options": "Contact", 
   "fieldname": "contact", 
   "fieldtype": "Link", 
-  "permlevel": 0
+  "label": "Contact", 
+  "options": "Contact"
  }, 
  {
-  "print_hide": 1, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Customer", 
-  "oldfieldname": "customer", 
-  "permlevel": 1, 
   "fieldname": "customer", 
   "fieldtype": "Link", 
-  "search_index": 1, 
-  "reqd": 0, 
+  "in_filter": 1, 
+  "label": "Customer", 
+  "oldfieldname": "customer", 
+  "oldfieldtype": "Link", 
   "options": "Customer", 
-  "in_filter": 1
+  "print_hide": 1, 
+  "read_only": 1, 
+  "reqd": 0, 
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Customer Name", 
-  "oldfieldname": "customer_name", 
   "fieldname": "customer_name", 
   "fieldtype": "Data", 
-  "search_index": 0, 
+  "in_filter": 1, 
+  "label": "Customer Name", 
+  "oldfieldname": "customer_name", 
+  "oldfieldtype": "Data", 
+  "read_only": 1, 
   "reqd": 0, 
-  "permlevel": 2, 
-  "in_filter": 1
+  "search_index": 0
  }, 
  {
   "default": "Today", 
-  "oldfieldtype": "Date", 
   "doctype": "DocField", 
-  "label": "Opening Date", 
-  "oldfieldname": "opening_date", 
-  "no_copy": 1, 
   "fieldname": "opening_date", 
   "fieldtype": "Date", 
-  "permlevel": 1
+  "label": "Opening Date", 
+  "no_copy": 1, 
+  "oldfieldname": "opening_date", 
+  "oldfieldtype": "Date", 
+  "read_only": 1
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Time", 
   "doctype": "DocField", 
-  "label": "Opening Time", 
-  "oldfieldname": "opening_time", 
   "fieldname": "opening_time", 
   "fieldtype": "Time", 
-  "permlevel": 1
+  "label": "Opening Time", 
+  "no_copy": 1, 
+  "oldfieldname": "opening_time", 
+  "oldfieldtype": "Time", 
+  "read_only": 1
  }, 
  {
-  "oldfieldtype": "Column Break", 
+  "depends_on": "eval:!doc.__islocal", 
   "doctype": "DocField", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
-  "depends_on": "eval:!doc.__islocal", 
-  "permlevel": 1
+  "oldfieldtype": "Column Break", 
+  "read_only": 1
  }, 
  {
-  "no_copy": 1, 
-  "oldfieldtype": "Text", 
+  "depends_on": "eval:!doc.__islocal", 
   "doctype": "DocField", 
-  "label": "Resolution Details", 
-  "oldfieldname": "resolution_details", 
   "fieldname": "resolution_details", 
   "fieldtype": "Small Text", 
-  "depends_on": "eval:!doc.__islocal", 
-  "permlevel": 1
+  "label": "Resolution Details", 
+  "no_copy": 1, 
+  "oldfieldname": "resolution_details", 
+  "oldfieldtype": "Text", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "First Responded On", 
   "fieldname": "first_responded_on", 
   "fieldtype": "Datetime", 
-  "permlevel": 0
+  "label": "First Responded On"
  }, 
  {
-  "no_copy": 1, 
   "depends_on": "eval:!doc.__islocal", 
   "doctype": "DocField", 
-  "label": "Resolution Date", 
-  "oldfieldname": "resolution_date", 
   "fieldname": "resolution_date", 
   "fieldtype": "Datetime", 
-  "search_index": 0, 
+  "in_filter": 0, 
+  "label": "Resolution Date", 
+  "no_copy": 1, 
+  "oldfieldname": "resolution_date", 
   "oldfieldtype": "Date", 
-  "permlevel": 1, 
-  "in_filter": 0
+  "read_only": 1, 
+  "search_index": 0
  }, 
  {
   "doctype": "DocField", 
-  "label": "Content Type", 
   "fieldname": "content_type", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Content Type"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "File List", 
   "fieldname": "file_list", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "File List", 
+  "no_copy": 1, 
+  "print_hide": 1
  }, 
  {
+  "cancel": 0, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
+  "permlevel": 0, 
   "role": "Guest", 
-  "cancel": 0, 
-  "permlevel": 0
+  "write": 1
  }, 
  {
+  "cancel": 0, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
+  "permlevel": 0, 
   "role": "Customer", 
-  "cancel": 0, 
-  "permlevel": 0
+  "write": 1
  }, 
  {
+  "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
+  "permlevel": 0, 
   "role": "Support Team", 
-  "cancel": 1, 
-  "permlevel": 0
+  "write": 1
  }, 
  {
+  "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "write": 1, 
+  "permlevel": 2, 
   "role": "Support Team", 
-  "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "role": "Support Team", 
-  "cancel": 0, 
-  "permlevel": 2
+  "write": 0
  }
 ]
\ No newline at end of file
diff --git a/utilities/doctype/address/address.txt b/utilities/doctype/address/address.txt
index 4eeb211..77f25cf 100644
--- a/utilities/doctype/address/address.txt
+++ b/utilities/doctype/address/address.txt
@@ -1,258 +1,221 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:32", 
   "docstatus": 0, 
-  "creation": "2012-07-03 13:30:41", 
+  "modified": "2013-01-22 14:55:56", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-27 18:08:55"
+  "owner": "Administrator"
  }, 
  {
-  "document_type": "Master", 
-  "name": "__common__", 
-  "module": "Utilities", 
   "doctype": "DocType", 
+  "document_type": "Master", 
   "in_dialog": 0, 
+  "module": "Utilities", 
+  "name": "__common__", 
   "search_fields": "customer, supplier, sales_partner, country, state"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Address", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "name": "__common__", 
-  "parent": "Address", 
-  "read": 1, 
+  "create": 1, 
   "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Address", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
+  "permlevel": 0, 
+  "read": 1, 
+  "report": 1, 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "name": "Address", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Address"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Address Details", 
   "fieldname": "address_details", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Address Details"
  }, 
  {
   "description": "e.g. Office, Billing, Shipping", 
   "doctype": "DocField", 
-  "label": "Address Type", 
   "fieldname": "address_type", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Address Type", 
+  "reqd": 1
  }, 
  {
   "description": "Name of person or organization that this address belongs to.", 
   "doctype": "DocField", 
-  "label": "Address Title", 
   "fieldname": "address_title", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Address Title", 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Address Line1", 
   "fieldname": "address_line1", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Address Line1", 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Address Line2", 
   "fieldname": "address_line2", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Address Line2"
  }, 
  {
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "City/Town", 
   "fieldname": "city", 
   "fieldtype": "Data", 
+  "in_filter": 1, 
+  "label": "City/Town", 
   "reqd": 1, 
-  "permlevel": 0, 
-  "in_filter": 1
+  "search_index": 1
  }, 
  {
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "Pincode", 
   "fieldname": "pincode", 
   "fieldtype": "Data", 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Pincode", 
+  "search_index": 1
  }, 
  {
-  "search_index": 1, 
   "doctype": "DocField", 
-  "label": "Country", 
-  "permlevel": 0, 
   "fieldname": "country", 
   "fieldtype": "Select", 
-  "reqd": 1, 
+  "in_filter": 1, 
+  "label": "Country", 
   "options": "link:Country", 
-  "in_filter": 1
+  "reqd": 1, 
+  "search_index": 1
  }, 
  {
-  "search_index": 0, 
   "doctype": "DocField", 
-  "label": "State", 
-  "permlevel": 0, 
   "fieldname": "state", 
   "fieldtype": "Data", 
+  "in_filter": 1, 
+  "label": "State", 
   "options": "Suggest", 
-  "in_filter": 1
+  "search_index": 0
  }, 
  {
-  "print_hide": 0, 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break0", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "print_hide": 0, 
+  "width": "50%"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Phone", 
   "fieldname": "phone", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Phone", 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Email Id", 
   "fieldname": "email_id", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Email Id"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Fax", 
   "fieldname": "fax", 
   "fieldtype": "Data", 
-  "permlevel": 0, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Fax"
  }, 
  {
-  "description": "Check to make primary address", 
   "default": "0", 
+  "description": "Check to make primary address", 
   "doctype": "DocField", 
-  "label": "Is Primary Address", 
   "fieldname": "is_primary_address", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "Is Primary Address"
  }, 
  {
-  "description": "Check to make Shipping Address", 
   "default": "0", 
+  "description": "Check to make Shipping Address", 
   "doctype": "DocField", 
-  "label": "Is Shipping Address", 
   "fieldname": "is_shipping_address", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "Is Shipping Address"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Linked With", 
   "fieldname": "linked_with", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Linked With"
  }, 
  {
   "depends_on": "eval:!doc.supplier && !doc.sales_partner", 
   "doctype": "DocField", 
-  "label": "Customer", 
-  "permlevel": 0, 
   "fieldname": "customer", 
   "fieldtype": "Link", 
+  "label": "Customer", 
   "options": "Customer"
  }, 
  {
   "depends_on": "eval:!doc.supplier && !doc.sales_partner", 
   "doctype": "DocField", 
-  "label": "Customer Name", 
   "fieldname": "customer_name", 
   "fieldtype": "Data", 
-  "permlevel": 1, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Customer Name", 
+  "read_only": 1
  }, 
  {
   "depends_on": "eval:!doc.customer && !doc.sales_partner", 
   "doctype": "DocField", 
-  "label": "Supplier", 
-  "permlevel": 0, 
   "fieldname": "supplier", 
   "fieldtype": "Link", 
+  "label": "Supplier", 
   "options": "Supplier"
  }, 
  {
   "depends_on": "eval:!doc.customer && !doc.sales_partner", 
   "doctype": "DocField", 
-  "label": "Supplier Name", 
   "fieldname": "supplier_name", 
   "fieldtype": "Data", 
-  "search_index": 0, 
-  "permlevel": 1, 
-  "in_filter": 1
+  "in_filter": 1, 
+  "label": "Supplier Name", 
+  "read_only": 1, 
+  "search_index": 0
  }, 
  {
   "depends_on": "eval:!doc.customer && !doc.supplier", 
   "doctype": "DocField", 
-  "label": "Sales Partner", 
-  "permlevel": 0, 
   "fieldname": "sales_partner", 
   "fieldtype": "Link", 
+  "label": "Sales Partner", 
   "options": "Sales Partner"
  }, 
  {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "Sales User", 
-  "report": 1, 
-  "permlevel": 0
+  "role": "Sales User"
  }, 
  {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "Purchase User", 
-  "report": 1, 
-  "permlevel": 0
+  "role": "Purchase User"
  }, 
  {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "Maintenance User", 
-  "report": 1, 
-  "permlevel": 0
+  "role": "Maintenance User"
  }, 
  {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "Accounts User", 
-  "report": 1, 
-  "permlevel": 0
- }, 
- {
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "write": 0, 
-  "role": "All", 
-  "cancel": 0, 
-  "permlevel": 1
+  "role": "Accounts User"
  }
 ]
\ No newline at end of file
diff --git a/utilities/doctype/contact/contact.txt b/utilities/doctype/contact/contact.txt
index 400c73b..0a244dc 100644
--- a/utilities/doctype/contact/contact.txt
+++ b/utilities/doctype/contact/contact.txt
@@ -1,320 +1,248 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:32", 
   "docstatus": 0, 
-  "creation": "2012-08-06 11:15:46", 
+  "modified": "2013-01-22 14:55:59", 
   "modified_by": "Administrator", 
-  "modified": "2012-11-27 18:32:42"
+  "owner": "Administrator"
  }, 
  {
-  "in_create": 0, 
-  "module": "Utilities", 
   "doctype": "DocType", 
-  "in_dialog": 0, 
   "document_type": "Master", 
+  "in_create": 0, 
+  "in_dialog": 0, 
+  "module": "Utilities", 
   "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Contact", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "name": "__common__", 
-  "parent": "Contact", 
-  "read": 1, 
+  "create": 1, 
   "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Contact", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
+  "permlevel": 0, 
+  "read": 1, 
+  "report": 1, 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "name": "Contact", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Contact"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "First Name", 
-  "oldfieldname": "first_name", 
   "fieldname": "first_name", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "First Name", 
+  "oldfieldname": "first_name", 
+  "oldfieldtype": "Data", 
+  "reqd": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Last Name", 
-  "oldfieldname": "last_name", 
   "fieldname": "last_name", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Last Name", 
+  "oldfieldname": "last_name", 
+  "oldfieldtype": "Data"
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "cb00", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
-  "oldfieldtype": "Data", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Email Id", 
-  "oldfieldname": "email_id", 
   "fieldname": "email_id", 
   "fieldtype": "Data", 
-  "search_index": 1, 
+  "label": "Email Id", 
+  "oldfieldname": "email_id", 
+  "oldfieldtype": "Data", 
   "reqd": 1, 
-  "permlevel": 0
+  "search_index": 1
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Phone", 
-  "oldfieldname": "contact_no", 
   "fieldname": "phone", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Phone", 
+  "oldfieldname": "contact_no", 
+  "oldfieldtype": "Data", 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "sb00", 
-  "fieldtype": "Section Break", 
-  "permlevel": 0
+  "fieldtype": "Section Break"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Communication HTML", 
   "fieldname": "communication_html", 
   "fieldtype": "HTML", 
-  "permlevel": 0
+  "label": "Communication HTML"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Contact Details", 
   "fieldname": "contact_details", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Contact Details"
  }, 
  {
-  "print_hide": 0, 
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
+  "depends_on": "eval:!doc.supplier && !doc.sales_partner", 
   "doctype": "DocField", 
-  "label": "Customer", 
-  "oldfieldname": "customer", 
-  "trigger": "Client", 
   "fieldname": "customer", 
   "fieldtype": "Link", 
-  "depends_on": "eval:!doc.supplier && !doc.sales_partner", 
+  "label": "Customer", 
+  "oldfieldname": "customer", 
+  "oldfieldtype": "Link", 
   "options": "Customer", 
-  "permlevel": 0
+  "print_hide": 0
  }, 
  {
   "depends_on": "eval:!doc.supplier && !doc.sales_partner", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Customer Name", 
   "fieldname": "customer_name", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Customer Name", 
+  "read_only": 1
  }, 
  {
   "depends_on": "eval:!doc.customer && !doc.sales_partner", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Supplier", 
-  "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "supplier", 
   "fieldtype": "Link", 
+  "label": "Supplier", 
   "options": "Supplier"
  }, 
  {
-  "depends_on": "eval:!doc.customer && !doc.sales_partner", 
-  "colour": "White:FFF", 
   "allow_on_submit": 0, 
+  "depends_on": "eval:!doc.customer && !doc.sales_partner", 
   "doctype": "DocField", 
-  "label": "Supplier Name", 
   "fieldname": "supplier_name", 
   "fieldtype": "Data", 
-  "permlevel": 1
+  "label": "Supplier Name", 
+  "read_only": 1
  }, 
  {
   "depends_on": "eval:!doc.customer && !doc.supplier", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Sales Partner", 
-  "permlevel": 0, 
   "fieldname": "sales_partner", 
   "fieldtype": "Link", 
+  "label": "Sales Partner", 
   "options": "Sales Partner"
  }, 
  {
   "default": "0", 
-  "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
+  "depends_on": "eval:(doc.customer || doc.supplier || doc.sales_partner)", 
   "doctype": "DocField", 
-  "label": "Is Primary Contact", 
-  "oldfieldname": "is_primary_contact", 
   "fieldname": "is_primary_contact", 
   "fieldtype": "Check", 
-  "depends_on": "eval:(doc.customer || doc.supplier || doc.sales_partner)", 
-  "permlevel": 0
+  "label": "Is Primary Contact", 
+  "oldfieldname": "is_primary_contact", 
+  "oldfieldtype": "Select"
  }, 
  {
-  "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break1", 
   "fieldtype": "Column Break", 
-  "permlevel": 0
+  "oldfieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Mobile No", 
-  "oldfieldname": "mobile_no", 
   "fieldname": "mobile_no", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Mobile No", 
+  "oldfieldname": "mobile_no", 
+  "oldfieldtype": "Data"
  }, 
  {
   "description": "Enter department to which this Contact belongs", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Department", 
-  "permlevel": 0, 
   "fieldname": "department", 
   "fieldtype": "Data", 
+  "label": "Department", 
   "options": "Suggest"
  }, 
  {
   "description": "Enter designation of this Contact", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
-  "label": "Designation", 
-  "permlevel": 0, 
   "fieldname": "designation", 
   "fieldtype": "Data", 
+  "label": "Designation", 
   "options": "Suggest"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Unsubscribed", 
   "fieldname": "unsubscribed", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "Unsubscribed"
  }, 
  {
-  "oldfieldtype": "Small Text", 
   "doctype": "DocField", 
-  "label": "Trash Reason", 
-  "oldfieldname": "trash_reason", 
   "fieldname": "trash_reason", 
   "fieldtype": "Small Text", 
-  "permlevel": 1
+  "label": "Trash Reason", 
+  "oldfieldname": "trash_reason", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1
  }, 
  {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
   "cancel": 1, 
-  "role": "System Manager", 
-  "report": 1, 
-  "permlevel": 0
+  "doctype": "DocPerm", 
+  "role": "System Manager"
  }, 
  {
   "amend": 0, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 1, 
-  "report": 1, 
-  "role": "Sales Master Manager", 
   "cancel": 1, 
-  "permlevel": 0
+  "doctype": "DocPerm", 
+  "role": "Sales Master Manager"
  }, 
  {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
   "cancel": 1, 
-  "role": "Purchase Master Manager", 
-  "report": 1, 
-  "permlevel": 0
- }, 
- {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "Sales Manager", 
-  "report": 1, 
-  "permlevel": 0
+  "role": "Purchase Master Manager"
  }, 
  {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "Purchase Manager", 
-  "report": 1, 
-  "permlevel": 0
+  "role": "Sales Manager"
  }, 
  {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "Maintenance Manager", 
-  "report": 1, 
-  "permlevel": 0
+  "role": "Purchase Manager"
  }, 
  {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "Accounts Manager", 
-  "report": 1, 
-  "permlevel": 0
+  "role": "Maintenance Manager"
  }, 
  {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "Sales User", 
-  "report": 1, 
-  "permlevel": 0
+  "role": "Accounts Manager"
  }, 
  {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "Purchase User", 
-  "report": 1, 
-  "permlevel": 0
+  "role": "Sales User"
  }, 
  {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "Maintenance User", 
-  "report": 1, 
-  "permlevel": 0
+  "role": "Purchase User"
  }, 
  {
-  "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "Accounts User", 
-  "report": 1, 
-  "permlevel": 0
+  "role": "Maintenance User"
  }, 
  {
-  "role": "All", 
-  "permlevel": 1, 
-  "doctype": "DocPerm"
+  "doctype": "DocPerm", 
+  "role": "Accounts User"
  }
 ]
\ No newline at end of file
diff --git a/utilities/doctype/sms_control/sms_control.txt b/utilities/doctype/sms_control/sms_control.txt
index 9523bc9..06b4b7b 100644
--- a/utilities/doctype/sms_control/sms_control.txt
+++ b/utilities/doctype/sms_control/sms_control.txt
@@ -1,44 +1,37 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:32", 
   "docstatus": 0, 
-  "creation": "2012-03-27 14:36:47", 
+  "modified": "2013-01-22 14:57:24", 
   "modified_by": "Administrator", 
-  "modified": "2012-03-27 14:36:47"
+  "owner": "Administrator"
  }, 
  {
-  "section_style": "Simple", 
-  "in_create": 0, 
-  "module": "Utilities", 
-  "server_code_error": " ", 
   "doctype": "DocType", 
+  "in_create": 0, 
   "issingle": 1, 
-  "name": "__common__", 
-  "colour": "White:FFF", 
-  "show_in_menu": 0, 
-  "version": 8
+  "module": "Utilities", 
+  "name": "__common__"
  }, 
  {
+  "create": 1, 
+  "doctype": "DocPerm", 
   "name": "__common__", 
   "parent": "SMS Control", 
-  "read": 1, 
-  "doctype": "DocPerm", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "role": "System Manager", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "SMS Control", 
-  "doctype": "DocType"
- }, 
- {
-  "write": 1, 
-  "create": 1, 
   "permlevel": 0, 
-  "doctype": "DocPerm"
+  "read": 1, 
+  "report": 1, 
+  "role": "System Manager", 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "permlevel": 1, 
+  "doctype": "DocType", 
+  "name": "SMS Control"
+ }, 
+ {
   "doctype": "DocPerm"
  }
 ]
\ No newline at end of file
diff --git a/website/doctype/about_us_settings/about_us_settings.txt b/website/doctype/about_us_settings/about_us_settings.txt
index e0c1d4c..a42d2f3 100644
--- a/website/doctype/about_us_settings/about_us_settings.txt
+++ b/website/doctype/about_us_settings/about_us_settings.txt
@@ -1,103 +1,105 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:32", 
   "docstatus": 0, 
-  "creation": "2012-12-27 14:24:35", 
+  "modified": "2013-01-22 14:12:16", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-27 17:44:55"
+  "owner": "Administrator"
  }, 
  {
-  "issingle": 1, 
   "description": "Settings for the About Us Page", 
   "doctype": "DocType", 
-  "module": "Website", 
   "document_type": "Master", 
+  "issingle": 1, 
+  "module": "Website", 
   "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "About Us Settings", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "permlevel": 0, 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "parent": "About Us Settings", 
-  "read": 1, 
-  "name": "__common__", 
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
+  "name": "__common__", 
+  "parent": "About Us Settings", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "role": "Website Manager", 
   "permlevel": 0, 
-  "parentfield": "permissions"
+  "read": 1, 
+  "report": 1, 
+  "role": "Website Manager", 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "name": "About Us Settings", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "About Us Settings"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Help", 
   "fieldname": "help", 
   "fieldtype": "HTML", 
+  "label": "Help", 
   "options": "<div class=\"alert\">Link for About Us Page is \"about.html\"</div>"
  }, 
  {
   "description": "Introduce your company to the website visitor.", 
   "doctype": "DocField", 
-  "label": "Company Introduction", 
   "fieldname": "company_introduction", 
-  "fieldtype": "Text Editor"
+  "fieldtype": "Text Editor", 
+  "label": "Company Introduction"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Company History", 
   "fieldname": "sb0", 
-  "fieldtype": "Section Break"
+  "fieldtype": "Section Break", 
+  "label": "Company History"
  }, 
  {
   "description": "\"Company History\"", 
   "doctype": "DocField", 
-  "label": "Company History Heading", 
   "fieldname": "company_history_heading", 
-  "fieldtype": "Data"
+  "fieldtype": "Data", 
+  "label": "Company History Heading"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Company History", 
   "fieldname": "company_history", 
   "fieldtype": "Table", 
+  "label": "Company History", 
   "options": "Company History"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Team Members", 
   "fieldname": "sb1", 
-  "fieldtype": "Section Break"
+  "fieldtype": "Section Break", 
+  "label": "Team Members"
  }, 
  {
   "description": "\"Team Members\" or \"Management\"", 
   "doctype": "DocField", 
-  "label": "Team Members Heading", 
   "fieldname": "team_members_heading", 
-  "fieldtype": "Data"
+  "fieldtype": "Data", 
+  "label": "Team Members Heading"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Team Members", 
   "fieldname": "team_members", 
   "fieldtype": "Table", 
+  "label": "Team Members", 
   "options": "About Us Team Member"
  }, 
  {
   "description": "More content for the bottom of the page.", 
   "doctype": "DocField", 
-  "label": "Footer", 
   "fieldname": "footer", 
-  "fieldtype": "Text Editor"
+  "fieldtype": "Text Editor", 
+  "label": "Footer"
  }, 
  {
   "doctype": "DocPerm"
diff --git a/website/doctype/blog/blog.txt b/website/doctype/blog/blog.txt
index cd0c40e..a1cd351 100644
--- a/website/doctype/blog/blog.txt
+++ b/website/doctype/blog/blog.txt
@@ -1,103 +1,100 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:32", 
   "docstatus": 0, 
-  "creation": "2012-11-30 18:14:18", 
+  "modified": "2013-01-22 14:16:45", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-06 16:33:36"
+  "owner": "Administrator"
  }, 
  {
   "allow_attach": 1, 
-  "module": "Website", 
   "doctype": "DocType", 
   "max_attachments": 5, 
+  "module": "Website", 
   "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Blog", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
+  "doctype": "DocPerm", 
   "name": "__common__", 
   "parent": "Blog", 
-  "read": 1, 
-  "doctype": "DocPerm", 
-  "report": 1, 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
   "permlevel": 0, 
-  "parentfield": "permissions"
+  "read": 1, 
+  "report": 1, 
+  "submit": 0
  }, 
  {
-  "name": "Blog", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Blog"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Title", 
   "fieldname": "title", 
   "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Title", 
+  "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Published", 
   "fieldname": "published", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "Published"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Content", 
   "fieldname": "content", 
   "fieldtype": "Text Editor", 
-  "reqd": 0, 
-  "permlevel": 0
+  "label": "Content", 
+  "reqd": 0
  }, 
  {
   "doctype": "DocField", 
-  "label": "Page Name", 
   "fieldname": "page_name", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "permlevel": 1
+  "label": "Page Name", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Email Sent", 
   "fieldname": "email_sent", 
   "fieldtype": "Check", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Email Sent"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "File List", 
   "fieldname": "file_list", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "File List", 
+  "no_copy": 1, 
+  "print_hide": 1
  }, 
  {
-  "write": 1, 
   "create": 1, 
+  "doctype": "DocPerm", 
   "role": "Website Manager", 
-  "doctype": "DocPerm"
+  "write": 1
  }, 
  {
-  "write": 1, 
   "create": 1, 
+  "doctype": "DocPerm", 
   "role": "Blogger", 
-  "doctype": "DocPerm"
+  "write": 1
  }, 
  {
-  "write": 0, 
+  "doctype": "DocPerm", 
   "role": "Guest", 
-  "doctype": "DocPerm"
+  "write": 0
  }
 ]
\ No newline at end of file
diff --git a/website/doctype/product/locale/_messages_doc.json b/website/doctype/product/locale/_messages_doc.json
deleted file mode 100644
index e4cc997..0000000
--- a/website/doctype/product/locale/_messages_doc.json
+++ /dev/null
@@ -1,25 +0,0 @@
-[
- "Title", 
- "Image for listing (Width: 100px) (Attach First)", 
- "Warehouse", 
- "Stock", 
- "Website", 
- "Product", 
- "Full Image", 
- "Price", 
- "File List", 
- "Page Name", 
- "Select shipping warehouse to show \"In Stock\" or \"Out of Stock\". To hide, leave blank", 
- "Full description (formatted as markdown)", 
- "Price List", 
- "Short Description", 
- "Item", 
- "Published", 
- "Long Description", 
- "A Product is shown on the website and is linked to an item.", 
- "Sales", 
- "Currency", 
- "Thumbnail Image", 
- "Image for listing (Width: 300px) (Attach First)", 
- "Select Price List for the web. Leave blank to hide price."
-]
\ No newline at end of file
diff --git a/website/doctype/product/locale/hi-doc.json b/website/doctype/product/locale/hi-doc.json
deleted file mode 100644
index 6827d64..0000000
--- a/website/doctype/product/locale/hi-doc.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "A Product is shown on the website and is linked to an item.": "\u090f\u0915 \u0909\u0924\u094d\u092a\u093e\u0926 \u0915\u0940 \u0935\u0947\u092c\u0938\u093e\u0907\u091f \u092a\u0930 \u0926\u093f\u0916\u093e\u092f\u093e \u091c\u093e\u0924\u093e \u0939\u0948 \u0914\u0930 \u090f\u0915 \u0906\u0907\u091f\u092e \u0915\u0947 \u0932\u093f\u090f \u091c\u0941\u0921\u093c\u093e \u0939\u0941\u0906 \u0939\u0948.", 
- "Currency": "\u092e\u0941\u0926\u094d\u0930\u093e", 
- "File List": "\u092b\u093c\u093e\u0907\u0932 \u0938\u0942\u091a\u0940", 
- "Full Image": "\u092a\u0942\u0930\u094d\u0923 \u091b\u0935\u093f", 
- "Full description (formatted as markdown)": "\u092a\u0942\u0930\u094d\u0923 \u0935\u093f\u0935\u0930\u0923 (markdown \u0915\u0947 \u0930\u0942\u092a \u092e\u0947\u0902 \u0938\u094d\u0935\u0930\u0942\u092a\u093f\u0924)", 
- "Image for listing (Width: 100px) (Attach First)": "\u0932\u093f\u0938\u094d\u091f\u093f\u0902\u0917 \u0915\u0947 \u0932\u093f\u090f \u091b\u0935\u093f (\u091a\u094c\u0921\u093c\u093e\u0908: 100px) (\u092a\u0939\u0932\u0947 \u0938\u0902\u0932\u0917\u094d\u0928)", 
- "Image for listing (Width: 300px) (Attach First)": "\u0932\u093f\u0938\u094d\u091f\u093f\u0902\u0917 \u0915\u0947 \u0932\u093f\u090f \u091b\u0935\u093f (\u091a\u094c\u0921\u093c\u093e\u0908: 300px) (\u092a\u0939\u0932\u0947 \u0938\u0902\u0932\u0917\u094d\u0928)", 
- "Item": "\u092e\u0926", 
- "Long Description": "\u0932\u093e\u0902\u0917 \u0935\u093f\u0935\u0930\u0923", 
- "Page Name": "\u092a\u0947\u091c \u0915\u093e \u0928\u093e\u092e", 
- "Price": "\u0915\u0940\u092e\u0924", 
- "Price List": "\u0915\u0940\u092e\u0924 \u0938\u0942\u091a\u0940", 
- "Product": "\u0909\u0924\u094d\u092a\u093e\u0926", 
- "Published": "\u092a\u094d\u0930\u0915\u093e\u0936\u093f\u0924", 
- "Sales": "\u0935\u093f\u0915\u094d\u0930\u092f", 
- "Select Price List for the web. Leave blank to hide price.": "\u0935\u0947\u092c \u0915\u0947 \u0932\u093f\u090f \u092e\u0942\u0932\u094d\u092f \u0938\u0942\u091a\u0940 \u0915\u093e \u091a\u092f\u0928 \u0915\u0930\u0947\u0902. \u0915\u0947 \u0932\u093f\u090f \u0915\u0940\u092e\u0924 \u091b\u093f\u092a\u093e\u0928\u0947 \u0915\u0930\u0928\u0947 \u0915\u0947 \u0932\u093f\u090f \u0916\u093e\u0932\u0940 \u091b\u094b\u0921\u093c \u0926\u0947\u0902.", 
- "Select shipping warehouse to show \"In Stock\" or \"Out of Stock\". To hide, leave blank": "\u0936\u093f\u092a\u093f\u0902\u0917 \u0917\u094b\u0926\u093e\u092e \u091a\u0941\u0928\u0947\u0902 \u092f\u093e &quot;\u0938\u094d\u091f\u0949\u0915 \u0938\u0947 \u092c\u093e\u0939\u0930&quot; &quot;\u0938\u094d\u091f\u0949\u0915 \u092e\u0947\u0902&quot; \u0926\u093f\u0916\u093e\u0928\u0947. \u091b\u0941\u092a\u093e\u0928\u0947 \u0915\u0947 \u0932\u093f\u090f, \u0930\u093f\u0915\u094d\u0924 \u091b\u094b\u0921\u093c", 
- "Short Description": "\u0938\u0902\u0915\u094d\u0937\u093f\u092a\u094d\u0924 \u0935\u0930\u094d\u0923\u0928", 
- "Stock": "\u0938\u094d\u091f\u0949\u0915", 
- "Thumbnail Image": "\u0925\u0902\u092c\u0928\u0947\u0932 \u091b\u0935\u093f", 
- "Title": "\u0936\u0940\u0930\u094d\u0937\u0915", 
- "Warehouse": "\u0917\u094b\u0926\u093e\u092e", 
- "Website": "\u0935\u0947\u092c\u0938\u093e\u0907\u091f"
-}
\ No newline at end of file
diff --git a/website/doctype/style_settings/style_settings.txt b/website/doctype/style_settings/style_settings.txt
index a3e81eb..5f53441 100644
--- a/website/doctype/style_settings/style_settings.txt
+++ b/website/doctype/style_settings/style_settings.txt
@@ -1,134 +1,120 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:32", 
   "docstatus": 0, 
-  "creation": "2012-07-03 13:30:57", 
+  "modified": "2013-01-22 14:57:25", 
   "modified_by": "Administrator", 
-  "modified": "2013-01-08 12:00:51"
+  "owner": "Administrator"
  }, 
  {
-  "issingle": 1, 
   "allow_attach": 1, 
-  "name": "__common__", 
+  "description": "Set your background color, font and image (tiled)", 
   "doctype": "DocType", 
-  "module": "Website", 
+  "issingle": 1, 
   "max_attachments": 1, 
-  "description": "Set your background color, font and image (tiled)"
+  "module": "Website", 
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Style Settings", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
-  "name": "__common__", 
-  "parent": "Style Settings", 
-  "read": 1, 
-  "doctype": "DocPerm", 
-  "parenttype": "DocType", 
-  "role": "Website Manager", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Style Settings", 
-  "doctype": "DocType"
- }, 
- {
-  "description": "If image is selected, color will be ignored (attach first)", 
-  "doctype": "DocField", 
-  "label": "Background Image", 
-  "options": "attach_files:", 
-  "fieldname": "background_image", 
-  "fieldtype": "Select", 
-  "permlevel": 0
- }, 
- {
-  "description": "Solid background color (default light gray)", 
-  "doctype": "DocField", 
-  "label": "Background Color", 
-  "fieldname": "background_color", 
-  "fieldtype": "Data", 
-  "permlevel": 0
- }, 
- {
-  "print_width": "50%", 
-  "doctype": "DocField", 
-  "width": "50%", 
-  "fieldname": "cb0", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "label": "Font", 
-  "options": "\nHelvetica Neue\nLucida Grande\nVerdana\nArial\nGeorgia\nTahoma", 
-  "fieldname": "font", 
-  "fieldtype": "Select", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "label": "Font Size", 
-  "options": "\n12px\n13px\n14px\n15px\n16px", 
-  "fieldname": "font_size", 
-  "fieldtype": "Select", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "label": "Heading Font", 
-  "options": "\nHelvetica Neue\nLucida Grande\nVerdana\nArial\nGeorgia\nTahoma\nLato\nOpen Sans", 
-  "fieldname": "heading_font", 
-  "fieldtype": "Select", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "label": "CSS", 
-  "fieldname": "css", 
-  "fieldtype": "Section Break", 
-  "permlevel": 0
- }, 
- {
-  "description": "add your own CSS (careful!)", 
-  "doctype": "DocField", 
-  "label": "Add CSS", 
-  "fieldname": "add_css", 
-  "fieldtype": "Code", 
-  "permlevel": 0
- }, 
- {
-  "description": "Auto generated", 
-  "doctype": "DocField", 
-  "label": "Custom CSS", 
-  "fieldname": "custom_css", 
-  "fieldtype": "Code", 
-  "permlevel": 1
- }, 
- {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "doctype": "DocField", 
-  "label": "File List", 
-  "fieldname": "file_list", 
-  "fieldtype": "Text", 
-  "hidden": 1, 
   "permlevel": 0
  }, 
  {
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
-  "permlevel": 0
+  "name": "__common__", 
+  "parent": "Style Settings", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
+  "permlevel": 0, 
+  "read": 1, 
+  "report": 1, 
+  "role": "Website Manager", 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "cancel": 0, 
-  "permlevel": 1
+  "doctype": "DocType", 
+  "name": "Style Settings"
+ }, 
+ {
+  "description": "If image is selected, color will be ignored (attach first)", 
+  "doctype": "DocField", 
+  "fieldname": "background_image", 
+  "fieldtype": "Select", 
+  "label": "Background Image", 
+  "options": "attach_files:"
+ }, 
+ {
+  "description": "Solid background color (default light gray)", 
+  "doctype": "DocField", 
+  "fieldname": "background_color", 
+  "fieldtype": "Data", 
+  "label": "Background Color"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "cb0", 
+  "fieldtype": "Column Break", 
+  "print_width": "50%", 
+  "width": "50%"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "font", 
+  "fieldtype": "Select", 
+  "label": "Font", 
+  "options": "\nHelvetica Neue\nLucida Grande\nVerdana\nArial\nGeorgia\nTahoma"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "font_size", 
+  "fieldtype": "Select", 
+  "label": "Font Size", 
+  "options": "\n12px\n13px\n14px\n15px\n16px"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "heading_font", 
+  "fieldtype": "Select", 
+  "label": "Heading Font", 
+  "options": "\nHelvetica Neue\nLucida Grande\nVerdana\nArial\nGeorgia\nTahoma\nLato\nOpen Sans"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "css", 
+  "fieldtype": "Section Break", 
+  "label": "CSS"
+ }, 
+ {
+  "description": "add your own CSS (careful!)", 
+  "doctype": "DocField", 
+  "fieldname": "add_css", 
+  "fieldtype": "Code", 
+  "label": "Add CSS"
+ }, 
+ {
+  "description": "Auto generated", 
+  "doctype": "DocField", 
+  "fieldname": "custom_css", 
+  "fieldtype": "Code", 
+  "label": "Custom CSS", 
+  "read_only": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "file_list", 
+  "fieldtype": "Text", 
+  "hidden": 1, 
+  "label": "File List", 
+  "no_copy": 1, 
+  "print_hide": 1
+ }, 
+ {
+  "doctype": "DocPerm"
  }
 ]
\ No newline at end of file
diff --git a/website/doctype/web_page/web_page.txt b/website/doctype/web_page/web_page.txt
index 8237ea4..788f1c0 100644
--- a/website/doctype/web_page/web_page.txt
+++ b/website/doctype/web_page/web_page.txt
@@ -1,162 +1,147 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:32", 
   "docstatus": 0, 
-  "creation": "2012-12-07 15:15:17", 
+  "modified": "2013-01-22 14:57:27", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-25 17:04:19"
+  "owner": "Administrator"
  }, 
  {
+  "allow_attach": 1, 
   "description": "Page to show on the website\n", 
-  "name": "__common__", 
-  "module": "Website", 
   "doctype": "DocType", 
-  "max_attachments": 20, 
   "document_type": "Transaction", 
-  "allow_attach": 1
+  "max_attachments": 20, 
+  "module": "Website", 
+  "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Web Page", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
- }, 
- {
-  "name": "__common__", 
-  "parent": "Web Page", 
-  "read": 1, 
-  "doctype": "DocPerm", 
-  "parenttype": "DocType", 
-  "role": "Website Manager", 
-  "parentfield": "permissions"
- }, 
- {
-  "name": "Web Page", 
-  "doctype": "DocType"
- }, 
- {
-  "description": "Title / headline of your page", 
-  "doctype": "DocField", 
-  "label": "Title", 
-  "fieldname": "title", 
-  "fieldtype": "Data", 
-  "reqd": 1, 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "width": "50%", 
-  "fieldname": "cb1", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "label": "Published", 
-  "fieldname": "published", 
-  "fieldtype": "Check", 
-  "permlevel": 0
- }, 
- {
-  "description": "Page url name (auto-generated) (add \".html\")", 
-  "doctype": "DocField", 
-  "label": "Page Name", 
-  "fieldname": "page_name", 
-  "fieldtype": "Data", 
-  "permlevel": 1
- }, 
- {
-  "description": "Page content", 
-  "doctype": "DocField", 
-  "label": "Content", 
-  "fieldname": "sb1", 
-  "fieldtype": "Section Break", 
-  "permlevel": 0
- }, 
- {
-  "description": "Begin this page with a slideshow of images", 
-  "doctype": "DocField", 
-  "label": "Slideshow", 
-  "permlevel": 0, 
-  "fieldname": "slideshow", 
-  "fieldtype": "Link", 
-  "options": "Website Slideshow"
- }, 
- {
-  "description": "Content in markdown format that appears on the main side of your page", 
-  "doctype": "DocField", 
-  "label": "Main Section", 
-  "fieldname": "main_section", 
-  "fieldtype": "Text Editor", 
-  "permlevel": 0
- }, 
- {
-  "description": "Link to other pages in the side bar and next section", 
-  "doctype": "DocField", 
-  "label": "More", 
-  "fieldname": "sb2", 
-  "fieldtype": "Section Break", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "options": "Left\nCenter\nRight", 
-  "fieldname": "text_align", 
-  "fieldtype": "Select", 
-  "label": "Text Align", 
-  "permlevel": 0
- }, 
- {
-  "description": "Add code as &lt;script&gt;", 
-  "doctype": "DocField", 
-  "label": "Insert Code", 
-  "fieldname": "insert_code", 
-  "fieldtype": "Check", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "options": "Javascript", 
-  "fieldname": "javascript", 
-  "fieldtype": "Code", 
-  "label": "Javascript", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "label": "Insert Style", 
-  "fieldname": "insert_style", 
-  "fieldtype": "Check", 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocField", 
-  "options": "CSS", 
-  "fieldname": "css", 
-  "fieldtype": "Code", 
-  "label": "CSS", 
-  "permlevel": 0
- }, 
- {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "doctype": "DocField", 
-  "label": "File List", 
-  "fieldname": "file_list", 
-  "fieldtype": "Text", 
-  "hidden": 1, 
   "permlevel": 0
  }, 
  {
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
+  "name": "__common__", 
+  "parent": "Web Page", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
+  "permlevel": 0, 
+  "read": 1, 
   "report": 1, 
-  "permlevel": 0
+  "role": "Website Manager", 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "permlevel": 1, 
+  "doctype": "DocType", 
+  "name": "Web Page"
+ }, 
+ {
+  "description": "Title / headline of your page", 
+  "doctype": "DocField", 
+  "fieldname": "title", 
+  "fieldtype": "Data", 
+  "label": "Title", 
+  "reqd": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "cb1", 
+  "fieldtype": "Column Break", 
+  "width": "50%"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "published", 
+  "fieldtype": "Check", 
+  "label": "Published"
+ }, 
+ {
+  "description": "Page url name (auto-generated) (add \".html\")", 
+  "doctype": "DocField", 
+  "fieldname": "page_name", 
+  "fieldtype": "Data", 
+  "label": "Page Name", 
+  "read_only": 1
+ }, 
+ {
+  "description": "Page content", 
+  "doctype": "DocField", 
+  "fieldname": "sb1", 
+  "fieldtype": "Section Break", 
+  "label": "Content"
+ }, 
+ {
+  "description": "Begin this page with a slideshow of images", 
+  "doctype": "DocField", 
+  "fieldname": "slideshow", 
+  "fieldtype": "Link", 
+  "label": "Slideshow", 
+  "options": "Website Slideshow"
+ }, 
+ {
+  "description": "Content in markdown format that appears on the main side of your page", 
+  "doctype": "DocField", 
+  "fieldname": "main_section", 
+  "fieldtype": "Text Editor", 
+  "label": "Main Section"
+ }, 
+ {
+  "description": "Link to other pages in the side bar and next section", 
+  "doctype": "DocField", 
+  "fieldname": "sb2", 
+  "fieldtype": "Section Break", 
+  "label": "More"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "text_align", 
+  "fieldtype": "Select", 
+  "label": "Text Align", 
+  "options": "Left\nCenter\nRight"
+ }, 
+ {
+  "description": "Add code as &lt;script&gt;", 
+  "doctype": "DocField", 
+  "fieldname": "insert_code", 
+  "fieldtype": "Check", 
+  "label": "Insert Code"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "javascript", 
+  "fieldtype": "Code", 
+  "label": "Javascript", 
+  "options": "Javascript"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "insert_style", 
+  "fieldtype": "Check", 
+  "label": "Insert Style"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "css", 
+  "fieldtype": "Code", 
+  "label": "CSS", 
+  "options": "CSS"
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "file_list", 
+  "fieldtype": "Text", 
+  "hidden": 1, 
+  "label": "File List", 
+  "no_copy": 1, 
+  "print_hide": 1
+ }, 
+ {
   "doctype": "DocPerm"
  }
 ]
\ No newline at end of file
diff --git a/website/doctype/website_settings/website_settings.txt b/website/doctype/website_settings/website_settings.txt
index 78e9336..78bc533 100644
--- a/website/doctype/website_settings/website_settings.txt
+++ b/website/doctype/website_settings/website_settings.txt
@@ -1,202 +1,180 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:33", 
   "docstatus": 0, 
-  "creation": "2012-07-12 23:29:36", 
+  "modified": "2013-01-22 14:59:43", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-27 12:27:02"
+  "owner": "Administrator"
  }, 
  {
-  "issingle": 1, 
   "allow_attach": 1, 
   "doctype": "DocType", 
-  "module": "Website", 
-  "max_attachments": 10, 
   "document_type": "Other", 
+  "issingle": 1, 
+  "max_attachments": 10, 
+  "module": "Website", 
   "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Website Settings", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "name": "__common__", 
-  "parent": "Website Settings", 
-  "read": 1, 
+  "create": 1, 
   "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Website Settings", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "parentfield": "permissions"
+  "permlevel": 0, 
+  "read": 1, 
+  "report": 0, 
+  "submit": 0, 
+  "write": 1
  }, 
  {
-  "name": "Website Settings", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Website Settings"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Landing Page", 
   "fieldname": "sb0", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Landing Page"
  }, 
  {
   "description": "The \"Web Page\" that is the website home page", 
   "doctype": "DocField", 
-  "label": "Home Page", 
-  "options": "Web Page", 
   "fieldname": "home_page", 
   "fieldtype": "Link", 
-  "reqd": 1, 
-  "permlevel": 0
+  "label": "Home Page", 
+  "options": "Web Page", 
+  "reqd": 1
  }, 
  {
   "description": "The name of your company / website as you want to appear on browser title bar. All pages will have this as the prefix to the title.", 
   "doctype": "DocField", 
-  "label": "Title Prefix", 
   "fieldname": "title_prefix", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Title Prefix"
  }, 
  {
   "doctype": "DocField", 
   "fieldname": "cb4", 
-  "fieldtype": "Column Break", 
-  "permlevel": 0
+  "fieldtype": "Column Break"
  }, 
  {
   "description": "If checked, the Home page will be the default Item Group for the website.", 
   "doctype": "DocField", 
-  "label": "Home Page is Products", 
   "fieldname": "home_page_is_products", 
   "fieldtype": "Check", 
-  "permlevel": 0
+  "label": "Home Page is Products"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Top Bar", 
   "fieldname": "top_bar", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Top Bar"
  }, 
  {
   "description": "Background shade of the top menu bar", 
   "doctype": "DocField", 
-  "label": "Top Bar Background", 
-  "options": "Black\nWhite", 
   "fieldname": "top_bar_background", 
   "fieldtype": "Select", 
-  "permlevel": 0
+  "label": "Top Bar Background", 
+  "options": "Black\nWhite"
  }, 
  {
   "description": "Brand is what appears on the top-right of the toolbar. If it is an image, make sure it\nhas a transparent background and use the &lt;img /&gt; tag. Keep size as 200px x 30px", 
   "doctype": "DocField", 
-  "label": "Brand HTML", 
   "fieldname": "brand_html", 
   "fieldtype": "Text", 
-  "permlevel": 0
+  "label": "Brand HTML"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Top Bar Items", 
-  "options": "Top Bar Item", 
   "fieldname": "top_bar_items", 
   "fieldtype": "Table", 
-  "permlevel": 0
+  "label": "Top Bar Items", 
+  "options": "Top Bar Item"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Footer", 
   "fieldname": "footer", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Footer"
  }, 
  {
   "description": "Address and other legal information you may want to put in the footer.", 
   "doctype": "DocField", 
-  "label": "Address", 
   "fieldname": "address", 
   "fieldtype": "Text Editor", 
-  "permlevel": 0
+  "label": "Address"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Copyright", 
   "fieldname": "copyright", 
   "fieldtype": "Data", 
-  "permlevel": 0
+  "label": "Copyright"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Footer Items", 
-  "options": "Top Bar Item", 
   "fieldname": "footer_items", 
   "fieldtype": "Table", 
-  "permlevel": 0
+  "label": "Footer Items", 
+  "options": "Top Bar Item"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Misc", 
   "fieldname": "misc_section", 
   "fieldtype": "Section Break", 
-  "permlevel": 0
+  "label": "Misc"
  }, 
  {
   "description": "An icon file with .ico extension. Should be 16 x 16 px. Generated using a favicon generator. [<a href=\"http://favicon-generator.org/\" target=\"_blank\">favicon-generator.org</a>]", 
   "doctype": "DocField", 
-  "label": "FavIcon", 
-  "options": "attach_files:", 
   "fieldname": "favicon", 
   "fieldtype": "Select", 
-  "permlevel": 0
+  "label": "FavIcon", 
+  "options": "attach_files:"
  }, 
  {
   "description": "Sub-domain provided by erpnext.com", 
   "doctype": "DocField", 
-  "label": "Subdomain", 
   "fieldname": "subdomain", 
   "fieldtype": "Text", 
-  "reqd": 0, 
-  "permlevel": 1
+  "label": "Subdomain", 
+  "read_only": 1, 
+  "reqd": 0
  }, 
  {
   "description": "Enter domain names associated to this website, each on a new line", 
   "doctype": "DocField", 
-  "label": "Domain List", 
   "fieldname": "domain_list", 
   "fieldtype": "Text", 
-  "reqd": 0, 
   "hidden": 1, 
-  "permlevel": 0
+  "label": "Domain List", 
+  "reqd": 0
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "File List", 
   "fieldname": "file_list", 
   "fieldtype": "Text", 
   "hidden": 1, 
-  "permlevel": 0
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "System Manager", 
-  "permlevel": 0
- }, 
- {
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "write": 1, 
-  "role": "Website Manager", 
-  "permlevel": 0
+  "label": "File List", 
+  "no_copy": 1, 
+  "print_hide": 1
  }, 
  {
   "doctype": "DocPerm", 
-  "role": "All", 
-  "permlevel": 1
+  "role": "System Manager"
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "role": "Website Manager"
  }
 ]
\ No newline at end of file