diff --git a/erpnext/accounts/doctype/account/account.txt b/erpnext/accounts/doctype/account/account.txt
index 0fdeaac..c06aeba 100644
--- a/erpnext/accounts/doctype/account/account.txt
+++ b/erpnext/accounts/doctype/account/account.txt
@@ -22,7 +22,7 @@
 		'in_create': 1,
 		'module': 'Accounts',
 		'name': '__common__',
-		'search_fields': 'account_type, debit_or_credit, group_or_ledger',
+		'search_fields': 'debit_or_credit, group_or_ledger',
 		'section_style': 'Tray',
 		'server_code_error': ' ',
 		'show_in_menu': 0,
@@ -484,4 +484,4 @@
 		'oldfieldtype': 'Small Text',
 		'permlevel': 1
 	}
-]
\ No newline at end of file
+]
diff --git a/erpnext/accounts/doctype/account_balance/account_balance.txt b/erpnext/accounts/doctype/account_balance/account_balance.txt
index 1d23bb2..7f3c12e 100644
--- a/erpnext/accounts/doctype/account_balance/account_balance.txt
+++ b/erpnext/accounts/doctype/account_balance/account_balance.txt
@@ -5,34 +5,35 @@
 	{
 		'creation': '2010-08-08 17:08:51',
 		'docstatus': 0,
-		'modified': '2011-03-24 14:43:15',
-		'modified_by': 'Administrator',
-		'owner': 'Administrator'
+		'modified': '2012-03-21 12:55:11',
+		'modified_by': u'Administrator',
+		'owner': u'Administrator'
 	},
 
 	# These values are common for all DocType
 	{
-		'_last_update': '1305714002',
-		'autoname': '_ACB.######',
-		'colour': 'White:FFF',
+		'_last_update': u'1322549700',
+		'autoname': u'_ACB.######',
+		'colour': u'White:FFF',
+		'default_print_format': u'Standard',
 		'doctype': 'DocType',
 		'istable': 0,
-		'module': 'Accounts',
+		'module': u'Accounts',
 		'name': '__common__',
-		'search_fields': 'account, period, fiscal_year, balance',
-		'section_style': 'Simple',
-		'server_code_error': ' ',
+		'search_fields': u'account, period, fiscal_year, balance',
+		'section_style': u'Simple',
+		'server_code_error': u' ',
 		'show_in_menu': 0,
-		'version': 28
+		'version': 6
 	},
 
 	# These values are common for all DocField
 	{
-		'doctype': 'DocField',
+		'doctype': u'DocField',
 		'name': '__common__',
-		'parent': 'Account Balance',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
+		'parent': u'Account Balance',
+		'parentfield': u'fields',
+		'parenttype': u'DocType',
 		'permlevel': 0
 	},
 
@@ -41,11 +42,11 @@
 		'amend': 0,
 		'cancel': 0,
 		'create': 0,
-		'doctype': 'DocPerm',
+		'doctype': u'DocPerm',
 		'name': '__common__',
-		'parent': 'Account Balance',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
+		'parent': u'Account Balance',
+		'parentfield': u'permissions',
+		'parenttype': u'DocType',
 		'permlevel': 0,
 		'read': 1,
 		'submit': 0,
@@ -55,153 +56,122 @@
 	# DocType, Account Balance
 	{
 		'doctype': 'DocType',
-		'name': 'Account Balance'
+		'name': u'Account Balance'
 	},
 
 	# DocPerm
 	{
-		'doctype': 'DocPerm',
-		'role': 'Accounts User'
+		'doctype': u'DocPerm',
+		'role': u'Accounts User'
 	},
 
 	# DocPerm
 	{
-		'doctype': 'DocPerm',
-		'role': 'Accounts Manager'
+		'doctype': u'DocPerm',
+		'role': u'Accounts Manager'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'account',
-		'fieldtype': 'Link',
-		'idx': 1,
+		'doctype': u'DocField',
+		'fieldname': u'account',
+		'fieldtype': u'Link',
 		'in_filter': 1,
-		'label': 'Account',
-		'options': 'Account',
+		'label': u'Account',
+		'options': u'Account',
 		'search_index': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'period',
-		'fieldtype': 'Link',
-		'idx': 2,
+		'doctype': u'DocField',
+		'fieldname': u'period',
+		'fieldtype': u'Link',
 		'in_filter': 1,
-		'label': 'Period',
-		'oldfieldname': 'period',
-		'oldfieldtype': 'Link',
-		'options': 'Period',
+		'label': u'Period',
+		'oldfieldname': u'period',
+		'oldfieldtype': u'Link',
+		'options': u'Period',
 		'search_index': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'opening',
-		'fieldtype': 'Currency',
-		'idx': 4,
-		'label': 'Opening',
-		'oldfieldname': 'opening',
-		'oldfieldtype': 'Currency'
+		'doctype': u'DocField',
+		'fieldname': u'opening',
+		'fieldtype': u'Currency',
+		'label': u'Opening',
+		'oldfieldname': u'opening',
+		'oldfieldtype': u'Currency'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'debit',
-		'fieldtype': 'Currency',
-		'idx': 6,
-		'label': 'Debit',
-		'oldfieldname': 'debit',
-		'oldfieldtype': 'Currency'
+		'doctype': u'DocField',
+		'fieldname': u'debit',
+		'fieldtype': u'Currency',
+		'label': u'Debit',
+		'oldfieldname': u'debit',
+		'oldfieldtype': u'Currency'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'debit',
-		'fieldtype': 'Currency',
-		'idx': 6,
-		'label': 'Debit',
-		'oldfieldname': 'debit',
-		'oldfieldtype': 'Currency'
+		'doctype': u'DocField',
+		'fieldname': u'credit',
+		'fieldtype': u'Currency',
+		'label': u'Credit',
+		'oldfieldname': u'credit',
+		'oldfieldtype': u'Currency'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'credit',
-		'fieldtype': 'Currency',
-		'idx': 7,
-		'label': 'Credit',
-		'oldfieldname': 'credit',
-		'oldfieldtype': 'Currency'
+		'doctype': u'DocField',
+		'fieldname': u'balance',
+		'fieldtype': u'Currency',
+		'label': u'Balance',
+		'oldfieldname': u'balance',
+		'oldfieldtype': u'Currency'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'credit',
-		'fieldtype': 'Currency',
-		'idx': 7,
-		'label': 'Credit',
-		'oldfieldname': 'credit',
-		'oldfieldtype': 'Currency'
-	},
-
-	# DocField
-	{
-		'doctype': 'DocField',
-		'fieldname': 'balance',
-		'fieldtype': 'Currency',
-		'idx': 8,
-		'label': 'Balance',
-		'oldfieldname': 'balance',
-		'oldfieldtype': 'Currency'
-	},
-
-	# DocField
-	{
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'fieldtype': 'Link',
+		'doctype': u'DocField',
+		'fieldname': u'fiscal_year',
+		'fieldtype': u'Link',
 		'hidden': 1,
-		'idx': 9,
 		'in_filter': 1,
-		'label': 'Fiscal Year',
-		'oldfieldname': 'fiscal_year',
-		'oldfieldtype': 'Link',
-		'options': 'Fiscal Year',
+		'label': u'Fiscal Year',
+		'oldfieldname': u'fiscal_year',
+		'oldfieldtype': u'Link',
+		'options': u'Fiscal Year',
 		'search_index': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'start_date',
-		'fieldtype': 'Date',
+		'doctype': u'DocField',
+		'fieldname': u'start_date',
+		'fieldtype': u'Date',
 		'hidden': 1,
-		'idx': 10,
 		'in_filter': 1,
-		'label': 'Start Date',
-		'oldfieldname': 'start_date',
-		'oldfieldtype': 'Date',
+		'label': u'Start Date',
+		'oldfieldname': u'start_date',
+		'oldfieldtype': u'Date',
 		'search_index': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'end_date',
-		'fieldtype': 'Date',
+		'doctype': u'DocField',
+		'fieldname': u'end_date',
+		'fieldtype': u'Date',
 		'hidden': 1,
-		'idx': 11,
 		'in_filter': 1,
-		'label': 'End Date',
-		'oldfieldname': 'end_date',
-		'oldfieldtype': 'Date',
+		'label': u'End Date',
+		'oldfieldname': u'end_date',
+		'oldfieldtype': u'Date',
 		'search_index': 1
 	}
 ]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.txt b/erpnext/accounts/doctype/fiscal_year/fiscal_year.txt
index de7e3d1..2834878 100644
--- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.txt
+++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.txt
@@ -5,7 +5,7 @@
 	{
 		'creation': '2010-08-08 17:09:02',
 		'docstatus': 0,
-		'modified': '2012-03-21 12:31:26',
+		'modified': '2012-03-21 12:54:40',
 		'modified_by': u'Administrator',
 		'owner': u'Administrator'
 	},
@@ -24,7 +24,7 @@
 		'section_style': u'Tabbed',
 		'server_code_error': u' ',
 		'show_in_menu': 0,
-		'version': 56
+		'version': 57
 	},
 
 	# These values are common for all DocField
diff --git a/erpnext/accounts/doctype/internal_reconciliation/internal_reconciliation.txt b/erpnext/accounts/doctype/internal_reconciliation/internal_reconciliation.txt
index adfbc72..7114987 100644
--- a/erpnext/accounts/doctype/internal_reconciliation/internal_reconciliation.txt
+++ b/erpnext/accounts/doctype/internal_reconciliation/internal_reconciliation.txt
@@ -5,7 +5,7 @@
 	{
 		'creation': '2011-08-30 11:45:50',
 		'docstatus': 0,
-		'modified': '2012-03-21 12:25:18',
+		'modified': '2012-03-21 12:55:31',
 		'modified_by': u'Administrator',
 		'owner': u'Administrator'
 	},
@@ -22,7 +22,7 @@
 		'name': '__common__',
 		'section_style': u'Simple',
 		'show_in_menu': 1,
-		'version': 36
+		'version': 37
 	},
 
 	# These values are common for all DocField
diff --git a/erpnext/hr/doctype/educational_qualifications/educational_qualifications.txt b/erpnext/hr/doctype/educational_qualifications/educational_qualifications.txt
index d57139b..76776d2 100644
--- a/erpnext/hr/doctype/educational_qualifications/educational_qualifications.txt
+++ b/erpnext/hr/doctype/educational_qualifications/educational_qualifications.txt
@@ -5,113 +5,108 @@
 	{
 		'creation': '2010-08-08 17:08:59',
 		'docstatus': 0,
-		'modified': '2010-09-20 14:06:57',
-		'modified_by': 'Administrator',
-		'owner': 'Administrator'
+		'modified': '2012-03-21 14:48:02',
+		'modified_by': u'Administrator',
+		'owner': u'Administrator'
 	},
 
 	# These values are common for all DocType
 	{
-		'colour': 'White:FFF',
+		'colour': u'White:FFF',
+		'default_print_format': u'Standard',
 		'doctype': 'DocType',
 		'istable': 1,
-		'module': 'HR',
+		'module': u'HR',
 		'name': '__common__',
-		'section_style': 'Simple',
-		'server_code_error': ' ',
+		'section_style': u'Simple',
+		'server_code_error': u' ',
 		'show_in_menu': 0,
-		'version': 11
+		'version': 12
 	},
 
 	# These values are common for all DocField
 	{
-		'doctype': 'DocField',
+		'doctype': u'DocField',
 		'name': '__common__',
-		'parent': 'Educational Qualifications',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
+		'parent': u'Educational Qualifications',
+		'parentfield': u'fields',
+		'parenttype': u'DocType',
 		'permlevel': 0
 	},
 
 	# DocType, Educational Qualifications
 	{
 		'doctype': 'DocType',
-		'name': 'Educational Qualifications'
+		'name': u'Educational Qualifications'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'school_univ',
-		'fieldtype': 'Data',
-		'idx': 1,
-		'label': 'School/University',
-		'oldfieldname': 'school_univ',
-		'oldfieldtype': 'Data'
+		'doctype': u'DocField',
+		'fieldname': u'school_univ',
+		'fieldtype': u'Data',
+		'label': u'School/University',
+		'oldfieldname': u'school_univ',
+		'oldfieldtype': u'Data'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'qualification',
-		'fieldtype': 'Data',
-		'idx': 2,
-		'label': 'Qualification (Degree/Diploma)',
-		'oldfieldname': 'qualification',
-		'oldfieldtype': 'Data',
+		'doctype': u'DocField',
+		'fieldname': u'qualification',
+		'fieldtype': u'Data',
+		'label': u'Qualification (Degree/Diploma)',
+		'oldfieldname': u'qualification',
+		'oldfieldtype': u'Data',
 		'reqd': 0,
 		'search_index': 1,
-		'width': '170px'
+		'width': u'170px'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'level',
-		'fieldtype': 'Select',
-		'idx': 3,
-		'label': 'Level',
-		'oldfieldname': 'level',
-		'oldfieldtype': 'Select',
-		'options': '\nGraduate\nPost Graduate\nUnder Graduate',
+		'doctype': u'DocField',
+		'fieldname': u'level',
+		'fieldtype': u'Select',
+		'label': u'Level',
+		'oldfieldname': u'level',
+		'oldfieldtype': u'Select',
+		'options': u'\nGraduate\nPost Graduate\nUnder Graduate',
 		'reqd': 0,
 		'search_index': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'year_of_passing',
-		'fieldtype': 'Int',
-		'idx': 4,
-		'label': 'Year of Passing',
-		'oldfieldname': 'year_of_passing',
-		'oldfieldtype': 'Int',
+		'doctype': u'DocField',
+		'fieldname': u'year_of_passing',
+		'fieldtype': u'Int',
+		'label': u'Year of Passing',
+		'oldfieldname': u'year_of_passing',
+		'oldfieldtype': u'Int',
 		'reqd': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'class_percent',
-		'fieldtype': 'Data',
-		'idx': 5,
-		'label': 'Class / Percentage',
-		'oldfieldname': 'class_percent',
-		'oldfieldtype': 'Data',
+		'doctype': u'DocField',
+		'fieldname': u'class_percent',
+		'fieldtype': u'Data',
+		'label': u'Class / Percentage',
+		'oldfieldname': u'class_percent',
+		'oldfieldtype': u'Data',
 		'reqd': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'maj_opt_sub',
-		'fieldtype': 'Data',
-		'idx': 6,
-		'label': 'Major / Optional Subject',
-		'oldfieldname': 'maj_opt_sub',
-		'oldfieldtype': 'Data',
+		'doctype': u'DocField',
+		'fieldname': u'maj_opt_sub',
+		'fieldtype': u'Data',
+		'label': u'Major / Optional Subject',
+		'oldfieldname': u'maj_opt_sub',
+		'oldfieldtype': u'Data',
 		'reqd': 0,
-		'width': '170px'
+		'width': u'170px'
 	}
 ]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/expense_voucher/expense_voucher.txt b/erpnext/hr/doctype/expense_voucher/expense_voucher.txt
index 596d4b5..ccc4cb4 100644
--- a/erpnext/hr/doctype/expense_voucher/expense_voucher.txt
+++ b/erpnext/hr/doctype/expense_voucher/expense_voucher.txt
@@ -5,51 +5,52 @@
 	{
 		'creation': '2010-09-03 16:45:08',
 		'docstatus': 0,
-		'modified': '2011-06-27 14:39:09',
-		'modified_by': 'Administrator',
-		'owner': 'harshada@webnotestech.com'
+		'modified': '2012-03-21 14:37:04',
+		'modified_by': u'Administrator',
+		'owner': u'harshada@webnotestech.com'
 	},
 
 	# These values are common for all DocType
 	{
-		'_last_update': '1308808105',
-		'autoname': 'EXP.######',
-		'colour': 'White:FFF',
+		'_last_update': u'1308808105',
+		'autoname': u'EXP.######',
+		'colour': u'White:FFF',
+		'default_print_format': u'Standard',
 		'doctype': 'DocType',
-		'module': 'HR',
+		'module': u'HR',
 		'name': '__common__',
-		'search_fields': 'approval_status,employee,employee_name',
-		'section_style': 'Simple',
-		'server_code_error': ' ',
+		'search_fields': u'approval_status,employee,employee_name',
+		'section_style': u'Simple',
+		'server_code_error': u' ',
 		'show_in_menu': 0,
-		'subject': 'From %(employee_name)s for %(total_claimed_amount)s (claimed)',
-		'tag_fields': 'approval_status',
-		'version': 134
+		'subject': u'From %(employee_name)s for %(total_claimed_amount)s (claimed)',
+		'tag_fields': u'approval_status',
+		'version': 135
 	},
 
 	# These values are common for all DocField
 	{
-		'doctype': 'DocField',
+		'doctype': u'DocField',
 		'name': '__common__',
-		'parent': 'Expense Voucher',
-		'parentfield': 'fields',
-		'parenttype': 'DocType'
+		'parent': u'Expense Voucher',
+		'parentfield': u'fields',
+		'parenttype': u'DocType'
 	},
 
 	# These values are common for all DocPerm
 	{
-		'doctype': 'DocPerm',
+		'doctype': u'DocPerm',
 		'name': '__common__',
-		'parent': 'Expense Voucher',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
+		'parent': u'Expense Voucher',
+		'parentfield': u'permissions',
+		'parenttype': u'DocType',
 		'read': 1
 	},
 
 	# DocType, Expense Voucher
 	{
 		'doctype': 'DocType',
-		'name': 'Expense Voucher'
+		'name': u'Expense Voucher'
 	},
 
 	# DocPerm
@@ -57,9 +58,10 @@
 		'amend': 1,
 		'cancel': 1,
 		'create': 1,
-		'doctype': 'DocPerm',
-		'match': 'owner',
+		'doctype': u'DocPerm',
+		'match': u'owner',
 		'permlevel': 0,
+		'role': u'Employee',
 		'submit': 1,
 		'write': 1
 	},
@@ -69,9 +71,9 @@
 		'amend': 1,
 		'cancel': 1,
 		'create': 1,
-		'doctype': 'DocPerm',
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'HR Manager',
+		'role': u'HR Manager',
 		'submit': 1,
 		'write': 1
 	},
@@ -81,358 +83,300 @@
 		'amend': 1,
 		'cancel': 1,
 		'create': 1,
-		'doctype': 'DocPerm',
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'HR User',
+		'role': u'HR User',
 		'submit': 1,
 		'write': 1
 	},
 
 	# DocPerm
 	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'doctype': 'DocPerm',
-		'match': 'owner',
-		'permlevel': 0,
-		'submit': 1,
-		'write': 1
-	},
-
-	# DocPerm
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'doctype': 'DocPerm',
-		'permlevel': 0,
-		'role': 'HR Manager',
-		'submit': 1,
-		'write': 1
-	},
-
-	# DocPerm
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'doctype': 'DocPerm',
-		'permlevel': 0,
-		'role': 'HR User',
-		'submit': 1,
-		'write': 1
-	},
-
-	# DocPerm
-	{
-		'doctype': 'DocPerm',
-		'idx': 3,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'All'
+		'role': u'All'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Section Break',
-		'idx': 1,
-		'label': 'Details',
-		'oldfieldtype': 'Section Break',
+		'doctype': u'DocField',
+		'fieldtype': u'Section Break',
+		'label': u'Details',
+		'oldfieldtype': u'Section Break',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'default': 'Draft',
-		'doctype': 'DocField',
-		'fieldname': 'approval_status',
-		'fieldtype': 'Select',
-		'idx': 2,
+		'colour': u'White:FFF',
+		'default': u'Draft',
+		'doctype': u'DocField',
+		'fieldname': u'approval_status',
+		'fieldtype': u'Select',
 		'in_filter': 1,
-		'label': 'Approval Status',
+		'label': u'Approval Status',
 		'no_copy': 1,
-		'oldfieldname': 'approval_status',
-		'oldfieldtype': 'Select',
-		'options': '\nDraft\nSubmitted\nApproved \nRejected\nCancelled',
+		'oldfieldname': u'approval_status',
+		'oldfieldtype': u'Select',
+		'options': u'\nDraft\nSubmitted\nApproved \nRejected\nCancelled',
 		'permlevel': 1,
 		'search_index': 1
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldname': 'employee',
-		'fieldtype': 'Link',
-		'idx': 3,
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldname': u'employee',
+		'fieldtype': u'Link',
 		'in_filter': 1,
-		'label': 'From Employee',
-		'oldfieldname': 'employee',
-		'oldfieldtype': 'Link',
-		'options': 'Employee',
+		'label': u'From Employee',
+		'oldfieldname': u'employee',
+		'oldfieldtype': u'Link',
+		'options': u'Employee',
 		'permlevel': 0,
 		'reqd': 1,
 		'search_index': 1,
-		'trigger': 'Client'
+		'trigger': u'Client'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'employee_name',
-		'fieldtype': 'Data',
-		'idx': 4,
+		'doctype': u'DocField',
+		'fieldname': u'employee_name',
+		'fieldtype': u'Data',
 		'in_filter': 1,
-		'label': 'Employee Name',
-		'oldfieldname': 'employee_name',
-		'oldfieldtype': 'Data',
+		'label': u'Employee Name',
+		'oldfieldname': u'employee_name',
+		'oldfieldtype': u'Data',
 		'permlevel': 1,
 		'search_index': 0,
-		'width': '150px'
+		'width': u'150px'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'fieldtype': 'Select',
-		'idx': 5,
+		'doctype': u'DocField',
+		'fieldname': u'fiscal_year',
+		'fieldtype': u'Select',
 		'in_filter': 1,
-		'label': 'Fiscal Year',
-		'oldfieldname': 'fiscal_year',
-		'oldfieldtype': 'Select',
-		'options': 'link:Fiscal Year',
+		'label': u'Fiscal Year',
+		'oldfieldname': u'fiscal_year',
+		'oldfieldtype': u'Select',
+		'options': u'link:Fiscal Year',
 		'permlevel': 0,
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Select',
-		'idx': 6,
+		'doctype': u'DocField',
+		'fieldname': u'company',
+		'fieldtype': u'Select',
 		'in_filter': 1,
-		'label': 'Company',
-		'oldfieldname': 'company',
-		'oldfieldtype': 'Link',
-		'options': 'link:Company',
+		'label': u'Company',
+		'oldfieldname': u'company',
+		'oldfieldtype': u'Link',
+		'options': u'link:Company',
 		'permlevel': 0,
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Column Break',
-		'idx': 7,
-		'oldfieldtype': 'Column Break',
+		'doctype': u'DocField',
+		'fieldtype': u'Column Break',
+		'oldfieldtype': u'Column Break',
 		'permlevel': 0,
-		'width': '50%'
+		'width': u'50%'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'posting_date',
-		'fieldtype': 'Date',
-		'idx': 8,
+		'doctype': u'DocField',
+		'fieldname': u'posting_date',
+		'fieldtype': u'Date',
 		'in_filter': 1,
-		'label': 'Posting Date',
-		'oldfieldname': 'posting_date',
-		'oldfieldtype': 'Date',
+		'label': u'Posting Date',
+		'oldfieldname': u'posting_date',
+		'oldfieldtype': u'Date',
 		'permlevel': 0,
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'exp_approver',
-		'fieldtype': 'Select',
-		'idx': 9,
-		'label': 'Approver',
-		'oldfieldname': 'exp_approver',
-		'oldfieldtype': 'Select',
+		'doctype': u'DocField',
+		'fieldname': u'exp_approver',
+		'fieldtype': u'Select',
+		'label': u'Approver',
+		'oldfieldname': u'exp_approver',
+		'oldfieldtype': u'Select',
 		'permlevel': 0,
-		'width': '160px'
+		'width': u'160px'
 	},
 
 	# DocField
 	{
 		'allow_on_submit': 1,
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldname': 'remark',
-		'fieldtype': 'Small Text',
-		'idx': 10,
-		'label': 'Remark',
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldname': u'remark',
+		'fieldtype': u'Small Text',
+		'label': u'Remark',
 		'no_copy': 1,
-		'oldfieldname': 'remark',
-		'oldfieldtype': 'Small Text',
+		'oldfieldname': u'remark',
+		'oldfieldtype': u'Small Text',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldname': 'amended_from',
-		'fieldtype': 'Data',
-		'idx': 11,
-		'label': 'Amended From',
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldname': u'amended_from',
+		'fieldtype': u'Data',
+		'label': u'Amended From',
 		'no_copy': 1,
-		'oldfieldname': 'amended_from',
-		'oldfieldtype': 'Data',
+		'oldfieldname': u'amended_from',
+		'oldfieldtype': u'Data',
 		'permlevel': 1,
 		'print_hide': 1,
 		'report_hide': 1,
-		'width': '160px'
+		'width': u'160px'
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldname': 'amendment_date',
-		'fieldtype': 'Date',
-		'idx': 12,
-		'label': 'Amendment Date',
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldname': u'amendment_date',
+		'fieldtype': u'Date',
+		'label': u'Amendment Date',
 		'no_copy': 1,
-		'oldfieldname': 'amendment_date',
-		'oldfieldtype': 'Date',
+		'oldfieldname': u'amendment_date',
+		'oldfieldtype': u'Date',
 		'permlevel': 1,
 		'print_hide': 1,
 		'report_hide': 1,
-		'width': '160px'
+		'width': u'160px'
 	},
 
 	# DocField
 	{
 		'allow_on_submit': 1,
-		'doctype': 'DocField',
-		'fieldtype': 'Button',
+		'doctype': u'DocField',
+		'fieldtype': u'Button',
 		'hidden': 1,
-		'idx': 13,
-		'label': 'Approve',
-		'oldfieldtype': 'Button',
+		'label': u'Approve',
+		'oldfieldtype': u'Button',
 		'permlevel': 0,
 		'print_hide': 1,
-		'trigger': 'Client'
+		'trigger': u'Client'
 	},
 
 	# DocField
 	{
 		'allow_on_submit': 1,
-		'doctype': 'DocField',
-		'fieldtype': 'Button',
+		'doctype': u'DocField',
+		'fieldtype': u'Button',
 		'hidden': 1,
-		'idx': 14,
-		'label': 'Reject',
-		'oldfieldtype': 'Button',
+		'label': u'Reject',
+		'oldfieldtype': u'Button',
 		'permlevel': 0,
 		'print_hide': 1,
-		'trigger': 'Client'
+		'trigger': u'Client'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Section Break',
-		'idx': 15,
-		'label': 'Expense Details',
-		'oldfieldtype': 'Section Break',
+		'doctype': u'DocField',
+		'fieldtype': u'Section Break',
+		'label': u'Expense Details',
+		'oldfieldtype': u'Section Break',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
 		'allow_on_submit': 1,
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldtype': 'Button',
-		'idx': 16,
-		'label': 'Calculate Total Amount',
-		'oldfieldtype': 'Button',
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldtype': u'Button',
+		'label': u'Calculate Total Amount',
+		'oldfieldtype': u'Button',
 		'permlevel': 0,
 		'print_hide': 1,
 		'report_hide': 1,
-		'trigger': 'Client'
+		'trigger': u'Client'
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldname': 'total_claimed_amount',
-		'fieldtype': 'Currency',
-		'idx': 17,
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldname': u'total_claimed_amount',
+		'fieldtype': u'Currency',
 		'in_filter': 0,
-		'label': 'Total Claimed Amount',
+		'label': u'Total Claimed Amount',
 		'no_copy': 1,
-		'oldfieldname': 'total_claimed_amount',
-		'oldfieldtype': 'Currency',
+		'oldfieldname': u'total_claimed_amount',
+		'oldfieldtype': u'Currency',
 		'permlevel': 1,
 		'reqd': 0,
-		'width': '160px'
+		'width': u'160px'
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldname': 'total_sanctioned_amount',
-		'fieldtype': 'Currency',
-		'idx': 18,
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldname': u'total_sanctioned_amount',
+		'fieldtype': u'Currency',
 		'in_filter': 0,
-		'label': 'Total Sanctioned Amount',
+		'label': u'Total Sanctioned Amount',
 		'no_copy': 1,
-		'oldfieldname': 'total_sanctioned_amount',
-		'oldfieldtype': 'Currency',
+		'oldfieldname': u'total_sanctioned_amount',
+		'oldfieldtype': u'Currency',
 		'permlevel': 1,
-		'width': '160px'
+		'width': u'160px'
 	},
 
 	# DocField
 	{
 		'allow_on_submit': 1,
-		'doctype': 'DocField',
-		'fieldtype': 'Button',
+		'doctype': u'DocField',
+		'fieldtype': u'Button',
 		'hidden': 1,
-		'idx': 19,
-		'label': 'Update Voucher',
-		'oldfieldtype': 'Button',
+		'label': u'Update Voucher',
+		'oldfieldtype': u'Button',
 		'permlevel': 0,
 		'print_hide': 1,
-		'trigger': 'Client'
+		'trigger': u'Client'
 	},
 
 	# DocField
 	{
 		'allow_on_submit': 1,
-		'doctype': 'DocField',
-		'fieldname': 'expense_voucher_details',
-		'fieldtype': 'Table',
-		'idx': 20,
-		'label': 'Expense Voucher Details',
-		'oldfieldname': 'expense_voucher_details',
-		'oldfieldtype': 'Table',
-		'options': 'Expense Voucher Detail',
+		'doctype': u'DocField',
+		'fieldname': u'expense_voucher_details',
+		'fieldtype': u'Table',
+		'label': u'Expense Voucher Details',
+		'oldfieldname': u'expense_voucher_details',
+		'oldfieldtype': u'Table',
+		'options': u'Expense Voucher Detail',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'email_id',
-		'fieldtype': 'Data',
+		'doctype': u'DocField',
+		'fieldname': u'email_id',
+		'fieldtype': u'Data',
 		'hidden': 1,
-		'idx': 21,
-		'label': 'Employees Email Id',
-		'oldfieldname': 'email_id',
-		'oldfieldtype': 'Data',
+		'label': u'Employees Email Id',
+		'oldfieldname': u'email_id',
+		'oldfieldtype': u'Data',
 		'permlevel': 0,
 		'print_hide': 1
 	}
diff --git a/erpnext/hr/doctype/holiday_list_detail/holiday_list_detail.txt b/erpnext/hr/doctype/holiday_list_detail/holiday_list_detail.txt
index 89f1b04..cc7ba94 100644
--- a/erpnext/hr/doctype/holiday_list_detail/holiday_list_detail.txt
+++ b/erpnext/hr/doctype/holiday_list_detail/holiday_list_detail.txt
@@ -5,61 +5,57 @@
 	{
 		'creation': '2010-08-08 17:09:03',
 		'docstatus': 0,
-		'modified': '2011-02-11 14:23:09',
-		'modified_by': 'Administrator',
-		'owner': 'Administrator'
+		'modified': '2012-03-21 14:36:29',
+		'modified_by': u'Administrator',
+		'owner': u'Administrator'
 	},
 
 	# These values are common for all DocType
 	{
-		'colour': 'White:FFF',
+		'colour': u'White:FFF',
+		'default_print_format': u'Standard',
 		'doctype': 'DocType',
 		'istable': 1,
-		'module': 'HR',
+		'module': u'HR',
 		'name': '__common__',
-		'section_style': 'Simple',
-		'server_code_error': ' ',
+		'section_style': u'Simple',
+		'server_code_error': u' ',
 		'show_in_menu': 0,
-		'version': 4
+		'version': 2
 	},
 
 	# These values are common for all DocField
 	{
-		'doctype': 'DocField',
+		'doctype': u'DocField',
 		'name': '__common__',
-		'parent': 'Holiday List Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
+		'parent': u'Holiday List Detail',
+		'parentfield': u'fields',
+		'parenttype': u'DocType',
 		'permlevel': 0
 	},
 
 	# DocType, Holiday List Detail
 	{
 		'doctype': 'DocType',
-		'name': 'Holiday List Detail'
+		'name': u'Holiday List Detail'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'description',
-		'fieldtype': 'Small Text',
-		'idx': 1,
-		'label': 'Description',
-		'oldfieldname': 'holiday_name',
-		'oldfieldtype': 'Data',
-		'width': '300px'
+		'doctype': u'DocField',
+		'fieldname': u'description',
+		'fieldtype': u'Small Text',
+		'label': u'Description',
+		'width': u'300px'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'holiday_date',
-		'fieldtype': 'Date',
-		'idx': 2,
-		'label': 'Date',
-		'oldfieldname': 'holiday_date',
-		'oldfieldtype': 'Date',
-		'width': '100px'
+		'doctype': u'DocField',
+		'fieldname': u'holiday_date',
+		'fieldtype': u'Date',
+		'label': u'Date',
+		'oldfieldname': u'holiday_date',
+		'oldfieldtype': u'Date'
 	}
 ]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/leave_allocation/leave_allocation.txt b/erpnext/hr/doctype/leave_allocation/leave_allocation.txt
index b147a7f..f461ca8 100644
--- a/erpnext/hr/doctype/leave_allocation/leave_allocation.txt
+++ b/erpnext/hr/doctype/leave_allocation/leave_allocation.txt
@@ -3,51 +3,52 @@
 
 	# These values are common in all dictionaries
 	{
-		'creation': '2011-02-10 17:24:59',
+		'creation': '2011-02-14 10:18:47',
 		'docstatus': 0,
-		'modified': '2011-02-17 13:47:13',
-		'modified_by': 'Administrator',
-		'owner': 'Administrator'
+		'modified': '2012-03-21 12:49:25',
+		'modified_by': u'Administrator',
+		'owner': u'Administrator'
 	},
 
 	# These values are common for all DocType
 	{
-		'_last_update': '1299063937',
-		'autoname': 'LAL/.#####',
-		'colour': 'White:FFF',
+		'_last_update': u'1317365120',
+		'autoname': u'LAL/.#####',
+		'colour': u'White:FFF',
+		'default_print_format': u'Standard',
 		'doctype': 'DocType',
-		'module': 'HR',
+		'module': u'HR',
 		'name': '__common__',
-		'search_fields': 'employee,employee_name,leave_type,total_leaves_allocated,fiscal_year',
-		'section_style': 'Simple',
-		'server_code_error': ' ',
+		'search_fields': u'employee,employee_name,leave_type,total_leaves_allocated,fiscal_year',
+		'section_style': u'Simple',
+		'server_code_error': u' ',
 		'show_in_menu': 0,
-		'version': 1565
+		'version': 1560
 	},
 
 	# These values are common for all DocField
 	{
-		'doctype': 'DocField',
+		'doctype': u'DocField',
 		'name': '__common__',
-		'parent': 'Leave Allocation',
-		'parentfield': 'fields',
-		'parenttype': 'DocType'
+		'parent': u'Leave Allocation',
+		'parentfield': u'fields',
+		'parenttype': u'DocType'
 	},
 
 	# These values are common for all DocPerm
 	{
-		'doctype': 'DocPerm',
+		'doctype': u'DocPerm',
 		'name': '__common__',
-		'parent': 'Leave Allocation',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
+		'parent': u'Leave Allocation',
+		'parentfield': u'permissions',
+		'parenttype': u'DocType',
 		'read': 1
 	},
 
 	# DocType, Leave Allocation
 	{
 		'doctype': 'DocType',
-		'name': 'Leave Allocation'
+		'name': u'Leave Allocation'
 	},
 
 	# DocPerm
@@ -55,11 +56,10 @@
 		'amend': 1,
 		'cancel': 1,
 		'create': 1,
-		'doctype': 'DocPerm',
-		'idx': 1,
-		'match': 'owner',
+		'doctype': u'DocPerm',
+		'match': u'owner',
 		'permlevel': 0,
-		'role': 'HR User',
+		'role': u'HR User',
 		'submit': 1,
 		'write': 1
 	},
@@ -69,11 +69,10 @@
 		'amend': 0,
 		'cancel': 0,
 		'create': 0,
-		'doctype': 'DocPerm',
-		'idx': 2,
-		'match': 'owner',
+		'doctype': u'DocPerm',
+		'match': u'owner',
 		'permlevel': 0,
-		'role': 'HR User',
+		'role': u'HR User',
 		'submit': 0,
 		'write': 0
 	},
@@ -83,93 +82,189 @@
 		'amend': 1,
 		'cancel': 1,
 		'create': 1,
-		'doctype': 'DocPerm',
-		'idx': 3,
+		'doctype': u'DocPerm',
+		'match': u'owner',
 		'permlevel': 0,
-		'role': 'HR Manager',
+		'role': u'HR User',
 		'submit': 1,
 		'write': 1
 	},
 
 	# DocPerm
 	{
-		'doctype': 'DocPerm',
-		'idx': 4,
-		'permlevel': 1,
-		'role': 'HR Manager'
-	},
-
-	# DocField
-	{
-		'doctype': 'DocField',
-		'fieldname': 'column_break1',
-		'fieldtype': 'Column Break',
-		'idx': 1,
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': u'DocPerm',
+		'match': u'owner',
 		'permlevel': 0,
-		'width': '50%'
+		'role': u'HR User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': u'DocPerm',
+		'match': u'owner',
+		'permlevel': 0,
+		'role': u'HR User',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': u'DocPerm',
+		'match': u'owner',
+		'permlevel': 0,
+		'role': u'HR User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': u'DocPerm',
+		'match': u'owner',
+		'permlevel': 0,
+		'role': u'HR User',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': u'DocPerm',
+		'match': u'owner',
+		'permlevel': 0,
+		'role': u'HR User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': u'DocPerm',
+		'match': u'owner',
+		'permlevel': 0,
+		'role': u'HR User',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': u'DocPerm',
+		'match': u'owner',
+		'permlevel': 0,
+		'role': u'HR User',
+		'submit': 0,
+		'write': 0
+	},
+
+	# DocPerm
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'doctype': u'DocPerm',
+		'permlevel': 0,
+		'role': u'HR Manager',
+		'submit': 1,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': u'DocPerm',
+		'permlevel': 1,
+		'role': u'HR Manager'
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldname': 'employee',
-		'fieldtype': 'Link',
-		'idx': 2,
+		'doctype': u'DocField',
+		'fieldtype': u'Column Break',
+		'permlevel': 0,
+		'width': u'50%'
+	},
+
+	# DocField
+	{
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldname': u'employee',
+		'fieldtype': u'Link',
 		'in_filter': 1,
-		'label': 'Employee',
-		'oldfieldname': 'employee',
-		'oldfieldtype': 'Link',
-		'options': 'Employee',
+		'label': u'Employee',
+		'oldfieldname': u'employee',
+		'oldfieldtype': u'Link',
+		'options': u'Employee',
 		'permlevel': 0,
 		'reqd': 1,
 		'search_index': 1,
-		'trigger': 'Client'
+		'trigger': u'Client'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'employee_name',
-		'fieldtype': 'Data',
-		'idx': 3,
+		'doctype': u'DocField',
+		'fieldname': u'employee_name',
+		'fieldtype': u'Data',
 		'in_filter': 1,
-		'label': 'Employee Name',
+		'label': u'Employee Name',
 		'permlevel': 1,
-		'search_index': 0
+		'search_index': 1
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldname': 'leave_type',
-		'fieldtype': 'Select',
-		'idx': 4,
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldname': u'leave_type',
+		'fieldtype': u'Select',
 		'in_filter': 1,
-		'label': 'Leave Type',
-		'oldfieldname': 'leave_type',
-		'oldfieldtype': 'Link',
-		'options': '\nCasual Leave\nCompensatory Off\nLeave Without Pay\nPaternity Leave\nPrivilege Leave\nSick Leave',
+		'label': u'Leave Type',
+		'oldfieldname': u'leave_type',
+		'oldfieldtype': u'Link',
+		'options': u'link:Leave Type',
 		'permlevel': 0,
 		'reqd': 1,
 		'search_index': 1,
-		'trigger': 'Client'
+		'trigger': u'Client'
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'default': 'Today',
-		'doctype': 'DocField',
-		'fieldname': 'posting_date',
-		'fieldtype': 'Date',
+		'colour': u'White:FFF',
+		'default': u'Today',
+		'doctype': u'DocField',
+		'fieldname': u'posting_date',
+		'fieldtype': u'Date',
 		'hidden': 0,
-		'idx': 5,
-		'label': 'Posting Date',
+		'label': u'Posting Date',
 		'no_copy': 1,
-		'oldfieldname': 'date',
-		'oldfieldtype': 'Date',
+		'oldfieldname': u'date',
+		'oldfieldtype': u'Date',
 		'permlevel': 1,
 		'reqd': 1,
 		'search_index': 0
@@ -177,116 +272,108 @@
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'fieldtype': 'Select',
-		'idx': 6,
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldname': u'fiscal_year',
+		'fieldtype': u'Select',
 		'in_filter': 1,
-		'label': 'Fiscal Year',
-		'oldfieldname': 'fiscal_year',
-		'oldfieldtype': 'Data',
-		'options': '\n2010-2011\n2011-2012\n2012-2013',
+		'label': u'Fiscal Year',
+		'oldfieldname': u'fiscal_year',
+		'oldfieldtype': u'Data',
+		'options': u'link:Fiscal Year',
 		'permlevel': 0,
 		'reqd': 1,
 		'search_index': 1,
-		'trigger': 'Client'
+		'trigger': u'Client'
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldname': 'description',
-		'fieldtype': 'Small Text',
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldname': u'description',
+		'fieldtype': u'Small Text',
 		'hidden': 0,
-		'idx': 7,
-		'label': 'Description',
-		'oldfieldname': 'reason',
-		'oldfieldtype': 'Small Text',
+		'label': u'Description',
+		'oldfieldname': u'reason',
+		'oldfieldtype': u'Small Text',
 		'permlevel': 0,
-		'width': '300px'
+		'width': u'300px'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'column_break8',
-		'fieldtype': 'Column Break',
-		'idx': 8,
+		'doctype': u'DocField',
+		'fieldtype': u'Column Break',
 		'permlevel': 0,
-		'width': '50%'
+		'width': u'50%'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'carry_forward',
-		'fieldtype': 'Check',
-		'idx': 9,
-		'label': 'Carry Forward',
+		'doctype': u'DocField',
+		'fieldname': u'carry_forward',
+		'fieldtype': u'Check',
+		'label': u'Carry Forward',
 		'permlevel': 0,
-		'trigger': 'Client'
+		'trigger': u'Client'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'carry_forwarded_leaves',
-		'fieldtype': 'Currency',
-		'idx': 10,
-		'label': 'Carry Forwarded Leaves',
+		'doctype': u'DocField',
+		'fieldname': u'carry_forwarded_leaves',
+		'fieldtype': u'Currency',
+		'label': u'Carry Forwarded Leaves',
 		'permlevel': 0,
-		'trigger': 'Client'
+		'trigger': u'Client'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'new_leaves_allocated',
-		'fieldtype': 'Currency',
-		'idx': 11,
-		'label': 'New Leaves Allocated',
+		'doctype': u'DocField',
+		'fieldname': u'new_leaves_allocated',
+		'fieldtype': u'Currency',
+		'label': u'New Leaves Allocated',
 		'permlevel': 0,
-		'trigger': 'Client'
+		'trigger': u'Client'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'total_leaves_allocated',
-		'fieldtype': 'Currency',
-		'idx': 12,
-		'label': 'Total Leaves Allocated',
+		'doctype': u'DocField',
+		'fieldname': u'total_leaves_allocated',
+		'fieldtype': u'Currency',
+		'label': u'Total Leaves Allocated',
 		'permlevel': 1,
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'amended_from',
-		'fieldtype': 'Data',
+		'doctype': u'DocField',
+		'fieldname': u'amended_from',
+		'fieldtype': u'Data',
 		'hidden': 0,
-		'idx': 13,
-		'label': 'Amended From',
-		'oldfieldname': 'amended_from',
-		'oldfieldtype': 'Data',
+		'label': u'Amended From',
+		'no_copy': 1,
+		'oldfieldname': u'amended_from',
+		'oldfieldtype': u'Data',
 		'permlevel': 1,
 		'print_hide': 1
 	},
 
 	# DocField
 	{
-		'description': 'The date at which current entry is corrected in the system.',
-		'doctype': 'DocField',
-		'fieldname': 'amendment_date',
-		'fieldtype': 'Date',
+		'description': u'The date at which current entry is corrected in the system.',
+		'doctype': u'DocField',
+		'fieldname': u'amendment_date',
+		'fieldtype': u'Date',
 		'hidden': 0,
-		'idx': 14,
-		'label': 'Amendment Date',
-		'oldfieldname': 'amendment_date',
-		'oldfieldtype': 'Date',
+		'label': u'Amendment Date',
+		'no_copy': 1,
+		'oldfieldname': u'amendment_date',
+		'oldfieldtype': u'Date',
 		'permlevel': 1,
 		'print_hide': 1
 	}
diff --git a/erpnext/hr/doctype/leave_control_panel/leave_control_panel.txt b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.txt
index 29999de..a044b16 100644
--- a/erpnext/hr/doctype/leave_control_panel/leave_control_panel.txt
+++ b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.txt
@@ -5,240 +5,222 @@
 	{
 		'creation': '2010-08-08 17:09:08',
 		'docstatus': 0,
-		'modified': '2011-02-12 15:42:00',
-		'modified_by': 'Administrator',
-		'owner': 'Administrator'
+		'modified': '2012-03-21 14:42:27',
+		'modified_by': u'Administrator',
+		'owner': u'Administrator'
 	},
 
 	# These values are common for all DocType
 	{
+		'_last_update': u'1297751828',
 		'allow_copy': 1,
 		'allow_email': 1,
 		'allow_print': 1,
-		'colour': 'White:FFF',
+		'colour': u'White:FFF',
+		'default_print_format': u'Standard',
 		'doctype': 'DocType',
 		'hide_heading': 0,
 		'hide_toolbar': 0,
 		'issingle': 1,
-		'module': 'HR',
+		'module': u'HR',
 		'name': '__common__',
 		'read_only': 1,
-		'section_style': 'Simple',
-		'server_code_error': ' ',
+		'section_style': u'Simple',
+		'server_code_error': u' ',
 		'show_in_menu': 0,
-		'version': 161
+		'version': 162
 	},
 
 	# These values are common for all DocField
 	{
-		'doctype': 'DocField',
+		'doctype': u'DocField',
 		'name': '__common__',
-		'parent': 'Leave Control Panel',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
+		'parent': u'Leave Control Panel',
+		'parentfield': u'fields',
+		'parenttype': u'DocType',
 		'permlevel': 0
 	},
 
 	# These values are common for all DocPerm
 	{
-		'doctype': 'DocPerm',
+		'doctype': u'DocPerm',
 		'name': '__common__',
-		'parent': 'Leave Control Panel',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
+		'parent': u'Leave Control Panel',
+		'parentfield': u'permissions',
+		'parenttype': u'DocType',
 		'read': 1
 	},
 
 	# DocType, Leave Control Panel
 	{
 		'doctype': 'DocType',
-		'name': 'Leave Control Panel'
+		'name': u'Leave Control Panel'
 	},
 
 	# DocPerm
 	{
 		'create': 1,
-		'doctype': 'DocPerm',
-		'idx': 1,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'System Manager',
+		'role': u'System Manager',
 		'write': 1
 	},
 
 	# DocPerm
 	{
-		'doctype': 'DocPerm',
-		'idx': 2,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'System Manager'
+		'role': u'System Manager'
 	},
 
 	# DocPerm
 	{
 		'create': 1,
-		'doctype': 'DocPerm',
-		'idx': 3,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'HR User',
+		'role': u'HR User',
 		'write': 1
 	},
 
 	# DocPerm
 	{
 		'create': 1,
-		'doctype': 'DocPerm',
-		'idx': 4,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'HR Manager',
+		'role': u'HR Manager',
 		'write': 1
 	},
 
 	# DocPerm
 	{
-		'doctype': 'DocPerm',
-		'idx': 5,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'HR User'
+		'role': u'HR User'
 	},
 
 	# DocPerm
 	{
-		'doctype': 'DocPerm',
-		'idx': 6,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'HR Manager'
+		'role': u'HR Manager'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'column_break1',
-		'fieldtype': 'Column Break',
-		'idx': 1,
-		'width': '50%'
+		'doctype': u'DocField',
+		'fieldtype': u'Column Break',
+		'width': u'50%'
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'description': 'Leave blank if considered for all employee types',
-		'doctype': 'DocField',
-		'fieldname': 'employee_type',
-		'fieldtype': 'Select',
-		'idx': 2,
-		'label': 'Employee Type',
-		'options': 'link:Employment Type'
+		'colour': u'White:FFF',
+		'description': u'Leave blank if considered for all employee types',
+		'doctype': u'DocField',
+		'fieldname': u'employee_type',
+		'fieldtype': u'Select',
+		'label': u'Employee Type',
+		'options': u'link:Employment Type'
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'description': 'Leave blank if considered for all branches',
-		'doctype': 'DocField',
-		'fieldname': 'branch',
-		'fieldtype': 'Select',
-		'idx': 3,
-		'label': 'Branch',
-		'options': 'link:Branch'
+		'colour': u'White:FFF',
+		'description': u'Leave blank if considered for all branches',
+		'doctype': u'DocField',
+		'fieldname': u'branch',
+		'fieldtype': u'Select',
+		'label': u'Branch',
+		'options': u'link:Branch'
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'description': 'Leave blank if considered for all departments',
-		'doctype': 'DocField',
-		'fieldname': 'department',
-		'fieldtype': 'Select',
-		'idx': 4,
-		'label': 'Department',
-		'options': 'link:Department'
+		'colour': u'White:FFF',
+		'description': u'Leave blank if considered for all departments',
+		'doctype': u'DocField',
+		'fieldname': u'department',
+		'fieldtype': u'Select',
+		'label': u'Department',
+		'options': u'link:Department'
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'description': 'Leave blank if considered for all designations',
-		'doctype': 'DocField',
-		'fieldname': 'designation',
-		'fieldtype': 'Select',
-		'idx': 5,
-		'label': 'Designation',
-		'options': 'link:Designation'
+		'colour': u'White:FFF',
+		'description': u'Leave blank if considered for all designations',
+		'doctype': u'DocField',
+		'fieldname': u'designation',
+		'fieldtype': u'Select',
+		'label': u'Designation',
+		'options': u'link:Designation'
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'description': 'Leave blank if considered for all grades',
-		'doctype': 'DocField',
-		'fieldname': 'grade',
-		'fieldtype': 'Select',
-		'idx': 6,
-		'label': 'Grade',
-		'options': 'link:Grade'
+		'colour': u'White:FFF',
+		'description': u'Leave blank if considered for all grades',
+		'doctype': u'DocField',
+		'fieldname': u'grade',
+		'fieldtype': u'Select',
+		'label': u'Grade',
+		'options': u'link:Grade'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'column_break7',
-		'fieldtype': 'Column Break',
-		'idx': 7,
-		'width': '50%'
+		'doctype': u'DocField',
+		'fieldtype': u'Column Break',
+		'width': u'50%'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'fieldtype': 'Select',
-		'idx': 8,
+		'doctype': u'DocField',
+		'fieldname': u'fiscal_year',
+		'fieldtype': u'Select',
 		'in_filter': 1,
-		'label': 'Fiscal Year',
-		'options': 'link:Fiscal Year',
+		'label': u'Fiscal Year',
+		'options': u'link:Fiscal Year',
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'leave_type',
-		'fieldtype': 'Select',
-		'idx': 9,
-		'label': 'Leave Type',
-		'options': 'link:Leave Type',
+		'doctype': u'DocField',
+		'fieldname': u'leave_type',
+		'fieldtype': u'Select',
+		'label': u'Leave Type',
+		'options': u'link:Leave Type',
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'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',
-		'idx': 10,
-		'label': 'Carry Forward'
+		'colour': u'White:FFF',
+		'description': u"Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year",
+		'doctype': u'DocField',
+		'fieldname': u'carry_forward',
+		'fieldtype': u'Check',
+		'label': u'Carry Forward'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'no_of_days',
-		'fieldtype': 'Currency',
-		'idx': 11,
-		'label': 'New Leaves Allocated (In Days)',
+		'doctype': u'DocField',
+		'fieldname': u'no_of_days',
+		'fieldtype': u'Currency',
+		'label': u'New Leaves Allocated (In Days)',
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldtype': 'Button',
-		'idx': 12,
-		'label': 'Allocate',
-		'options': 'allocate_leave',
-		'trigger': 'Server'
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldtype': u'Button',
+		'label': u'Allocate',
+		'options': u'allocate_leave',
+		'trigger': u'Server'
 	}
 ]
\ No newline at end of file
diff --git a/erpnext/hr/doctype/payroll_rule/__init__.py b/erpnext/hr/doctype/payroll_rule/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/hr/doctype/payroll_rule/__init__.py
+++ /dev/null
diff --git a/erpnext/hr/doctype/payroll_rule/payroll_rule.js b/erpnext/hr/doctype/payroll_rule/payroll_rule.js
deleted file mode 100644
index e021338..0000000
--- a/erpnext/hr/doctype/payroll_rule/payroll_rule.js
+++ /dev/null
@@ -1,111 +0,0 @@
-// ERPNext - web based ERP (http://erpnext.com)
-// Copyright (C) 2012 Web Notes Technologies Pvt Ltd
-// 
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-//omload function to set values in select field
-cur_frm.cscript.onload = function(doc, cdt, cdn){
-  var mydoc = doc
-  doc.select_master = 'Salary Structure';
-  refresh_field('select_master');
-
-  var call_back_master2 = function(mydoc){
-    $c('runserverobj', args={'method':'get_masters', 'docs':compress_doclist (make_doclist (doc.doctype,doc.name))},
-    function(r, rt) {
-    var doc = locals[mydoc.doctype][mydoc.name];
-     get_field(doc.doctype, 'select_master2' , doc.name).options = r.message;
-     refresh_field('select_master2');
-   
-    }
-  );
-  }
-  $c('runserverobj', args={'method':'maindoc_field', 'arg':doc.select_master,'docs':compress_doclist (make_doclist (doc.doctype,doc.name))},
-    function(r, rt) {
-     var doc = locals[mydoc.doctype][mydoc.name];
-     get_field(doc.doctype, 'select_field' , doc.name).options = r.message;
-     refresh_field('select_field');
-     call_back_master2(mydoc);
-    }
-  );
-}
-
-//select_master2 onchanged event function: it will add values to select_field2 based on select_master2 field 
-cur_frm.cscript.select_master2 = function(doc, cdt, cdn){
-  var mydoc = doc
-  doc.select_field2 ='';
-  refresh_field('select_field2');
-  doc.select_value='';
-  refresh_field('select_value');
-  $c('runserverobj', args={'method':'maindoc_field', 'arg':doc.select_master2, 'docs':compress_doclist (make_doclist (doc.doctype,doc.name))},
-    function(r, rt) {
-     var doc = locals[mydoc.doctype][mydoc.name];
-     get_field(doc.doctype, 'select_field2' , doc.name).options = r.message;
-     refresh_field('select_field2');
-     get_field(doc.doctype, 'select_value' , doc.name).options = '';
-     refresh_field('select_value'); 
-        
-    }
-  );
-}
-
-//select_field2 onchanged event function: used to add records values of selected master & their field_name
-cur_frm.cscript.select_field2 = function(doc, cdt, cdn){
-  var mydoc = doc
-  doc.select_value='';
-  refresh_field('select_value');
-  $c('runserverobj', args={'method':'get_values','docs':compress_doclist (make_doclist (doc.doctype,doc.name))},
-    function(r, rt) {
-     var doc = locals[mydoc.doctype][mydoc.name];
-     get_field(doc.doctype, 'select_value' , doc.name).options = r.message;
-     refresh_field('select_value');
-     
-    }
-  );
-}
-
-//transaction onchanged event function: used to add transaction terms to transaction term field
-cur_frm.cscript.transaction = function(doc, cdt, cdn){
-  var mydoc = doc
-  doc.transaction_term='';
-  refresh_field('transaction_term');
-  if(doc.transaction){
-    $c('runserverobj', args={'method':'add_transaction_terms','docs':compress_doclist (make_doclist (doc.doctype,doc.name))},
-      function(r, rt) {
-       var doc = locals[mydoc.doctype][mydoc.name];
-       get_field(doc.doctype, 'transaction_term' , doc.name).options = r.message;
-       refresh_field('transaction_term');
-     }
-    );
-  }
-}
-
-
-//right operand of condition :hide or unhide 
-cur_frm.cscript.right_operand = function(doc, cdt, cdn){
-  doc.select_master2 = "";
-  doc.select_field2 = "";
-  doc.select_value = "";
-  if(doc.right_operand =='Automatic'){
-    unhide_field('select_master2');
-    unhide_field('select_field2');
-    unhide_field('select_value');
-  }
-  else {
-   hide_field('select_master2');
-   hide_field('select_field2');
-   hide_field('select_value');
-  
-  }
-}
-
diff --git a/erpnext/hr/doctype/payroll_rule/payroll_rule.py b/erpnext/hr/doctype/payroll_rule/payroll_rule.py
deleted file mode 100644
index 5d6e13f..0000000
--- a/erpnext/hr/doctype/payroll_rule/payroll_rule.py
+++ /dev/null
@@ -1,327 +0,0 @@
-# ERPNext - web based ERP (http://erpnext.com)
-# Copyright (C) 2012 Web Notes Technologies Pvt Ltd
-# 
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Please edit this list and import only required elements
-import webnotes
-
-from webnotes.utils import add_days, add_months, add_years, cint, cstr, date_diff, default_fields, flt, fmt_money, formatdate, generate_hash, getTraceback, get_defaults, get_first_day, get_last_day, getdate, has_common, month_name, now, nowdate, replace_newlines, sendmail, set_default, str_esc_quote, user_format, validate_email_add
-from webnotes.model import db_exists
-from webnotes.model.doc import Document, addchild, removechild, getchildren, make_autoname, SuperDocType
-from webnotes.model.doclist import getlist, copy_doclist
-from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax
-from webnotes import session, form, is_testing, msgprint, errprint
-
-set = webnotes.conn.set
-sql = webnotes.conn.sql
-get_value = webnotes.conn.get_value
-in_transaction = webnotes.conn.in_transaction
-convert_to_lists = webnotes.conn.convert_to_lists
-	
-# -----------------------------------------------------------------------------------------
-
-
-class DocType:
-  def __init__(self, doc, doclist=[]):
-    self.doc, self.doclist = doc, doclist  
-  
-  #----------------------------------------------------
-  # list of master whose module is payroll & isnot table
-  def get_masters(self):
-    master1 = sql("select name from `tabDocType` where module = 'Payroll' and (istable = 0 or istable is null)")
-    ret =''
-    if master1:
-      for i in master1:
-        ret += "\n" + i[0]
-    return ret
-    
-
-  #---------------------------------------------------- 
-  #list of all fields for which conditions can be set
-  def maindoc_field(self, select_form):
-    field_list=[]
-    
-    
-    field_info = sql("select label,fieldtype,options,fieldname from `tabDocField` where parent='%s' and fieldtype not in('Section Break','Column Break','Text','Small Text','Text Editor', 'Time', 'Check', 'Button','Code','HTML','Image','Blob','Password')"%select_form)
-    
-    for f in field_info:
-      sl=[]
-      for x in f:
-        sl.append(x)
-      field_list.append(sl)
-    ret = ''
-    
-    #=====================================================  
-    
-    for fi in field_list:
-      if fi[1] !='Select' or fi[1] !='Link' or fi[1] !='Table':
-        ret += "\n" + cstr(select_form) + ':' + fi[0]
-      elif fi[1] =='Select':
-        op = fi[2].split(':')
-        if op[0] != 'link':
-          ret += "\n" + cstr(select_form) + ':' +fi[0]
-        #========  
-        # linked doctype field list
-    
-    #=====================================================  
-    
-    for fi in field_list:    
-      if fi[1] == 'Link':
-        flist=sql("select label from tabDocField where parent='%s' and fieldtype in ('Data', 'Int', 'Select','Currency','Float','Link')"%fi[2])
-        for f in flist:
-          ret += "\n" + fi[0] + ':' +f[0]
-      elif fi[1] == 'Select':
-        op = fi[2].split(':')
-        if op[0] == 'link':
-          flist=sql("select label from tabDocField where parent='%s' and fieldtype in ('Data', 'Select', 'Int','Currency','Float','Link')"%op[1])
-          for f in flist:
-            ret += "\n" + fi[0] + ':' +f[0]
-
-    return ret
-
-
-  #----------------------------------------------------  
-  # function for finding fieldname,datatype of mentioned label
-  def field_info(self,label,parent):
-    field_name=sql("select fieldname from tabDocField where parent='%s' and label='%s'" %(parent,label))[0][0]
-    if field_name: 
-      datatype=sql("select fieldtype from `tabDocField` where fieldname='%s' and parent='%s'" %(field_name,parent))[0][0]
-      ret={'fieldnm':field_name,'datatype':datatype}
-    
-    return ret
-  
-  #----------------------------------------------------
-  def compare_string(self,first,second,op):
-
-    if op=='Equals':
-      if first.lower()==second.lower():
-        return 'true'
-      else:
-        return 'false'
-    elif op=='Not Equals':
-      if first.lower()!=second.lower():
-        return 'true'
-      else:
-        return 'false'
-    elif op=='Greater than':
-      if first.lower()>second.lower():
-        return 'true'
-      else:
-        return 'false'
-    elif op=='Greater than or Equals':
-      if first.lower()>=second.lower():
-        return 'true'
-      else:
-        return 'false'
-    elif op=='Less than':
-      if first.lower()<second.lower():
-        return 'true'
-      else:
-        return 'false'
-    elif op=='Less than or Equals':
-      if first.lower()<=second.lower():
-        return 'true'
-      else:
-        return 'false'
- 
-  
-  #----------------------------------------------------
-  #evalute operator
-  def eval_operator(self,op):
-    op_sign =''
-    if op=='Equals':
-      op_sign='=='
-    elif op=='Not Equals':
-      op_sign='!='
-    elif op=='Greater than':
-      op_sign='>'
-    elif op=='Greater than or Equals':
-      op_sign='>='
-    elif op=='Less than':
-      op_sign='<'
-    elif op=='Less than or Equals':
-      op_sign='<='
-    
-    return op_sign
-  
-  #----------------------------------------------------  
-  #evaluation condition
-  def eval_condition(self,field_dict,form_val,value,operator):
-    if field_dict['datatype']=='Data' or field_dict['datatype']=='Select' or field_dict['datatype'] =='Link':
-      
-      if self.compare_string(cstr(form_val),cstr(value),operator)=='false':
-        cond_hold='No'
-      else:
-        cond_hold='Yes'
-    else:
-      op_sign = self.eval_operator(operator)  
-      chk_cond=str(form_val) + str(op_sign) + str(value)
-      errprint(chk_cond)
-      if eval(chk_cond):
-        cond_hold='Yes'
-      else:
-        cond_hold='No'
-   
-    return cond_hold
-  
-  #----------------------------------------------------
-  # fetching the value from the form
-  def find_value(self,fld_nm,tab_nm,rec_nm,child=0):
-    if child == 0:
-      form_val=sql("select %s from `tab%s` where name='%s'"%(fld_nm,tab_nm,rec_nm))
-    
-    elif child == 1:
-      form_val=sql("select %s from `tab%s` where parent='%s'"%(fld_nm,tab_nm,rec_nm))
-    
-    return form_val and form_val[0][0]
-  
-  #----------------------------------------------------
-  # checking with main doctype  
-  def chk_from_main_dt(self,master,label1,value,operator,form_obj):
-    cond_hold = ''
-    field_dict = self.field_info(label1,master) #getting fieldname info
-    form_val=self.find_value(field_dict['fieldnm'],master,form_obj.doc.name) # find value
-   
-    if form_val :
-      cond_hold = self.eval_condition(field_dict,form_val,value,operator)
-    elif not form_val and field_dict['datatype'] =='Currency' or field_dict['datatype'] =='Float' or field_dict['datatype'] =='Int':
-      
-      form_val = 0.0
-      cond_hold = self.eval_condition(field_dict,form_val,value,operator)
-    return cond_hold
-
-  #----------------------------------------------------  
-  #checking with child doctype
-  def chk_from_child_dt(self,first_label,second_label,value,operator,form_obj):
-    cond_hold = ''
-    field_dict = self.field_info(second_label,first_label)
-    form_val=self.find_value(field_dict['fieldnm'],first_label,form_obj.doc.name,1) #fetching the value in current form from a table
-    if form_val or form_val==0:
-      cond_hold = self.eval_condition(field_dict,form_val,value,operator)
-    
-    return cond_hold
-
-  #----------------------------------------------------
-  # if checking is with any linked doctype means first_label field from the doctype for which rule is given and second_label field from the doctype with which first_label is linked  
-  
-  def chk_from_link_dt(self,master,first_label,second_label,form_obj,value,operator):
-    cond_hold=''
-    field_list=[]
-    field_dict_first = self.field_info(first_label,master)
-    field_info = sql("select label,fieldtype,options,fieldname from `tabDocField` where parent='%s' and fieldtype not in('Section Break','Column Break','Text','Small Text','Text Editor', 'Time', 'Check', 'Button','Code','HTML','Image','Blob','Password')"%master)
-    for f in field_info:
-      sl=[]
-      for x in f:
-        sl.append(x)
-      field_list.append(sl)
-    for x in field_list:
-      if x[3] == field_dict_first['fieldnm']:
-        linked_to = x[2]
-    
-    lt = linked_to.split(':')
-    
-    #=================================================
-    if lt[0] == 'link':
-      field_dict_second = self.field_info(second_label,lt[1])
-      link_val=sql("select %s from `tab%s` where name='%s'"%(field_dict_first['fieldnm'],master,form_obj.doc.name))
-      if link_val and link_val[0][0]:
-        form_val = self.find_value(field_dict_second['fieldnm'],lt[1],link_val[0][0])
-        if form_val :
-          cond_hold = self.eval_condition(field_dict_second,form_val,value,operator)
-      
-    else:
-      field_dict_second = self.field_info(second_label,lt[0])
-      link_val=sql("select %s from `tab%s` where name='%s'"%(field_dict_first['fieldnm'],master,form_obj.doc.name))
-      if link_val and link_val[0][0]:
-        form_val = self.find_value(field_dict_second['fieldnm'],lt[0],link_val[0][0])
-        if form_val :
-          cond_hold = self.eval_condition(field_dict_second,form_val,value,operator)
-    
-    return cond_hold
-
-  #----------------------------------------------------
-  def evalute_rule(self,form_obj):
-    
-    all_cond_hold='Yes'
-    for d in getlist(self.doclist,'condition_details'):
-      master = d.rule_master
-      label = d.rule_field.split(':')  #break up checking condition
-      
-      #findout the value with which condition will be checked
-      if d.value:
-        chk_with_value = d.value
-        
-      
-      # label[0] is doctype name for which rule is given, label[1] field name of that doctype
-      if label[0] == master:
-        cond_hold = self.chk_from_main_dt(master,label[1],chk_with_value,d.operator,form_obj) 
-        if cond_hold =='No':
-          all_cond_hold = 'No'
-          break
-        elif cond_hold =='Yes':
-          all_cond_hold ='Yes'
-          
-      #=====================================================   
-      # if checking is with any linked doctype means label[0] field from the doctype for which rule is given and label[1] field from the doctype with which label[0] is linked
-      else:
-        cond_hold=self.chk_from_link_dt(master,label[0],label[1],form_obj,chk_with_value,d.operator)
-        if cond_hold =='No':
-          if d.exception == 'Yes':
-              msgprint(d.message)
-              raise Exception
-          elif d.exception=='No' or d.exception=='':
-              msgprint(d.message)
-          all_cond_hold = 'No'
-          break
-        elif cond_hold =='Yes':
-          all_cond_hold ='Yes'
-   
-    return all_cond_hold
-  
-  #----------------------------------------------------
-  #list of values of label & fieldname of selected master    
-  def get_values(self):
-    op = self.doc.select_field2.split(':')
-    
-    if op[0] == self.doc.master2:
-      field_info = sql("select label,fieldname from `tabDocField` where parent= '%s' AND label = '%s'" %(self.doc.select_master2,op[1]))
-      
-    else:
-      field_info = sql("select label,fieldname from `tabDocField` where parent= '%s' AND label = '%s'" %(op[0],op[1]))
-      
-    comp = sql("SELECT DISTINCT %s FROM `tab%s`" %(field_info[0][1],op[0]))
-    
-    res = ''
-    for i in comp:
-      res +=  "\n" + str(i[0])
-    
-    return cstr(res)
-
-  #----------------------------------------------------  
-  #add_details function add records in condition detail table     
-  def add_details(self):
-    
-    if((self.doc.select_master)  and (self.doc.select_field)):
-      if((self.doc.right_operand=='Automatic') and (self.doc.select_value=='')):
-        msgprint("Please select value")
-      else:
-        ch = addchild(self.doc,'condition_details','Condition Detail',0, self.doclist)
-        ch.rule_master = self.doc.select_master
-        ch.rule_field = self.doc.select_field
-        ch.operator = 'Equals'
-        ch.value = self.doc.select_value
-        ch.save()
-    else:
-      msgprint("Please select form, select field")
\ No newline at end of file
diff --git a/erpnext/hr/doctype/payroll_rule/payroll_rule.txt b/erpnext/hr/doctype/payroll_rule/payroll_rule.txt
deleted file mode 100644
index 0f6b734..0000000
--- a/erpnext/hr/doctype/payroll_rule/payroll_rule.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2010-04-01 14:14:46', 'search_fields': None, 'module': 'Payroll', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 167, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': 1, 'allow_print': None, 'autoname': 'field:rule_name', 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'harshada@webnotestech.com', 'document_type': '', 'name': 'Payroll Rule', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-10-11 18:22:26', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00744', 'parent': 'Payroll Rule', 'read': 1, 'create': 1, 'creation': '2010-04-01 14:14:46', 'modified': '2010-10-11 18:22:26', 'submit': 0, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00815', 'parent': 'Payroll Rule', 'read': 1, 'create': 1, 'creation': '2010-04-19 09:58:46', 'modified': '2010-10-11 18:22:26', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 2, 'parenttype': 'DocType', 'role': 'HR Manager', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': 1, 'amend': None, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM00816', 'parent': 'Payroll Rule', 'read': 1, 'create': 1, 'creation': '2010-04-19 09:58:46', 'modified': '2010-10-11 18:22:26', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 3, 'parenttype': 'DocType', 'role': 'HR User', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM01117', 'parent': 'Payroll Rule', 'read': 1, 'create': None, 'creation': '2010-08-12 16:33:07', 'modified': '2010-10-11 18:22:26', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 4, 'parenttype': 'DocType', 'role': 'HR User', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM01118', 'parent': 'Payroll Rule', 'read': 1, 'create': None, 'creation': '2010-08-12 16:33:07', 'modified': '2010-10-11 18:22:26', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 5, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'harshada@webnotestech.com', 'name': 'PERM01119', 'parent': 'Payroll Rule', 'read': 1, 'create': None, 'creation': '2010-08-12 16:33:07', 'modified': '2010-10-11 18:22:26', 'submit': None, 'doctype': 'DocPerm', 'write': None, 'idx': 6, 'parenttype': 'DocType', 'role': 'HR Manager', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': 'Small Text', 'creation': '2010-04-20 14:06:44', 'doctype': 'DocField', 'oldfieldname': 'trash_reason', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Trash Reason', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Payroll Rule', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04856', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-10-11 18:22:26', 'parenttype': 'DocType', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2010-04-06 14:20:43', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Payroll Rule', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Payroll Rule', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04635', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-10-11 18:22:26', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:46', 'doctype': 'DocField', 'oldfieldname': 'rule_name', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Rule Name', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Payroll Rule', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04485', 'idx': 3, 'default': None, 'colour': 'White:FFF', 'modified': '2010-10-11 18:22:26', 'parenttype': 'DocType', 'fieldname': 'rule_name', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Int', 'creation': '2010-04-01 14:14:47', 'doctype': 'DocField', 'oldfieldname': 'rule_priority', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Rule Priority', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': '', 'parent': 'Payroll Rule', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04487', 'idx': 4, 'default': None, 'colour': 'White:FFF', 'modified': '2010-10-11 18:22:26', 'parenttype': 'DocType', 'fieldname': 'rule_priority', 'fieldtype': 'Int', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2010-04-01 14:14:47', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Operand', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Payroll Rule', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04488', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-10-11 18:22:26', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': 'Simple', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Column Break', 'creation': '2010-04-01 14:14:47', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Left Operand', 'width': '50%', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Payroll Rule', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04489', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-10-11 18:22:26', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2010-04-01 14:14:47', 'doctype': 'DocField', 'oldfieldname': 'select_master', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Select Form', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Payroll Rule', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04490', 'idx': 7, 'default': 'Salary Structure', 'colour': 'White:FFF', 'modified': '2010-10-11 18:22:26', 'parenttype': 'DocType', 'fieldname': 'select_master', 'fieldtype': 'Data', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:47', 'doctype': 'DocField', 'oldfieldname': 'select_field', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Select Field', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Payroll Rule', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04491', 'idx': 8, 'default': None, 'colour': 'White:FFF', 'modified': '2010-10-11 18:22:26', 'parenttype': 'DocType', 'fieldname': 'select_field', 'fieldtype': 'Select', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:47', 'doctype': 'DocField', 'oldfieldname': 'right_operand', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Select Right Operand', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Payroll Rule', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04492', 'idx': 9, 'default': '', 'colour': 'White:FFF', 'modified': '2010-10-11 18:22:26', 'parenttype': 'DocType', 'fieldname': 'right_operand', 'fieldtype': 'Select', 'options': '\nManual\nAutomatic', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Button', 'creation': '2010-04-01 14:14:47', 'doctype': 'DocField', 'oldfieldname': 'add_condition', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Add', 'width': None, 'trigger': 'Server', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'first select left operand and/or right operand then press Add Button to add condition in Define Rule.', 'parent': 'Payroll Rule', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04493', 'idx': 10, 'default': '', 'colour': 'White:FFF', 'modified': '2010-10-11 18:22:26', 'parenttype': 'DocType', 'fieldname': 'add_condition', 'fieldtype': 'Button', 'options': 'add_details', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Column Break', 'creation': '2010-04-01 14:14:47', 'doctype': 'DocField', 'oldfieldname': 'right_operand1', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Right Operand', 'width': '50%', 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': 0, 'permlevel': 0, 'description': None, 'parent': 'Payroll Rule', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04494', 'idx': 11, 'default': None, 'colour': 'White:FFF', 'modified': '2010-10-11 18:22:26', 'parenttype': 'DocType', 'fieldname': 'right_operand1', 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:47', 'doctype': 'DocField', 'oldfieldname': 'select_master2', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Select Form', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Payroll Rule', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04495', 'idx': 12, 'default': None, 'colour': 'White:FFF', 'modified': '2010-10-11 18:22:26', 'parenttype': 'DocType', 'fieldname': 'select_master2', 'fieldtype': 'Select', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:47', 'doctype': 'DocField', 'oldfieldname': 'select_field2', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Select Field', 'width': None, 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Payroll Rule', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04496', 'idx': 13, 'default': None, 'colour': 'White:FFF', 'modified': '2010-10-11 18:22:26', 'parenttype': 'DocType', 'fieldname': 'select_field2', 'fieldtype': 'Select', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Select', 'creation': '2010-04-01 14:14:47', 'doctype': 'DocField', 'oldfieldname': 'select_value', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Select Value', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 0, 'description': None, 'parent': 'Payroll Rule', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04497', 'idx': 14, 'default': None, 'colour': 'White:FFF', 'modified': '2010-10-11 18:22:26', 'parenttype': 'DocType', 'fieldname': 'select_value', 'fieldtype': 'Select', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2010-04-01 14:14:47', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Define Rule', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Payroll Rule', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04498', 'idx': 15, 'default': None, 'colour': None, 'modified': '2010-10-11 18:22:26', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': 'Simple', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Table', 'creation': '2010-04-01 14:14:47', 'doctype': 'DocField', 'oldfieldname': 'condition_details', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Define Rule1', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Payroll Rule', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04499', 'idx': 16, 'default': None, 'colour': 'White:FFF', 'modified': '2010-10-11 18:22:26', 'parenttype': 'DocType', 'fieldname': 'condition_details', 'fieldtype': 'Table', 'options': 'Condition Detail', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2010-04-01 14:14:47', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Action Detail', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Payroll Rule', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04500', 'idx': 17, 'default': None, 'colour': None, 'modified': '2010-10-11 18:22:26', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': 'Simple', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'HTML', 'creation': '2010-04-01 14:14:47', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Action html', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Payroll Rule', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04501', 'idx': 18, 'default': None, 'colour': None, 'modified': '2010-10-11 18:22:26', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'HTML', 'options': '<b>Specify actions to be taken  when conditions hold satisfied</b>', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2010-04-01 14:14:47', 'doctype': 'DocField', 'oldfieldname': 'expression', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Expression', 'width': None, 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Payroll Rule', 'search_index': 1, 'allow_on_submit': None, 'icon': None, 'name': 'FL04502', 'idx': 19, 'default': None, 'colour': 'White:FFF', 'modified': '2010-10-11 18:22:26', 'parenttype': 'DocType', 'fieldname': 'expression', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Section Break', 'creation': '2010-04-05 17:10:06', 'doctype': 'DocField', 'oldfieldname': '', 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Help', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Payroll Rule', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04631', 'idx': 20, 'default': None, 'colour': None, 'modified': '2010-10-11 18:22:26', 'parenttype': 'DocType', 'fieldname': '', 'fieldtype': 'Section Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'HTML', 'creation': '2010-04-05 17:00:57', 'doctype': 'DocField', 'oldfieldname': '', 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Help Rule Priority', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Payroll Rule', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04630', 'idx': 21, 'default': None, 'colour': None, 'modified': '2010-10-11 18:22:26', 'parenttype': 'DocType', 'fieldname': '', 'fieldtype': 'HTML', 'options': '<pre><h4>Rule Priority Help:</h4>\nLower rule priority number executes first. \nSuppose there are 2 rules:\nFirst rule priority: <b>1</b> and second priority: <b>2</b> \nTheir actions are:\nFor rule priority <b>1</b>\nBasic = 900\nhra = basic*0.5\n \nFor rule priority <b>2</b>\nBasic = 1000\n\nThen <b>1</b> priority action executes first and then <b>2</b> priority.\nAccordingly output will be:\nBasic = 1000 and hra = 450\n</pre>', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'HTML', 'creation': '2010-04-05 17:31:28', 'doctype': 'DocField', 'oldfieldname': '', 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Right Operand select help', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Payroll Rule', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04632', 'idx': 22, 'default': None, 'colour': None, 'modified': '2010-10-11 18:22:26', 'parenttype': 'DocType', 'fieldname': '', 'fieldtype': 'HTML', 'options': '<hr><br><pre><h4>Right Operand Select Help:</h4>\nIf you select Manual option then you have to write value in define rule\nIf you select Automatic option then right operand will open to select value</pre> <br>', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'HTML', 'creation': '2010-04-05 17:00:57', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'harshada@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'harshada@webnotestech.com', 'label': 'Expression Help ', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Payroll Rule', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL04629', 'idx': 23, 'default': None, 'colour': None, 'modified': '2010-10-11 18:22:26', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'HTML', 'options': '<hr><br><pre><h4>Expression Help:</h4>\nPlease write all letters in lower case and place underscore in between two words.<br>\n<b>Sample Expression:</b>\nbasic=10000\nhouse_rent_allowance = basic *0.5 \ndearness_allowance = basic*0.2\nprovident_fund = 0.12*basic\ncheck = basic + house_rent_allowance +dearness_allowance\nif check<=3000 and check>0: professional_tax = 0\nif check<=6000 and check>3000: professional_tax = 20\nif check<=9000 and check>6000: professional_tax = 80\nif check<=12000 and check>9000: professional_tax = 150\nelse: professional_tax = 200\nemployees_state_insurance = basic*0.28\n\n<b>Note: Place : (colon) after if condition and after else </b>\n\nif condition:\n  someaction\nelse:\n  otheraction</pre> \n  ', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/erpnext/production/doctype/update_delivery_date/__init__.py b/erpnext/production/doctype/update_delivery_date/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/production/doctype/update_delivery_date/__init__.py
+++ /dev/null
diff --git a/erpnext/production/doctype/update_delivery_date/update_delivery_date.js b/erpnext/production/doctype/update_delivery_date/update_delivery_date.js
deleted file mode 100644
index 394f76c..0000000
--- a/erpnext/production/doctype/update_delivery_date/update_delivery_date.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// ERPNext - web based ERP (http://erpnext.com)
-// Copyright (C) 2012 Web Notes Technologies Pvt Ltd
-// 
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-//get query select Territory
-//=======================================================================================================================
-cur_frm.fields_dict['territory'].get_query = function(doc,cdt,cdn) {
-  return 'SELECT `tabTerritory`.`name`,`tabTerritory`.`parent_territory` FROM `tabTerritory` WHERE `tabTerritory`.`is_group` = "No" AND `tabTerritory`.`docstatus`!= 2 AND `tabTerritory`.%(key)s LIKE "%s"  ORDER BY  `tabTerritory`.`name` ASC LIMIT 50';
-}
\ No newline at end of file
diff --git a/erpnext/production/doctype/update_delivery_date/update_delivery_date.py b/erpnext/production/doctype/update_delivery_date/update_delivery_date.py
deleted file mode 100644
index c7c2e48..0000000
--- a/erpnext/production/doctype/update_delivery_date/update_delivery_date.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# ERPNext - web based ERP (http://erpnext.com)
-# Copyright (C) 2012 Web Notes Technologies Pvt Ltd
-# 
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Please edit this list and import only required elements
-import webnotes
-
-from webnotes.utils import add_days, add_months, add_years, cint, cstr, date_diff, default_fields, flt, fmt_money, formatdate, generate_hash, getTraceback, get_defaults, get_first_day, get_last_day, getdate, has_common, month_name, now, nowdate, replace_newlines, sendmail, set_default, str_esc_quote, user_format, validate_email_add
-from webnotes.model import db_exists
-from webnotes.model.doc import Document, addchild, removechild, getchildren, make_autoname, SuperDocType
-from webnotes.model.doclist import getlist, copy_doclist
-from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax
-from webnotes import session, form, is_testing, msgprint, errprint
-
-set = webnotes.conn.set
-sql = webnotes.conn.sql
-get_value = webnotes.conn.get_value
-in_transaction = webnotes.conn.in_transaction
-convert_to_lists = webnotes.conn.convert_to_lists
-	
-# -----------------------------------------------------------------------------------------
-
-
-class DocType:
-  def __init__(self, d, dl):
-    self.doc, self.doclist = d, dl
-
-  def get_open_sales_order(self):
-    if not (self.doc.from_date and self.doc.to_date):
-      msgprint("From Date and To Date are Mandatory")
-      return
-    
-    cond = ''  
-    if self.doc.customer:
-      cond += " AND t1.customer = '%s' " % self.doc.customer
-    if self.doc.sales_order:
-      cond += " AND t1.name = '%s' " % self.doc.sales_order
-    if self.doc.territory:
-      cond += " AND t1.territory = '%s' " %self.doc.territory
-
-    dl = sql("select distinct t1.name, t1.customer,  t1.delivery_date, t1.territory, t1.rounded_total from `tabSales Order` t1, `tabSales Order Detail` t2 where  t1.transaction_date >= '%s' and t1.transaction_date <= '%s' and t1.docstatus=1 and t1.status != 'Completed' and t1.name = t2.parent and t2.docstatus =1 and t2.qty > t2.delivered_qty and (t2.confirmation_date is null or t2.confirmation_date= '' or t2.confirmation_date='0000-00-00') %s"% (self.doc.from_date, self.doc.to_date, cond)) 
-    self.doc.clear_table(self.doclist, 'entries')
-    count = 0 
-    for d in dl:
-      nl = addchild(self.doc, 'entries', 'Update Delivery Date Detail', 1, self.doclist)
-      nl.sales_order_no = str(d[0])
-      nl.customer = str(d[1])
-      nl.territory = str(d[3])
-      nl.rounded_total = str(d[4])
-      nl.delivery_date = str(d[2])
-      count = count +1
-    if not count:
-      msgprint("No Sales Order found as per filters set.")
-
-  def update_sales_order(self):
-    for d in getlist(self.doclist, 'entries'):
-      if d.confirmation_date:
-        sql("update `tabSales Order Detail` set confirmation_date = %s where parent = %s ", (d.confirmation_date, d.sales_order_no))
-    msgprint("Updated")
\ No newline at end of file
diff --git a/erpnext/production/doctype/update_delivery_date/update_delivery_date.txt b/erpnext/production/doctype/update_delivery_date/update_delivery_date.txt
deleted file mode 100644
index fcd62aa..0000000
--- a/erpnext/production/doctype/update_delivery_date/update_delivery_date.txt
+++ /dev/null
@@ -1,150 +0,0 @@
-# DocType, Update Delivery Date
-[
-
-	# These values are common in all dictionaries
-	{
-		'creation': '2010-08-08 17:09:29',
-		'docstatus': 0,
-		'modified': '2010-09-20 14:06:57',
-		'modified_by': 'Administrator',
-		'owner': 'jai@webnotestech.com'
-	},
-
-	# These values are common for all DocType
-	{
-		'colour': 'White:FFF',
-		'doctype': 'DocType',
-		'issingle': 1,
-		'module': 'Production',
-		'name': '__common__',
-		'section_style': 'Simple',
-		'server_code_error': ' ',
-		'version': 5
-	},
-
-	# These values are common for all DocField
-	{
-		'doctype': 'DocField',
-		'name': '__common__',
-		'parent': 'Update Delivery Date',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0
-	},
-
-	# These values are common for all DocPerm
-	{
-		'create': 1,
-		'doctype': 'DocPerm',
-		'idx': 1,
-		'name': '__common__',
-		'parent': 'Update Delivery Date',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'System Manager',
-		'write': 1
-	},
-
-	# DocType, Update Delivery Date
-	{
-		'doctype': 'DocType',
-		'name': 'Update Delivery Date'
-	},
-
-	# DocPerm
-	{
-		'doctype': 'DocPerm'
-	},
-
-	# DocField
-	{
-		'doctype': 'DocField',
-		'fieldname': 'from_date',
-		'fieldtype': 'Date',
-		'idx': 1,
-		'label': 'From Date',
-		'reqd': 1
-	},
-
-	# DocField
-	{
-		'doctype': 'DocField',
-		'fieldname': 'to_date',
-		'fieldtype': 'Date',
-		'idx': 2,
-		'label': 'To Date',
-		'reqd': 1
-	},
-
-	# DocField
-	{
-		'doctype': 'DocField',
-		'fieldname': 'customer',
-		'fieldtype': 'Link',
-		'idx': 3,
-		'label': 'Customer',
-		'options': 'Customer'
-	},
-
-	# DocField
-	{
-		'doctype': 'DocField',
-		'fieldname': 'sales_order',
-		'fieldtype': 'Link',
-		'idx': 4,
-		'label': 'Sales Order',
-		'options': 'Sales Order'
-	},
-
-	# DocField
-	{
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Select',
-		'idx': 5,
-		'label': 'Company',
-		'options': 'link:Company'
-	},
-
-	# DocField
-	{
-		'doctype': 'DocField',
-		'fieldname': 'territory',
-		'fieldtype': 'Link',
-		'idx': 6,
-		'label': 'Territory',
-		'options': 'Territory',
-		'print_hide': 1
-	},
-
-	# DocField
-	{
-		'doctype': 'DocField',
-		'fieldtype': 'Button',
-		'idx': 7,
-		'label': 'Get Open Sales Order',
-		'options': 'get_open_sales_order'
-	},
-
-	# DocField
-	{
-		'default': 'No Toolbar',
-		'doctype': 'DocField',
-		'fieldname': 'entries',
-		'fieldtype': 'Table',
-		'idx': 8,
-		'label': 'Entries',
-		'options': 'Update Delivery Date Detail'
-	},
-
-	# DocField
-	{
-		'doctype': 'DocField',
-		'fieldtype': 'Button',
-		'idx': 9,
-		'label': 'Update Sales Order',
-		'options': 'update_sales_order'
-	}
-]
\ No newline at end of file
diff --git a/erpnext/production/doctype/update_delivery_date_detail/__init__.py b/erpnext/production/doctype/update_delivery_date_detail/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/production/doctype/update_delivery_date_detail/__init__.py
+++ /dev/null
diff --git a/erpnext/production/doctype/update_delivery_date_detail/update_delivery_date_detail.txt b/erpnext/production/doctype/update_delivery_date_detail/update_delivery_date_detail.txt
deleted file mode 100644
index 646a97e..0000000
--- a/erpnext/production/doctype/update_delivery_date_detail/update_delivery_date_detail.txt
+++ /dev/null
@@ -1,143 +0,0 @@
-# DocType, Update Delivery Date Detail
-[
-
-	# These values are common in all dictionaries
-	{
-		'creation': '2010-08-08 17:09:29',
-		'docstatus': 0,
-		'modified': '2010-09-20 14:06:57',
-		'modified_by': 'Administrator',
-		'owner': 'jai@webnotestech.com'
-	},
-
-	# These values are common for all DocType
-	{
-		'colour': 'White:FFF',
-		'doctype': 'DocType',
-		'istable': 1,
-		'module': 'Production',
-		'name': '__common__',
-		'section_style': 'Simple',
-		'server_code_error': ' ',
-		'version': 1
-	},
-
-	# These values are common for all DocField
-	{
-		'doctype': 'DocField',
-		'name': '__common__',
-		'parent': 'Update Delivery Date Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType'
-	},
-
-	# DocType, Update Delivery Date Detail
-	{
-		'doctype': 'DocType',
-		'name': 'Update Delivery Date Detail'
-	},
-
-	# DocField
-	{
-		'doctype': 'DocField',
-		'fieldname': 'sales_order_no',
-		'fieldtype': 'Link',
-		'idx': 1,
-		'label': 'Sales Order No',
-		'oldfieldname': 'sales_order_no',
-		'oldfieldtype': 'Link',
-		'options': 'Sales Order',
-		'permlevel': 1
-	},
-
-	# DocField
-	{
-		'doctype': 'DocField',
-		'fieldname': 'customer',
-		'fieldtype': 'Data',
-		'idx': 2,
-		'label': 'Customer',
-		'oldfieldname': 'customer',
-		'oldfieldtype': 'Data',
-		'options': 'Customer',
-		'permlevel': 1
-	},
-
-	# DocField
-	{
-		'doctype': 'DocField',
-		'fieldname': 'city',
-		'fieldtype': 'Data',
-		'idx': 3,
-		'label': 'City',
-		'oldfieldname': 'city',
-		'oldfieldtype': 'Data',
-		'permlevel': 0,
-		'reqd': 0
-	},
-
-	# DocField
-	{
-		'doctype': 'DocField',
-		'fieldname': 'state',
-		'fieldtype': 'Link',
-		'idx': 4,
-		'label': 'State',
-		'oldfieldname': 'state',
-		'oldfieldtype': 'Link',
-		'options': 'State',
-		'permlevel': 0,
-		'search_index': 0
-	},
-
-	# DocField
-	{
-		'doctype': 'DocField',
-		'fieldname': 'territory',
-		'fieldtype': 'Link',
-		'idx': 5,
-		'label': 'Territory',
-		'oldfieldname': 'territory',
-		'oldfieldtype': 'Link',
-		'options': 'Territory',
-		'permlevel': 1,
-		'print_hide': 1,
-		'search_index': 0
-	},
-
-	# DocField
-	{
-		'doctype': 'DocField',
-		'fieldname': 'rounded_total',
-		'fieldtype': 'Data',
-		'idx': 6,
-		'label': 'Total Amount',
-		'oldfieldname': 'rounded_total',
-		'oldfieldtype': 'Data',
-		'permlevel': 0
-	},
-
-	# DocField
-	{
-		'doctype': 'DocField',
-		'fieldname': 'delivery_date',
-		'fieldtype': 'Date',
-		'idx': 7,
-		'label': 'Expected Delivery Date',
-		'oldfieldname': 'delivery_date',
-		'oldfieldtype': 'Date',
-		'permlevel': 1
-	},
-
-	# DocField
-	{
-		'doctype': 'DocField',
-		'fieldname': 'confirmation_date',
-		'fieldtype': 'Date',
-		'idx': 8,
-		'label': 'Confirmation Date',
-		'oldfieldname': 'confirmation_date',
-		'oldfieldtype': 'Date',
-		'permlevel': 0
-	}
-]
\ No newline at end of file
diff --git a/erpnext/selling/doctype/enquiry_sms_detail/__init__.py b/erpnext/selling/doctype/enquiry_sms_detail/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/selling/doctype/enquiry_sms_detail/__init__.py
+++ /dev/null
diff --git a/erpnext/selling/doctype/enquiry_sms_detail/enquiry_sms_detail.txt b/erpnext/selling/doctype/enquiry_sms_detail/enquiry_sms_detail.txt
deleted file mode 100644
index 84d0907..0000000
--- a/erpnext/selling/doctype/enquiry_sms_detail/enquiry_sms_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-12-11 11:45:55', 'search_fields': None, 'module': 'CRM', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'dhanalekshmi@webnotestech.com', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 5, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'ashwini@webnotestech.com', 'document_type': None, 'name': 'Enquiry SMS Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-12-11 11:45:55', 'doctype': 'DocField', 'oldfieldname': 'other_mobile_no', 'owner': 'dhanalekshmi@webnotestech.com', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'ashwini@webnotestech.com', 'label': 'Mobile No', 'width': '200px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Enquiry SMS Detail', 'search_index': None, 'allow_on_submit': 1, 'icon': None, 'name': 'FL03494', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-08-08 11:13:11', 'parenttype': 'DocType', 'fieldname': 'other_mobile_no', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/erpnext/selling/doctype/installation_note/installation_note.txt b/erpnext/selling/doctype/installation_note/installation_note.txt
index 8feb2f5..f71a5f7 100644
--- a/erpnext/selling/doctype/installation_note/installation_note.txt
+++ b/erpnext/selling/doctype/installation_note/installation_note.txt
@@ -5,49 +5,50 @@
 	{
 		'creation': '2010-08-08 17:09:04',
 		'docstatus': 0,
-		'modified': '2011-05-17 16:34:30',
-		'modified_by': 'Administrator',
-		'owner': 'Administrator'
+		'modified': '2012-03-21 14:08:59',
+		'modified_by': u'Administrator',
+		'owner': u'Administrator'
 	},
 
 	# These values are common for all DocType
 	{
-		'_last_update': '1308741898',
-		'autoname': 'IN/.####',
-		'colour': 'White:FFF',
+		'_last_update': u'1306480044',
+		'autoname': u'IN/.####',
+		'colour': u'White:FFF',
+		'default_print_format': u'Standard',
 		'doctype': 'DocType',
-		'module': 'Selling',
+		'module': u'Selling',
 		'name': '__common__',
-		'section_style': 'Simple',
-		'server_code_error': ' ',
+		'section_style': u'Simple',
+		'server_code_error': u' ',
 		'show_in_menu': 0,
-		'subject': 'At %(customer_name)s on %(inst_date)s',
-		'version': 96
+		'subject': u'At %(customer_name)s on %(inst_date)s',
+		'version': 97
 	},
 
 	# These values are common for all DocField
 	{
-		'doctype': 'DocField',
+		'doctype': u'DocField',
 		'name': '__common__',
-		'parent': 'Installation Note',
-		'parentfield': 'fields',
-		'parenttype': 'DocType'
+		'parent': u'Installation Note',
+		'parentfield': u'fields',
+		'parenttype': u'DocType'
 	},
 
 	# These values are common for all DocPerm
 	{
-		'doctype': 'DocPerm',
+		'doctype': u'DocPerm',
 		'name': '__common__',
-		'parent': 'Installation Note',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
+		'parent': u'Installation Note',
+		'parentfield': u'permissions',
+		'parenttype': u'DocType',
 		'read': 1
 	},
 
 	# DocType, Installation Note
 	{
 		'doctype': 'DocType',
-		'name': 'Installation Note'
+		'name': u'Installation Note'
 	},
 
 	# DocPerm
@@ -55,20 +56,18 @@
 		'amend': 1,
 		'cancel': 1,
 		'create': 1,
-		'doctype': 'DocPerm',
-		'idx': 1,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'System Manager',
+		'role': u'System Manager',
 		'submit': 1,
 		'write': 1
 	},
 
 	# DocPerm
 	{
-		'doctype': 'DocPerm',
-		'idx': 2,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'System Manager'
+		'role': u'System Manager'
 	},
 
 	# DocPerm
@@ -76,20 +75,18 @@
 		'amend': 1,
 		'cancel': 1,
 		'create': 1,
-		'doctype': 'DocPerm',
-		'idx': 3,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'Sales User',
+		'role': u'Sales User',
 		'submit': 1,
 		'write': 1
 	},
 
 	# DocPerm
 	{
-		'doctype': 'DocPerm',
-		'idx': 4,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'Sales User'
+		'role': u'Sales User'
 	},
 
 	# DocPerm
@@ -97,108 +94,99 @@
 		'amend': 1,
 		'cancel': 1,
 		'create': 1,
-		'doctype': 'DocPerm',
-		'idx': 5,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'Sales Manager',
+		'role': u'Sales Manager',
 		'submit': 1,
 		'write': 1
 	},
 
 	# DocPerm
 	{
-		'doctype': 'DocPerm',
-		'idx': 6,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'Sales Manager'
+		'role': u'Sales Manager'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Section Break',
-		'idx': 1,
-		'label': 'Installation Note',
-		'oldfieldtype': 'Section Break',
+		'doctype': u'DocField',
+		'fieldtype': u'Section Break',
+		'label': u'Installation Note',
+		'oldfieldtype': u'Section Break',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Column Break',
-		'idx': 2,
-		'oldfieldtype': 'Column Break',
+		'doctype': u'DocField',
+		'fieldtype': u'Column Break',
+		'oldfieldtype': u'Column Break',
 		'permlevel': 0,
-		'width': '50%'
+		'width': u'50%'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'naming_series',
-		'fieldtype': 'Select',
-		'idx': 3,
-		'label': 'Series',
+		'doctype': u'DocField',
+		'fieldname': u'naming_series',
+		'fieldtype': u'Select',
+		'label': u'Series',
 		'no_copy': 1,
-		'oldfieldname': 'naming_series',
-		'oldfieldtype': 'Select',
-		'options': '\nIN',
+		'oldfieldname': u'naming_series',
+		'oldfieldtype': u'Select',
+		'options': u'\nIN',
 		'permlevel': 0,
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'customer',
-		'fieldtype': 'Link',
-		'idx': 4,
-		'label': 'Customer',
-		'oldfieldname': 'customer',
-		'oldfieldtype': 'Link',
-		'options': 'Customer',
+		'doctype': u'DocField',
+		'fieldname': u'customer',
+		'fieldtype': u'Link',
+		'label': u'Customer',
+		'oldfieldname': u'customer',
+		'oldfieldtype': u'Link',
+		'options': u'Customer',
 		'permlevel': 0,
 		'print_hide': 1,
 		'reqd': 1,
 		'search_index': 1,
-		'trigger': 'Client'
+		'trigger': u'Client'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'customer_address',
-		'fieldtype': 'Link',
-		'idx': 5,
-		'label': 'Customer Address',
-		'options': 'Address',
+		'doctype': u'DocField',
+		'fieldname': u'customer_address',
+		'fieldtype': u'Link',
+		'label': u'Customer Address',
+		'options': u'Address',
 		'permlevel': 0,
 		'print_hide': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'contact_person',
-		'fieldtype': 'Link',
-		'idx': 6,
-		'label': 'Contact Person',
-		'options': 'Contact',
+		'doctype': u'DocField',
+		'fieldname': u'contact_person',
+		'fieldtype': u'Link',
+		'label': u'Contact Person',
+		'options': u'Contact',
 		'permlevel': 0,
 		'print_hide': 1
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldname': 'customer_name',
-		'fieldtype': 'Data',
-		'idx': 7,
-		'label': 'Name',
-		'oldfieldname': 'customer_name',
-		'oldfieldtype': 'Data',
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldname': u'customer_name',
+		'fieldtype': u'Data',
+		'label': u'Name',
+		'oldfieldname': u'customer_name',
+		'oldfieldtype': u'Data',
 		'permlevel': 1,
 		'reqd': 0,
 		'search_index': 0
@@ -206,91 +194,83 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'address_display',
-		'fieldtype': 'Small Text',
-		'idx': 8,
-		'label': 'Address',
+		'doctype': u'DocField',
+		'fieldname': u'address_display',
+		'fieldtype': u'Small Text',
+		'label': u'Address',
 		'permlevel': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'contact_display',
-		'fieldtype': 'Small Text',
-		'idx': 9,
-		'label': 'Contact',
+		'doctype': u'DocField',
+		'fieldname': u'contact_display',
+		'fieldtype': u'Small Text',
+		'label': u'Contact',
 		'permlevel': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'contact_mobile',
-		'fieldtype': 'Text',
-		'idx': 10,
-		'label': 'Mobile No',
+		'doctype': u'DocField',
+		'fieldname': u'contact_mobile',
+		'fieldtype': u'Text',
+		'label': u'Mobile No',
 		'permlevel': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'contact_email',
-		'fieldtype': 'Text',
-		'idx': 11,
-		'label': 'Contact Email',
+		'doctype': u'DocField',
+		'fieldname': u'contact_email',
+		'fieldtype': u'Text',
+		'label': u'Contact Email',
 		'permlevel': 1,
 		'print_hide': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'territory',
-		'fieldtype': 'Link',
-		'idx': 12,
+		'doctype': u'DocField',
+		'fieldname': u'territory',
+		'fieldtype': u'Link',
 		'in_filter': 1,
-		'label': 'Territory',
-		'options': 'Territory',
+		'label': u'Territory',
+		'options': u'Territory',
 		'permlevel': 0,
 		'print_hide': 1,
 		'reqd': 1,
-		'search_index': 0
+		'search_index': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'customer_group',
-		'fieldtype': 'Link',
-		'idx': 13,
-		'label': 'Customer Group',
-		'options': 'Customer Group',
+		'doctype': u'DocField',
+		'fieldname': u'customer_group',
+		'fieldtype': u'Link',
+		'label': u'Customer Group',
+		'options': u'Customer Group',
 		'permlevel': 0,
 		'print_hide': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Column Break',
-		'idx': 14,
-		'oldfieldtype': 'Column Break',
+		'doctype': u'DocField',
+		'fieldtype': u'Column Break',
+		'oldfieldtype': u'Column Break',
 		'permlevel': 0,
-		'width': '50%'
+		'width': u'50%'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'inst_date',
-		'fieldtype': 'Date',
-		'idx': 15,
-		'label': 'Installation Date',
-		'oldfieldname': 'inst_date',
-		'oldfieldtype': 'Date',
+		'doctype': u'DocField',
+		'fieldname': u'inst_date',
+		'fieldtype': u'Date',
+		'label': u'Installation Date',
+		'oldfieldname': u'inst_date',
+		'oldfieldtype': u'Date',
 		'permlevel': 0,
 		'reqd': 1,
 		'search_index': 1
@@ -298,28 +278,26 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'inst_time',
-		'fieldtype': 'Time',
-		'idx': 16,
-		'label': 'Installation Time',
-		'oldfieldname': 'inst_time',
-		'oldfieldtype': 'Time',
+		'doctype': u'DocField',
+		'fieldname': u'inst_time',
+		'fieldtype': u'Time',
+		'label': u'Installation Time',
+		'oldfieldname': u'inst_time',
+		'oldfieldtype': u'Time',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'default': 'Draft',
-		'doctype': 'DocField',
-		'fieldname': 'status',
-		'fieldtype': 'Select',
-		'idx': 17,
-		'label': 'Status',
+		'default': u'Draft',
+		'doctype': u'DocField',
+		'fieldname': u'status',
+		'fieldtype': u'Select',
+		'label': u'Status',
 		'no_copy': 1,
-		'oldfieldname': 'status',
-		'oldfieldtype': 'Select',
-		'options': 'Draft\nSubmitted\nCancelled',
+		'oldfieldname': u'status',
+		'oldfieldtype': u'Select',
+		'options': u'Draft\nSubmitted\nCancelled',
 		'permlevel': 1,
 		'print_hide': 1,
 		'reqd': 1
@@ -327,35 +305,33 @@
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'description': 'Select the relevant company name if you have multiple companies.',
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Select',
-		'idx': 18,
+		'colour': u'White:FFF',
+		'description': u'Select the relevant company name if you have multiple companies.',
+		'doctype': u'DocField',
+		'fieldname': u'company',
+		'fieldtype': u'Select',
 		'in_filter': 1,
-		'label': 'Company',
-		'oldfieldname': 'company',
-		'oldfieldtype': 'Select',
-		'options': 'link:Company',
+		'label': u'Company',
+		'oldfieldname': u'company',
+		'oldfieldtype': u'Select',
+		'options': u'link:Company',
 		'permlevel': 0,
 		'print_hide': 1,
 		'reqd': 1,
 		'search_index': 0,
-		'trigger': 'Client'
+		'trigger': u'Client'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'fieldtype': 'Select',
-		'idx': 19,
+		'doctype': u'DocField',
+		'fieldname': u'fiscal_year',
+		'fieldtype': u'Select',
 		'in_filter': 1,
-		'label': 'Fiscal Year',
-		'oldfieldname': 'fiscal_year',
-		'oldfieldtype': 'Select',
-		'options': 'link:Fiscal Year',
+		'label': u'Fiscal Year',
+		'oldfieldname': u'fiscal_year',
+		'oldfieldtype': u'Select',
+		'options': u'link:Fiscal Year',
 		'permlevel': 0,
 		'print_hide': 1,
 		'reqd': 1
@@ -363,117 +339,121 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'amended_from',
-		'fieldtype': 'Data',
-		'idx': 20,
-		'label': 'Amended From',
+		'doctype': u'DocField',
+		'fieldname': u'amended_from',
+		'fieldtype': u'Data',
+		'label': u'Amended From',
 		'no_copy': 1,
-		'oldfieldname': 'amended_from',
-		'oldfieldtype': 'Data',
+		'oldfieldname': u'amended_from',
+		'oldfieldtype': u'Data',
 		'permlevel': 1,
 		'print_hide': 1
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'description': 'The date at which current entry is corrected in the system.',
-		'doctype': 'DocField',
-		'fieldname': 'amendment_date',
-		'fieldtype': 'Date',
+		'colour': u'White:FFF',
+		'description': u'The date at which current entry is corrected in the system.',
+		'doctype': u'DocField',
+		'fieldname': u'amendment_date',
+		'fieldtype': u'Date',
 		'hidden': 1,
-		'idx': 21,
-		'label': 'Amendment Date',
+		'label': u'Amendment Date',
 		'no_copy': 1,
-		'oldfieldname': 'amendment_date',
-		'oldfieldtype': 'Date',
+		'oldfieldname': u'amendment_date',
+		'oldfieldtype': u'Date',
 		'permlevel': 0,
 		'print_hide': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'remarks',
-		'fieldtype': 'Small Text',
-		'idx': 22,
-		'label': 'Remarks',
-		'oldfieldname': 'remarks',
-		'oldfieldtype': 'Small Text',
+		'doctype': u'DocField',
+		'fieldname': u'remarks',
+		'fieldtype': u'Small Text',
+		'label': u'Remarks',
+		'oldfieldname': u'remarks',
+		'oldfieldtype': u'Small Text',
 		'permlevel': 0,
 		'print_hide': 1
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldname': 'cancel_reason',
-		'fieldtype': 'Data',
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldname': u'cancel_reason',
+		'fieldtype': u'Data',
 		'hidden': 1,
-		'idx': 23,
-		'label': 'Cancel Reason',
+		'label': u'Cancel Reason',
 		'no_copy': 1,
-		'oldfieldname': 'cancel_reason',
-		'oldfieldtype': 'Data',
+		'oldfieldname': u'cancel_reason',
+		'oldfieldtype': u'Data',
 		'permlevel': 1,
 		'print_hide': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Section Break',
-		'idx': 24,
-		'label': 'Item Details',
-		'oldfieldtype': 'Section Break',
-		'options': 'Simple',
+		'doctype': u'DocField',
+		'fieldtype': u'Section Break',
+		'label': u'Item Details',
+		'oldfieldtype': u'Section Break',
+		'options': u'Simple',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldname': 'delivery_note_no',
-		'fieldtype': 'Link',
-		'idx': 25,
-		'label': 'Delivery Note No',
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldname': u'delivery_note_no',
+		'fieldtype': u'Link',
+		'label': u'Delivery Note No',
 		'no_copy': 1,
-		'oldfieldname': 'delivery_note_no',
-		'oldfieldtype': 'Link',
-		'options': 'Delivery Note',
+		'oldfieldname': u'delivery_note_no',
+		'oldfieldtype': u'Link',
+		'options': u'Delivery Note',
 		'permlevel': 0,
 		'print_hide': 0,
 		'reqd': 1,
 		'search_index': 1,
-		'trigger': 'Client'
+		'trigger': u'Client'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Button',
+		'doctype': u'DocField',
+		'fieldtype': u'Button',
 		'hidden': 0,
-		'idx': 26,
-		'label': 'Get Items',
-		'oldfieldtype': 'Button',
-		'options': 'pull_delivery_note_details',
+		'label': u'Get Items',
+		'oldfieldtype': u'Button',
+		'options': u'pull_delivery_note_details',
 		'permlevel': 0,
 		'print_hide': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'installed_item_details',
-		'fieldtype': 'Table',
-		'idx': 27,
-		'label': 'Installed Item Details',
-		'oldfieldname': 'installed_item_details',
-		'oldfieldtype': 'Table',
-		'options': 'Installed Item Details',
+		'doctype': u'DocField',
+		'fieldtype': u'Button',
+		'hidden': 0,
+		'label': u'Get Items',
+		'oldfieldtype': u'Button',
+		'options': u'pull_delivery_note_details',
+		'permlevel': 0,
+		'print_hide': 1
+	},
+
+	# DocField
+	{
+		'doctype': u'DocField',
+		'fieldname': u'installed_item_details',
+		'fieldtype': u'Table',
+		'label': u'Installed Item Details',
+		'oldfieldname': u'installed_item_details',
+		'oldfieldtype': u'Table',
+		'options': u'Installed Item Details',
 		'permlevel': 0
 	}
 ]
\ No newline at end of file
diff --git a/erpnext/selling/doctype/installed_item_details/installed_item_details.txt b/erpnext/selling/doctype/installed_item_details/installed_item_details.txt
index 3b4632c..0aa4c1b 100644
--- a/erpnext/selling/doctype/installed_item_details/installed_item_details.txt
+++ b/erpnext/selling/doctype/installed_item_details/installed_item_details.txt
@@ -5,154 +5,148 @@
 	{
 		'creation': '2010-08-08 17:09:05',
 		'docstatus': 0,
-		'modified': '2010-09-20 14:06:57',
-		'modified_by': 'abhishek@webnotestech.com',
-		'owner': 'Administrator'
+		'modified': '2012-03-21 14:52:10',
+		'modified_by': u'Administrator',
+		'owner': u'Administrator'
 	},
 
 	# These values are common for all DocType
 	{
-		'autoname': 'IID/.#####',
-		'colour': 'White:FFF',
+		'autoname': u'IID/.#####',
+		'colour': u'White:FFF',
+		'default_print_format': u'Standard',
 		'doctype': 'DocType',
 		'istable': 1,
-		'module': 'Selling',
+		'module': u'Selling',
 		'name': '__common__',
-		'section_style': 'Simple',
-		'server_code_error': ' ',
-		'version': 24
+		'section_style': u'Simple',
+		'server_code_error': u' ',
+		'show_in_menu': 0,
+		'version': 25
 	},
 
 	# These values are common for all DocField
 	{
-		'doctype': 'DocField',
+		'doctype': u'DocField',
 		'name': '__common__',
-		'parent': 'Installed Item Details',
-		'parentfield': 'fields',
-		'parenttype': 'DocType'
+		'parent': u'Installed Item Details',
+		'parentfield': u'fields',
+		'parenttype': u'DocType'
 	},
 
 	# DocType, Installed Item Details
 	{
 		'doctype': 'DocType',
-		'name': 'Installed Item Details'
+		'name': u'Installed Item Details'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'item_code',
-		'fieldtype': 'Link',
-		'idx': 1,
-		'label': 'Item Code',
-		'oldfieldname': 'item_code',
-		'oldfieldtype': 'Link',
-		'options': 'Item',
+		'doctype': u'DocField',
+		'fieldname': u'item_code',
+		'fieldtype': u'Link',
+		'label': u'Item Code',
+		'oldfieldname': u'item_code',
+		'oldfieldtype': u'Link',
+		'options': u'Item',
 		'permlevel': 0,
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'description',
-		'fieldtype': 'Data',
-		'idx': 2,
-		'label': 'Description',
-		'oldfieldname': 'description',
-		'oldfieldtype': 'Data',
+		'doctype': u'DocField',
+		'fieldname': u'description',
+		'fieldtype': u'Data',
+		'label': u'Description',
+		'oldfieldname': u'description',
+		'oldfieldtype': u'Data',
 		'permlevel': 1,
-		'width': '300px'
+		'width': u'300px'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'prevdoc_date',
-		'fieldtype': 'Date',
+		'doctype': u'DocField',
+		'fieldname': u'prevdoc_date',
+		'fieldtype': u'Date',
 		'hidden': 0,
-		'idx': 3,
-		'label': 'Delivery Date',
-		'oldfieldname': 'prevdoc_date',
-		'oldfieldtype': 'Date',
+		'label': u'Delivery Date',
+		'oldfieldname': u'prevdoc_date',
+		'oldfieldtype': u'Date',
 		'permlevel': 1,
 		'print_hide': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'serial_no',
-		'fieldtype': 'Small Text',
-		'idx': 5,
-		'label': 'Serial No',
-		'oldfieldname': 'serial_no',
-		'oldfieldtype': 'Small Text',
+		'doctype': u'DocField',
+		'fieldname': u'serial_no',
+		'fieldtype': u'Small Text',
+		'label': u'Serial No',
+		'oldfieldname': u'serial_no',
+		'oldfieldtype': u'Small Text',
 		'permlevel': 0,
-		'width': '180px'
+		'width': u'180px'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'prevdoc_detail_docname',
-		'fieldtype': 'Data',
+		'doctype': u'DocField',
+		'fieldname': u'prevdoc_detail_docname',
+		'fieldtype': u'Data',
 		'hidden': 1,
-		'idx': 6,
-		'label': 'Against Document Detail No',
+		'label': u'Against Document Detail No',
 		'no_copy': 1,
-		'oldfieldname': 'prevdoc_detail_docname',
-		'oldfieldtype': 'Data',
+		'oldfieldname': u'prevdoc_detail_docname',
+		'oldfieldtype': u'Data',
 		'permlevel': 1,
 		'print_hide': 1,
-		'width': '150px'
+		'width': u'150px'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'prevdoc_docname',
-		'fieldtype': 'Data',
+		'doctype': u'DocField',
+		'fieldname': u'prevdoc_docname',
+		'fieldtype': u'Data',
 		'hidden': 1,
-		'idx': 7,
 		'in_filter': 1,
-		'label': 'Against Document No',
+		'label': u'Against Document No',
 		'no_copy': 1,
-		'oldfieldname': 'prevdoc_docname',
-		'oldfieldtype': 'Data',
+		'oldfieldname': u'prevdoc_docname',
+		'oldfieldtype': u'Data',
 		'permlevel': 1,
 		'print_hide': 1,
 		'search_index': 1,
-		'width': '150px'
+		'width': u'150px'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'prevdoc_doctype',
-		'fieldtype': 'Data',
+		'doctype': u'DocField',
+		'fieldname': u'prevdoc_doctype',
+		'fieldtype': u'Data',
 		'hidden': 1,
-		'idx': 8,
 		'in_filter': 1,
-		'label': 'Document Type',
+		'label': u'Document Type',
 		'no_copy': 1,
-		'oldfieldname': 'prevdoc_doctype',
-		'oldfieldtype': 'Data',
+		'oldfieldname': u'prevdoc_doctype',
+		'oldfieldtype': u'Data',
 		'permlevel': 1,
 		'print_hide': 1,
-		'search_index': 0,
-		'width': '150px'
+		'search_index': 1,
+		'width': u'150px'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'qty',
-		'fieldtype': 'Currency',
-		'idx': 9,
-		'label': 'Installed Qty',
-		'oldfieldname': 'qty',
-		'oldfieldtype': 'Currency',
+		'doctype': u'DocField',
+		'fieldname': u'qty',
+		'fieldtype': u'Currency',
+		'label': u'Installed Qty',
+		'oldfieldname': u'qty',
+		'oldfieldtype': u'Currency',
 		'permlevel': 0,
 		'reqd': 1
 	}
diff --git a/erpnext/selling/doctype/lead/lead.txt b/erpnext/selling/doctype/lead/lead.txt
index 2387323..2a0cf9a 100644
--- a/erpnext/selling/doctype/lead/lead.txt
+++ b/erpnext/selling/doctype/lead/lead.txt
@@ -5,52 +5,53 @@
 	{
 		'creation': '2010-08-08 17:09:07',
 		'docstatus': 0,
-		'modified': '2011-05-10 12:15:21',
-		'modified_by': 'Administrator',
-		'owner': 'Administrator'
+		'modified': '2012-03-21 14:35:34',
+		'modified_by': u'Administrator',
+		'owner': u'Administrator'
 	},
 
 	# These values are common for all DocType
 	{
-		'_last_update': '1305009922',
+		'_last_update': u'1332222225',
 		'allow_trash': 1,
-		'colour': 'White:FFF',
+		'colour': u'White:FFF',
+		'default_print_format': u'Standard',
 		'doctype': 'DocType',
-		'document_type': 'Master',
-		'module': 'Selling',
+		'document_type': u'Master',
+		'module': u'Selling',
 		'name': '__common__',
-		'search_fields': 'lead_name,lead_owner,status',
-		'section_style': 'Tabbed',
-		'server_code_error': ' ',
+		'search_fields': u'lead_name,lead_owner,status',
+		'section_style': u'Tabbed',
+		'server_code_error': u' ',
 		'show_in_menu': 0,
-		'subject': '%(lead_name)s from %(company_name)s | To Discuss: %(to_discuss)s',
-		'tag_fields': 'status,source',
-		'version': 394
+		'subject': u'%(lead_name)s from %(company_name)s | To Discuss: %(to_discuss)s',
+		'tag_fields': u'status,source',
+		'version': 395
 	},
 
 	# These values are common for all DocField
 	{
-		'doctype': 'DocField',
+		'doctype': u'DocField',
 		'name': '__common__',
-		'parent': 'Lead',
-		'parentfield': 'fields',
-		'parenttype': 'DocType'
+		'parent': u'Lead',
+		'parentfield': u'fields',
+		'parenttype': u'DocType'
 	},
 
 	# These values are common for all DocPerm
 	{
-		'doctype': 'DocPerm',
+		'doctype': u'DocPerm',
 		'name': '__common__',
-		'parent': 'Lead',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
+		'parent': u'Lead',
+		'parentfield': u'permissions',
+		'parenttype': u'DocType',
 		'read': 1
 	},
 
 	# DocType, Lead
 	{
 		'doctype': 'DocType',
-		'name': 'Lead'
+		'name': u'Lead'
 	},
 
 	# DocPerm
@@ -58,10 +59,9 @@
 		'amend': 0,
 		'cancel': 0,
 		'create': 0,
-		'doctype': 'DocPerm',
-		'idx': 1,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'Sales User',
+		'role': u'Sales User',
 		'submit': 0,
 		'write': 0
 	},
@@ -71,10 +71,9 @@
 		'amend': 0,
 		'cancel': 0,
 		'create': 0,
-		'doctype': 'DocPerm',
-		'idx': 2,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'Sales Manager',
+		'role': u'Sales Manager',
 		'submit': 0,
 		'write': 0
 	},
@@ -84,10 +83,9 @@
 		'amend': 0,
 		'cancel': 1,
 		'create': 1,
-		'doctype': 'DocPerm',
-		'idx': 3,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'Sales Manager',
+		'role': u'Sales Manager',
 		'submit': 0,
 		'write': 1
 	},
@@ -97,20 +95,18 @@
 		'amend': 0,
 		'cancel': 0,
 		'create': 1,
-		'doctype': 'DocPerm',
-		'idx': 4,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'Sales User',
+		'role': u'Sales User',
 		'submit': 0,
 		'write': 1
 	},
 
 	# DocPerm
 	{
-		'doctype': 'DocPerm',
-		'idx': 5,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'All'
+		'role': u'All'
 	},
 
 	# DocPerm
@@ -118,10 +114,9 @@
 		'amend': 0,
 		'cancel': 0,
 		'create': 1,
-		'doctype': 'DocPerm',
-		'idx': 6,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'System Manager',
+		'role': u'System Manager',
 		'submit': 0,
 		'write': 1
 	},
@@ -129,45 +124,41 @@
 	# DocPerm
 	{
 		'create': 1,
-		'doctype': 'DocPerm',
-		'idx': 7,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'Guest',
+		'role': u'Guest',
 		'write': 1
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldtype': 'Section Break',
-		'idx': 1,
-		'label': 'Basic Info',
-		'oldfieldtype': 'Section Break',
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldtype': u'Section Break',
+		'label': u'Basic Info',
+		'oldfieldtype': u'Section Break',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Column Break',
-		'idx': 2,
-		'oldfieldtype': 'Column Break',
+		'doctype': u'DocField',
+		'fieldtype': u'Column Break',
+		'oldfieldtype': u'Column Break',
 		'permlevel': 0,
-		'width': '50%'
+		'width': u'50%'
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldname': 'lead_name',
-		'fieldtype': 'Data',
-		'idx': 3,
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldname': u'lead_name',
+		'fieldtype': u'Data',
 		'in_filter': 1,
-		'label': 'Contact Name',
-		'oldfieldname': 'lead_name',
-		'oldfieldtype': 'Data',
+		'label': u'Contact Name',
+		'oldfieldname': u'lead_name',
+		'oldfieldtype': u'Data',
 		'permlevel': 0,
 		'reqd': 1,
 		'search_index': 1
@@ -175,124 +166,117 @@
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldname': 'source',
-		'fieldtype': 'Select',
-		'idx': 4,
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldname': u'source',
+		'fieldtype': u'Select',
 		'in_filter': 1,
-		'label': 'Source',
+		'label': u'Source',
 		'no_copy': 1,
-		'oldfieldname': 'source',
-		'oldfieldtype': 'Select',
-		'options': "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign\nWebsite",
+		'oldfieldname': u'source',
+		'oldfieldtype': u'Select',
+		'options': u"\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign\nWebsite",
 		'permlevel': 0,
 		'reqd': 1,
 		'search_index': 0,
-		'trigger': 'Client'
+		'trigger': u'Client'
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'depends_on': "eval:doc.source == 'Existing Customer'",
-		'doctype': 'DocField',
-		'fieldname': 'customer',
-		'fieldtype': 'Link',
+		'colour': u'White:FFF',
+		'depends_on': u"eval:doc.source == 'Existing Customer'",
+		'doctype': u'DocField',
+		'fieldname': u'customer',
+		'fieldtype': u'Link',
 		'hidden': 0,
-		'idx': 5,
-		'label': 'From Customer',
-		'oldfieldname': 'customer',
-		'oldfieldtype': 'Link',
-		'options': 'Customer',
+		'label': u'From Customer',
+		'oldfieldname': u'customer',
+		'oldfieldtype': u'Link',
+		'options': u'Customer',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'depends_on': "eval:doc.source == 'Campaign'",
-		'description': 'Enter campaign name if the source of lead is campaign.',
-		'doctype': 'DocField',
-		'fieldname': 'campaign_name',
-		'fieldtype': 'Link',
+		'colour': u'White:FFF',
+		'depends_on': u"eval:doc.source == 'Campaign'",
+		'description': u'Enter campaign name if the source of lead is campaign.',
+		'doctype': u'DocField',
+		'fieldname': u'campaign_name',
+		'fieldtype': u'Link',
 		'hidden': 0,
-		'idx': 6,
-		'label': 'Campaign Name',
-		'oldfieldname': 'campaign_name',
-		'oldfieldtype': 'Link',
-		'options': 'Campaign',
+		'label': u'Campaign Name',
+		'oldfieldname': u'campaign_name',
+		'oldfieldtype': u'Link',
+		'options': u'Campaign',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'description': 'Name of organization from where lead has come',
-		'doctype': 'DocField',
-		'fieldname': 'company_name',
-		'fieldtype': 'Data',
-		'idx': 7,
+		'colour': u'White:FFF',
+		'description': u'Name of organization from where lead has come',
+		'doctype': u'DocField',
+		'fieldname': u'company_name',
+		'fieldtype': u'Data',
 		'in_filter': 1,
-		'label': 'Company Name',
-		'oldfieldname': 'company_name',
-		'oldfieldtype': 'Data',
+		'label': u'Company Name',
+		'oldfieldname': u'company_name',
+		'oldfieldtype': u'Data',
 		'permlevel': 0,
 		'reqd': 0,
 		'search_index': 0,
-		'trigger': 'Client'
+		'trigger': u'Client'
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'description': 'To manage multiple series please go to Setup > Manage Series',
-		'doctype': 'DocField',
-		'fieldname': 'naming_series',
-		'fieldtype': 'Select',
-		'idx': 8,
-		'label': 'Series',
+		'colour': u'White:FFF',
+		'description': u'To manage multiple series please go to Setup > Manage Series',
+		'doctype': u'DocField',
+		'fieldname': u'naming_series',
+		'fieldtype': u'Select',
+		'label': u'Series',
 		'no_copy': 1,
-		'oldfieldname': 'naming_series',
-		'oldfieldtype': 'Select',
-		'options': '\nLEAD\nLEAD/10-11/\nLEAD/MUMBAI/',
+		'oldfieldname': u'naming_series',
+		'oldfieldtype': u'Select',
+		'options': u'LEAD\nLEAD/10-11/\nLEAD/MUMBAI/',
 		'permlevel': 0,
 		'reqd': 0
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'default': 'Open',
-		'doctype': 'DocField',
-		'fieldname': 'status',
-		'fieldtype': 'Select',
-		'idx': 9,
+		'colour': u'White:FFF',
+		'default': u'Open',
+		'doctype': u'DocField',
+		'fieldname': u'status',
+		'fieldtype': u'Select',
 		'in_filter': 1,
-		'label': 'Status',
+		'label': u'Status',
 		'no_copy': 1,
-		'oldfieldname': 'status',
-		'oldfieldtype': 'Select',
-		'options': '\nOpen\nAttempted to Contact\nContact in Future\nContacted\nInterested\nNot interested\nLead Lost\nConverted',
+		'oldfieldname': u'status',
+		'oldfieldtype': u'Select',
+		'options': u'\nOpen\nAttempted to Contact\nContact in Future\nContacted\nInterested\nNot interested\nLead Lost\nConverted',
 		'permlevel': 0,
 		'reqd': 1,
 		'search_index': 1,
-		'trigger': 'Client'
+		'trigger': u'Client'
 	},
 
 	# DocField
 	{
-		'default': 'Today',
-		'description': 'The date at which current entry is made in system.',
-		'doctype': 'DocField',
-		'fieldname': 'transaction_date',
-		'fieldtype': 'Date',
-		'idx': 10,
+		'default': u'Today',
+		'description': u'The date at which current entry is made in system.',
+		'doctype': u'DocField',
+		'fieldname': u'transaction_date',
+		'fieldtype': u'Date',
 		'in_filter': 1,
-		'label': 'Lead Date',
+		'label': u'Lead Date',
 		'no_copy': 1,
-		'oldfieldname': 'transaction_date',
-		'oldfieldtype': 'Date',
+		'oldfieldname': u'transaction_date',
+		'oldfieldtype': u'Date',
 		'permlevel': 0,
 		'reqd': 1,
 		'search_index': 1
@@ -300,54 +284,50 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Column Break',
-		'idx': 11,
+		'doctype': u'DocField',
+		'fieldtype': u'Column Break',
 		'permlevel': 0,
-		'width': '50%'
+		'width': u'50%'
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldname': 'type',
-		'fieldtype': 'Select',
-		'idx': 12,
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldname': u'type',
+		'fieldtype': u'Select',
 		'in_filter': 1,
-		'label': 'Lead Type',
-		'oldfieldname': 'type',
-		'oldfieldtype': 'Select',
-		'options': '\nClient\nChannel Partner\nConsultant',
+		'label': u'Lead Type',
+		'oldfieldname': u'type',
+		'oldfieldtype': u'Select',
+		'options': u'\nClient\nChannel Partner\nConsultant',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'request_type',
-		'fieldtype': 'Select',
-		'idx': 13,
-		'label': 'Request Type',
-		'oldfieldname': 'request_type',
-		'oldfieldtype': 'Select',
-		'options': '\nProduct Enquiry\nRequest for Information\nSuggestions\nOther',
+		'doctype': u'DocField',
+		'fieldname': u'request_type',
+		'fieldtype': u'Select',
+		'label': u'Request Type',
+		'oldfieldname': u'request_type',
+		'oldfieldtype': u'Select',
+		'options': u'\nProduct Enquiry\nRequest for Information\nSuggestions\nOther',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'description': 'Probability of lead converting to customer',
-		'doctype': 'DocField',
-		'fieldname': 'rating',
-		'fieldtype': 'Select',
-		'idx': 14,
+		'colour': u'White:FFF',
+		'description': u'Probability of lead converting to customer',
+		'doctype': u'DocField',
+		'fieldname': u'rating',
+		'fieldtype': u'Select',
 		'in_filter': 1,
-		'label': 'Rating',
-		'oldfieldname': 'rating',
-		'oldfieldtype': 'Select',
-		'options': '\nHot\nWarm\nCold',
+		'label': u'Rating',
+		'oldfieldname': u'rating',
+		'oldfieldtype': u'Select',
+		'options': u'\nHot\nWarm\nCold',
 		'permlevel': 0,
 		'reqd': 0,
 		'search_index': 0
@@ -355,153 +335,141 @@
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldname': 'remark',
-		'fieldtype': 'Small Text',
-		'idx': 15,
-		'label': 'Remark',
-		'oldfieldname': 'remark',
-		'oldfieldtype': 'Text',
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldname': u'remark',
+		'fieldtype': u'Small Text',
+		'label': u'Remark',
+		'oldfieldname': u'remark',
+		'oldfieldtype': u'Text',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
 		'allow_on_submit': 0,
-		'depends_on': "eval:doc.status == 'Lead Lost'",
-		'doctype': 'DocField',
-		'fieldname': 'order_lost_reason',
-		'fieldtype': 'Link',
+		'depends_on': u"eval:doc.status == 'Lead Lost'",
+		'doctype': u'DocField',
+		'fieldname': u'order_lost_reason',
+		'fieldtype': u'Link',
 		'hidden': 0,
-		'idx': 16,
-		'label': 'Lost Reason',
-		'oldfieldname': 'order_lost_reason',
-		'oldfieldtype': 'Link',
-		'options': 'Order Lost Reason',
+		'label': u'Lost Reason',
+		'oldfieldname': u'order_lost_reason',
+		'oldfieldtype': u'Link',
+		'options': u'Order Lost Reason',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'trash_reason',
-		'fieldtype': 'Small Text',
-		'idx': 17,
-		'label': 'Trash Reason',
+		'doctype': u'DocField',
+		'fieldname': u'trash_reason',
+		'fieldtype': u'Small Text',
+		'label': u'Trash Reason',
 		'no_copy': 1,
-		'oldfieldname': 'trash_reason',
-		'oldfieldtype': 'Small Text',
+		'oldfieldname': u'trash_reason',
+		'oldfieldtype': u'Small Text',
 		'permlevel': 1,
 		'print_hide': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Section Break',
-		'idx': 18,
-		'label': 'Contact Info',
-		'oldfieldtype': 'Column Break',
+		'doctype': u'DocField',
+		'fieldtype': u'Section Break',
+		'label': u'Contact Info',
+		'oldfieldtype': u'Column Break',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldname': 'phone',
-		'fieldtype': 'Data',
-		'idx': 19,
-		'label': 'Phone',
-		'oldfieldname': 'contact_no',
-		'oldfieldtype': 'Data',
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldname': u'phone',
+		'fieldtype': u'Data',
+		'label': u'Phone',
+		'oldfieldname': u'contact_no',
+		'oldfieldtype': u'Data',
 		'permlevel': 0,
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'mobile_no',
-		'fieldtype': 'Data',
-		'idx': 20,
-		'label': 'Mobile No.',
-		'oldfieldname': 'mobile_no',
-		'oldfieldtype': 'Data',
+		'doctype': u'DocField',
+		'fieldname': u'mobile_no',
+		'fieldtype': u'Data',
+		'label': u'Mobile No.',
+		'oldfieldname': u'mobile_no',
+		'oldfieldtype': u'Data',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'email_id',
-		'fieldtype': 'Data',
-		'idx': 21,
-		'label': 'Email Id',
-		'oldfieldname': 'email_id',
-		'oldfieldtype': 'Data',
+		'doctype': u'DocField',
+		'fieldname': u'email_id',
+		'fieldtype': u'Data',
+		'label': u'Email Id',
+		'oldfieldname': u'email_id',
+		'oldfieldtype': u'Data',
 		'permlevel': 0,
 		'reqd': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'fax',
-		'fieldtype': 'Data',
-		'idx': 22,
-		'label': 'Fax',
-		'oldfieldname': 'fax',
-		'oldfieldtype': 'Data',
+		'doctype': u'DocField',
+		'fieldname': u'fax',
+		'fieldtype': u'Data',
+		'label': u'Fax',
+		'oldfieldname': u'fax',
+		'oldfieldtype': u'Data',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'website',
-		'fieldtype': 'Data',
-		'idx': 23,
-		'label': 'Website',
-		'oldfieldname': 'website',
-		'oldfieldtype': 'Data',
+		'doctype': u'DocField',
+		'fieldname': u'website',
+		'fieldtype': u'Data',
+		'label': u'Website',
+		'oldfieldname': u'website',
+		'oldfieldtype': u'Data',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'description': '<a href="javascript:cur_frm.cscript.TerritoryHelp();">To manage Territory, click here</a>',
-		'doctype': 'DocField',
-		'fieldname': 'territory',
-		'fieldtype': 'Link',
-		'idx': 24,
-		'label': 'Territory',
-		'oldfieldname': 'territory',
-		'oldfieldtype': 'Link',
-		'options': 'Territory',
+		'colour': u'White:FFF',
+		'description': u'<a href="javascript:cur_frm.cscript.TerritoryHelp();">To manage Territory, click here</a>',
+		'doctype': u'DocField',
+		'fieldname': u'territory',
+		'fieldtype': u'Link',
+		'label': u'Territory',
+		'oldfieldname': u'territory',
+		'oldfieldtype': u'Link',
+		'options': u'Territory',
 		'permlevel': 0,
 		'print_hide': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Column Break',
-		'idx': 25,
+		'doctype': u'DocField',
+		'fieldtype': u'Column Break',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'address_line1',
-		'fieldtype': 'Data',
-		'idx': 26,
-		'label': 'Address Line 1',
-		'oldfieldname': 'address_line1',
-		'oldfieldtype': 'Data',
+		'doctype': u'DocField',
+		'fieldname': u'address_line1',
+		'fieldtype': u'Data',
+		'label': u'Address Line 1',
+		'oldfieldname': u'address_line1',
+		'oldfieldtype': u'Data',
 		'permlevel': 0,
 		'print_hide': 1,
 		'reqd': 0
@@ -509,26 +477,24 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'address_line2',
-		'fieldtype': 'Data',
-		'idx': 27,
-		'label': 'Address Line 2',
-		'oldfieldname': 'address_line2',
-		'oldfieldtype': 'Data',
+		'doctype': u'DocField',
+		'fieldname': u'address_line2',
+		'fieldtype': u'Data',
+		'label': u'Address Line 2',
+		'oldfieldname': u'address_line2',
+		'oldfieldtype': u'Data',
 		'permlevel': 0,
 		'print_hide': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'city',
-		'fieldtype': 'Data',
-		'idx': 28,
-		'label': 'City',
-		'oldfieldname': 'city',
-		'oldfieldtype': 'Select',
+		'doctype': u'DocField',
+		'fieldname': u'city',
+		'fieldtype': u'Data',
+		'label': u'City',
+		'oldfieldname': u'city',
+		'oldfieldtype': u'Select',
 		'permlevel': 0,
 		'print_hide': 1,
 		'reqd': 1
@@ -536,101 +502,94 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'country',
-		'fieldtype': 'Select',
-		'idx': 29,
-		'label': 'Country',
-		'oldfieldname': 'country',
-		'oldfieldtype': 'Select',
-		'options': 'link:Country',
+		'doctype': u'DocField',
+		'fieldname': u'country',
+		'fieldtype': u'Select',
+		'label': u'Country',
+		'oldfieldname': u'country',
+		'oldfieldtype': u'Select',
+		'options': u'link:Country',
 		'permlevel': 0,
 		'print_hide': 1,
 		'reqd': 1,
-		'trigger': 'Client'
+		'trigger': u'Client'
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldname': 'state',
-		'fieldtype': 'Data',
-		'idx': 30,
-		'label': 'State',
-		'oldfieldname': 'state',
-		'oldfieldtype': 'Select',
-		'options': 'Suggest',
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldname': u'state',
+		'fieldtype': u'Data',
+		'label': u'State',
+		'oldfieldname': u'state',
+		'oldfieldtype': u'Select',
+		'options': u'Suggest',
 		'permlevel': 0,
 		'print_hide': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'pincode',
-		'fieldtype': 'Data',
-		'idx': 31,
-		'label': 'Pin Code',
-		'oldfieldname': 'pincode',
-		'oldfieldtype': 'Data',
+		'doctype': u'DocField',
+		'fieldname': u'pincode',
+		'fieldtype': u'Data',
+		'label': u'Pin Code',
+		'oldfieldname': u'pincode',
+		'oldfieldtype': u'Data',
 		'permlevel': 0,
 		'print_hide': 1
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldtype': 'Section Break',
-		'idx': 32,
-		'label': 'More Info',
-		'oldfieldtype': 'Section Break',
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldtype': u'Section Break',
+		'label': u'More Info',
+		'oldfieldtype': u'Section Break',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Link',
-		'idx': 33,
-		'label': 'Company',
-		'oldfieldname': 'company',
-		'oldfieldtype': 'Link',
-		'options': 'Company',
+		'doctype': u'DocField',
+		'fieldname': u'company',
+		'fieldtype': u'Link',
+		'label': u'Company',
+		'oldfieldname': u'company',
+		'oldfieldtype': u'Link',
+		'options': u'Company',
 		'permlevel': 0,
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'default': '__user',
-		'doctype': 'DocField',
-		'fieldname': 'lead_owner',
-		'fieldtype': 'Link',
-		'idx': 34,
+		'default': u'__user',
+		'doctype': u'DocField',
+		'fieldname': u'lead_owner',
+		'fieldtype': u'Link',
 		'in_filter': 1,
-		'label': 'Lead Owner',
-		'oldfieldname': 'lead_owner',
-		'oldfieldtype': 'Link',
-		'options': 'Profile',
+		'label': u'Lead Owner',
+		'oldfieldname': u'lead_owner',
+		'oldfieldtype': u'Link',
+		'options': u'Profile',
 		'permlevel': 0,
-		'search_index': 0
+		'search_index': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'market_segment',
-		'fieldtype': 'Select',
+		'doctype': u'DocField',
+		'fieldname': u'market_segment',
+		'fieldtype': u'Select',
 		'hidden': 0,
-		'idx': 35,
 		'in_filter': 1,
-		'label': 'Market Segment',
-		'oldfieldname': 'market_segment',
-		'oldfieldtype': 'Select',
-		'options': '\nLower Income\nMiddle Income\nUpper Income',
+		'label': u'Market Segment',
+		'oldfieldname': u'market_segment',
+		'oldfieldtype': u'Select',
+		'options': u'\nLower Income\nMiddle Income\nUpper Income',
 		'permlevel': 0,
 		'reqd': 0,
 		'search_index': 0
@@ -638,109 +597,102 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'industry',
-		'fieldtype': 'Link',
-		'idx': 36,
-		'label': 'Industry',
-		'oldfieldname': 'industry',
-		'oldfieldtype': 'Link',
-		'options': 'Industry Type',
+		'doctype': u'DocField',
+		'fieldname': u'industry',
+		'fieldtype': u'Link',
+		'label': u'Industry',
+		'oldfieldname': u'industry',
+		'oldfieldtype': u'Link',
+		'options': u'Industry Type',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'description': 'Your products or facilities in which the lead is interested',
-		'doctype': 'DocField',
-		'fieldname': 'interested_in',
-		'fieldtype': 'Data',
-		'idx': 37,
-		'label': 'Interested In',
-		'oldfieldname': 'interested_in',
-		'oldfieldtype': 'Data',
+		'colour': u'White:FFF',
+		'description': u'Your products or facilities in which the lead is interested',
+		'doctype': u'DocField',
+		'fieldname': u'interested_in',
+		'fieldtype': u'Data',
+		'label': u'Interested In',
+		'oldfieldname': u'interested_in',
+		'oldfieldtype': u'Data',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'fieldtype': 'Select',
+		'doctype': u'DocField',
+		'fieldname': u'fiscal_year',
+		'fieldtype': u'Select',
 		'hidden': 1,
-		'idx': 38,
 		'in_filter': 1,
-		'label': 'Fiscal Year',
-		'oldfieldname': 'fiscal_year',
-		'oldfieldtype': 'Select',
-		'options': 'link:Fiscal Year',
+		'label': u'Fiscal Year',
+		'oldfieldname': u'fiscal_year',
+		'oldfieldtype': u'Select',
+		'options': u'link:Fiscal Year',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Column Break',
-		'idx': 39,
-		'oldfieldtype': 'Column Break',
+		'doctype': u'DocField',
+		'fieldtype': u'Column Break',
+		'oldfieldtype': u'Column Break',
 		'permlevel': 0,
-		'width': '50%'
+		'width': u'50%'
 	},
 
 	# DocField
 	{
 		'allow_on_submit': 0,
-		'colour': 'White:FFF',
-		'description': 'Your sales person who will contact the lead in future',
-		'doctype': 'DocField',
-		'fieldname': 'contact_by',
-		'fieldtype': 'Link',
+		'colour': u'White:FFF',
+		'description': u'Your sales person who will contact the lead in future',
+		'doctype': u'DocField',
+		'fieldname': u'contact_by',
+		'fieldtype': u'Link',
 		'hidden': 0,
-		'idx': 40,
 		'in_filter': 1,
-		'label': 'Next Contact By',
-		'oldfieldname': 'contact_by',
-		'oldfieldtype': 'Link',
-		'options': 'Profile',
+		'label': u'Next Contact By',
+		'oldfieldname': u'contact_by',
+		'oldfieldtype': u'Link',
+		'options': u'Profile',
 		'permlevel': 0,
 		'print_hide': 0,
 		'reqd': 0,
-		'width': '100px'
+		'width': u'100px'
 	},
 
 	# DocField
 	{
 		'allow_on_submit': 0,
-		'colour': 'White:FFF',
-		'description': 'Your sales person will get a reminder on this date to contact the lead',
-		'doctype': 'DocField',
-		'fieldname': 'contact_date',
-		'fieldtype': 'Date',
-		'idx': 41,
+		'colour': u'White:FFF',
+		'description': u'Your sales person will get a reminder on this date to contact the lead',
+		'doctype': u'DocField',
+		'fieldname': u'contact_date',
+		'fieldtype': u'Date',
 		'in_filter': 1,
-		'label': 'Next Contact Date',
+		'label': u'Next Contact Date',
 		'no_copy': 1,
-		'oldfieldname': 'contact_date',
-		'oldfieldtype': 'Date',
+		'oldfieldname': u'contact_date',
+		'oldfieldtype': u'Date',
 		'permlevel': 0,
 		'reqd': 0,
-		'width': '100px'
+		'width': u'100px'
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'depends_on': 'eval:!doc.__islocal',
-		'description': 'Date on which the lead was last contacted',
-		'doctype': 'DocField',
-		'fieldname': 'last_contact_date',
-		'fieldtype': 'Date',
-		'idx': 42,
-		'label': 'Last Contact Date',
+		'colour': u'White:FFF',
+		'depends_on': u'eval:!doc.__islocal',
+		'description': u'Date on which the lead was last contacted',
+		'doctype': u'DocField',
+		'fieldname': u'last_contact_date',
+		'fieldtype': u'Date',
+		'label': u'Last Contact Date',
 		'no_copy': 1,
-		'oldfieldname': 'last_contact_date',
-		'oldfieldtype': 'Date',
+		'oldfieldname': u'last_contact_date',
+		'oldfieldtype': u'Date',
 		'permlevel': 1,
 		'print_hide': 1
 	},
@@ -748,40 +700,37 @@
 	# DocField
 	{
 		'allow_on_submit': 0,
-		'doctype': 'DocField',
-		'fieldname': 'to_discuss',
-		'fieldtype': 'Small Text',
-		'idx': 43,
-		'label': 'To Discuss',
+		'doctype': u'DocField',
+		'fieldname': u'to_discuss',
+		'fieldtype': u'Small Text',
+		'label': u'To Discuss',
 		'no_copy': 1,
-		'oldfieldname': 'to_discuss',
-		'oldfieldtype': 'Small Text',
+		'oldfieldname': u'to_discuss',
+		'oldfieldtype': u'Small Text',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'description': 'Keep a track of communication with this lead which will help for future reference.',
-		'doctype': 'DocField',
-		'fieldtype': 'Section Break',
-		'idx': 44,
-		'label': 'Communication History',
-		'oldfieldtype': 'Section Break',
+		'colour': u'White:FFF',
+		'description': u'Keep a track of communication with this lead which will help for future reference.',
+		'doctype': u'DocField',
+		'fieldtype': u'Section Break',
+		'label': u'Communication History',
+		'oldfieldtype': u'Section Break',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
 		'allow_on_submit': 0,
-		'doctype': 'DocField',
-		'fieldname': 'follow_up',
-		'fieldtype': 'Table',
-		'idx': 45,
-		'label': 'Follow up',
-		'oldfieldname': 'follow_up',
-		'oldfieldtype': 'Table',
-		'options': 'Follow up',
+		'doctype': u'DocField',
+		'fieldname': u'follow_up',
+		'fieldtype': u'Table',
+		'label': u'Follow up',
+		'oldfieldname': u'follow_up',
+		'oldfieldtype': u'Table',
+		'options': u'Follow up',
 		'permlevel': 0
 	}
 ]
\ No newline at end of file
diff --git a/erpnext/selling/doctype/lead_attachment_detail/__init__.py b/erpnext/selling/doctype/lead_attachment_detail/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/selling/doctype/lead_attachment_detail/__init__.py
+++ /dev/null
diff --git a/erpnext/selling/doctype/lead_attachment_detail/lead_attachment_detail.txt b/erpnext/selling/doctype/lead_attachment_detail/lead_attachment_detail.txt
deleted file mode 100644
index 85f086c..0000000
--- a/erpnext/selling/doctype/lead_attachment_detail/lead_attachment_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-10-06 12:12:21', 'search_fields': None, 'module': 'CRM', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 2, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Lead Attachment Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-10-06 12:12:21', 'doctype': 'DocField', 'oldfieldname': 'select_file', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Select File For Attachment', 'width': '200px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Lead Attachment Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03137', 'idx': 1, 'default': None, 'colour': None, 'modified': '2009-10-06 12:35:51', 'parenttype': 'DocType', 'fieldname': 'select_file', 'fieldtype': 'Link', 'options': 'File', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/erpnext/selling/doctype/lead_item_detail/__init__.py b/erpnext/selling/doctype/lead_item_detail/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/selling/doctype/lead_item_detail/__init__.py
+++ /dev/null
diff --git a/erpnext/selling/doctype/lead_item_detail/lead_item_detail.txt b/erpnext/selling/doctype/lead_item_detail/lead_item_detail.txt
deleted file mode 100644
index 2f83a9f..0000000
--- a/erpnext/selling/doctype/lead_item_detail/lead_item_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Tray', 'is_transaction_doc': None, 'creation': '2009-03-30 15:38:55', 'search_fields': None, 'module': 'CRM', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 5, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': '', 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'swarnalata@webnotestech.com', 'document_type': None, 'name': 'Lead Item Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': '', 'modified': '2010-09-20 14:06:57', 'server_code_error': None, 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Link', 'creation': '2009-03-30 15:38:55', 'doctype': 'DocField', 'oldfieldname': 'item_code', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'swarnalata@webnotestech.com', 'label': 'Item Code', 'width': '200px', 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Lead Item Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01565', 'idx': 1, 'default': None, 'colour': None, 'modified': '2009-10-09 15:32:48', 'parenttype': 'DocType', 'fieldname': 'item_code', 'fieldtype': 'Link', 'options': 'Item', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-05-19 11:15:06', 'doctype': 'DocField', 'oldfieldname': 'item_name', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'swarnalata@webnotestech.com', 'label': 'Item Name', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Lead Item Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02098', 'idx': 2, 'default': None, 'colour': None, 'modified': '2009-10-09 15:32:48', 'parenttype': 'DocType', 'fieldname': 'item_name', 'fieldtype': 'Data', 'options': '', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-07-08 11:17:32', 'doctype': 'DocField', 'oldfieldname': 'item_group', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'swarnalata@webnotestech.com', 'label': 'Item Group', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Lead Item Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02551', 'idx': 3, 'default': None, 'colour': None, 'modified': '2009-10-09 15:32:48', 'parenttype': 'DocType', 'fieldname': 'item_group', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-07-08 11:17:32', 'doctype': 'DocField', 'oldfieldname': 'brand', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'swarnalata@webnotestech.com', 'label': 'Brand', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Lead Item Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL02552', 'idx': 4, 'default': None, 'colour': None, 'modified': '2009-10-09 15:32:48', 'parenttype': 'DocType', 'fieldname': 'brand', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Text', 'creation': '2009-03-30 15:38:55', 'doctype': 'DocField', 'oldfieldname': 'description', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'swarnalata@webnotestech.com', 'label': 'Description', 'width': '100px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 1, 'description': None, 'parent': 'Lead Item Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01566', 'idx': 5, 'default': None, 'colour': None, 'modified': '2009-10-09 15:32:48', 'parenttype': 'DocType', 'fieldname': 'description', 'fieldtype': 'Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-03-30 15:38:55', 'doctype': 'DocField', 'oldfieldname': 'uom', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'swarnalata@webnotestech.com', 'label': 'UOM', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 0, 'permlevel': 1, 'description': None, 'parent': 'Lead Item Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01567', 'idx': 6, 'default': None, 'colour': None, 'modified': '2009-10-09 15:32:48', 'parenttype': 'DocType', 'fieldname': 'uom', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-30 15:38:55', 'doctype': 'DocField', 'oldfieldname': 'qty', 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': 0, 'modified_by': 'swarnalata@webnotestech.com', 'label': 'Qty', 'width': '100px', 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': 0, 'permlevel': 0, 'description': None, 'parent': 'Lead Item Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01568', 'idx': 7, 'default': None, 'colour': None, 'modified': '2009-10-09 15:32:48', 'parenttype': 'DocType', 'fieldname': 'qty', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Currency', 'creation': '2009-03-30 15:38:55', 'doctype': 'DocField', 'oldfieldname': 'rate', 'owner': 'Administrator', 'reqd': 0, 'in_filter': None, 'print_hide': None, 'modified_by': 'swarnalata@webnotestech.com', 'label': 'Rate', 'width': '100px', 'trigger': '', 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 1, 'description': None, 'parent': 'Lead Item Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01569', 'idx': 8, 'default': None, 'colour': None, 'modified': '2009-10-09 15:32:48', 'parenttype': 'DocType', 'fieldname': 'rate', 'fieldtype': 'Currency', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': 'Read Only', 'creation': '2009-03-30 15:38:55', 'doctype': 'DocField', 'oldfieldname': 'amount', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'swarnalata@webnotestech.com', 'label': 'Amount', 'width': '100px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': 1, 'permlevel': 1, 'description': None, 'parent': 'Lead Item Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01570', 'idx': 9, 'default': None, 'colour': None, 'modified': '2009-10-09 15:32:48', 'parenttype': 'DocType', 'fieldname': 'amount', 'fieldtype': 'Read Only', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/erpnext/selling/doctype/lead_sms_detail/__init__.py b/erpnext/selling/doctype/lead_sms_detail/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/selling/doctype/lead_sms_detail/__init__.py
+++ /dev/null
diff --git a/erpnext/selling/doctype/lead_sms_detail/lead_sms_detail.txt b/erpnext/selling/doctype/lead_sms_detail/lead_sms_detail.txt
deleted file mode 100644
index aeb93cb..0000000
--- a/erpnext/selling/doctype/lead_sms_detail/lead_sms_detail.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-10-06 12:10:26', 'search_fields': None, 'module': 'CRM', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': None, 'read_only': None, 'allow_email': None, 'dt_template': None, 'hide_heading': None, 'issingle': None, 'allow_rename': None, 'smallicon': None, 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 2, 'menu_index': None, 'docstatus': 0, 'allow_copy': None, 'istable': 1, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'Administrator', 'document_type': None, 'name': 'Lead SMS Detail', 'idx': None, 'hide_toolbar': None, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'no_copy': None, 'oldfieldtype': 'Data', 'creation': '2009-10-06 12:10:26', 'doctype': 'DocField', 'oldfieldname': 'other_mobile_no', 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'Administrator', 'label': 'Mobile No', 'width': '200px', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'Lead SMS Detail', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL03136', 'idx': 1, 'default': None, 'colour': None, 'modified': '2009-10-06 17:26:45', 'parenttype': 'DocType', 'fieldname': 'other_mobile_no', 'fieldtype': 'Data', 'options': None, 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file
diff --git a/erpnext/selling/doctype/sms_center/sms_center.txt b/erpnext/selling/doctype/sms_center/sms_center.txt
index 507f160..cb0a8d8 100644
--- a/erpnext/selling/doctype/sms_center/sms_center.txt
+++ b/erpnext/selling/doctype/sms_center/sms_center.txt
@@ -5,66 +5,66 @@
 	{
 		'creation': '2011-01-11 17:52:26',
 		'docstatus': 0,
-		'modified': '2011-02-15 17:06:33',
-		'modified_by': 'Administrator',
-		'owner': 'Administrator'
+		'modified': '2012-03-21 13:06:26',
+		'modified_by': u'Administrator',
+		'owner': u'Administrator'
 	},
 
 	# These values are common for all DocType
 	{
-		'_last_update': '1300788634',
+		'_last_update': u'1322549700',
 		'allow_attach': 0,
 		'allow_copy': 1,
 		'allow_email': 1,
 		'allow_print': 1,
-		'colour': 'White:FFF',
+		'colour': u'White:FFF',
+		'default_print_format': u'Standard',
 		'doctype': 'DocType',
 		'hide_heading': 0,
 		'hide_toolbar': 0,
 		'in_create': 0,
 		'issingle': 1,
 		'menu_index': 4,
-		'module': 'Selling',
+		'module': u'Selling',
 		'name': '__common__',
 		'read_only': 1,
-		'section_style': 'Simple',
-		'server_code_error': ' ',
+		'section_style': u'Simple',
+		'server_code_error': u' ',
 		'show_in_menu': 1,
-		'version': 39
+		'version': 41
 	},
 
 	# These values are common for all DocField
 	{
-		'doctype': 'DocField',
+		'doctype': u'DocField',
 		'name': '__common__',
-		'parent': 'SMS Center',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
+		'parent': u'SMS Center',
+		'parentfield': u'fields',
+		'parenttype': u'DocType',
 		'permlevel': 0
 	},
 
 	# These values are common for all DocPerm
 	{
-		'doctype': 'DocPerm',
+		'doctype': u'DocPerm',
 		'name': '__common__',
-		'parent': 'SMS Center',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
+		'parent': u'SMS Center',
+		'parentfield': u'permissions',
+		'parenttype': u'DocType',
 		'read': 1,
-		'role': 'System Manager'
+		'role': u'System Manager'
 	},
 
 	# DocType, SMS Center
 	{
 		'doctype': 'DocType',
-		'name': 'SMS Center'
+		'name': u'SMS Center'
 	},
 
 	# DocPerm
 	{
 		'create': 1,
-		'doctype': 'DocPerm',
-		'idx': 1,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
 		'write': 1
 	},
@@ -72,124 +72,112 @@
 	# DocPerm
 	{
 		'create': 0,
-		'doctype': 'DocPerm',
-		'idx': 2,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
 		'write': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'column_break1',
-		'fieldtype': 'Column Break',
-		'idx': 1,
-		'width': '50%'
+		'doctype': u'DocField',
+		'fieldname': u'column_break1',
+		'fieldtype': u'Column Break',
+		'width': u'50%'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'send_to',
-		'fieldtype': 'Select',
-		'idx': 2,
-		'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',
-		'trigger': 'Client'
+		'doctype': u'DocField',
+		'fieldname': u'send_to',
+		'fieldtype': u'Select',
+		'label': u'Send To',
+		'options': u'\nAll Contact\nAll Customer Contact\nAll Supplier Contact\nAll Sales Partner Contact\nAll Lead (Open)\nAll Employee (Active)\nAll Sales Person',
+		'trigger': u'Client'
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'depends_on': "eval:doc.send_to=='All Customer Contact'",
-		'doctype': 'DocField',
-		'fieldname': 'customer',
-		'fieldtype': 'Link',
-		'idx': 3,
-		'label': 'Customer',
-		'options': 'Customer'
+		'colour': u'White:FFF',
+		'depends_on': u"eval:doc.send_to=='All Customer Contact'",
+		'doctype': u'DocField',
+		'fieldname': u'customer',
+		'fieldtype': u'Link',
+		'label': u'Customer',
+		'options': u'Customer'
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'depends_on': "eval:doc.send_to=='All Supplier Contact'",
-		'doctype': 'DocField',
-		'fieldname': 'supplier',
-		'fieldtype': 'Link',
-		'idx': 4,
-		'label': 'Supplier',
-		'options': 'Supplier'
+		'colour': u'White:FFF',
+		'depends_on': u"eval:doc.send_to=='All Supplier Contact'",
+		'doctype': u'DocField',
+		'fieldname': u'supplier',
+		'fieldtype': u'Link',
+		'label': u'Supplier',
+		'options': u'Supplier'
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'depends_on': "eval:doc.send_to=='All Employee (Active)'",
-		'doctype': 'DocField',
-		'fieldname': 'department',
-		'fieldtype': 'Select',
-		'idx': 5,
-		'label': 'Department',
-		'options': 'link:Department'
+		'colour': u'White:FFF',
+		'depends_on': u"eval:doc.send_to=='All Employee (Active)'",
+		'doctype': u'DocField',
+		'fieldname': u'department',
+		'fieldtype': u'Select',
+		'label': u'Department',
+		'options': u'link:Department'
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'depends_on': "eval:doc.send_to=='All Employee (Active)'",
-		'doctype': 'DocField',
-		'fieldname': 'branch',
-		'fieldtype': 'Select',
-		'idx': 6,
-		'label': 'Branch',
-		'options': 'link:Branch'
+		'colour': u'White:FFF',
+		'depends_on': u"eval:doc.send_to=='All Employee (Active)'",
+		'doctype': u'DocField',
+		'fieldname': u'branch',
+		'fieldtype': u'Select',
+		'label': u'Branch',
+		'options': u'link:Branch'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Button',
-		'idx': 7,
-		'label': 'Create Receiver List',
-		'options': 'create_receiver_list'
+		'doctype': u'DocField',
+		'fieldtype': u'Button',
+		'label': u'Create Receiver List',
+		'options': u'create_receiver_list'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'receiver_list',
-		'fieldtype': 'Code',
-		'idx': 8,
-		'label': 'Receiver List'
+		'doctype': u'DocField',
+		'fieldname': u'receiver_list',
+		'fieldtype': u'Code',
+		'label': u'Receiver List'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'column_break9',
-		'fieldtype': 'Column Break',
-		'idx': 9,
-		'width': '50%'
+		'doctype': u'DocField',
+		'fieldname': u'column_break9',
+		'fieldtype': u'Column Break',
+		'width': u'50%'
 	},
 
 	# DocField
 	{
-		'description': 'Message greater than 160 character will be splitted into multiple mesage',
-		'doctype': 'DocField',
-		'fieldname': 'message',
-		'fieldtype': 'Text',
-		'idx': 10,
-		'label': 'Message',
+		'description': u'Message greater than 160 character will be splitted into multiple mesage',
+		'doctype': u'DocField',
+		'fieldname': u'message',
+		'fieldtype': u'Text',
+		'label': u'Message',
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Button',
-		'idx': 11,
-		'label': 'Send SMS',
-		'options': 'send_sms'
+		'doctype': u'DocField',
+		'fieldtype': u'Button',
+		'label': u'Send SMS',
+		'options': u'send_sms'
 	}
 ]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/customer_group/customer_group.txt b/erpnext/setup/doctype/customer_group/customer_group.txt
index 6cffdd1..90043c8 100644
--- a/erpnext/setup/doctype/customer_group/customer_group.txt
+++ b/erpnext/setup/doctype/customer_group/customer_group.txt
@@ -5,45 +5,47 @@
 	{
 		'creation': '2010-08-08 17:08:57',
 		'docstatus': 0,
-		'modified': '2010-09-20 14:06:57',
-		'modified_by': 'yogesh@webnotestech.com',
-		'owner': 'Administrator'
+		'modified': '2012-03-21 14:52:40',
+		'modified_by': u'Administrator',
+		'owner': u'Administrator'
 	},
 
 	# These values are common for all DocType
 	{
+		'_last_update': u'1294214943',
 		'allow_trash': 1,
-		'autoname': 'field:customer_group_name',
-		'colour': 'White:FFF',
+		'autoname': u'field:customer_group_name',
+		'colour': u'White:FFF',
+		'default_print_format': u'Standard',
 		'doctype': 'DocType',
-		'document_type': 'Master',
+		'document_type': u'Master',
 		'in_create': 1,
-		'module': 'Setup',
+		'module': u'Setup',
 		'name': '__common__',
-		'search_fields': 'name,parent_customer_group',
-		'section_style': 'Simple',
-		'server_code_error': ' ',
+		'search_fields': u'name,parent_customer_group',
+		'section_style': u'Simple',
+		'server_code_error': u' ',
 		'show_in_menu': 0,
-		'version': 33
+		'version': 34
 	},
 
 	# These values are common for all DocField
 	{
-		'doctype': 'DocField',
+		'doctype': u'DocField',
 		'name': '__common__',
-		'parent': 'Customer Group',
-		'parentfield': 'fields',
-		'parenttype': 'DocType'
+		'parent': u'Customer Group',
+		'parentfield': u'fields',
+		'parenttype': u'DocType'
 	},
 
 	# These values are common for all DocPerm
 	{
 		'amend': 0,
-		'doctype': 'DocPerm',
+		'doctype': u'DocPerm',
 		'name': '__common__',
-		'parent': 'Customer Group',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
+		'parent': u'Customer Group',
+		'parentfield': u'permissions',
+		'parenttype': u'DocType',
 		'read': 1,
 		'submit': 0
 	},
@@ -51,17 +53,16 @@
 	# DocType, Customer Group
 	{
 		'doctype': 'DocType',
-		'name': 'Customer Group'
+		'name': u'Customer Group'
 	},
 
 	# DocPerm
 	{
 		'cancel': 0,
 		'create': 0,
-		'doctype': 'DocPerm',
-		'idx': 1,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'Sales Manager',
+		'role': u'Sales Manager',
 		'write': 0
 	},
 
@@ -69,10 +70,9 @@
 	{
 		'cancel': 0,
 		'create': 0,
-		'doctype': 'DocPerm',
-		'idx': 2,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'Sales Manager',
+		'role': u'Sales Manager',
 		'write': 0
 	},
 
@@ -80,10 +80,9 @@
 	{
 		'cancel': 0,
 		'create': 0,
-		'doctype': 'DocPerm',
-		'idx': 3,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'Sales Master Manager',
+		'role': u'Sales Master Manager',
 		'write': 0
 	},
 
@@ -91,10 +90,9 @@
 	{
 		'cancel': 0,
 		'create': 0,
-		'doctype': 'DocPerm',
-		'idx': 4,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'Sales User',
+		'role': u'Sales User',
 		'write': 0
 	},
 
@@ -102,10 +100,9 @@
 	{
 		'cancel': 0,
 		'create': 0,
-		'doctype': 'DocPerm',
-		'idx': 5,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'Sales User',
+		'role': u'Sales User',
 		'write': 0
 	},
 
@@ -113,95 +110,88 @@
 	{
 		'cancel': 1,
 		'create': 1,
-		'doctype': 'DocPerm',
-		'idx': 6,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'Sales Master Manager',
+		'role': u'Sales Master Manager',
 		'write': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'trash_reason',
-		'fieldtype': 'Small Text',
-		'idx': 1,
-		'label': 'Trash Reason',
-		'oldfieldname': 'trash_reason',
-		'oldfieldtype': 'Small Text',
+		'doctype': u'DocField',
+		'fieldname': u'trash_reason',
+		'fieldtype': u'Small Text',
+		'label': u'Trash Reason',
+		'oldfieldname': u'trash_reason',
+		'oldfieldtype': u'Small Text',
 		'permlevel': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'customer_group_name',
-		'fieldtype': 'Data',
-		'idx': 2,
-		'label': 'Customer Group Name',
+		'doctype': u'DocField',
+		'fieldname': u'customer_group_name',
+		'fieldtype': u'Data',
+		'label': u'Customer Group Name',
 		'no_copy': 1,
-		'oldfieldname': 'customer_group_name',
-		'oldfieldtype': 'Data',
+		'oldfieldname': u'customer_group_name',
+		'oldfieldtype': u'Data',
 		'permlevel': 0,
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'description',
-		'fieldtype': 'Text',
-		'idx': 3,
-		'label': 'Description',
-		'oldfieldname': 'description',
-		'oldfieldtype': 'Text',
+		'doctype': u'DocField',
+		'fieldname': u'description',
+		'fieldtype': u'Text',
+		'label': u'Description',
+		'oldfieldname': u'description',
+		'oldfieldtype': u'Text',
 		'permlevel': 0,
-		'width': '300px'
+		'width': u'300px'
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldname': 'parent_customer_group',
-		'fieldtype': 'Link',
-		'idx': 4,
-		'label': 'Parent Customer Group',
-		'oldfieldname': 'parent_customer_group',
-		'oldfieldtype': 'Link',
-		'options': 'Customer Group',
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldname': u'parent_customer_group',
+		'fieldtype': u'Link',
+		'label': u'Parent Customer Group',
+		'oldfieldname': u'parent_customer_group',
+		'oldfieldtype': u'Link',
+		'options': u'Customer Group',
 		'permlevel': 0,
 		'reqd': 1,
-		'trigger': 'Client'
+		'trigger': u'Client'
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'description': 'Only leaf nodes are allowed in transaction',
-		'doctype': 'DocField',
-		'fieldname': 'is_group',
-		'fieldtype': 'Select',
-		'idx': 5,
-		'label': 'Has Child Node',
-		'oldfieldname': 'is_group',
-		'oldfieldtype': 'Select',
-		'options': '\nYes\nNo',
+		'colour': u'White:FFF',
+		'description': u'Only leaf nodes are allowed in transaction',
+		'doctype': u'DocField',
+		'fieldname': u'is_group',
+		'fieldtype': u'Select',
+		'label': u'Has Child Node',
+		'oldfieldname': u'is_group',
+		'oldfieldtype': u'Select',
+		'options': u'\nYes\nNo',
 		'permlevel': 0,
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'lft',
-		'fieldtype': 'Int',
+		'doctype': u'DocField',
+		'fieldname': u'lft',
+		'fieldtype': u'Int',
 		'hidden': 1,
-		'idx': 6,
-		'label': 'lft',
+		'label': u'lft',
 		'no_copy': 1,
-		'oldfieldname': 'lft',
-		'oldfieldtype': 'Int',
+		'oldfieldname': u'lft',
+		'oldfieldtype': u'Int',
 		'permlevel': 0,
 		'print_hide': 1,
 		'report_hide': 1,
@@ -210,15 +200,14 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'rgt',
-		'fieldtype': 'Int',
+		'doctype': u'DocField',
+		'fieldname': u'rgt',
+		'fieldtype': u'Int',
 		'hidden': 1,
-		'idx': 7,
-		'label': 'rgt',
+		'label': u'rgt',
 		'no_copy': 1,
-		'oldfieldname': 'rgt',
-		'oldfieldtype': 'Int',
+		'oldfieldname': u'rgt',
+		'oldfieldtype': u'Int',
 		'permlevel': 0,
 		'print_hide': 1,
 		'report_hide': 1,
@@ -227,15 +216,15 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'old_parent',
-		'fieldtype': 'Data',
+		'doctype': u'DocField',
+		'fieldname': u'old_parent',
+		'fieldtype': u'Link',
 		'hidden': 1,
-		'idx': 8,
-		'label': 'old_parent',
+		'label': u'old_parent',
 		'no_copy': 1,
-		'oldfieldname': 'old_parent',
-		'oldfieldtype': 'Data',
+		'oldfieldname': u'old_parent',
+		'oldfieldtype': u'Data',
+		'options': u'Customer Group',
 		'permlevel': 0,
 		'print_hide': 1,
 		'report_hide': 1
diff --git a/erpnext/setup/doctype/naming_series_options/naming_series_options.txt b/erpnext/setup/doctype/naming_series_options/naming_series_options.txt
index b964556..23f4905 100644
--- a/erpnext/setup/doctype/naming_series_options/naming_series_options.txt
+++ b/erpnext/setup/doctype/naming_series_options/naming_series_options.txt
@@ -5,79 +5,78 @@
 	{
 		'creation': '2010-12-14 10:23:17',
 		'docstatus': 0,
-		'modified': '2010-09-20 14:06:57',
-		'modified_by': 'yogesh@webnotestech.com',
-		'owner': 'Administrator'
+		'modified': '2012-03-21 14:53:21',
+		'modified_by': u'Administrator',
+		'owner': u'Administrator'
 	},
 
 	# These values are common for all DocType
 	{
-		'autoname': '__NSO.#####',
-		'colour': 'White:FFF',
+		'autoname': u'__NSO.#####',
+		'colour': u'White:FFF',
+		'default_print_format': u'Standard',
 		'doctype': 'DocType',
 		'in_create': 1,
-		'module': 'Setup',
+		'module': u'Setup',
 		'name': '__common__',
 		'read_only': 0,
-		'section_style': 'Simple',
-		'server_code_error': ' ',
-		'version': 4
+		'section_style': u'Simple',
+		'server_code_error': u' ',
+		'show_in_menu': 0,
+		'version': 5
 	},
 
 	# These values are common for all DocField
 	{
-		'doctype': 'DocField',
+		'doctype': u'DocField',
 		'name': '__common__',
-		'parent': 'Naming Series Options',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
+		'parent': u'Naming Series Options',
+		'parentfield': u'fields',
+		'parenttype': u'DocType',
 		'permlevel': 0
 	},
 
 	# These values are common for all DocPerm
 	{
-		'doctype': 'DocPerm',
-		'idx': 1,
+		'doctype': u'DocPerm',
 		'name': '__common__',
-		'parent': 'Naming Series Options',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
+		'parent': u'Naming Series Options',
+		'parentfield': u'permissions',
+		'parenttype': u'DocType',
 		'permlevel': 0,
 		'read': 1,
-		'role': 'System Manager'
+		'role': u'System Manager'
 	},
 
 	# DocType, Naming Series Options
 	{
 		'doctype': 'DocType',
-		'name': 'Naming Series Options'
+		'name': u'Naming Series Options'
 	},
 
 	# DocPerm
 	{
-		'doctype': 'DocPerm'
+		'doctype': u'DocPerm'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'doc_type',
-		'fieldtype': 'Data',
-		'idx': 1,
-		'label': 'Doc Type',
-		'oldfieldname': 'doc_type',
-		'oldfieldtype': 'Data',
+		'doctype': u'DocField',
+		'fieldname': u'doc_type',
+		'fieldtype': u'Data',
+		'label': u'Doc Type',
+		'oldfieldname': u'doc_type',
+		'oldfieldtype': u'Data',
 		'search_index': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'series_options',
-		'fieldtype': 'Text',
-		'idx': 2,
-		'label': 'Series Options',
-		'oldfieldname': 'series_options',
-		'oldfieldtype': 'Text'
+		'doctype': u'DocField',
+		'fieldname': u'series_options',
+		'fieldtype': u'Text',
+		'label': u'Series Options',
+		'oldfieldname': u'series_options',
+		'oldfieldtype': u'Text'
 	}
 ]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/other_charges/other_charges.txt b/erpnext/setup/doctype/other_charges/other_charges.txt
index ac9c6c5..b4dee65 100644
--- a/erpnext/setup/doctype/other_charges/other_charges.txt
+++ b/erpnext/setup/doctype/other_charges/other_charges.txt
@@ -5,49 +5,51 @@
 	{
 		'creation': '2010-08-08 17:09:11',
 		'docstatus': 0,
-		'modified': '2011-01-07 11:04:07',
-		'modified_by': 'rakesh@iwebnotes.com',
-		'owner': 'Administrator'
+		'modified': '2012-03-21 14:51:06',
+		'modified_by': u'Administrator',
+		'owner': u'Administrator'
 	},
 
 	# These values are common for all DocType
 	{
+		'_last_update': u'1322549700',
 		'allow_trash': 1,
-		'autoname': 'field:title',
-		'colour': 'White:FFF',
+		'autoname': u'field:title',
+		'colour': u'White:FFF',
+		'default_print_format': u'Standard',
 		'doctype': 'DocType',
-		'document_type': 'Master',
-		'module': 'Setup',
+		'document_type': u'Master',
+		'module': u'Setup',
 		'name': '__common__',
-		'section_style': 'Tabbed',
-		'server_code_error': ' ',
+		'section_style': u'Tabbed',
+		'server_code_error': u' ',
 		'show_in_menu': 0,
-		'version': 56
+		'version': 57
 	},
 
 	# These values are common for all DocField
 	{
-		'doctype': 'DocField',
+		'doctype': u'DocField',
 		'name': '__common__',
-		'parent': 'Other Charges',
-		'parentfield': 'fields',
-		'parenttype': 'DocType'
+		'parent': u'Other Charges',
+		'parentfield': u'fields',
+		'parenttype': u'DocType'
 	},
 
 	# These values are common for all DocPerm
 	{
-		'doctype': 'DocPerm',
+		'doctype': u'DocPerm',
 		'name': '__common__',
-		'parent': 'Other Charges',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
+		'parent': u'Other Charges',
+		'parentfield': u'permissions',
+		'parenttype': u'DocType',
 		'read': 1
 	},
 
 	# DocType, Other Charges
 	{
 		'doctype': 'DocType',
-		'name': 'Other Charges'
+		'name': u'Other Charges'
 	},
 
 	# DocPerm
@@ -55,10 +57,9 @@
 		'amend': 0,
 		'cancel': 0,
 		'create': 0,
-		'doctype': 'DocPerm',
-		'idx': 1,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'Sales Master Manager',
+		'role': u'Sales Master Manager',
 		'submit': 0,
 		'write': 0
 	},
@@ -68,10 +69,9 @@
 		'amend': 0,
 		'cancel': 0,
 		'create': 0,
-		'doctype': 'DocPerm',
-		'idx': 2,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'Sales User',
+		'role': u'Sales User',
 		'submit': 0,
 		'write': 0
 	},
@@ -81,10 +81,9 @@
 		'amend': 0,
 		'cancel': 0,
 		'create': 0,
-		'doctype': 'DocPerm',
-		'idx': 3,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'Sales User',
+		'role': u'Sales User',
 		'submit': 0,
 		'write': 0
 	},
@@ -94,10 +93,9 @@
 		'amend': 0,
 		'cancel': 1,
 		'create': 1,
-		'doctype': 'DocPerm',
-		'idx': 4,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'Accounts Manager',
+		'role': u'Accounts Manager',
 		'submit': 0,
 		'write': 1
 	},
@@ -106,10 +104,9 @@
 	{
 		'cancel': 1,
 		'create': 1,
-		'doctype': 'DocPerm',
-		'idx': 5,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'System Manager',
+		'role': u'System Manager',
 		'write': 1
 	},
 
@@ -118,46 +115,42 @@
 		'amend': 0,
 		'cancel': 1,
 		'create': 1,
-		'doctype': 'DocPerm',
-		'idx': 6,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'Sales Master Manager',
+		'role': u'Sales Master Manager',
 		'submit': 0,
 		'write': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'trash_reason',
-		'fieldtype': 'Small Text',
-		'idx': 1,
-		'label': 'Trash Reason',
-		'oldfieldname': 'trash_reason',
-		'oldfieldtype': 'Small Text',
+		'doctype': u'DocField',
+		'fieldname': u'trash_reason',
+		'fieldtype': u'Small Text',
+		'label': u'Trash Reason',
+		'oldfieldname': u'trash_reason',
+		'oldfieldtype': u'Small Text',
 		'permlevel': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Section Break',
-		'idx': 2,
-		'label': 'Other Charges Details',
-		'oldfieldtype': 'Section Break',
+		'doctype': u'DocField',
+		'fieldtype': u'Section Break',
+		'label': u'Other Charges Details',
+		'oldfieldtype': u'Section Break',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'title',
-		'fieldtype': 'Data',
-		'idx': 3,
+		'doctype': u'DocField',
+		'fieldname': u'title',
+		'fieldtype': u'Data',
 		'in_filter': 1,
-		'label': 'Title',
-		'oldfieldname': 'title',
-		'oldfieldtype': 'Data',
+		'label': u'Title',
+		'oldfieldname': u'title',
+		'oldfieldtype': u'Data',
 		'permlevel': 0,
 		'reqd': 1,
 		'search_index': 0
@@ -165,25 +158,23 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'is_default',
-		'fieldtype': 'Check',
-		'idx': 4,
-		'label': 'Default',
+		'doctype': u'DocField',
+		'fieldname': u'is_default',
+		'fieldtype': u'Check',
+		'label': u'Default',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Link',
-		'idx': 5,
+		'doctype': u'DocField',
+		'fieldname': u'company',
+		'fieldtype': u'Link',
 		'in_filter': 1,
-		'label': 'Company',
-		'oldfieldname': 'company',
-		'oldfieldtype': 'Link',
-		'options': 'Company',
+		'label': u'Company',
+		'oldfieldname': u'company',
+		'oldfieldtype': u'Link',
+		'options': u'Company',
 		'permlevel': 0,
 		'reqd': 1,
 		'search_index': 0
@@ -191,14 +182,13 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'other_charges',
-		'fieldtype': 'Table',
-		'idx': 6,
-		'label': 'Other Charges',
-		'oldfieldname': 'other_charges',
-		'oldfieldtype': 'Table',
-		'options': 'RV Tax Detail',
+		'doctype': u'DocField',
+		'fieldname': u'other_charges',
+		'fieldtype': u'Table',
+		'label': u'Other Charges',
+		'oldfieldname': u'other_charges',
+		'oldfieldtype': u'Table',
+		'options': u'RV Tax Detail',
 		'permlevel': 0
 	}
 ]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.txt b/erpnext/setup/doctype/sales_partner/sales_partner.txt
index 18b3abb..b030b34 100644
--- a/erpnext/setup/doctype/sales_partner/sales_partner.txt
+++ b/erpnext/setup/doctype/sales_partner/sales_partner.txt
@@ -5,52 +5,53 @@
 	{
 		'creation': '2010-08-08 17:09:22',
 		'docstatus': 0,
-		'modified': '2011-05-17 14:32:10',
-		'modified_by': 'Administrator',
-		'owner': 'Administrator'
+		'modified': '2012-03-21 14:53:54',
+		'modified_by': u'Administrator',
+		'owner': u'Administrator'
 	},
 
 	# These values are common for all DocType
 	{
-		'_last_update': '1307707462',
+		'_last_update': u'1322549700',
 		'allow_trash': 1,
-		'autoname': 'field:partner_name',
-		'colour': 'White:FFF',
+		'autoname': u'field:partner_name',
+		'colour': u'White:FFF',
+		'default_print_format': u'Standard',
 		'doctype': 'DocType',
-		'document_type': 'Master',
+		'document_type': u'Master',
 		'in_create': 0,
-		'module': 'Setup',
+		'module': u'Setup',
 		'name': '__common__',
 		'read_only': 0,
-		'section_style': 'Tabbed',
-		'server_code_error': ' ',
+		'section_style': u'Tabbed',
+		'server_code_error': u' ',
 		'show_in_menu': 0,
-		'version': 72
+		'version': 73
 	},
 
 	# These values are common for all DocField
 	{
-		'doctype': 'DocField',
+		'doctype': u'DocField',
 		'name': '__common__',
-		'parent': 'Sales Partner',
-		'parentfield': 'fields',
-		'parenttype': 'DocType'
+		'parent': u'Sales Partner',
+		'parentfield': u'fields',
+		'parenttype': u'DocType'
 	},
 
 	# These values are common for all DocPerm
 	{
-		'doctype': 'DocPerm',
+		'doctype': u'DocPerm',
 		'name': '__common__',
-		'parent': 'Sales Partner',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
+		'parent': u'Sales Partner',
+		'parentfield': u'permissions',
+		'parenttype': u'DocType',
 		'read': 1
 	},
 
 	# DocType, Sales Partner
 	{
 		'doctype': 'DocType',
-		'name': 'Sales Partner'
+		'name': u'Sales Partner'
 	},
 
 	# DocPerm
@@ -58,10 +59,9 @@
 		'amend': 0,
 		'cancel': 0,
 		'create': 0,
-		'doctype': 'DocPerm',
-		'idx': 1,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'Sales Manager',
+		'role': u'Sales Manager',
 		'submit': 0,
 		'write': 0
 	},
@@ -71,10 +71,9 @@
 		'amend': 0,
 		'cancel': 0,
 		'create': 0,
-		'doctype': 'DocPerm',
-		'idx': 2,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'Sales Manager',
+		'role': u'Sales Manager',
 		'submit': 0,
 		'write': 0
 	},
@@ -84,10 +83,9 @@
 		'amend': 0,
 		'cancel': 0,
 		'create': 0,
-		'doctype': 'DocPerm',
-		'idx': 3,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'Sales User',
+		'role': u'Sales User',
 		'submit': 0,
 		'write': 0
 	},
@@ -97,10 +95,9 @@
 		'amend': 0,
 		'cancel': 0,
 		'create': 0,
-		'doctype': 'DocPerm',
-		'idx': 4,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'Sales User',
+		'role': u'Sales User',
 		'submit': 0,
 		'write': 0
 	},
@@ -110,10 +107,9 @@
 		'amend': 0,
 		'cancel': 1,
 		'create': 1,
-		'doctype': 'DocPerm',
-		'idx': 5,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'Sales Master Manager',
+		'role': u'Sales Master Manager',
 		'submit': 0,
 		'write': 1
 	},
@@ -123,10 +119,9 @@
 		'amend': 0,
 		'cancel': 0,
 		'create': 0,
-		'doctype': 'DocPerm',
-		'idx': 6,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'Sales Master Manager',
+		'role': u'Sales Master Manager',
 		'submit': 0,
 		'write': 0
 	},
@@ -135,45 +130,41 @@
 	{
 		'cancel': 1,
 		'create': 1,
-		'doctype': 'DocPerm',
-		'idx': 7,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'System Manager',
+		'role': u'System Manager',
 		'write': 1
 	},
 
 	# DocPerm
 	{
 		'create': 0,
-		'doctype': 'DocPerm',
-		'idx': 8,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'System Manager',
+		'role': u'System Manager',
 		'write': 0
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'description': 'Note: You Can Manage Multiple Address or Contacts via Addresses & Contacts',
-		'doctype': 'DocField',
-		'fieldtype': 'Section Break',
-		'idx': 1,
-		'label': 'Basic Info',
-		'oldfieldtype': 'Section Break',
+		'colour': u'White:FFF',
+		'description': u'Note: You Can Manage Multiple Address or Contacts via Addresses & Contacts',
+		'doctype': u'DocField',
+		'fieldtype': u'Section Break',
+		'label': u'Basic Info',
+		'oldfieldtype': u'Section Break',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'partner_name',
-		'fieldtype': 'Data',
-		'idx': 2,
+		'doctype': u'DocField',
+		'fieldname': u'partner_name',
+		'fieldtype': u'Data',
 		'in_filter': 1,
-		'label': 'Sales Partner Name',
-		'oldfieldname': 'partner_name',
-		'oldfieldtype': 'Data',
+		'label': u'Sales Partner Name',
+		'oldfieldname': u'partner_name',
+		'oldfieldtype': u'Data',
 		'permlevel': 0,
 		'reqd': 1,
 		'search_index': 1
@@ -181,193 +172,176 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'partner_type',
-		'fieldtype': 'Select',
-		'idx': 3,
+		'doctype': u'DocField',
+		'fieldname': u'partner_type',
+		'fieldtype': u'Select',
 		'in_filter': 1,
-		'label': 'Partner Type',
-		'oldfieldname': 'partner_type',
-		'oldfieldtype': 'Select',
-		'options': '\nChannel Partner\nDistributor\nDealer\nAgent\nRetailer\nImplementation Partner\nReseller',
+		'label': u'Partner Type',
+		'oldfieldname': u'partner_type',
+		'oldfieldtype': u'Select',
+		'options': u'\nChannel Partner\nDistributor\nDealer\nAgent\nRetailer\nImplementation Partner\nReseller',
 		'permlevel': 0,
 		'search_index': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Column Break',
-		'idx': 4,
-		'oldfieldtype': 'Column Break',
+		'doctype': u'DocField',
+		'fieldtype': u'Column Break',
+		'oldfieldtype': u'Column Break',
 		'permlevel': 0,
-		'width': '50%'
+		'width': u'50%'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'commission_rate',
-		'fieldtype': 'Currency',
-		'idx': 5,
-		'label': 'Commission Rate',
-		'oldfieldname': 'commission_rate',
-		'oldfieldtype': 'Currency',
+		'doctype': u'DocField',
+		'fieldname': u'commission_rate',
+		'fieldtype': u'Currency',
+		'label': u'Commission Rate',
+		'oldfieldname': u'commission_rate',
+		'oldfieldtype': u'Currency',
 		'permlevel': 0,
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'territory',
-		'fieldtype': 'Link',
-		'idx': 6,
-		'label': 'Territory',
-		'options': 'Territory',
+		'doctype': u'DocField',
+		'fieldname': u'territory',
+		'fieldtype': u'Link',
+		'label': u'Territory',
+		'options': u'Territory',
 		'permlevel': 0,
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Section Break',
-		'idx': 7,
-		'label': 'Address & Contacts',
+		'doctype': u'DocField',
+		'fieldtype': u'Section Break',
+		'label': u'Address & Contacts',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'depends_on': 'eval:doc.__islocal',
-		'doctype': 'DocField',
-		'fieldtype': 'HTML',
-		'idx': 8,
-		'label': 'Address Desc',
-		'options': '<em>Addresses will appear only when you save the customer</em>',
+		'colour': u'White:FFF',
+		'depends_on': u'eval:doc.__islocal',
+		'doctype': u'DocField',
+		'fieldtype': u'HTML',
+		'label': u'Address Desc',
+		'options': u'<em>Addresses will appear only when you save the customer</em>',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'HTML',
-		'idx': 9,
-		'label': 'Address HTML',
+		'doctype': u'DocField',
+		'fieldtype': u'HTML',
+		'label': u'Address HTML',
 		'permlevel': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Column Break',
-		'idx': 10,
+		'doctype': u'DocField',
+		'fieldtype': u'Column Break',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'depends_on': 'eval:doc.__islocal',
-		'doctype': 'DocField',
-		'fieldtype': 'HTML',
-		'idx': 11,
-		'label': 'Contact Desc',
-		'options': '<em>Contact Details will appear only when you save the customer</em>',
+		'colour': u'White:FFF',
+		'depends_on': u'eval:doc.__islocal',
+		'doctype': u'DocField',
+		'fieldtype': u'HTML',
+		'label': u'Contact Desc',
+		'options': u'<em>Contact Details will appear only when you save the customer</em>',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'HTML',
-		'idx': 12,
-		'label': 'Contact HTML',
+		'doctype': u'DocField',
+		'fieldtype': u'HTML',
+		'label': u'Contact HTML',
 		'permlevel': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Section Break',
-		'idx': 13,
-		'label': 'Partner Target Details',
-		'oldfieldtype': 'Section Break',
+		'doctype': u'DocField',
+		'fieldtype': u'Section Break',
+		'label': u'Partner Target Details',
+		'oldfieldtype': u'Section Break',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'distribution_id',
-		'fieldtype': 'Link',
-		'idx': 14,
-		'label': 'Distribution Id',
-		'oldfieldname': 'distribution_id',
-		'oldfieldtype': 'Link',
-		'options': 'Budget Distribution',
+		'doctype': u'DocField',
+		'fieldname': u'distribution_id',
+		'fieldtype': u'Link',
+		'label': u'Distribution Id',
+		'oldfieldname': u'distribution_id',
+		'oldfieldtype': u'Link',
+		'options': u'Budget Distribution',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'partner_target_details',
-		'fieldtype': 'Table',
-		'idx': 15,
-		'label': 'Partner Target Detail',
-		'oldfieldname': 'partner_target_details',
-		'oldfieldtype': 'Table',
-		'options': 'Target Detail',
+		'doctype': u'DocField',
+		'fieldname': u'partner_target_details',
+		'fieldtype': u'Table',
+		'label': u'Partner Target Detail',
+		'oldfieldname': u'partner_target_details',
+		'oldfieldtype': u'Table',
+		'options': u'Target Detail',
 		'permlevel': 0,
 		'reqd': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'HTML',
+		'doctype': u'DocField',
+		'fieldtype': u'HTML',
 		'hidden': 1,
-		'idx': 16,
-		'label': 'Manage HTML',
-		'oldfieldtype': 'HTML',
+		'label': u'Manage HTML',
+		'oldfieldtype': u'HTML',
 		'permlevel': 0,
 		'print_hide': 1
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'depends_on': 'eval:!doc.__islocal',
-		'doctype': 'DocField',
-		'fieldtype': 'Section Break',
-		'idx': 17,
-		'label': 'Transaction History',
-		'oldfieldtype': 'Section Break',
+		'colour': u'White:FFF',
+		'depends_on': u'eval:!doc.__islocal',
+		'doctype': u'DocField',
+		'fieldtype': u'Section Break',
+		'label': u'Transaction History',
+		'oldfieldtype': u'Section Break',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'HTML',
-		'idx': 18,
-		'label': 'History HTML',
-		'oldfieldtype': 'HTML',
+		'doctype': u'DocField',
+		'fieldtype': u'HTML',
+		'label': u'History HTML',
+		'oldfieldtype': u'HTML',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'trash_reason',
-		'fieldtype': 'Small Text',
-		'idx': 19,
-		'label': 'Trash Reason',
-		'oldfieldname': 'trash_reason',
-		'oldfieldtype': 'Small Text',
+		'doctype': u'DocField',
+		'fieldname': u'trash_reason',
+		'fieldtype': u'Small Text',
+		'label': u'Trash Reason',
+		'oldfieldname': u'trash_reason',
+		'oldfieldtype': u'Small Text',
 		'permlevel': 1
 	}
 ]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/term/term.txt b/erpnext/setup/doctype/term/term.txt
index fe3bd75..5adae34 100644
--- a/erpnext/setup/doctype/term/term.txt
+++ b/erpnext/setup/doctype/term/term.txt
@@ -5,48 +5,51 @@
 	{
 		'creation': '2010-08-08 17:09:27',
 		'docstatus': 0,
-		'modified': '2010-09-20 14:06:57',
-		'modified_by': 'yogesh@webnotestech.com',
-		'owner': 'Administrator'
+		'modified': '2012-03-21 14:54:12',
+		'modified_by': u'Administrator',
+		'owner': u'Administrator'
 	},
 
 	# These values are common for all DocType
 	{
+		'_last_update': u'1322549700',
 		'allow_trash': 1,
-		'autoname': 'field:title',
-		'colour': 'White:FFF',
+		'autoname': u'field:title',
+		'colour': u'White:FFF',
+		'default_print_format': u'Standard',
 		'doctype': 'DocType',
-		'document_type': 'Master',
-		'module': 'Setup',
+		'document_type': u'Master',
+		'module': u'Setup',
 		'name': '__common__',
-		'section_style': 'Simple',
-		'server_code_error': ' ',
-		'version': 10
+		'section_style': u'Simple',
+		'server_code_error': u' ',
+		'show_in_menu': 0,
+		'version': 11
 	},
 
 	# These values are common for all DocField
 	{
-		'doctype': 'DocField',
+		'doctype': u'DocField',
 		'name': '__common__',
-		'parent': 'Term',
-		'parentfield': 'fields',
-		'parenttype': 'DocType'
+		'parent': u'Term',
+		'parentfield': u'fields',
+		'parenttype': u'DocType'
 	},
 
 	# These values are common for all DocPerm
 	{
-		'doctype': 'DocPerm',
+		'doctype': u'DocPerm',
 		'name': '__common__',
-		'parent': 'Term',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
+		'parent': u'Term',
+		'parentfield': u'permissions',
+		'parenttype': u'DocType',
 		'read': 1
 	},
 
 	# DocType, Term
 	{
 		'doctype': 'DocType',
-		'name': 'Term'
+		'name': u'Term'
 	},
 
 	# DocPerm
@@ -54,10 +57,9 @@
 		'amend': 0,
 		'cancel': 0,
 		'create': 0,
-		'doctype': 'DocPerm',
-		'idx': 1,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'Sales Master Manager',
+		'role': u'Sales Master Manager',
 		'submit': 0,
 		'write': 0
 	},
@@ -67,10 +69,9 @@
 		'amend': 0,
 		'cancel': 1,
 		'create': 1,
-		'doctype': 'DocPerm',
-		'idx': 2,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'Sales Master Manager',
+		'role': u'Sales Master Manager',
 		'submit': 0,
 		'write': 1
 	},
@@ -80,10 +81,9 @@
 		'amend': 0,
 		'cancel': 0,
 		'create': 0,
-		'doctype': 'DocPerm',
-		'idx': 3,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'Sales User',
+		'role': u'Sales User',
 		'submit': 0,
 		'write': 0
 	},
@@ -93,30 +93,27 @@
 		'amend': 0,
 		'cancel': 0,
 		'create': 0,
-		'doctype': 'DocPerm',
-		'idx': 4,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'Sales User',
+		'role': u'Sales User',
 		'submit': 0,
 		'write': 0
 	},
 
 	# DocPerm
 	{
-		'doctype': 'DocPerm',
-		'idx': 5,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'All'
+		'role': u'All'
 	},
 
 	# DocPerm
 	{
 		'cancel': 1,
 		'create': 1,
-		'doctype': 'DocPerm',
-		'idx': 6,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'System Manager',
+		'role': u'System Manager',
 		'write': 1
 	},
 
@@ -124,35 +121,32 @@
 	{
 		'cancel': 1,
 		'create': 1,
-		'doctype': 'DocPerm',
-		'idx': 7,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'Accounts User',
+		'role': u'Accounts User',
 		'write': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'trash_reason',
-		'fieldtype': 'Small Text',
-		'idx': 1,
-		'label': 'Trash Reason',
-		'oldfieldname': 'trash_reason',
-		'oldfieldtype': 'Small Text',
+		'doctype': u'DocField',
+		'fieldname': u'trash_reason',
+		'fieldtype': u'Small Text',
+		'label': u'Trash Reason',
+		'oldfieldname': u'trash_reason',
+		'oldfieldtype': u'Small Text',
 		'permlevel': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'title',
-		'fieldtype': 'Data',
-		'idx': 2,
+		'doctype': u'DocField',
+		'fieldname': u'title',
+		'fieldtype': u'Data',
 		'in_filter': 1,
-		'label': 'Title',
-		'oldfieldname': 'title',
-		'oldfieldtype': 'Data',
+		'label': u'Title',
+		'oldfieldname': u'title',
+		'oldfieldtype': u'Data',
 		'permlevel': 0,
 		'reqd': 1,
 		'search_index': 0
@@ -160,13 +154,12 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'terms',
-		'fieldtype': 'Text Editor',
-		'idx': 3,
-		'label': 'Terms',
-		'oldfieldname': 'terms',
-		'oldfieldtype': 'Text Editor',
+		'doctype': u'DocField',
+		'fieldname': u'terms',
+		'fieldtype': u'Text Editor',
+		'label': u'Terms',
+		'oldfieldname': u'terms',
+		'oldfieldtype': u'Text Editor',
 		'permlevel': 0
 	}
 ]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/territory/territory.txt b/erpnext/setup/doctype/territory/territory.txt
index a4de2d6..098c28f 100644
--- a/erpnext/setup/doctype/territory/territory.txt
+++ b/erpnext/setup/doctype/territory/territory.txt
@@ -5,47 +5,48 @@
 	{
 		'creation': '2010-08-08 17:09:28',
 		'docstatus': 0,
-		'modified': '2010-12-24 12:09:17',
-		'modified_by': 'abhishek@webnotestech.com',
-		'owner': 'Administrator'
+		'modified': '2012-03-21 14:46:04',
+		'modified_by': u'Administrator',
+		'owner': u'Administrator'
 	},
 
 	# These values are common for all DocType
 	{
-		'_last_update': '1307707462',
+		'_last_update': u'1311621379',
 		'allow_trash': 1,
-		'autoname': 'field:territory_name',
-		'colour': 'White:FFF',
+		'autoname': u'field:territory_name',
+		'colour': u'White:FFF',
+		'default_print_format': u'Standard',
 		'doctype': 'DocType',
-		'document_type': 'Master',
+		'document_type': u'Master',
 		'in_create': 1,
-		'module': 'Setup',
+		'module': u'Setup',
 		'name': '__common__',
-		'name_case': 'Title Case',
-		'search_fields': 'name,parent_territory,territory_manager',
-		'section_style': 'Simple',
-		'server_code_error': ' ',
+		'name_case': u'Title Case',
+		'search_fields': u'name,parent_territory,territory_manager',
+		'section_style': u'Simple',
+		'server_code_error': u' ',
 		'show_in_menu': 0,
-		'version': 85
+		'version': 86
 	},
 
 	# These values are common for all DocField
 	{
-		'doctype': 'DocField',
+		'doctype': u'DocField',
 		'name': '__common__',
-		'parent': 'Territory',
-		'parentfield': 'fields',
-		'parenttype': 'DocType'
+		'parent': u'Territory',
+		'parentfield': u'fields',
+		'parenttype': u'DocType'
 	},
 
 	# These values are common for all DocPerm
 	{
 		'amend': 0,
-		'doctype': 'DocPerm',
+		'doctype': u'DocPerm',
 		'name': '__common__',
-		'parent': 'Territory',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
+		'parent': u'Territory',
+		'parentfield': u'permissions',
+		'parenttype': u'DocType',
 		'read': 1,
 		'submit': 0
 	},
@@ -53,17 +54,16 @@
 	# DocType, Territory
 	{
 		'doctype': 'DocType',
-		'name': 'Territory'
+		'name': u'Territory'
 	},
 
 	# DocPerm
 	{
 		'cancel': 0,
 		'create': 0,
-		'doctype': 'DocPerm',
-		'idx': 1,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'Sales Manager',
+		'role': u'Sales Manager',
 		'write': 0
 	},
 
@@ -71,10 +71,9 @@
 	{
 		'cancel': 0,
 		'create': 0,
-		'doctype': 'DocPerm',
-		'idx': 2,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'Sales Manager',
+		'role': u'Sales Manager',
 		'write': 0
 	},
 
@@ -82,10 +81,9 @@
 	{
 		'cancel': 0,
 		'create': 0,
-		'doctype': 'DocPerm',
-		'idx': 3,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'Sales Master Manager',
+		'role': u'Sales Master Manager',
 		'write': 0
 	},
 
@@ -93,10 +91,9 @@
 	{
 		'cancel': 0,
 		'create': 0,
-		'doctype': 'DocPerm',
-		'idx': 4,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'Sales User',
+		'role': u'Sales User',
 		'write': 0
 	},
 
@@ -104,10 +101,9 @@
 	{
 		'cancel': 0,
 		'create': 0,
-		'doctype': 'DocPerm',
-		'idx': 5,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'Sales User',
+		'role': u'Sales User',
 		'write': 0
 	},
 
@@ -115,108 +111,100 @@
 	{
 		'cancel': 1,
 		'create': 1,
-		'doctype': 'DocPerm',
-		'idx': 6,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'Sales Master Manager',
+		'role': u'Sales Master Manager',
 		'write': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'trash_reason',
-		'fieldtype': 'Small Text',
-		'idx': 1,
-		'label': 'Trash Reason',
-		'oldfieldname': 'trash_reason',
-		'oldfieldtype': 'Small Text',
+		'doctype': u'DocField',
+		'fieldname': u'trash_reason',
+		'fieldtype': u'Small Text',
+		'label': u'Trash Reason',
+		'oldfieldname': u'trash_reason',
+		'oldfieldtype': u'Small Text',
 		'permlevel': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'territory_name',
-		'fieldtype': 'Data',
-		'idx': 2,
-		'label': 'Territory Name',
+		'doctype': u'DocField',
+		'fieldname': u'territory_name',
+		'fieldtype': u'Data',
+		'label': u'Territory Name',
 		'no_copy': 1,
-		'oldfieldname': 'territory_name',
-		'oldfieldtype': 'Data',
+		'oldfieldname': u'territory_name',
+		'oldfieldtype': u'Data',
 		'permlevel': 0,
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'territory_manager',
-		'fieldtype': 'Link',
-		'idx': 3,
+		'doctype': u'DocField',
+		'fieldname': u'territory_manager',
+		'fieldtype': u'Link',
 		'in_filter': 1,
-		'label': 'Territory Manager',
-		'oldfieldname': 'territory_manager',
-		'oldfieldtype': 'Link',
-		'options': 'Sales Person',
+		'label': u'Territory Manager',
+		'oldfieldname': u'territory_manager',
+		'oldfieldtype': u'Link',
+		'options': u'Sales Person',
 		'permlevel': 0,
-		'search_index': 0
+		'search_index': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'parent_territory',
-		'fieldtype': 'Link',
-		'idx': 4,
-		'label': 'Parent Territory',
-		'oldfieldname': 'parent_territory',
-		'oldfieldtype': 'Link',
-		'options': 'Territory',
+		'doctype': u'DocField',
+		'fieldname': u'parent_territory',
+		'fieldtype': u'Link',
+		'label': u'Parent Territory',
+		'oldfieldname': u'parent_territory',
+		'oldfieldtype': u'Link',
+		'options': u'Territory',
 		'permlevel': 0,
 		'reqd': 1,
-		'trigger': 'Client'
+		'trigger': u'Client'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'HTML',
-		'idx': 5,
-		'label': 'TerritoryHelp',
-		'oldfieldtype': 'HTML',
-		'options': '<a href="javascript:cur_frm.cscript.TerritoryHelp();">To manage Territory, click here</a>',
+		'doctype': u'DocField',
+		'fieldtype': u'HTML',
+		'label': u'TerritoryHelp',
+		'oldfieldtype': u'HTML',
+		'options': u'<a href="javascript:cur_frm.cscript.TerritoryHelp();">To manage Territory, click here</a>',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'description': 'Only leaf nodes are allowed in transaction',
-		'doctype': 'DocField',
-		'fieldname': 'is_group',
-		'fieldtype': 'Select',
-		'idx': 6,
-		'label': 'Has Child Node',
-		'oldfieldname': 'is_group',
-		'oldfieldtype': 'Select',
-		'options': '\nYes\nNo',
+		'colour': u'White:FFF',
+		'description': u'Only leaf nodes are allowed in transaction',
+		'doctype': u'DocField',
+		'fieldname': u'is_group',
+		'fieldtype': u'Select',
+		'label': u'Has Child Node',
+		'oldfieldname': u'is_group',
+		'oldfieldtype': u'Select',
+		'options': u'\nYes\nNo',
 		'permlevel': 0,
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'lft',
-		'fieldtype': 'Int',
+		'doctype': u'DocField',
+		'fieldname': u'lft',
+		'fieldtype': u'Int',
 		'hidden': 1,
-		'idx': 7,
 		'in_filter': 1,
-		'label': 'lft',
+		'label': u'lft',
 		'no_copy': 1,
-		'oldfieldname': 'lft',
-		'oldfieldtype': 'Int',
+		'oldfieldname': u'lft',
+		'oldfieldtype': u'Int',
 		'permlevel': 0,
 		'print_hide': 1,
 		'report_hide': 0,
@@ -225,16 +213,15 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'rgt',
-		'fieldtype': 'Int',
+		'doctype': u'DocField',
+		'fieldname': u'rgt',
+		'fieldtype': u'Int',
 		'hidden': 1,
-		'idx': 8,
 		'in_filter': 1,
-		'label': 'rgt',
+		'label': u'rgt',
 		'no_copy': 1,
-		'oldfieldname': 'rgt',
-		'oldfieldtype': 'Int',
+		'oldfieldname': u'rgt',
+		'oldfieldtype': u'Int',
 		'permlevel': 0,
 		'print_hide': 1,
 		'report_hide': 0,
@@ -243,15 +230,15 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'old_parent',
-		'fieldtype': 'Data',
+		'doctype': u'DocField',
+		'fieldname': u'old_parent',
+		'fieldtype': u'Link',
 		'hidden': 1,
-		'idx': 9,
-		'label': 'old_parent',
+		'label': u'old_parent',
 		'no_copy': 1,
-		'oldfieldname': 'old_parent',
-		'oldfieldtype': 'Data',
+		'oldfieldname': u'old_parent',
+		'oldfieldtype': u'Data',
+		'options': u'Territory',
 		'permlevel': 0,
 		'print_hide': 1,
 		'report_hide': 1
@@ -259,38 +246,34 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'distribution_id',
-		'fieldtype': 'Link',
-		'idx': 10,
-		'label': 'Distribution Id',
-		'oldfieldname': 'distribution_id',
-		'oldfieldtype': 'Link',
-		'options': 'Budget Distribution',
-		'permlevel': 0,
-		'search_index': 0
-	},
-
-	# DocField
-	{
-		'doctype': 'DocField',
-		'fieldtype': 'Section Break',
-		'idx': 11,
-		'label': 'Target Details',
-		'oldfieldtype': 'Section Break',
+		'doctype': u'DocField',
+		'fieldname': u'distribution_id',
+		'fieldtype': u'Link',
+		'label': u'Distribution Id',
+		'oldfieldname': u'distribution_id',
+		'oldfieldtype': u'Link',
+		'options': u'Budget Distribution',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'target_details',
-		'fieldtype': 'Table',
-		'idx': 12,
-		'label': 'Target Details1',
-		'oldfieldname': 'target_details',
-		'oldfieldtype': 'Table',
-		'options': 'Target Detail',
+		'doctype': u'DocField',
+		'fieldtype': u'Section Break',
+		'label': u'Target Details',
+		'oldfieldtype': u'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': u'DocField',
+		'fieldname': u'target_details',
+		'fieldtype': u'Table',
+		'label': u'Target Details1',
+		'oldfieldname': u'target_details',
+		'oldfieldtype': u'Table',
+		'options': u'Target Detail',
 		'permlevel': 0
 	}
 ]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/upload_accounts_transactions/__init__.py b/erpnext/setup/doctype/upload_accounts_transactions/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/setup/doctype/upload_accounts_transactions/__init__.py
+++ /dev/null
diff --git a/erpnext/setup/doctype/upload_accounts_transactions/upload_accounts_transactions.js b/erpnext/setup/doctype/upload_accounts_transactions/upload_accounts_transactions.js
deleted file mode 100644
index 4f46546..0000000
--- a/erpnext/setup/doctype/upload_accounts_transactions/upload_accounts_transactions.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// ERPNext - web based ERP (http://erpnext.com)
-// Copyright (C) 2012 Web Notes Technologies Pvt Ltd
-// 
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-//--------- ONLOAD -------------
-cur_frm.cscript.onload = function(doc, cdt, cdn) {
-}
-
-cur_frm.cscript.refresh = function(doc, cdt, cdn) {
-	if(!doc.file_list) {
-		set_field_options('Upload Accounts Transactions Help', '<div class="help_box">To upload transactions, please attach a (.csv) file with 5 columns - <b>Date, Transaction Number, Account, Debit Amount, Credit Amount</b> (no headings necessary). See attachments box in the right column</div>')
-	} else {
-		set_field_options('Upload Accounts Transactions Help', '<div class="help_box">To update transactions from the attachment, please click on "Upload Accounts Transactions"</div>')
-	}
-}
-
-cur_frm.cscript['Upload Accounts Transactions'] = function(doc, cdt, cdn) {
-	if(confirm("This action will append all transactions and cannot be un-done. Are you sure you want to continue?")) {
-		$c_obj([doc], 'upload_accounts_transactions', '', function(r, rt) { });
-	}
-}
diff --git a/erpnext/setup/doctype/upload_accounts_transactions/upload_accounts_transactions.py b/erpnext/setup/doctype/upload_accounts_transactions/upload_accounts_transactions.py
deleted file mode 100644
index 2d695f3d..0000000
--- a/erpnext/setup/doctype/upload_accounts_transactions/upload_accounts_transactions.py
+++ /dev/null
@@ -1,120 +0,0 @@
-# ERPNext - web based ERP (http://erpnext.com)
-# Copyright (C) 2012 Web Notes Technologies Pvt Ltd
-# 
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Please edit this list and import only required elements
-import webnotes
-
-from webnotes.utils import add_days, add_months, add_years, cint, cstr, date_diff, default_fields, flt, fmt_money, formatdate, generate_hash, getTraceback, get_defaults, get_first_day, get_last_day, getdate, has_common, month_name, now, nowdate, replace_newlines, sendmail, set_default, str_esc_quote, user_format, validate_email_add
-from webnotes.model import db_exists
-from webnotes.model.doc import Document, addchild, removechild, getchildren, make_autoname, SuperDocType
-from webnotes.model.doclist import getlist, copy_doclist
-from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax
-from webnotes import session, form, is_testing, msgprint, errprint
-
-set = webnotes.conn.set
-sql = webnotes.conn.sql
-get_value = webnotes.conn.get_value
-in_transaction = webnotes.conn.in_transaction
-convert_to_lists = webnotes.conn.convert_to_lists
-
-# -----------------------------------------------------------------------------------------
-
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
-		self.cl = []
-
-	# upload transactions
-	def upload_accounts_transactions(self):
-		import csv
-		data = csv.reader(self.get_csv_data().splitlines())
-
-		abbr = sql("select concat(' - ',abbr) as abbr from tabCompany where name=%s",self.doc.company)
-		updated = 0
-		jv_name=''
-#		jv = Document('Journal Voucher')
-		global line,jv,name,jv_go
-		for line in data:
-			if len(line)>=7: #Minimum no of fields
-				if line[3]!=jv_name: #Create JV
-					if jv_name!='':
-						jv_go = get_obj('Journal Voucher',name, with_children=1)
-						jv_go.validate()
-						jv_go.on_submit()
-
-					jv_name=line[3]
-					jv = Document('Journal Voucher')
-					jv.voucher_type = line[0]
-					jv.naming_series = line[1]
-					jv.voucher_date = formatdate(line[2])
-					jv.posting_date = formatdate(line[2])
-#					jv.name = line[3]
-					jv.fiscal_year = self.doc.fiscal_year
-					jv.company = self.doc.company
-					jv.remark = len(line)==8 and line[3]+' '+line[7] or line[3]+' Uploaded Record'
-					jv.docstatus=1
-					jv.save(1)
-					name=jv.name
-
-					jc = addchild(jv,'entries','Journal Voucher Detail',0)
-					jc.account = line[4]+abbr[0][0]
-					jc.cost_center=len(line)==9 and line[8] or self.doc.default_cost_center
-					if line[5]!='':
-						jc.debit = line[5]
-					else:
-						jc.credit = line[6]
-					jc.save()
-
-				else: #Create JV Child
-					jc = addchild(jv,'entries','Journal Voucher Detail',0)
-					jc.account = line[4]+abbr[0][0]
-					jc.cost_center=len(line)==9 and line[8] or self.doc.default_cost_center
-					if line[5]!='':
-						jc.debit = line[5]
-					else:
-						jc.credit = line[6]
-					jc.save()
-			else:
-				msgprint("[Ignored] Incorrect format: %s" % str(line))
-		if jv_name!='':
-			jv_go = get_obj('Journal Voucher',name, with_children=1)
-			jv_go.validate()
-			jv_go.on_submit()
-
-		msgprint("<b>%s</b> items updated" % updated)
-
-	# clear prices
-	def clear_prices(self):
-		cnt = sql("select count(*) from `tabRef Rate Detail` where price_list_name = %s", self.doc.name)
-		sql("delete from `tabRef Rate Detail` where price_list_name = %s", self.doc.name)
-		msgprint("%s prices cleared" % cnt[0][0])
-
-	# Update CSV data
-	def get_csv_data(self):
-		if not self.doc.file_list:
-		  msgprint("File not attached!")
-		  raise Exception
-
-		fid = self.doc.file_list.split(',')[1]
-
-		from webnotes.utils import file_manager
-		fn, content = file_manager.get_file(fid)
-		
-		# NOTE: Don't know why this condition exists
-		if not isinstance(content, basestring) and hasattr(content, 'tostring'):
-		  content = content.tostring()
-
-		return content
diff --git a/erpnext/setup/doctype/upload_accounts_transactions/upload_accounts_transactions.txt b/erpnext/setup/doctype/upload_accounts_transactions/upload_accounts_transactions.txt
deleted file mode 100644
index d637a88..0000000
--- a/erpnext/setup/doctype/upload_accounts_transactions/upload_accounts_transactions.txt
+++ /dev/null
@@ -1,126 +0,0 @@
-# DocType, Upload Accounts Transactions
-[
-
-	# These values are common in all dictionaries
-	{
-		'creation': '2011-07-18 14:56:48',
-		'docstatus': 0,
-		'modified': '2011-07-19 12:19:13',
-		'modified_by': 'Administrator',
-		'owner': 'Administrator'
-	},
-
-	# These values are common for all DocType
-	{
-		'_last_update': '1310985428',
-		'allow_attach': 1,
-		'colour': 'White:FFF',
-		'doctype': 'DocType',
-		'issingle': 1,
-		'max_attachments': 1,
-		'module': 'Setup',
-		'name': '__common__',
-		'section_style': 'Simple',
-		'show_in_menu': 1,
-		'version': 5
-	},
-
-	# These values are common for all DocField
-	{
-		'doctype': 'DocField',
-		'name': '__common__',
-		'parent': 'Upload Accounts Transactions',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0
-	},
-
-	# These values are common for all DocPerm
-	{
-		'cancel': 1,
-		'create': 1,
-		'doctype': 'DocPerm',
-		'execute': 1,
-		'idx': 1,
-		'name': '__common__',
-		'parent': 'Upload Accounts Transactions',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Accounts Manager',
-		'submit': 1,
-		'write': 1
-	},
-
-	# DocType, Upload Accounts Transactions
-	{
-		'doctype': 'DocType',
-		'name': 'Upload Accounts Transactions'
-	},
-
-	# DocPerm
-	{
-		'doctype': 'DocPerm'
-	},
-
-	# DocField
-	{
-		'doctype': 'DocField',
-		'fieldtype': 'HTML',
-		'idx': 1,
-		'label': 'Usage',
-		'options': '<div class="help_box">\n<b>Upload Account Transactions Help</b>\n<p>To update the account transactions, upload a CSV file with five columns Date, Transaction Number, Account Name, Credit and Debit amount and click on the "Upload Account Transactions" button. The system will add the transactions.\n</div>'
-	},
-
-	# DocField
-	{
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'fieldtype': 'Link',
-		'idx': 2,
-		'label': 'Fiscal Year',
-		'options': 'Fiscal Year',
-		'reqd': 1
-	},
-
-	# DocField
-	{
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Link',
-		'idx': 3,
-		'label': 'Company',
-		'options': 'Company',
-		'reqd': 1
-	},
-
-	# DocField
-	{
-		'doctype': 'DocField',
-		'fieldname': 'default_cost_center',
-		'fieldtype': 'Link',
-		'idx': 4,
-		'label': 'Default Cost Center',
-		'options': 'Cost Center',
-		'reqd': 1
-	},
-
-	# DocField
-	{
-		'doctype': 'DocField',
-		'fieldname': 'file_list',
-		'fieldtype': 'Small Text',
-		'hidden': 1,
-		'idx': 5,
-		'label': 'File List'
-	},
-
-	# DocField
-	{
-		'doctype': 'DocField',
-		'fieldtype': 'Button',
-		'idx': 6,
-		'label': 'Upload Accounts Transactions'
-	}
-]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/workflow_rule/workflow_rule.txt b/erpnext/setup/doctype/workflow_rule/workflow_rule.txt
index 7c35826..a3ed11b 100644
--- a/erpnext/setup/doctype/workflow_rule/workflow_rule.txt
+++ b/erpnext/setup/doctype/workflow_rule/workflow_rule.txt
@@ -5,253 +5,237 @@
 	{
 		'creation': '2010-08-08 17:09:31',
 		'docstatus': 0,
-		'modified': '2010-09-20 14:06:57',
-		'modified_by': 'Administrator',
-		'owner': 'swarnalata@webnotestech.com'
+		'modified': '2012-03-21 14:58:16',
+		'modified_by': u'Administrator',
+		'owner': u'swarnalata@webnotestech.com'
 	},
 
 	# These values are common for all DocType
 	{
-		'_last_update': '1308741898',
-		'autoname': 'field:rule_name',
-		'colour': 'White:FFF',
+		'autoname': u'field:rule_name',
+		'colour': u'White:FFF',
+		'default_print_format': u'Standard',
 		'doctype': 'DocType',
-		'document_type': 'Master',
-		'module': 'Setup',
+		'document_type': u'Master',
+		'module': u'Setup',
 		'name': '__common__',
-		'search_fields': 'select_form,rule_status',
-		'section_style': 'Tray',
-		'server_code_error': ' ',
+		'search_fields': u'select_form,rule_status',
+		'section_style': u'Tray',
+		'server_code_error': u' ',
 		'show_in_menu': 0,
-		'version': 30
+		'version': 31
 	},
 
 	# These values are common for all DocField
 	{
-		'doctype': 'DocField',
+		'doctype': u'DocField',
 		'name': '__common__',
-		'parent': 'Workflow Rule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
+		'parent': u'Workflow Rule',
+		'parentfield': u'fields',
+		'parenttype': u'DocType',
 		'permlevel': 0
 	},
 
 	# These values are common for all DocPerm
 	{
 		'create': 1,
-		'doctype': 'DocPerm',
-		'idx': 1,
+		'doctype': u'DocPerm',
 		'name': '__common__',
-		'parent': 'Workflow Rule',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
+		'parent': u'Workflow Rule',
+		'parentfield': u'permissions',
+		'parenttype': u'DocType',
 		'permlevel': 0,
 		'read': 1,
-		'role': 'System Manager',
+		'role': u'System Manager',
 		'write': 1
 	},
 
 	# DocType, Workflow Rule
 	{
 		'doctype': 'DocType',
-		'name': 'Workflow Rule'
+		'name': u'Workflow Rule'
 	},
 
 	# DocPerm
 	{
-		'doctype': 'DocPerm'
+		'doctype': u'DocPerm'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Section Break',
-		'idx': 1,
-		'label': 'Rule Definition',
-		'oldfieldtype': 'Section Break'
+		'doctype': u'DocField',
+		'fieldtype': u'Section Break',
+		'label': u'Rule Definition',
+		'oldfieldtype': u'Section Break'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'HTML',
-		'idx': 2,
-		'label': 'Intro HTML',
-		'oldfieldtype': 'HTML',
-		'options': '<b>Select form for which you want to define rules,set priority & status.</b>'
+		'doctype': u'DocField',
+		'fieldtype': u'HTML',
+		'label': u'Intro HTML',
+		'oldfieldtype': u'HTML',
+		'options': u'<b>Select form for which you want to define rules,set priority & status.</b>'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'rule_name',
-		'fieldtype': 'Data',
-		'idx': 3,
-		'label': 'Rule Name',
-		'oldfieldname': 'rule_name',
-		'oldfieldtype': 'Data',
+		'doctype': u'DocField',
+		'fieldname': u'rule_name',
+		'fieldtype': u'Data',
+		'label': u'Rule Name',
+		'oldfieldname': u'rule_name',
+		'oldfieldtype': u'Data',
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldname': 'rule_status',
-		'fieldtype': 'Select',
-		'idx': 4,
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldname': u'rule_status',
+		'fieldtype': u'Select',
 		'in_filter': 1,
-		'label': 'Rule Status',
-		'oldfieldname': 'rule_status',
-		'oldfieldtype': 'Select',
-		'options': '\nActive\nInactive',
+		'label': u'Rule Status',
+		'oldfieldname': u'rule_status',
+		'oldfieldtype': u'Select',
+		'options': u'\nActive\nInactive',
 		'reqd': 1,
 		'search_index': 0
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldname': 'select_form',
-		'fieldtype': 'Link',
-		'idx': 5,
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldname': u'select_form',
+		'fieldtype': u'Link',
 		'in_filter': 1,
-		'label': 'Select Form',
-		'oldfieldname': 'select_form',
-		'oldfieldtype': 'Link',
-		'options': 'DocType',
+		'label': u'Select Form',
+		'oldfieldname': u'select_form',
+		'oldfieldtype': u'Link',
+		'options': u'DocType',
 		'reqd': 1,
 		'search_index': 1,
-		'trigger': 'Client'
+		'trigger': u'Client'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'rule_priority',
-		'fieldtype': 'Int',
-		'idx': 6,
-		'label': 'Rule Priority',
-		'oldfieldname': 'rule_priority',
-		'oldfieldtype': 'Int',
+		'doctype': u'DocField',
+		'fieldname': u'rule_priority',
+		'fieldtype': u'Int',
+		'label': u'Rule Priority',
+		'oldfieldname': u'rule_priority',
+		'oldfieldtype': u'Int',
 		'reqd': 0
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldtype': 'Section Break',
-		'idx': 7,
-		'label': 'Define Rule',
-		'oldfieldtype': 'Section Break',
-		'options': 'Simple'
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldtype': u'Section Break',
+		'label': u'Define Rule',
+		'oldfieldtype': u'Section Break',
+		'options': u'Simple'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'workflow_rule_details',
-		'fieldtype': 'Table',
-		'idx': 8,
-		'label': 'Workflow Rule Details',
-		'oldfieldname': 'workflow_rule_details',
-		'oldfieldtype': 'Table',
-		'options': 'Workflow Rule Detail',
-		'width': '100px'
+		'doctype': u'DocField',
+		'fieldname': u'workflow_rule_details',
+		'fieldtype': u'Table',
+		'label': u'Workflow Rule Details',
+		'oldfieldname': u'workflow_rule_details',
+		'oldfieldtype': u'Table',
+		'options': u'Workflow Rule Detail',
+		'width': u'100px'
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldname': 'extra_condition',
-		'fieldtype': 'Code',
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldname': u'extra_condition',
+		'fieldtype': u'Code',
 		'hidden': 1,
-		'idx': 9,
-		'label': 'Extra Condition',
-		'oldfieldname': 'extra_condition',
-		'oldfieldtype': 'Code',
+		'label': u'Extra Condition',
+		'oldfieldname': u'extra_condition',
+		'oldfieldtype': u'Code',
 		'print_hide': 1
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldtype': 'Section Break',
-		'idx': 10,
-		'label': 'Action Detail',
-		'oldfieldtype': 'Section Break'
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldtype': u'Section Break',
+		'label': u'Action Detail',
+		'oldfieldtype': u'Section Break'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'HTML',
-		'idx': 11,
-		'label': 'Action html',
-		'oldfieldtype': 'HTML',
-		'options': '<b>Specify actions to be taken  when conditions hold satisfied</b>'
+		'doctype': u'DocField',
+		'fieldtype': u'HTML',
+		'label': u'Action html',
+		'oldfieldtype': u'HTML',
+		'options': u'<b>Specify actions to be taken  when conditions hold satisfied</b>'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'workflow_action_details',
-		'fieldtype': 'Table',
-		'idx': 12,
-		'label': 'Workflow Action Details',
-		'oldfieldname': 'workflow_action_details',
-		'oldfieldtype': 'Table',
-		'options': 'Workflow Action Detail'
+		'doctype': u'DocField',
+		'fieldname': u'workflow_action_details',
+		'fieldtype': u'Table',
+		'label': u'Workflow Action Details',
+		'oldfieldname': u'workflow_action_details',
+		'oldfieldtype': u'Table',
+		'options': u'Workflow Action Detail'
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldtype': 'HTML',
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldtype': u'HTML',
 		'hidden': 1,
-		'idx': 13,
-		'label': 'Reject HTML',
+		'label': u'Reject HTML',
 		'no_copy': 1,
-		'oldfieldtype': 'HTML',
-		'options': "<b>If any condition holds false the following message will be displayed . If you wish to stop rule engine when condition holds false then set 'Raise Exception' as 'Yes' otherwise keep this field blank or 'No'.</b>",
+		'oldfieldtype': u'HTML',
+		'options': u"<b>If any condition holds false the following message will be displayed . If you wish to stop rule engine when condition holds false then set 'Raise Exception' as 'Yes' otherwise keep this field blank or 'No'.</b>",
 		'print_hide': 1,
 		'report_hide': 1
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldname': 'message',
-		'fieldtype': 'Text',
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldname': u'message',
+		'fieldtype': u'Text',
 		'hidden': 1,
-		'idx': 14,
-		'label': 'Enter message',
+		'label': u'Enter message',
 		'no_copy': 1,
-		'oldfieldname': 'message',
-		'oldfieldtype': 'Text',
+		'oldfieldname': u'message',
+		'oldfieldtype': u'Text',
 		'print_hide': 1,
 		'report_hide': 1
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldname': 'raise_exception',
-		'fieldtype': 'Select',
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldname': u'raise_exception',
+		'fieldtype': u'Select',
 		'hidden': 1,
-		'idx': 15,
-		'label': 'Raise Exception',
+		'label': u'Raise Exception',
 		'no_copy': 1,
-		'oldfieldname': 'raise_exception',
-		'oldfieldtype': 'Select',
-		'options': '\nYes\nNo',
+		'oldfieldname': u'raise_exception',
+		'oldfieldtype': u'Select',
+		'options': u'\nYes\nNo',
 		'print_hide': 1,
 		'report_hide': 1
 	}
diff --git a/erpnext/setup/page/setup_wizard/__init__.py b/erpnext/setup/page/setup_wizard/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/setup/page/setup_wizard/__init__.py
+++ /dev/null
diff --git a/erpnext/setup/page/setup_wizard/setup_wizard.html b/erpnext/setup/page/setup_wizard/setup_wizard.html
deleted file mode 100644
index 1f5547e..0000000
--- a/erpnext/setup/page/setup_wizard/setup_wizard.html
+++ /dev/null
@@ -1 +0,0 @@
-<div id="setup_wizard_wrapper" class="layout_wrapper"></div>
\ No newline at end of file
diff --git a/erpnext/setup/page/setup_wizard/setup_wizard.js b/erpnext/setup/page/setup_wizard/setup_wizard.js
deleted file mode 100644
index 053330b..0000000
--- a/erpnext/setup/page/setup_wizard/setup_wizard.js
+++ /dev/null
@@ -1,183 +0,0 @@
-// ERPNext - web based ERP (http://erpnext.com)
-// Copyright (C) 2012 Web Notes Technologies Pvt Ltd
-// 
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-pscript['onload_Setup Wizard'] = function()
-{   
-
-  // header and toolbar
-  var h = new PageHeader('setup_wizard_wrapper','Setup Wizard','All important setup items in one place');
-
-  pscript.setup_wizard_callback();
-}
-
-// ==================================================================================================
-
-pscript.setup_wizard_callback = function(){
-    var items = {};
-    items['Customer'] = new pscript.Setup_Wizard_Obj('Customer', 'customer_name', 0, '', 'Customer', 'Manage your customers',1);
-    items['Supplier'] = new pscript.Setup_Wizard_Obj('Supplier', 'supplier_name', 0, '', 'Supplier', 'Manage your supplier',1);
-    items['Item'] = new pscript.Setup_Wizard_Obj('Item', 'item_name', 0, '', 'Item', 'Create your items',1);
-    //items['Customer Group'] = new pscript.Setup_Wizard_Obj('Customer Group', 'group_name', 0, '', 'Customer Group', 'Organizes your customers for better analysis');
-    items['Price List'] = new pscript.Setup_Wizard_Obj('Price List', 'price_list_name', 0, '', 'Price List', 'Helps you maintain different prices for different customers, currencies etc.');
-    items['Supplier Type'] = new pscript.Setup_Wizard_Obj('Supplier Type', 'supplier_type', 0, '', 'Supplier Type', 'Organizes your suppliers for better analysis');
-    //items['Item Group'] = new pscript.Setup_Wizard_Obj('Item Group', 'group_name', 0, '', 'Item Group', 'Organizes your items for better analysis');
-    items['UoM'] = new pscript.Setup_Wizard_Obj('UOM', 'uom_name', 0, '', 'UOM', 'Maintain multiple Units of Measure (UOM)');
-    items['Warehouse Type'] = new pscript.Setup_Wizard_Obj('Warehouse Type', 'warehouse_type', 0, '', 'Warehouse Type', 'Define types of warehouses');
-    items['Warehouse'] = new pscript.Setup_Wizard_Obj('Warehouse', 'warehouse_name', 'warehouse_type', 'Warehouse Type', 'Warehouse', 'Manage stock across different warehouses');
-    items['Print Heading'] = new pscript.Setup_Wizard_Obj('Print Heading', 'print_heading', 'transaction', 'Transaction', 'Print Heading', 'Define print heading for various transaction.');
-    items['Warehouse Type'].onmake = function(){
-       items['Warehouse'].refresh_select('warehouse_type', 'Warehouse Type', 'Warehouse');
-    }
-    items['Print Heading'].onmake = function(){
-       items['Print Heading'].refresh_select('transaction', 'Transaction', 'Print Heading');
-    }
-}
-
-// ==================================================================================================
-pscript.Setup_Wizard_Obj = function(lbl, name_field, opt_fieldname, opt_field_tbl, dt, desc, important) 
-{
-    this.lbl = lbl;
-    this.make_body(lbl, important);
-    if(lbl != 'Item')
-      this.make_input(name_field);
-    if(opt_fieldname){
-      this.make_select(opt_fieldname, opt_field_tbl, dt);
-    }
-   
-    this.show_description(desc);
-    this.make_button();
-    this.create_doc_link(dt);
-
-}
-
-pscript.Setup_Wizard_Obj.prototype.make_body = function(lbl, important) {
-    var wrapper = $a($i('setup_wizard_wrapper'), 'div', '', {padding:'8px', borderBottom: '1px solid #AAA'});
-    if(important)$y(wrapper, {backgroundColor:'#FFD'});
-    this.tab = make_table(wrapper,1,3,'90%',['20%','50%','30%'], {padding:'2px 0px', verticalAlign:'middle'});
-    this.desc_area = $a(wrapper,'div','comment');
-    
-    $td(this.tab,0,0).innerHTML = lbl.bold();
-}
-
-pscript.Setup_Wizard_Obj.prototype.make_input = function(name_field){
-    this.input = $a_input($td(this.tab,0,1), 'text');
-    this.name_field = name_field;
-}
-
-pscript.Setup_Wizard_Obj.prototype.make_select = function(fn, ft, dt){
-    this.select = $a($td(this.tab,0,1), 'select', '', {width:'120px', marginLeft:'8px'});
-    this.opt_field = fn;
-    this.sel_field = 'Select ' + ft + '...';
-    this.refresh_select(fn, ft, dt);
-}                
-
-pscript.Setup_Wizard_Obj.prototype.refresh_select = function(fn, ft, dt){
-  var me = this;
-  if(ft == 'Transaction'){
-    empty_select(me.select);
-    add_sel_options(me.select, ['Select Transaction ...','Purchase Order','Sales Order','Service Order','Purchase Receipt','Delivery Note','Receivable Voucher','Payable Voucher','Journal Voucher']);
-  }
-  else{
-    $c_obj('Setup Wizard Control', 'get_master_lists','', function(r,rt){
-      var ft_lst = [];
-      if(r.message) ft_lst = r.message;
-      ft_lst.push('Select Warehouse Type ...');
-      empty_select(me.select);
-      add_sel_options(me.select, ft_lst.reverse(), 'Warehouse Type');
-    });
-  }
-}  
- 
-pscript.Setup_Wizard_Obj.prototype.make_button = function(){   
-    var me = this;
-
-    var create = $a($td(this.tab,0,1), 'button', '', {marginLeft:'8px'});
-    create.innerHTML = 'Create';
-    
-    create.onclick = function(){
-        me.create_record(this);
-    }
-}
-
-// show description
-pscript.Setup_Wizard_Obj.prototype.show_description=function(desc){ 
-    this.desc_area.innerHTML = desc;
-}
-
-// create link to show listing of all records
-pscript.Setup_Wizard_Obj.prototype.create_doc_link = function(doc_link){  
-    this.obj_link = $a($td(this.tab,0,2), 'span', 'link_type',{marginLeft:'8px'});
-    this.obj_link.innerHTML = 'View ' + doc_link + ' list';
-    this.dt = doc_link;
-
-    this.obj_link.onclick = function(){
-      if(doc_link == 'Customer') doc_lst = 'customer_group'+NEWLINE+'country';
-      else if(doc_link == 'Supplier') doc_lst = 'supplier_type'+NEWLINE+'supplier_status'+NEWLINE+'company';
-      else if(doc_link == 'Item') doc_lst = 'item_group'+NEWLINE+'description';
-        
-      if(doc_link == 'Customer' || doc_link == 'Supplier' || doc_link == 'Item')
-        loaddocbrowser(doc_link,doc_link, doc_lst);
-      else
-        loaddocbrowser(doc_link);
-    }
-}    
-pscript.Setup_Wizard_Obj.prototype.create_record = function(cur_obj)
-{   
-    var me = this;
-    if(me.lbl == 'Item'){ me.create_master_rec(); }
-    else{
-      if(this.input.value) { //check for input value
-        
-        if (this.select && (this.sel_field == this.select.value)){ //check for value is selected or not
-          alert('Please select '+this.select.value);  
-          this.input.value = '';
-        }
-        else{
-          args = {};
-          args['Doctype'] = this.dt;
-          if(strip(this.input.value) == ''){ alert("Please enter proper name."); me.input.value = '';}
-          else{
-            if(me.lbl == 'Customer' || me.lbl == 'Supplier'){ this.create_master_rec(); }
-            else{
-              args[this.name_field] = this.input.value;
-              args[this.opt_field] = this.opt_field ? this.select.value : '';
-              
-              $c_obj('Setup Wizard Control', 'create_record', JSON.stringify(args), function(r,rt){        
-                alert(r.message);
-                me.input.value = '';
-                if(me.onmake) me.onmake();  
-              });
-            }
-          }
-        }
-      }
-      else
-        alert("Please enter " +this.dt);
-    }
-}
-
-pscript.Setup_Wizard_Obj.prototype.create_master_rec = function(){
-  var me = this;
-  var fn = function(new_docname) {
-    var new_doc = locals[me.lbl][new_docname];
-    if(me.lbl == 'Customer')
-      new_doc.customer_name = me.input.value;
-    else if(me.lbl == 'Supplier')
-      new_doc.supplier_name = me.input.value;
-  }
-  new_doc(me.lbl, fn);
-  
-}
\ No newline at end of file
diff --git a/erpnext/setup/page/setup_wizard/setup_wizard.txt b/erpnext/setup/page/setup_wizard/setup_wizard.txt
deleted file mode 100644
index 4017586..0000000
--- a/erpnext/setup/page/setup_wizard/setup_wizard.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-# Page, Setup Wizard
-[
-
-	# These values are common in all dictionaries
-	{
-		'creation': '2010-10-12 15:19:32',
-		'docstatus': 0,
-		'modified': '2010-09-25 00:00:00',
-		'modified_by': 'Administrator',
-		'owner': 'Administrator'
-	},
-
-	# These values are common for all Page
-	{
-		'doctype': 'Page',
-		'module': 'Setup',
-		'name': '__common__',
-		'page_name': 'Setup Wizard',
-		'show_in_menu': 0,
-		'standard': 'Yes'
-	},
-
-	# These values are common for all Page Role
-	{
-		'doctype': 'Page Role',
-		'idx': 1,
-		'name': '__common__',
-		'parent': 'Setup Wizard',
-		'parentfield': 'roles',
-		'parenttype': 'Page',
-		'role': 'System Manager'
-	},
-
-	# Page, Setup Wizard
-	{
-		'doctype': 'Page',
-		'name': 'Setup Wizard'
-	},
-
-	# Page Role
-	{
-		'doctype': 'Page Role'
-	}
-]
\ No newline at end of file
diff --git a/erpnext/setup/page/setup_wizard/setup_wizard_static.html b/erpnext/setup/page/setup_wizard/setup_wizard_static.html
deleted file mode 100644
index 281c686..0000000
--- a/erpnext/setup/page/setup_wizard/setup_wizard_static.html
+++ /dev/null
@@ -1 +0,0 @@
-<div></div>
\ No newline at end of file
diff --git a/erpnext/stock/doctype/bin/bin.txt b/erpnext/stock/doctype/bin/bin.txt
index 6a40297..c0c525e 100644
--- a/erpnext/stock/doctype/bin/bin.txt
+++ b/erpnext/stock/doctype/bin/bin.txt
@@ -5,244 +5,224 @@
 	{
 		'creation': '2010-08-08 17:08:52',
 		'docstatus': 0,
-		'modified': '2010-12-16 23:57:05',
-		'modified_by': 'nabin@webnotestech.com',
-		'owner': 'Administrator'
+		'modified': '2012-03-21 14:07:49',
+		'modified_by': u'Administrator',
+		'owner': u'Administrator'
 	},
 
 	# These values are common for all DocType
 	{
-		'_last_update': '1308741898',
-		'autoname': 'BIN/.#######',
-		'colour': 'White:FFF',
+		'_last_update': u'1322549701',
+		'autoname': u'BIN/.#######',
+		'colour': u'White:FFF',
+		'default_print_format': u'Standard',
 		'doctype': 'DocType',
 		'hide_toolbar': 1,
 		'in_create': 1,
-		'module': 'Stock',
+		'module': u'Stock',
 		'name': '__common__',
 		'read_only': 0,
-		'search_fields': 'item_code,warehouse',
-		'section_style': 'Simple',
-		'server_code_error': ' ',
+		'search_fields': u'item_code,warehouse',
+		'section_style': u'Simple',
+		'server_code_error': u' ',
 		'show_in_menu': 0,
-		'version': 114
+		'version': 115
 	},
 
 	# These values are common for all DocField
 	{
-		'doctype': 'DocField',
+		'doctype': u'DocField',
 		'name': '__common__',
-		'parent': 'Bin',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
+		'parent': u'Bin',
+		'parentfield': u'fields',
+		'parenttype': u'DocType',
 		'permlevel': 1
 	},
 
 	# These values are common for all DocPerm
 	{
-		'doctype': 'DocPerm',
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': u'DocPerm',
 		'name': '__common__',
-		'parent': 'Bin',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'read': 1
+		'parent': u'Bin',
+		'parentfield': u'permissions',
+		'parenttype': u'DocType',
+		'read': 1,
+		'submit': 0,
+		'write': 0
 	},
 
 	# DocType, Bin
 	{
 		'doctype': 'DocType',
-		'name': 'Bin'
+		'name': u'Bin'
 	},
 
 	# DocPerm
 	{
-		'doctype': 'DocPerm',
-		'idx': 1,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'Sales Manager'
+		'role': u'Sales Manager'
 	},
 
 	# DocPerm
 	{
-		'doctype': 'DocPerm',
-		'idx': 2,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'Sales User'
+		'role': u'Sales User'
 	},
 
 	# DocPerm
 	{
-		'doctype': 'DocPerm',
-		'idx': 3,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'Purchase Manager'
+		'role': u'Purchase Manager'
 	},
 
 	# DocPerm
 	{
-		'doctype': 'DocPerm',
-		'idx': 4,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'Purchase User'
+		'role': u'Purchase User'
 	},
 
 	# DocPerm
 	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'doctype': 'DocPerm',
-		'idx': 5,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'Material User',
-		'submit': 0,
-		'write': 0
+		'role': u'Material User'
 	},
 
 	# DocPerm
 	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'doctype': 'DocPerm',
-		'idx': 6,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'Material Manager',
-		'submit': 0,
-		'write': 0
+		'role': u'Material Manager'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'warehouse',
-		'fieldtype': 'Link',
-		'idx': 1,
+		'doctype': u'DocField',
+		'fieldname': u'warehouse',
+		'fieldtype': u'Link',
 		'in_filter': 1,
-		'label': 'Warehouse',
-		'oldfieldname': 'warehouse',
-		'oldfieldtype': 'Link',
-		'options': 'Warehouse',
+		'label': u'Warehouse',
+		'oldfieldname': u'warehouse',
+		'oldfieldtype': u'Link',
+		'options': u'Warehouse',
 		'search_index': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'warehouse_type',
-		'fieldtype': 'Data',
-		'idx': 2,
-		'label': 'Warehouse Type',
-		'oldfieldname': 'warehouse_type',
-		'oldfieldtype': 'Data'
+		'doctype': u'DocField',
+		'fieldname': u'warehouse_type',
+		'fieldtype': u'Data',
+		'label': u'Warehouse Type',
+		'oldfieldname': u'warehouse_type',
+		'oldfieldtype': u'Data'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'item_code',
-		'fieldtype': 'Link',
-		'idx': 3,
+		'doctype': u'DocField',
+		'fieldname': u'item_code',
+		'fieldtype': u'Link',
 		'in_filter': 1,
-		'label': 'Item Code',
-		'oldfieldname': 'item_code',
-		'oldfieldtype': 'Link',
-		'options': 'Item',
+		'label': u'Item Code',
+		'oldfieldname': u'item_code',
+		'oldfieldtype': u'Link',
+		'options': u'Item',
 		'search_index': 1
 	},
 
 	# DocField
 	{
-		'default': '0.00',
-		'doctype': 'DocField',
-		'fieldname': 'reserved_qty',
-		'fieldtype': 'Currency',
-		'idx': 5,
-		'in_filter': 1,
-		'label': 'Reserved Quantity',
-		'oldfieldname': 'reserved_qty',
-		'oldfieldtype': 'Currency',
-		'search_index': 0
-	},
-
-	# DocField
-	{
-		'default': '0.00',
-		'doctype': 'DocField',
-		'fieldname': 'actual_qty',
-		'fieldtype': 'Currency',
-		'idx': 6,
-		'in_filter': 1,
-		'label': 'Actual Quantity',
-		'oldfieldname': 'actual_qty',
-		'oldfieldtype': 'Currency',
-		'search_index': 0
-	},
-
-	# DocField
-	{
-		'default': '0.00',
-		'doctype': 'DocField',
-		'fieldname': 'ordered_qty',
-		'fieldtype': 'Currency',
-		'idx': 7,
-		'in_filter': 1,
-		'label': 'Ordered Quantity',
-		'oldfieldname': 'ordered_qty',
-		'oldfieldtype': 'Currency',
-		'search_index': 0
-	},
-
-	# DocField
-	{
-		'default': '0.00',
-		'doctype': 'DocField',
-		'fieldname': 'indented_qty',
-		'fieldtype': 'Currency',
-		'idx': 8,
-		'in_filter': 1,
-		'label': 'Indented Quantity',
-		'oldfieldname': 'indented_qty',
-		'oldfieldtype': 'Currency',
-		'search_index': 0
-	},
-
-	# DocField
-	{
-		'doctype': 'DocField',
-		'fieldname': 'planned_qty',
-		'fieldtype': 'Currency',
-		'idx': 9,
-		'in_filter': 1,
-		'label': 'Planned Qty',
-		'oldfieldname': 'planned_qty',
-		'oldfieldtype': 'Currency',
-		'search_index': 0
-	},
-
-	# DocField
-	{
-		'doctype': 'DocField',
-		'fieldname': 'projected_qty',
-		'fieldtype': 'Currency',
-		'idx': 10,
-		'in_filter': 1,
-		'label': 'Projected Qty',
-		'oldfieldname': 'projected_qty',
-		'oldfieldtype': 'Currency'
-	},
-
-	# DocField
-	{
-		'doctype': 'DocField',
-		'fieldname': 'ma_rate',
-		'fieldtype': 'Currency',
-		'hidden': 1,
-		'idx': 11,
+		'default': u'0.00',
+		'doctype': u'DocField',
+		'fieldname': u'reserved_qty',
+		'fieldtype': u'Currency',
 		'in_filter': 0,
-		'label': 'Moving Average Rate',
-		'oldfieldname': 'ma_rate',
-		'oldfieldtype': 'Currency',
+		'label': u'Reserved Quantity',
+		'oldfieldname': u'reserved_qty',
+		'oldfieldtype': u'Currency',
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'default': u'0.00',
+		'doctype': u'DocField',
+		'fieldname': u'actual_qty',
+		'fieldtype': u'Currency',
+		'in_filter': 0,
+		'label': u'Actual Quantity',
+		'oldfieldname': u'actual_qty',
+		'oldfieldtype': u'Currency',
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'default': u'0.00',
+		'doctype': u'DocField',
+		'fieldname': u'ordered_qty',
+		'fieldtype': u'Currency',
+		'in_filter': 0,
+		'label': u'Ordered Quantity',
+		'oldfieldname': u'ordered_qty',
+		'oldfieldtype': u'Currency',
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'default': u'0.00',
+		'doctype': u'DocField',
+		'fieldname': u'indented_qty',
+		'fieldtype': u'Currency',
+		'in_filter': 0,
+		'label': u'Indented Quantity',
+		'oldfieldname': u'indented_qty',
+		'oldfieldtype': u'Currency',
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': u'DocField',
+		'fieldname': u'planned_qty',
+		'fieldtype': u'Currency',
+		'in_filter': 0,
+		'label': u'Planned Qty',
+		'oldfieldname': u'planned_qty',
+		'oldfieldtype': u'Currency',
+		'search_index': 0
+	},
+
+	# DocField
+	{
+		'doctype': u'DocField',
+		'fieldname': u'projected_qty',
+		'fieldtype': u'Currency',
+		'in_filter': 0,
+		'label': u'Projected Qty',
+		'oldfieldname': u'projected_qty',
+		'oldfieldtype': u'Currency'
+	},
+
+	# DocField
+	{
+		'doctype': u'DocField',
+		'fieldname': u'ma_rate',
+		'fieldtype': u'Currency',
+		'hidden': 1,
+		'in_filter': 0,
+		'label': u'Moving Average Rate',
+		'oldfieldname': u'ma_rate',
+		'oldfieldtype': u'Currency',
 		'print_hide': 1,
 		'report_hide': 1,
 		'search_index': 0
@@ -250,50 +230,46 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'stock_uom',
-		'fieldtype': 'Data',
-		'idx': 12,
+		'doctype': u'DocField',
+		'fieldname': u'stock_uom',
+		'fieldtype': u'Data',
 		'in_filter': 1,
-		'label': 'UOM',
-		'oldfieldname': 'stock_uom',
-		'oldfieldtype': 'Data',
+		'label': u'UOM',
+		'oldfieldname': u'stock_uom',
+		'oldfieldtype': u'Data',
 		'search_index': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'fcfs_rate',
-		'fieldtype': 'Currency',
+		'doctype': u'DocField',
+		'fieldname': u'fcfs_rate',
+		'fieldtype': u'Currency',
 		'hidden': 1,
-		'idx': 12,
-		'label': 'FCFS Rate',
-		'oldfieldname': 'fcfs_rate',
-		'oldfieldtype': 'Currency',
+		'label': u'FCFS Rate',
+		'oldfieldname': u'fcfs_rate',
+		'oldfieldtype': u'Currency',
 		'print_hide': 1,
 		'report_hide': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'valuation_rate',
-		'fieldtype': 'Currency',
-		'idx': 13,
-		'label': 'Valuation Rate',
-		'oldfieldname': 'valuation_rate',
-		'oldfieldtype': 'Currency'
+		'doctype': u'DocField',
+		'fieldname': u'valuation_rate',
+		'fieldtype': u'Currency',
+		'label': u'Valuation Rate',
+		'oldfieldname': u'valuation_rate',
+		'oldfieldtype': u'Currency'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'stock_value',
-		'fieldtype': 'Currency',
-		'idx': 14,
-		'label': 'Stock Value',
-		'oldfieldname': 'stock_value',
-		'oldfieldtype': 'Currency'
+		'doctype': u'DocField',
+		'fieldname': u'stock_value',
+		'fieldtype': u'Currency',
+		'label': u'Stock Value',
+		'oldfieldname': u'stock_value',
+		'oldfieldtype': u'Currency'
 	}
 ]
\ No newline at end of file
diff --git a/erpnext/stock/doctype/landed_cost_detail/landed_cost_detail.txt b/erpnext/stock/doctype/landed_cost_detail/landed_cost_detail.txt
index 57c7370..9792f33 100644
--- a/erpnext/stock/doctype/landed_cost_detail/landed_cost_detail.txt
+++ b/erpnext/stock/doctype/landed_cost_detail/landed_cost_detail.txt
@@ -5,31 +5,32 @@
 	{
 		'creation': '2010-08-08 17:09:06',
 		'docstatus': 0,
-		'modified': '2011-06-30 18:47:46',
-		'modified_by': 'Administrator',
-		'owner': 'wasim@webnotestech.com'
+		'modified': '2012-03-21 14:58:34',
+		'modified_by': u'Administrator',
+		'owner': u'wasim@webnotestech.com'
 	},
 
 	# These values are common for all DocType
 	{
-		'colour': 'White:FFF',
+		'colour': u'White:FFF',
+		'default_print_format': u'Standard',
 		'doctype': 'DocType',
 		'istable': 1,
-		'module': 'Stock',
+		'module': u'Stock',
 		'name': '__common__',
-		'section_style': 'Simple',
-		'server_code_error': ' ',
+		'section_style': u'Simple',
+		'server_code_error': u' ',
 		'show_in_menu': 0,
 		'version': 2
 	},
 
 	# These values are common for all DocField
 	{
-		'doctype': 'DocField',
+		'doctype': u'DocField',
 		'name': '__common__',
-		'parent': 'Landed Cost Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
+		'parent': u'Landed Cost Detail',
+		'parentfield': u'fields',
+		'parenttype': u'DocType',
 		'permlevel': 0,
 		'reqd': 1
 	},
@@ -37,42 +38,39 @@
 	# DocType, Landed Cost Detail
 	{
 		'doctype': 'DocType',
-		'name': 'Landed Cost Detail'
+		'name': u'Landed Cost Detail'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'account_head',
-		'fieldtype': 'Link',
-		'idx': 1,
-		'label': 'Account Head',
-		'oldfieldname': 'account_head',
-		'oldfieldtype': 'Link',
-		'options': 'Account',
+		'doctype': u'DocField',
+		'fieldname': u'account_head',
+		'fieldtype': u'Link',
+		'label': u'Account Head',
+		'oldfieldname': u'account_head',
+		'oldfieldtype': u'Link',
+		'options': u'Account',
 		'search_index': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'description',
-		'fieldtype': 'Data',
-		'idx': 2,
-		'label': 'Description',
-		'oldfieldname': 'description',
-		'oldfieldtype': 'Data',
-		'width': '300px'
+		'doctype': u'DocField',
+		'fieldname': u'description',
+		'fieldtype': u'Data',
+		'label': u'Description',
+		'oldfieldname': u'description',
+		'oldfieldtype': u'Data',
+		'width': u'300px'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'amount',
-		'fieldtype': 'Currency',
-		'idx': 3,
-		'label': 'Amount',
-		'oldfieldname': 'amount',
-		'oldfieldtype': 'Currency'
+		'doctype': u'DocField',
+		'fieldname': u'amount',
+		'fieldtype': u'Currency',
+		'label': u'Amount',
+		'oldfieldname': u'amount',
+		'oldfieldtype': u'Currency'
 	}
 ]
\ No newline at end of file
diff --git a/erpnext/stock/doctype/ref_rate_detail/ref_rate_detail.txt b/erpnext/stock/doctype/ref_rate_detail/ref_rate_detail.txt
index 3f9b5a7..5e17acd 100644
--- a/erpnext/stock/doctype/ref_rate_detail/ref_rate_detail.txt
+++ b/erpnext/stock/doctype/ref_rate_detail/ref_rate_detail.txt
@@ -5,35 +5,36 @@
 	{
 		'creation': '2010-08-08 17:09:19',
 		'docstatus': 0,
-		'modified': '2011-08-31 11:36:41',
-		'modified_by': 'Administrator',
-		'owner': 'Administrator'
+		'modified': '2012-03-21 14:57:41',
+		'modified_by': u'Administrator',
+		'owner': u'Administrator'
 	},
 
 	# These values are common for all DocType
 	{
-		'autoname': 'RFD/.#####',
-		'colour': 'White:FFF',
+		'autoname': u'RFD/.#####',
+		'colour': u'White:FFF',
+		'default_print_format': u'Standard',
 		'doctype': 'DocType',
 		'in_create': 1,
 		'istable': 1,
-		'module': 'Stock',
+		'module': u'Stock',
 		'name': '__common__',
 		'read_only': 0,
-		'section_style': 'Tray',
-		'server_code_error': ' ',
+		'section_style': u'Tray',
+		'server_code_error': u' ',
 		'show_in_menu': 0,
 		'version': 3
 	},
 
 	# These values are common for all DocField
 	{
-		'doctype': 'DocField',
+		'doctype': u'DocField',
 		'in_filter': 1,
 		'name': '__common__',
-		'parent': 'Ref Rate Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
+		'parent': u'Ref Rate Detail',
+		'parentfield': u'fields',
+		'parenttype': u'DocType',
 		'permlevel': 0,
 		'search_index': 1
 	},
@@ -41,42 +42,41 @@
 	# DocType, Ref Rate Detail
 	{
 		'doctype': 'DocType',
-		'name': 'Ref Rate Detail'
+		'name': u'Ref Rate Detail'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'price_list_name',
-		'fieldtype': 'Select',
-		'label': 'Price List Name',
-		'oldfieldname': 'price_list_name',
-		'oldfieldtype': 'Select',
-		'options': 'link:Price List',
-		'reqd': 1,
-		'trigger': 'Client'
+		'doctype': u'DocField',
+		'fieldname': u'price_list_name',
+		'fieldtype': u'Select',
+		'label': u'Price List Name',
+		'oldfieldname': u'price_list_name',
+		'oldfieldtype': u'Select',
+		'options': u'link:Price List',
+		'reqd': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'ref_rate',
-		'fieldtype': 'Currency',
-		'label': 'Ref Rate',
-		'oldfieldname': 'ref_rate',
-		'oldfieldtype': 'Currency',
+		'doctype': u'DocField',
+		'fieldname': u'ref_rate',
+		'fieldtype': u'Currency',
+		'label': u'Ref Rate',
+		'oldfieldname': u'ref_rate',
+		'oldfieldtype': u'Currency',
 		'reqd': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'ref_currency',
-		'fieldtype': 'Select',
-		'label': 'Currency',
-		'oldfieldname': 'ref_currency',
-		'oldfieldtype': 'Select',
-		'options': 'link:Currency',
+		'doctype': u'DocField',
+		'fieldname': u'ref_currency',
+		'fieldtype': u'Select',
+		'label': u'Currency',
+		'oldfieldname': u'ref_currency',
+		'oldfieldtype': u'Select',
+		'options': u'link:Currency',
 		'reqd': 1
 	}
 ]
\ No newline at end of file
diff --git a/erpnext/stock/doctype/sales_bom/sales_bom.txt b/erpnext/stock/doctype/sales_bom/sales_bom.txt
index b97458a..2e80a37 100644
--- a/erpnext/stock/doctype/sales_bom/sales_bom.txt
+++ b/erpnext/stock/doctype/sales_bom/sales_bom.txt
@@ -5,48 +5,50 @@
 	{
 		'creation': '2010-08-08 17:09:21',
 		'docstatus': 0,
-		'modified': '2010-12-23 11:43:34',
-		'modified_by': 'umair@iwebnotes.com',
-		'owner': 'Administrator'
+		'modified': '2012-03-21 14:55:47',
+		'modified_by': u'Administrator',
+		'owner': u'Administrator'
 	},
 
 	# These values are common for all DocType
 	{
+		'_last_update': u'1322549701',
 		'allow_trash': 1,
-		'colour': 'White:FFF',
+		'colour': u'White:FFF',
+		'default_print_format': u'Standard',
 		'doctype': 'DocType',
-		'document_type': 'Master',
-		'module': 'Stock',
+		'document_type': u'Master',
+		'module': u'Stock',
 		'name': '__common__',
-		'section_style': 'Simple',
-		'server_code_error': ' ',
+		'section_style': u'Simple',
+		'server_code_error': u' ',
 		'show_in_menu': 0,
-		'version': 37
+		'version': 40
 	},
 
 	# These values are common for all DocField
 	{
-		'doctype': 'DocField',
+		'doctype': u'DocField',
 		'name': '__common__',
-		'parent': 'Sales BOM',
-		'parentfield': 'fields',
-		'parenttype': 'DocType'
+		'parent': u'Sales BOM',
+		'parentfield': u'fields',
+		'parenttype': u'DocType'
 	},
 
 	# These values are common for all DocPerm
 	{
-		'doctype': 'DocPerm',
+		'doctype': u'DocPerm',
 		'name': '__common__',
-		'parent': 'Sales BOM',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
+		'parent': u'Sales BOM',
+		'parentfield': u'permissions',
+		'parenttype': u'DocType',
 		'read': 1
 	},
 
 	# DocType, Sales BOM
 	{
 		'doctype': 'DocType',
-		'name': 'Sales BOM'
+		'name': u'Sales BOM'
 	},
 
 	# DocPerm
@@ -54,10 +56,9 @@
 		'amend': 0,
 		'cancel': 0,
 		'create': 0,
-		'doctype': 'DocPerm',
-		'idx': 1,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'Material Manager',
+		'role': u'Material Manager',
 		'submit': 0,
 		'write': 0
 	},
@@ -67,10 +68,9 @@
 		'amend': 1,
 		'cancel': 1,
 		'create': 1,
-		'doctype': 'DocPerm',
-		'idx': 2,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'Material Manager',
+		'role': u'Material Manager',
 		'submit': 1,
 		'write': 1
 	},
@@ -80,10 +80,9 @@
 		'amend': 0,
 		'cancel': 0,
 		'create': 0,
-		'doctype': 'DocPerm',
-		'idx': 3,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'Material User',
+		'role': u'Material User',
 		'submit': 0,
 		'write': 0
 	},
@@ -93,10 +92,9 @@
 		'amend': 0,
 		'cancel': 0,
 		'create': 0,
-		'doctype': 'DocPerm',
-		'idx': 4,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'Material User',
+		'role': u'Material User',
 		'submit': 0,
 		'write': 0
 	},
@@ -106,10 +104,9 @@
 		'amend': 0,
 		'cancel': 1,
 		'create': 1,
-		'doctype': 'DocPerm',
-		'idx': 5,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'Sales User',
+		'role': u'Sales User',
 		'submit': 0,
 		'write': 1
 	},
@@ -119,156 +116,143 @@
 		'amend': 0,
 		'cancel': 0,
 		'create': 0,
-		'doctype': 'DocPerm',
-		'idx': 6,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'Sales User',
+		'role': u'Sales User',
 		'submit': 0,
 		'write': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'trash_reason',
-		'fieldtype': 'Small Text',
-		'idx': 1,
-		'label': 'Trash Reason',
-		'oldfieldname': 'trash_reason',
-		'oldfieldtype': 'Small Text',
+		'doctype': u'DocField',
+		'fieldname': u'trash_reason',
+		'fieldtype': u'Small Text',
+		'label': u'Trash Reason',
+		'oldfieldname': u'trash_reason',
+		'oldfieldtype': u'Small Text',
 		'permlevel': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'new_item_code',
-		'fieldtype': 'Data',
-		'idx': 2,
-		'label': 'New Item Code',
+		'doctype': u'DocField',
+		'fieldname': u'new_item_code',
+		'fieldtype': u'Data',
+		'label': u'New Item Code',
 		'no_copy': 1,
-		'oldfieldname': 'new_item_code',
-		'oldfieldtype': 'Data',
+		'oldfieldname': u'new_item_code',
+		'oldfieldtype': u'Data',
 		'permlevel': 1,
 		'reqd': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'new_item_name',
-		'fieldtype': 'Data',
-		'idx': 3,
-		'label': 'New Item Name',
-		'oldfieldname': 'new_item_name',
-		'oldfieldtype': 'Data',
+		'doctype': u'DocField',
+		'fieldname': u'new_item_name',
+		'fieldtype': u'Data',
+		'label': u'New Item Name',
+		'oldfieldname': u'new_item_name',
+		'oldfieldtype': u'Data',
+		'permlevel': 0
+	},
+
+	# DocField
+	{
+		'doctype': u'DocField',
+		'fieldname': u'new_item_brand',
+		'fieldtype': u'Data',
+		'label': u'New Item Brand',
+		'oldfieldname': u'new_item_brand',
+		'oldfieldtype': u'Data',
 		'permlevel': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'new_item_brand',
-		'fieldtype': 'Data',
-		'idx': 4,
-		'label': 'New Item Brand',
-		'oldfieldname': 'new_item_brand',
-		'oldfieldtype': 'Data',
-		'permlevel': 1
-	},
-
-	# DocField
-	{
-		'doctype': 'DocField',
-		'fieldname': 'description',
-		'fieldtype': 'Text',
-		'idx': 5,
-		'label': 'New Description',
-		'oldfieldname': 'description',
-		'oldfieldtype': 'Text',
+		'doctype': u'DocField',
+		'fieldname': u'description',
+		'fieldtype': u'Text',
+		'label': u'New Description',
+		'oldfieldname': u'description',
+		'oldfieldtype': u'Text',
 		'permlevel': 1,
-		'width': '300px'
+		'width': u'300px'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'item_group',
-		'fieldtype': 'Link',
-		'idx': 7,
-		'label': 'Item Group',
-		'oldfieldname': 'item_group',
-		'oldfieldtype': 'Link',
-		'options': 'Item Group',
+		'doctype': u'DocField',
+		'fieldname': u'item_group',
+		'fieldtype': u'Link',
+		'label': u'Item Group',
+		'oldfieldname': u'item_group',
+		'oldfieldtype': u'Link',
+		'options': u'Item Group',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldname': 'price_list',
-		'fieldtype': 'Select',
-		'idx': 8,
-		'label': 'Price List',
-		'oldfieldname': 'price_list',
-		'oldfieldtype': 'Select',
-		'options': 'link:Price List',
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldname': u'price_list',
+		'fieldtype': u'Select',
+		'label': u'Price List',
+		'oldfieldname': u'price_list',
+		'oldfieldtype': u'Select',
+		'options': u'link:Price List',
 		'permlevel': 0,
-		'trigger': 'Client'
+		'trigger': u'Client'
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldname': 'currency',
-		'fieldtype': 'Select',
-		'idx': 9,
-		'label': 'Currency',
-		'oldfieldname': 'currency',
-		'oldfieldtype': 'Select',
-		'options': 'link:Currency',
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldname': u'currency',
+		'fieldtype': u'Select',
+		'label': u'Currency',
+		'oldfieldname': u'currency',
+		'oldfieldtype': u'Select',
+		'options': u'link:Currency',
 		'permlevel': 0,
-		'trigger': 'Client'
+		'trigger': u'Client'
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldtype': 'Button',
-		'idx': 10,
-		'label': 'Find Sales BOM',
-		'oldfieldtype': 'Button',
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldtype': u'Button',
+		'label': u'Find Sales BOM',
+		'oldfieldtype': u'Button',
 		'permlevel': 0,
-		'trigger': 'Client'
+		'trigger': u'Client'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'sales_bom_items',
-		'fieldtype': 'Table',
-		'idx': 11,
-		'label': 'Sales BOM Items',
-		'oldfieldname': 'sales_bom_items',
-		'oldfieldtype': 'Table',
-		'options': 'Sales BOM Detail',
+		'doctype': u'DocField',
+		'fieldname': u'sales_bom_items',
+		'fieldtype': u'Table',
+		'label': u'Sales BOM Items',
+		'oldfieldname': u'sales_bom_items',
+		'oldfieldtype': u'Table',
+		'options': u'Sales BOM Detail',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'stock_uom',
-		'fieldtype': 'Link',
-		'idx': 12,
-		'label': 'Stock UOM',
-		'oldfieldname': 'stock_uom',
-		'oldfieldtype': 'Link',
-		'options': 'UOM',
-		'permlevel': 0,
-		'search_index': 0
+		'doctype': u'DocField',
+		'fieldname': u'stock_uom',
+		'fieldtype': u'Link',
+		'label': u'Stock UOM',
+		'oldfieldname': u'stock_uom',
+		'oldfieldtype': u'Link',
+		'options': u'UOM',
+		'permlevel': 0
 	}
 ]
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt
index 823837a..bef15f8 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt
@@ -5,322 +5,305 @@
 	{
 		'creation': '2010-08-08 17:09:25',
 		'docstatus': 0,
-		'modified': '2011-06-02 15:42:37',
-		'modified_by': 'Administrator',
-		'owner': 'Administrator'
+		'modified': '2012-03-21 14:04:38',
+		'modified_by': u'Administrator',
+		'owner': u'Administrator'
 	},
 
 	# These values are common for all DocType
 	{
-		'_last_update': '1309508840',
-		'autoname': 'SLE/.########',
-		'colour': 'White:FFF',
+		'_last_update': u'1322549701',
+		'autoname': u'SLE/.########',
+		'colour': u'White:FFF',
+		'default_print_format': u'Standard',
 		'doctype': 'DocType',
 		'hide_toolbar': 1,
 		'in_create': 1,
-		'module': 'Stock',
+		'module': u'Stock',
 		'name': '__common__',
-		'section_style': 'Simple',
-		'server_code_error': ' ',
+		'section_style': u'Simple',
+		'server_code_error': u' ',
 		'show_in_menu': 0,
 		'version': 53
 	},
 
 	# These values are common for all DocField
 	{
-		'doctype': 'DocField',
+		'doctype': u'DocField',
 		'name': '__common__',
-		'parent': 'Stock Ledger Entry',
-		'parentfield': 'fields',
-		'parenttype': 'DocType'
+		'parent': u'Stock Ledger Entry',
+		'parentfield': u'fields',
+		'parenttype': u'DocType'
 	},
 
 	# These values are common for all DocPerm
 	{
-		'doctype': 'DocPerm',
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'doctype': u'DocPerm',
 		'name': '__common__',
-		'parent': 'Stock Ledger Entry',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'read': 1
+		'parent': u'Stock Ledger Entry',
+		'parentfield': u'permissions',
+		'parenttype': u'DocType',
+		'read': 1,
+		'submit': 0,
+		'write': 0
 	},
 
 	# DocType, Stock Ledger Entry
 	{
 		'doctype': 'DocType',
-		'name': 'Stock Ledger Entry'
+		'name': u'Stock Ledger Entry'
 	},
 
 	# DocPerm
 	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'doctype': 'DocPerm',
-		'idx': 1,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'Material User',
-		'submit': 0,
-		'write': 0
+		'role': u'System Manager'
 	},
 
 	# DocPerm
 	{
-		'doctype': 'DocPerm',
-		'idx': 2,
+		'doctype': u'DocPerm',
+		'permlevel': 0,
+		'role': u'Material User'
+	},
+
+	# DocPerm
+	{
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'All'
+		'role': u'All'
 	},
 
 	# DocPerm
 	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'doctype': 'DocPerm',
-		'idx': 3,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'Material User',
-		'submit': 0,
-		'write': 0
+		'role': u'Material User'
 	},
 
 	# DocPerm
 	{
-		'doctype': 'DocPerm',
-		'idx': 4,
+		'doctype': u'DocPerm',
 		'permlevel': 2,
-		'role': 'System Manager'
+		'role': u'System Manager'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'item_code',
-		'fieldtype': 'Link',
-		'idx': 1,
+		'doctype': u'DocField',
+		'fieldname': u'item_code',
+		'fieldtype': u'Link',
 		'in_filter': 1,
-		'label': 'Item Code',
-		'oldfieldname': 'item_code',
-		'oldfieldtype': 'Link',
-		'options': 'Item',
+		'label': u'Item Code',
+		'oldfieldname': u'item_code',
+		'oldfieldtype': u'Link',
+		'options': u'Item',
 		'permlevel': 1,
 		'reqd': 0,
 		'search_index': 1,
-		'width': '100px'
+		'width': u'100px'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'serial_no',
-		'fieldtype': 'Text',
-		'idx': 2,
+		'doctype': u'DocField',
+		'fieldname': u'serial_no',
+		'fieldtype': u'Text',
 		'in_filter': 0,
-		'label': 'Serial No',
+		'label': u'Serial No',
 		'permlevel': 0,
 		'search_index': 0,
-		'width': '100px'
+		'width': u'100px'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'batch_no',
-		'fieldtype': 'Data',
-		'idx': 3,
-		'label': 'Batch No',
-		'oldfieldname': 'batch_no',
-		'oldfieldtype': 'Data',
+		'doctype': u'DocField',
+		'fieldname': u'batch_no',
+		'fieldtype': u'Data',
+		'label': u'Batch No',
+		'oldfieldname': u'batch_no',
+		'oldfieldtype': u'Data',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'warehouse',
-		'fieldtype': 'Link',
-		'idx': 4,
+		'doctype': u'DocField',
+		'fieldname': u'warehouse',
+		'fieldtype': u'Link',
 		'in_filter': 1,
-		'label': 'Warehouse',
-		'oldfieldname': 'warehouse',
-		'oldfieldtype': 'Link',
-		'options': 'Warehouse',
+		'label': u'Warehouse',
+		'oldfieldname': u'warehouse',
+		'oldfieldtype': u'Link',
+		'options': u'Warehouse',
 		'permlevel': 1,
 		'search_index': 1,
-		'width': '100px'
+		'width': u'100px'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'warehouse_type',
-		'fieldtype': 'Select',
-		'idx': 5,
+		'doctype': u'DocField',
+		'fieldname': u'warehouse_type',
+		'fieldtype': u'Select',
 		'in_filter': 1,
-		'label': 'Warehouse Type',
-		'oldfieldname': 'warehouse_type',
-		'oldfieldtype': 'Select',
-		'options': 'link:Warehouse Type',
+		'label': u'Warehouse Type',
+		'oldfieldname': u'warehouse_type',
+		'oldfieldtype': u'Select',
+		'options': u'link:Warehouse Type',
 		'permlevel': 1,
 		'search_index': 0
 	},
 
 	# DocField
 	{
-		'description': 'The date at which current entry will get or has actually executed.',
-		'doctype': 'DocField',
-		'fieldname': 'posting_date',
-		'fieldtype': 'Date',
-		'idx': 6,
+		'description': u'The date at which current entry will get or has actually executed.',
+		'doctype': u'DocField',
+		'fieldname': u'posting_date',
+		'fieldtype': u'Date',
 		'in_filter': 1,
-		'label': 'Posting Date',
-		'oldfieldname': 'posting_date',
-		'oldfieldtype': 'Date',
+		'label': u'Posting Date',
+		'oldfieldname': u'posting_date',
+		'oldfieldtype': u'Date',
 		'permlevel': 1,
 		'reqd': 0,
 		'search_index': 1,
-		'width': '100px'
+		'width': u'100px'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'posting_time',
-		'fieldtype': 'Time',
-		'idx': 7,
+		'doctype': u'DocField',
+		'fieldname': u'posting_time',
+		'fieldtype': u'Time',
 		'in_filter': 0,
-		'label': 'Posting Time',
-		'oldfieldname': 'posting_time',
-		'oldfieldtype': 'Time',
-		'permlevel': 1,
-		'search_index': 1,
-		'width': '100px'
-	},
-
-	# DocField
-	{
-		'description': 'The date at which current entry is made in system.',
-		'doctype': 'DocField',
-		'fieldname': 'transaction_date',
-		'fieldtype': 'Date',
-		'idx': 8,
-		'in_filter': 1,
-		'label': 'Transaction Date',
-		'oldfieldname': 'transaction_date',
-		'oldfieldtype': 'Date',
+		'label': u'Posting Time',
+		'oldfieldname': u'posting_time',
+		'oldfieldtype': u'Time',
 		'permlevel': 1,
 		'search_index': 0,
-		'width': '100px'
+		'width': u'100px'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'voucher_type',
-		'fieldtype': 'Data',
-		'idx': 9,
+		'description': u'The date at which current entry is made in system.',
+		'doctype': u'DocField',
+		'fieldname': u'transaction_date',
+		'fieldtype': u'Date',
 		'in_filter': 1,
-		'label': 'Voucher Type',
-		'oldfieldname': 'voucher_type',
-		'oldfieldtype': 'Data',
+		'label': u'Transaction Date',
+		'oldfieldname': u'transaction_date',
+		'oldfieldtype': u'Date',
 		'permlevel': 1,
 		'search_index': 0,
-		'width': '150px'
+		'width': u'100px'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'voucher_no',
-		'fieldtype': 'Data',
-		'idx': 10,
+		'doctype': u'DocField',
+		'fieldname': u'voucher_type',
+		'fieldtype': u'Data',
 		'in_filter': 1,
-		'label': 'Voucher No',
-		'oldfieldname': 'voucher_no',
-		'oldfieldtype': 'Data',
+		'label': u'Voucher Type',
+		'oldfieldname': u'voucher_type',
+		'oldfieldtype': u'Data',
 		'permlevel': 1,
 		'search_index': 0,
-		'width': '150px'
+		'width': u'150px'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'voucher_detail_no',
-		'fieldtype': 'Data',
-		'idx': 11,
-		'label': 'Voucher Detail No',
-		'oldfieldname': 'voucher_detail_no',
-		'oldfieldtype': 'Data',
-		'permlevel': 1,
-		'width': '150px'
-	},
-
-	# DocField
-	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldname': 'actual_qty',
-		'fieldtype': 'Currency',
-		'idx': 12,
+		'doctype': u'DocField',
+		'fieldname': u'voucher_no',
+		'fieldtype': u'Data',
 		'in_filter': 1,
-		'label': 'Actual Quantity',
-		'oldfieldname': 'actual_qty',
-		'oldfieldtype': 'Currency',
+		'label': u'Voucher No',
+		'oldfieldname': u'voucher_no',
+		'oldfieldtype': u'Data',
 		'permlevel': 1,
-		'width': '150px'
+		'search_index': 0,
+		'width': u'150px'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'incoming_rate',
-		'fieldtype': 'Currency',
-		'idx': 13,
-		'label': 'Incoming Rate',
-		'oldfieldname': 'incoming_rate',
-		'oldfieldtype': 'Currency',
+		'doctype': u'DocField',
+		'fieldname': u'voucher_detail_no',
+		'fieldtype': u'Data',
+		'label': u'Voucher Detail No',
+		'oldfieldname': u'voucher_detail_no',
+		'oldfieldtype': u'Data',
+		'permlevel': 1,
+		'width': u'150px'
+	},
+
+	# DocField
+	{
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldname': u'actual_qty',
+		'fieldtype': u'Currency',
+		'in_filter': 1,
+		'label': u'Actual Quantity',
+		'oldfieldname': u'actual_qty',
+		'oldfieldtype': u'Currency',
+		'permlevel': 1,
+		'width': u'150px'
+	},
+
+	# DocField
+	{
+		'doctype': u'DocField',
+		'fieldname': u'incoming_rate',
+		'fieldtype': u'Currency',
+		'label': u'Incoming Rate',
+		'oldfieldname': u'incoming_rate',
+		'oldfieldtype': u'Currency',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'stock_uom',
-		'fieldtype': 'Data',
-		'idx': 14,
-		'label': 'Stock UOM',
-		'oldfieldname': 'stock_uom',
-		'oldfieldtype': 'Data',
+		'doctype': u'DocField',
+		'fieldname': u'stock_uom',
+		'fieldtype': u'Data',
+		'label': u'Stock UOM',
+		'oldfieldname': u'stock_uom',
+		'oldfieldtype': u'Data',
 		'permlevel': 1,
-		'width': '150px'
+		'width': u'150px'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'bin_aqat',
-		'fieldtype': 'Currency',
-		'idx': 15,
+		'doctype': u'DocField',
+		'fieldname': u'bin_aqat',
+		'fieldtype': u'Currency',
 		'in_filter': 1,
-		'label': 'Bin Actual Qty After Transaction',
-		'oldfieldname': 'bin_aqat',
-		'oldfieldtype': 'Currency',
+		'label': u'Bin Actual Qty After Transaction',
+		'oldfieldname': u'bin_aqat',
+		'oldfieldtype': u'Currency',
 		'permlevel': 1,
-		'width': '150px'
+		'width': u'150px'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'ma_rate',
-		'fieldtype': 'Currency',
+		'doctype': u'DocField',
+		'fieldname': u'ma_rate',
+		'fieldtype': u'Currency',
 		'hidden': 1,
-		'idx': 16,
-		'label': 'Moving Average Rate',
-		'oldfieldname': 'ma_rate',
-		'oldfieldtype': 'Currency',
+		'label': u'Moving Average Rate',
+		'oldfieldname': u'ma_rate',
+		'oldfieldtype': u'Currency',
 		'permlevel': 0,
 		'print_hide': 1,
 		'report_hide': 1
@@ -328,14 +311,13 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'fcfs_rate',
-		'fieldtype': 'Currency',
+		'doctype': u'DocField',
+		'fieldname': u'fcfs_rate',
+		'fieldtype': u'Currency',
 		'hidden': 1,
-		'idx': 17,
-		'label': 'FIFO Rate',
-		'oldfieldname': 'fcfs_rate',
-		'oldfieldtype': 'Currency',
+		'label': u'FIFO Rate',
+		'oldfieldname': u'fcfs_rate',
+		'oldfieldtype': u'Currency',
 		'permlevel': 0,
 		'print_hide': 1,
 		'report_hide': 1
@@ -343,105 +325,99 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'valuation_rate',
-		'fieldtype': 'Currency',
-		'idx': 18,
-		'label': 'Valuation Rate',
-		'oldfieldname': 'valuation_rate',
-		'oldfieldtype': 'Currency',
+		'doctype': u'DocField',
+		'fieldname': u'valuation_rate',
+		'fieldtype': u'Currency',
+		'label': u'Valuation Rate',
+		'oldfieldname': u'valuation_rate',
+		'oldfieldtype': u'Currency',
 		'permlevel': 0,
-		'width': '150px'
+		'width': u'150px'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'stock_value',
-		'fieldtype': 'Currency',
-		'idx': 19,
-		'label': 'Stock Value',
-		'oldfieldname': 'stock_value',
-		'oldfieldtype': 'Currency',
+		'doctype': u'DocField',
+		'fieldname': u'stock_value',
+		'fieldtype': u'Currency',
+		'label': u'Stock Value',
+		'oldfieldname': u'stock_value',
+		'oldfieldtype': u'Currency',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'fcfs_stack',
-		'fieldtype': 'Text',
-		'hidden': 0,
-		'idx': 20,
+		'doctype': u'DocField',
+		'fieldname': u'fcfs_stack',
+		'fieldtype': u'Text',
+		'hidden': 1,
 		'in_filter': 0,
-		'label': 'FIFO Stack',
-		'oldfieldname': 'fcfs_stack',
-		'oldfieldtype': 'Text',
-		'permlevel': 0,
+		'label': u'FIFO Stack',
+		'oldfieldname': u'fcfs_stack',
+		'oldfieldtype': u'Text',
+		'permlevel': 2,
 		'print_hide': 1,
-		'report_hide': 0,
+		'report_hide': 1,
 		'search_index': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Data',
-		'idx': 21,
+		'doctype': u'DocField',
+		'fieldname': u'company',
+		'fieldtype': u'Select',
 		'in_filter': 1,
-		'label': 'Company',
-		'oldfieldname': 'company',
-		'oldfieldtype': 'Data',
+		'label': u'Company',
+		'oldfieldname': u'company',
+		'oldfieldtype': u'Data',
+		'options': u'link:Company',
 		'permlevel': 1,
 		'search_index': 0,
-		'width': '150px'
+		'width': u'150px'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'fieldtype': 'Data',
-		'idx': 22,
+		'doctype': u'DocField',
+		'fieldname': u'fiscal_year',
+		'fieldtype': u'Data',
 		'in_filter': 1,
-		'label': 'Fiscal Year',
-		'oldfieldname': 'fiscal_year',
-		'oldfieldtype': 'Data',
+		'label': u'Fiscal Year',
+		'oldfieldname': u'fiscal_year',
+		'oldfieldtype': u'Data',
 		'permlevel': 1,
 		'search_index': 0,
-		'width': '150px'
+		'width': u'150px'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'is_cancelled',
-		'fieldtype': 'Select',
-		'idx': 23,
+		'doctype': u'DocField',
+		'fieldname': u'is_cancelled',
+		'fieldtype': u'Select',
 		'in_filter': 1,
-		'label': 'Is Cancelled',
-		'oldfieldname': 'is_cancelled',
-		'oldfieldtype': 'Select',
-		'options': '\nYes\nNo',
+		'label': u'Is Cancelled',
+		'oldfieldname': u'is_cancelled',
+		'oldfieldtype': u'Select',
+		'options': u'\nYes\nNo',
 		'permlevel': 1,
 		'search_index': 0,
-		'width': '100px'
+		'width': u'100px'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'is_stock_entry',
-		'fieldtype': 'Select',
-		'idx': 24,
+		'doctype': u'DocField',
+		'fieldname': u'is_stock_entry',
+		'fieldtype': u'Select',
 		'in_filter': 1,
-		'label': 'Is Stock Entry',
-		'oldfieldname': 'is_stock_entry',
-		'oldfieldtype': 'Select',
-		'options': '\nYes\nNo',
+		'label': u'Is Stock Entry',
+		'oldfieldname': u'is_stock_entry',
+		'oldfieldtype': u'Select',
+		'options': u'\nYes\nNo',
 		'permlevel': 1,
 		'search_index': 0,
-		'width': '100px'
+		'width': u'100px'
 	}
 ]
\ No newline at end of file
diff --git a/erpnext/support/doctype/item_maintenance_detail/item_maintenance_detail.txt b/erpnext/support/doctype/item_maintenance_detail/item_maintenance_detail.txt
index 4d4e26a..e323498 100644
--- a/erpnext/support/doctype/item_maintenance_detail/item_maintenance_detail.txt
+++ b/erpnext/support/doctype/item_maintenance_detail/item_maintenance_detail.txt
@@ -5,92 +5,90 @@
 	{
 		'creation': '2010-08-08 17:09:06',
 		'docstatus': 0,
-		'modified': '2010-09-20 14:06:57',
-		'modified_by': 'umair@iwebnotes.com',
-		'owner': 'Administrator'
+		'modified': '2012-03-21 14:57:06',
+		'modified_by': u'Administrator',
+		'owner': u'Administrator'
 	},
 
 	# These values are common for all DocType
 	{
-		'autoname': 'IMD.#####',
-		'colour': 'White:FFF',
+		'autoname': u'IMD.#####',
+		'colour': u'White:FFF',
+		'default_print_format': u'Standard',
 		'doctype': 'DocType',
 		'istable': 1,
-		'module': 'Support',
+		'module': u'Support',
 		'name': '__common__',
-		'section_style': 'Simple',
-		'server_code_error': ' ',
-		'version': 8
+		'section_style': u'Simple',
+		'server_code_error': u' ',
+		'show_in_menu': 0,
+		'version': 9
 	},
 
 	# These values are common for all DocField
 	{
-		'doctype': 'DocField',
+		'doctype': u'DocField',
 		'name': '__common__',
-		'parent': 'Item Maintenance Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType'
+		'parent': u'Item Maintenance Detail',
+		'parentfield': u'fields',
+		'parenttype': u'DocType'
 	},
 
 	# DocType, Item Maintenance Detail
 	{
 		'doctype': 'DocType',
-		'name': 'Item Maintenance Detail'
+		'name': u'Item Maintenance Detail'
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldname': 'item_code',
-		'fieldtype': 'Link',
-		'idx': 1,
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldname': u'item_code',
+		'fieldtype': u'Link',
 		'in_filter': 1,
-		'label': 'Item Code',
-		'oldfieldname': 'item_code',
-		'oldfieldtype': 'Link',
-		'options': 'Item',
+		'label': u'Item Code',
+		'oldfieldname': u'item_code',
+		'oldfieldtype': u'Link',
+		'options': u'Item',
 		'permlevel': 0,
 		'reqd': 1,
 		'search_index': 1,
-		'trigger': 'Client'
+		'trigger': u'Client'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'item_name',
-		'fieldtype': 'Data',
-		'idx': 2,
-		'label': 'Item Name',
-		'oldfieldname': 'item_name',
-		'oldfieldtype': 'Data',
+		'doctype': u'DocField',
+		'fieldname': u'item_name',
+		'fieldtype': u'Data',
+		'label': u'Item Name',
+		'oldfieldname': u'item_name',
+		'oldfieldtype': u'Data',
 		'permlevel': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'description',
-		'fieldtype': 'Data',
-		'idx': 3,
-		'label': 'Description',
-		'oldfieldname': 'description',
-		'oldfieldtype': 'Data',
+		'doctype': u'DocField',
+		'fieldname': u'description',
+		'fieldtype': u'Data',
+		'label': u'Description',
+		'oldfieldname': u'description',
+		'oldfieldtype': u'Data',
 		'permlevel': 1,
-		'width': '300px'
+		'width': u'300px'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'start_date',
-		'fieldtype': 'Date',
-		'idx': 4,
+		'doctype': u'DocField',
+		'fieldname': u'start_date',
+		'fieldtype': u'Date',
 		'in_filter': 1,
-		'label': 'Start Date',
-		'oldfieldname': 'start_date',
-		'oldfieldtype': 'Date',
+		'label': u'Start Date',
+		'oldfieldname': u'start_date',
+		'oldfieldtype': u'Date',
 		'permlevel': 0,
 		'reqd': 1,
 		'search_index': 1
@@ -98,14 +96,13 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'end_date',
-		'fieldtype': 'Date',
-		'idx': 5,
+		'doctype': u'DocField',
+		'fieldname': u'end_date',
+		'fieldtype': u'Date',
 		'in_filter': 1,
-		'label': 'End Date',
-		'oldfieldname': 'end_date',
-		'oldfieldtype': 'Date',
+		'label': u'End Date',
+		'oldfieldname': u'end_date',
+		'oldfieldtype': u'Date',
 		'permlevel': 0,
 		'reqd': 1,
 		'search_index': 1
@@ -113,41 +110,38 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'periodicity',
-		'fieldtype': 'Select',
-		'idx': 6,
-		'label': 'Periodicity',
-		'oldfieldname': 'periodicity',
-		'oldfieldtype': 'Select',
-		'options': '\nWeekly\nMonthly\nQuarterly\nHalf Yearly\nYearly\nRandom',
+		'doctype': u'DocField',
+		'fieldname': u'periodicity',
+		'fieldtype': u'Select',
+		'label': u'Periodicity',
+		'oldfieldname': u'periodicity',
+		'oldfieldtype': u'Select',
+		'options': u'\nWeekly\nMonthly\nQuarterly\nHalf Yearly\nYearly\nRandom',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'no_of_visits',
-		'fieldtype': 'Int',
-		'idx': 7,
-		'label': 'No of Visits',
-		'oldfieldname': 'no_of_visits',
-		'oldfieldtype': 'Int',
+		'doctype': u'DocField',
+		'fieldname': u'no_of_visits',
+		'fieldtype': u'Int',
+		'label': u'No of Visits',
+		'oldfieldname': u'no_of_visits',
+		'oldfieldtype': u'Int',
 		'permlevel': 0,
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'incharge_name',
-		'fieldtype': 'Link',
-		'idx': 8,
+		'doctype': u'DocField',
+		'fieldname': u'incharge_name',
+		'fieldtype': u'Link',
 		'in_filter': 1,
-		'label': 'Incharge Name',
-		'oldfieldname': 'incharge_name',
-		'oldfieldtype': 'Link',
-		'options': 'Sales Person',
+		'label': u'Incharge Name',
+		'oldfieldname': u'incharge_name',
+		'oldfieldtype': u'Link',
+		'options': u'Sales Person',
 		'permlevel': 0,
 		'reqd': 1,
 		'search_index': 0
@@ -155,30 +149,28 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'serial_no',
-		'fieldtype': 'Small Text',
-		'idx': 9,
-		'label': 'Serial No',
-		'oldfieldname': 'serial_no',
-		'oldfieldtype': 'Small Text',
+		'doctype': u'DocField',
+		'fieldname': u'serial_no',
+		'fieldtype': u'Small Text',
+		'label': u'Serial No',
+		'oldfieldname': u'serial_no',
+		'oldfieldtype': u'Small Text',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'prevdoc_docname',
-		'fieldtype': 'Data',
-		'idx': 10,
+		'doctype': u'DocField',
+		'fieldname': u'prevdoc_docname',
+		'fieldtype': u'Data',
 		'in_filter': 1,
-		'label': 'Against Docname',
+		'label': u'Against Docname',
 		'no_copy': 1,
-		'oldfieldname': 'prevdoc_docname',
-		'oldfieldtype': 'Data',
+		'oldfieldname': u'prevdoc_docname',
+		'oldfieldtype': u'Data',
 		'permlevel': 1,
 		'print_hide': 1,
 		'search_index': 1,
-		'width': '150px'
+		'width': u'150px'
 	}
 ]
\ No newline at end of file
diff --git a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.txt b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.txt
index a053cf9..5048c85 100644
--- a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.txt
+++ b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.txt
@@ -5,49 +5,50 @@
 	{
 		'creation': '2010-08-08 17:09:09',
 		'docstatus': 0,
-		'modified': '2011-05-17 17:13:43',
-		'modified_by': 'Administrator',
-		'owner': 'Administrator'
+		'modified': '2012-03-21 14:09:46',
+		'modified_by': u'Administrator',
+		'owner': u'Administrator'
 	},
 
 	# These values are common for all DocType
 	{
-		'_last_update': '1305632624',
-		'autoname': 'MS.#####',
-		'colour': 'White:FFF',
+		'_last_update': u'1322549701',
+		'autoname': u'MS.#####',
+		'colour': u'White:FFF',
+		'default_print_format': u'Standard',
 		'doctype': 'DocType',
-		'module': 'Support',
+		'module': u'Support',
 		'name': '__common__',
-		'search_fields': 'status,customer,customer_name, sales_order_no',
-		'section_style': 'Simple',
-		'server_code_error': ' ',
+		'search_fields': u'status,customer,customer_name, sales_order_no',
+		'section_style': u'Simple',
+		'server_code_error': u' ',
 		'show_in_menu': 0,
-		'version': 155
+		'version': 156
 	},
 
 	# These values are common for all DocField
 	{
-		'doctype': 'DocField',
+		'doctype': u'DocField',
 		'name': '__common__',
-		'parent': 'Maintenance Schedule',
-		'parentfield': 'fields',
-		'parenttype': 'DocType'
+		'parent': u'Maintenance Schedule',
+		'parentfield': u'fields',
+		'parenttype': u'DocType'
 	},
 
 	# These values are common for all DocPerm
 	{
-		'doctype': 'DocPerm',
+		'doctype': u'DocPerm',
 		'name': '__common__',
-		'parent': 'Maintenance Schedule',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
+		'parent': u'Maintenance Schedule',
+		'parentfield': u'permissions',
+		'parenttype': u'DocType',
 		'read': 1
 	},
 
 	# DocType, Maintenance Schedule
 	{
 		'doctype': 'DocType',
-		'name': 'Maintenance Schedule'
+		'name': u'Maintenance Schedule'
 	},
 
 	# DocPerm
@@ -55,20 +56,18 @@
 		'amend': 1,
 		'cancel': 1,
 		'create': 1,
-		'doctype': 'DocPerm',
-		'idx': 1,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'System Manager',
+		'role': u'System Manager',
 		'submit': 1,
 		'write': 1
 	},
 
 	# DocPerm
 	{
-		'doctype': 'DocPerm',
-		'idx': 2,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'System Manager'
+		'role': u'System Manager'
 	},
 
 	# DocPerm
@@ -76,95 +75,87 @@
 		'amend': 1,
 		'cancel': 1,
 		'create': 1,
-		'doctype': 'DocPerm',
-		'idx': 3,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'Maintenance Manager',
+		'role': u'Maintenance Manager',
 		'submit': 1,
 		'write': 1
 	},
 
 	# DocPerm
 	{
-		'doctype': 'DocPerm',
-		'idx': 4,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'Maintenance Manager'
+		'role': u'Maintenance Manager'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Section Break',
-		'idx': 1,
-		'label': 'Customer Details',
-		'oldfieldtype': 'Section Break',
-		'options': 'Simple',
+		'doctype': u'DocField',
+		'fieldtype': u'Section Break',
+		'label': u'Customer Details',
+		'oldfieldtype': u'Section Break',
+		'options': u'Simple',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Column Break',
-		'idx': 2,
-		'oldfieldtype': 'Column Break',
+		'doctype': u'DocField',
+		'fieldtype': u'Column Break',
+		'oldfieldtype': u'Column Break',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'customer',
-		'fieldtype': 'Link',
-		'idx': 3,
+		'doctype': u'DocField',
+		'fieldname': u'customer',
+		'fieldtype': u'Link',
 		'in_filter': 1,
-		'label': 'Customer',
-		'oldfieldname': 'customer',
-		'oldfieldtype': 'Link',
-		'options': 'Customer',
+		'label': u'Customer',
+		'oldfieldname': u'customer',
+		'oldfieldtype': u'Link',
+		'options': u'Customer',
 		'permlevel': 0,
 		'print_hide': 1,
 		'reqd': 1,
 		'search_index': 1,
-		'trigger': 'Client'
+		'trigger': u'Client'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'customer_address',
-		'fieldtype': 'Link',
-		'idx': 4,
-		'label': 'Customer Address',
-		'options': 'Address',
+		'doctype': u'DocField',
+		'fieldname': u'customer_address',
+		'fieldtype': u'Link',
+		'label': u'Customer Address',
+		'options': u'Address',
 		'permlevel': 0,
 		'print_hide': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'contact_person',
-		'fieldtype': 'Link',
-		'idx': 5,
-		'label': 'Contact Person',
-		'options': 'Contact',
+		'doctype': u'DocField',
+		'fieldname': u'contact_person',
+		'fieldtype': u'Link',
+		'label': u'Contact Person',
+		'options': u'Contact',
 		'permlevel': 0,
 		'print_hide': 1
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldname': 'customer_name',
-		'fieldtype': 'Data',
-		'idx': 6,
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldname': u'customer_name',
+		'fieldtype': u'Data',
 		'in_filter': 1,
-		'label': 'Name',
-		'oldfieldname': 'customer_name',
-		'oldfieldtype': 'Data',
+		'label': u'Name',
+		'oldfieldname': u'customer_name',
+		'oldfieldtype': u'Data',
 		'permlevel': 1,
 		'reqd': 0,
 		'search_index': 0
@@ -172,65 +163,59 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'address_display',
-		'fieldtype': 'Small Text',
-		'idx': 7,
-		'label': 'Address',
+		'doctype': u'DocField',
+		'fieldname': u'address_display',
+		'fieldtype': u'Small Text',
+		'label': u'Address',
 		'permlevel': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'contact_display',
-		'fieldtype': 'Small Text',
-		'idx': 8,
-		'label': 'Contact',
+		'doctype': u'DocField',
+		'fieldname': u'contact_display',
+		'fieldtype': u'Small Text',
+		'label': u'Contact',
 		'permlevel': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'contact_mobile',
-		'fieldtype': 'Text',
-		'idx': 9,
-		'label': 'Mobile No',
+		'doctype': u'DocField',
+		'fieldname': u'contact_mobile',
+		'fieldtype': u'Text',
+		'label': u'Mobile No',
 		'permlevel': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'contact_email',
-		'fieldtype': 'Text',
-		'idx': 10,
-		'label': 'Contact Email',
+		'doctype': u'DocField',
+		'fieldname': u'contact_email',
+		'fieldtype': u'Text',
+		'label': u'Contact Email',
 		'permlevel': 1,
 		'print_hide': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Column Break',
-		'idx': 11,
-		'oldfieldtype': 'Column Break',
+		'doctype': u'DocField',
+		'fieldtype': u'Column Break',
+		'oldfieldtype': u'Column Break',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldname': 'transaction_date',
-		'fieldtype': 'Date',
-		'idx': 12,
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldname': u'transaction_date',
+		'fieldtype': u'Date',
 		'in_filter': 1,
-		'label': 'Transaction Date',
-		'oldfieldname': 'transaction_date',
-		'oldfieldtype': 'Date',
+		'label': u'Transaction Date',
+		'oldfieldname': u'transaction_date',
+		'oldfieldtype': u'Date',
 		'permlevel': 0,
 		'reqd': 1,
 		'search_index': 0
@@ -238,18 +223,17 @@
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'default': 'Draft',
-		'doctype': 'DocField',
-		'fieldname': 'status',
-		'fieldtype': 'Select',
-		'idx': 13,
+		'colour': u'White:FFF',
+		'default': u'Draft',
+		'doctype': u'DocField',
+		'fieldname': u'status',
+		'fieldtype': u'Select',
 		'in_filter': 1,
-		'label': 'Status',
+		'label': u'Status',
 		'no_copy': 1,
-		'oldfieldname': 'status',
-		'oldfieldtype': 'Select',
-		'options': '\nDraft\nSubmitted\nCancelled',
+		'oldfieldname': u'status',
+		'oldfieldtype': u'Select',
+		'options': u'\nDraft\nSubmitted\nCancelled',
 		'permlevel': 1,
 		'reqd': 1,
 		'search_index': 0
@@ -257,28 +241,26 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'amended_from',
-		'fieldtype': 'Data',
-		'idx': 14,
-		'label': 'Amended From',
+		'doctype': u'DocField',
+		'fieldname': u'amended_from',
+		'fieldtype': u'Data',
+		'label': u'Amended From',
 		'no_copy': 1,
-		'oldfieldname': 'amended_from',
-		'oldfieldtype': 'Data',
+		'oldfieldname': u'amended_from',
+		'oldfieldtype': u'Data',
 		'permlevel': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'amendment_date',
-		'fieldtype': 'Date',
+		'doctype': u'DocField',
+		'fieldname': u'amendment_date',
+		'fieldtype': u'Date',
 		'hidden': 1,
-		'idx': 15,
-		'label': 'Amendment Date',
+		'label': u'Amendment Date',
 		'no_copy': 1,
-		'oldfieldname': 'amendment_date',
-		'oldfieldtype': 'Date',
+		'oldfieldname': u'amendment_date',
+		'oldfieldtype': u'Date',
 		'permlevel': 1,
 		'print_hide': 1,
 		'report_hide': 1
@@ -286,15 +268,14 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Link',
-		'idx': 16,
+		'doctype': u'DocField',
+		'fieldname': u'company',
+		'fieldtype': u'Link',
 		'in_filter': 1,
-		'label': 'Company',
-		'oldfieldname': 'company',
-		'oldfieldtype': 'Link',
-		'options': 'Company',
+		'label': u'Company',
+		'oldfieldname': u'company',
+		'oldfieldtype': u'Link',
+		'options': u'Company',
 		'permlevel': 0,
 		'reqd': 1,
 		'search_index': 0
@@ -302,15 +283,14 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'territory',
-		'fieldtype': 'Link',
-		'idx': 17,
+		'doctype': u'DocField',
+		'fieldname': u'territory',
+		'fieldtype': u'Link',
 		'in_filter': 1,
-		'label': 'Territory',
-		'oldfieldname': 'territory',
-		'oldfieldtype': 'Link',
-		'options': 'Territory',
+		'label': u'Territory',
+		'oldfieldname': u'territory',
+		'oldfieldtype': u'Link',
+		'options': u'Territory',
 		'permlevel': 0,
 		'reqd': 1,
 		'search_index': 0
@@ -318,102 +298,94 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'customer_group',
-		'fieldtype': 'Link',
-		'idx': 18,
-		'label': 'Customer Group',
-		'options': 'Customer Group',
+		'doctype': u'DocField',
+		'fieldname': u'customer_group',
+		'fieldtype': u'Link',
+		'label': u'Customer Group',
+		'options': u'Customer Group',
 		'permlevel': 0,
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Section Break',
-		'idx': 19,
-		'label': 'Items',
-		'oldfieldtype': 'Section Break',
-		'options': 'Simple',
+		'doctype': u'DocField',
+		'fieldtype': u'Section Break',
+		'label': u'Items',
+		'oldfieldtype': u'Section Break',
+		'options': u'Simple',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldname': 'sales_order_no',
-		'fieldtype': 'Link',
-		'idx': 20,
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldname': u'sales_order_no',
+		'fieldtype': u'Link',
 		'in_filter': 1,
-		'label': 'Sales Order No',
-		'oldfieldname': 'sales_order_no',
-		'oldfieldtype': 'Link',
-		'options': 'Sales Order',
+		'label': u'Sales Order No',
+		'oldfieldname': u'sales_order_no',
+		'oldfieldtype': u'Link',
+		'options': u'Sales Order',
 		'permlevel': 0,
 		'search_index': 1,
-		'trigger': 'Client'
+		'trigger': u'Client'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Button',
-		'idx': 21,
-		'label': 'Get Items',
-		'oldfieldtype': 'Button',
-		'options': 'pull_sales_order_detail',
+		'doctype': u'DocField',
+		'fieldtype': u'Button',
+		'label': u'Get Items',
+		'oldfieldtype': u'Button',
+		'options': u'pull_sales_order_detail',
 		'permlevel': 0,
 		'report_hide': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'item_maintenance_detail',
-		'fieldtype': 'Table',
-		'idx': 22,
-		'label': 'Item Maintenance Detail',
-		'oldfieldname': 'item_maintenance_detail',
-		'oldfieldtype': 'Table',
-		'options': 'Item Maintenance Detail',
+		'doctype': u'DocField',
+		'fieldname': u'item_maintenance_detail',
+		'fieldtype': u'Table',
+		'label': u'Item Maintenance Detail',
+		'oldfieldname': u'item_maintenance_detail',
+		'oldfieldtype': u'Table',
+		'options': u'Item Maintenance Detail',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Section Break',
-		'idx': 23,
-		'label': 'Schedule',
-		'oldfieldtype': 'Section Break',
-		'options': 'Simple',
+		'doctype': u'DocField',
+		'fieldtype': u'Section Break',
+		'label': u'Schedule',
+		'oldfieldtype': u'Section Break',
+		'options': u'Simple',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldtype': 'Button',
-		'idx': 24,
-		'label': 'Generate Schedule',
-		'oldfieldtype': 'Button',
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldtype': u'Button',
+		'label': u'Generate Schedule',
+		'oldfieldtype': u'Button',
 		'permlevel': 0,
-		'trigger': 'Client'
+		'trigger': u'Client'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'maintenance_schedule_detail',
-		'fieldtype': 'Table',
-		'idx': 25,
-		'label': 'Maintenance Schedule Detail',
-		'oldfieldname': 'maintenance_schedule_detail',
-		'oldfieldtype': 'Table',
-		'options': 'Maintenance Schedule Detail',
+		'doctype': u'DocField',
+		'fieldname': u'maintenance_schedule_detail',
+		'fieldtype': u'Table',
+		'label': u'Maintenance Schedule Detail',
+		'oldfieldname': u'maintenance_schedule_detail',
+		'oldfieldtype': u'Table',
+		'options': u'Maintenance Schedule Detail',
 		'permlevel': 1
 	}
 ]
\ No newline at end of file
diff --git a/erpnext/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt b/erpnext/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt
index edd8091..b526538 100644
--- a/erpnext/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt
+++ b/erpnext/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt
@@ -5,50 +5,51 @@
 	{
 		'creation': '2010-08-08 17:09:09',
 		'docstatus': 0,
-		'modified': '2010-09-20 14:06:57',
-		'modified_by': 'umair@iwebnotes.com',
-		'owner': 'Administrator'
+		'modified': '2012-03-21 14:10:17',
+		'modified_by': u'Administrator',
+		'owner': u'Administrator'
 	},
 
 	# These values are common for all DocType
 	{
-		'autoname': 'MSD.#####',
-		'colour': 'White:FFF',
+		'autoname': u'MSD.#####',
+		'colour': u'White:FFF',
+		'default_print_format': u'Standard',
 		'doctype': 'DocType',
 		'istable': 1,
-		'module': 'Support',
+		'module': u'Support',
 		'name': '__common__',
-		'section_style': 'Simple',
-		'server_code_error': ' ',
-		'version': 12
+		'section_style': u'Simple',
+		'server_code_error': u' ',
+		'show_in_menu': 0,
+		'version': 13
 	},
 
 	# These values are common for all DocField
 	{
-		'doctype': 'DocField',
+		'doctype': u'DocField',
 		'name': '__common__',
-		'parent': 'Maintenance Schedule Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType'
+		'parent': u'Maintenance Schedule Detail',
+		'parentfield': u'fields',
+		'parenttype': u'DocType'
 	},
 
 	# DocType, Maintenance Schedule Detail
 	{
 		'doctype': 'DocType',
-		'name': 'Maintenance Schedule Detail'
+		'name': u'Maintenance Schedule Detail'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'item_code',
-		'fieldtype': 'Link',
-		'idx': 1,
+		'doctype': u'DocField',
+		'fieldname': u'item_code',
+		'fieldtype': u'Link',
 		'in_filter': 1,
-		'label': 'Item Code',
-		'oldfieldname': 'item_code',
-		'oldfieldtype': 'Link',
-		'options': 'Item',
+		'label': u'Item Code',
+		'oldfieldname': u'item_code',
+		'oldfieldtype': u'Link',
+		'options': u'Item',
 		'permlevel': 1,
 		'reqd': 0,
 		'search_index': 1
@@ -56,28 +57,26 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'item_name',
-		'fieldtype': 'Data',
-		'idx': 2,
+		'doctype': u'DocField',
+		'fieldname': u'item_name',
+		'fieldtype': u'Data',
 		'in_filter': 0,
-		'label': 'Item Name',
-		'oldfieldname': 'item_name',
-		'oldfieldtype': 'Data',
+		'label': u'Item Name',
+		'oldfieldname': u'item_name',
+		'oldfieldtype': u'Data',
 		'permlevel': 1,
 		'search_index': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'scheduled_date',
-		'fieldtype': 'Date',
-		'idx': 3,
+		'doctype': u'DocField',
+		'fieldname': u'scheduled_date',
+		'fieldtype': u'Date',
 		'in_filter': 1,
-		'label': 'Scheduled Date',
-		'oldfieldname': 'scheduled_date',
-		'oldfieldtype': 'Date',
+		'label': u'Scheduled Date',
+		'oldfieldname': u'scheduled_date',
+		'oldfieldtype': u'Date',
 		'permlevel': 0,
 		'reqd': 1,
 		'search_index': 1
@@ -85,15 +84,14 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'actual_date',
-		'fieldtype': 'Date',
+		'doctype': u'DocField',
+		'fieldname': u'actual_date',
+		'fieldtype': u'Date',
 		'hidden': 1,
-		'idx': 4,
-		'label': 'Actual Date',
+		'label': u'Actual Date',
 		'no_copy': 1,
-		'oldfieldname': 'actual_date',
-		'oldfieldtype': 'Date',
+		'oldfieldname': u'actual_date',
+		'oldfieldtype': u'Date',
 		'permlevel': 1,
 		'print_hide': 1,
 		'report_hide': 1
@@ -101,15 +99,14 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'incharge_name',
-		'fieldtype': 'Link',
-		'idx': 5,
+		'doctype': u'DocField',
+		'fieldname': u'incharge_name',
+		'fieldtype': u'Link',
 		'in_filter': 1,
-		'label': 'Incharge Name',
-		'oldfieldname': 'incharge_name',
-		'oldfieldtype': 'Link',
-		'options': 'Sales Person',
+		'label': u'Incharge Name',
+		'oldfieldname': u'incharge_name',
+		'oldfieldtype': u'Link',
+		'options': u'Sales Person',
 		'permlevel': 0,
 		'reqd': 1,
 		'search_index': 0
@@ -117,17 +114,16 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'serial_no',
-		'fieldtype': 'Small Text',
-		'idx': 6,
+		'doctype': u'DocField',
+		'fieldname': u'serial_no',
+		'fieldtype': u'Small Text',
 		'in_filter': 1,
-		'label': 'Serial No',
+		'label': u'Serial No',
 		'no_copy': 0,
-		'oldfieldname': 'serial_no',
-		'oldfieldtype': 'Small Text',
+		'oldfieldname': u'serial_no',
+		'oldfieldtype': u'Small Text',
 		'permlevel': 1,
-		'search_index': 1,
-		'width': '160px'
+		'search_index': 0,
+		'width': u'160px'
 	}
 ]
\ No newline at end of file
diff --git a/erpnext/support/doctype/maintenance_visit/maintenance_visit.txt b/erpnext/support/doctype/maintenance_visit/maintenance_visit.txt
index 76cf56f..6643db5 100644
--- a/erpnext/support/doctype/maintenance_visit/maintenance_visit.txt
+++ b/erpnext/support/doctype/maintenance_visit/maintenance_visit.txt
@@ -5,51 +5,52 @@
 	{
 		'creation': '2010-08-08 17:09:09',
 		'docstatus': 0,
-		'modified': '2011-07-01 11:20:38',
-		'modified_by': 'Administrator',
-		'owner': 'ashwini@webnotestech.com'
+		'modified': '2012-03-21 14:11:12',
+		'modified_by': u'Administrator',
+		'owner': u'ashwini@webnotestech.com'
 	},
 
 	# These values are common for all DocType
 	{
-		'_last_update': '1305704021',
-		'autoname': 'MV.#####',
-		'colour': 'White:FFF',
+		'_last_update': u'1322549701',
+		'autoname': u'MV.#####',
+		'colour': u'White:FFF',
+		'default_print_format': u'Standard',
 		'doctype': 'DocType',
-		'module': 'Support',
+		'module': u'Support',
 		'name': '__common__',
-		'search_fields': 'status,maintenance_type,customer,customer_name, address,mntc_date,company,fiscal_year',
-		'section_style': 'Simple',
-		'server_code_error': ' ',
+		'search_fields': u'status,maintenance_type,customer,customer_name, address,mntc_date,company,fiscal_year',
+		'section_style': u'Simple',
+		'server_code_error': u' ',
 		'show_in_menu': 0,
-		'subject': 'To %(customer_name)s on %(mntc_date)s',
-		'tag_fields': 'completion_status,maintenance_type',
-		'version': 101
+		'subject': u'To %(customer_name)s on %(mntc_date)s',
+		'tag_fields': u'completion_status,maintenance_type',
+		'version': 95
 	},
 
 	# These values are common for all DocField
 	{
-		'doctype': 'DocField',
+		'doctype': u'DocField',
 		'name': '__common__',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'fields',
-		'parenttype': 'DocType'
+		'parent': u'Maintenance Visit',
+		'parentfield': u'fields',
+		'parenttype': u'DocType'
 	},
 
 	# These values are common for all DocPerm
 	{
-		'doctype': 'DocPerm',
+		'doctype': u'DocPerm',
 		'name': '__common__',
-		'parent': 'Maintenance Visit',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
+		'parent': u'Maintenance Visit',
+		'parentfield': u'permissions',
+		'parenttype': u'DocType',
 		'read': 1
 	},
 
 	# DocType, Maintenance Visit
 	{
 		'doctype': 'DocType',
-		'name': 'Maintenance Visit'
+		'name': u'Maintenance Visit'
 	},
 
 	# DocPerm
@@ -57,20 +58,18 @@
 		'amend': 1,
 		'cancel': 1,
 		'create': 1,
-		'doctype': 'DocPerm',
-		'idx': 1,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'System Manager',
+		'role': u'System Manager',
 		'submit': 1,
 		'write': 1
 	},
 
 	# DocPerm
 	{
-		'doctype': 'DocPerm',
-		'idx': 2,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'System Manager'
+		'role': u'System Manager'
 	},
 
 	# DocPerm
@@ -78,20 +77,18 @@
 		'amend': 1,
 		'cancel': 1,
 		'create': 1,
-		'doctype': 'DocPerm',
-		'idx': 3,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'Maintenance Manager',
+		'role': u'Maintenance Manager',
 		'submit': 1,
 		'write': 1
 	},
 
 	# DocPerm
 	{
-		'doctype': 'DocPerm',
-		'idx': 4,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'Maintenance Manager'
+		'role': u'Maintenance Manager'
 	},
 
 	# DocPerm
@@ -99,145 +96,132 @@
 		'amend': 1,
 		'cancel': 1,
 		'create': 1,
-		'doctype': 'DocPerm',
-		'idx': 5,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
-		'role': 'Maintenance User',
+		'role': u'Maintenance User',
 		'submit': 1,
 		'write': 1
 	},
 
 	# DocPerm
 	{
-		'doctype': 'DocPerm',
-		'idx': 6,
+		'doctype': u'DocPerm',
 		'permlevel': 1,
-		'role': 'Maintenance User'
+		'role': u'Maintenance User'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Section Break',
-		'idx': 1,
-		'label': 'Customer Details',
-		'oldfieldtype': 'Section Break',
-		'options': 'Simple',
+		'doctype': u'DocField',
+		'fieldtype': u'Section Break',
+		'label': u'Customer Details',
+		'oldfieldtype': u'Section Break',
+		'options': u'Simple',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Column Break',
-		'idx': 2,
-		'oldfieldtype': 'Column Break',
+		'doctype': u'DocField',
+		'fieldtype': u'Column Break',
+		'oldfieldtype': u'Column Break',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'customer',
-		'fieldtype': 'Link',
-		'idx': 3,
+		'doctype': u'DocField',
+		'fieldname': u'customer',
+		'fieldtype': u'Link',
 		'in_filter': 1,
-		'label': 'Customer',
-		'oldfieldname': 'customer',
-		'oldfieldtype': 'Link',
-		'options': 'Customer',
+		'label': u'Customer',
+		'oldfieldname': u'customer',
+		'oldfieldtype': u'Link',
+		'options': u'Customer',
 		'permlevel': 0,
 		'print_hide': 1,
 		'reqd': 1,
 		'search_index': 1,
-		'trigger': 'Client'
+		'trigger': u'Client'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'customer_address',
-		'fieldtype': 'Link',
-		'idx': 4,
-		'label': 'Customer Address',
-		'options': 'Address',
+		'doctype': u'DocField',
+		'fieldname': u'customer_address',
+		'fieldtype': u'Link',
+		'label': u'Customer Address',
+		'options': u'Address',
 		'permlevel': 0,
 		'print_hide': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'contact_person',
-		'fieldtype': 'Link',
-		'idx': 5,
-		'label': 'Contact Person',
-		'options': 'Contact',
+		'doctype': u'DocField',
+		'fieldname': u'contact_person',
+		'fieldtype': u'Link',
+		'label': u'Contact Person',
+		'options': u'Contact',
 		'permlevel': 0,
 		'print_hide': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'customer_name',
-		'fieldtype': 'Data',
-		'idx': 6,
-		'label': 'Name',
+		'doctype': u'DocField',
+		'fieldname': u'customer_name',
+		'fieldtype': u'Data',
+		'label': u'Name',
 		'permlevel': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'address_display',
-		'fieldtype': 'Small Text',
-		'idx': 7,
-		'label': 'Address',
+		'doctype': u'DocField',
+		'fieldname': u'address_display',
+		'fieldtype': u'Small Text',
+		'label': u'Address',
 		'permlevel': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'contact_display',
-		'fieldtype': 'Small Text',
-		'idx': 8,
-		'label': 'Contact',
+		'doctype': u'DocField',
+		'fieldname': u'contact_display',
+		'fieldtype': u'Small Text',
+		'label': u'Contact',
 		'permlevel': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'contact_mobile',
-		'fieldtype': 'Data',
-		'idx': 9,
-		'label': 'Mobile No',
+		'doctype': u'DocField',
+		'fieldname': u'contact_mobile',
+		'fieldtype': u'Data',
+		'label': u'Mobile No',
 		'permlevel': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'contact_email',
-		'fieldtype': 'Data',
-		'idx': 10,
-		'label': 'Contact Email',
+		'doctype': u'DocField',
+		'fieldname': u'contact_email',
+		'fieldtype': u'Data',
+		'label': u'Contact Email',
 		'permlevel': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'fieldtype': 'Select',
-		'idx': 11,
+		'doctype': u'DocField',
+		'fieldname': u'company',
+		'fieldtype': u'Select',
 		'in_filter': 1,
-		'label': 'Company',
-		'oldfieldname': 'company',
-		'oldfieldtype': 'Select',
-		'options': 'link:Company',
+		'label': u'Company',
+		'oldfieldname': u'company',
+		'oldfieldtype': u'Select',
+		'options': u'link:Company',
 		'permlevel': 0,
 		'print_hide': 1,
 		'reqd': 1,
@@ -246,15 +230,14 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'fieldtype': 'Select',
-		'idx': 12,
+		'doctype': u'DocField',
+		'fieldname': u'fiscal_year',
+		'fieldtype': u'Select',
 		'in_filter': 1,
-		'label': 'Fiscal Year',
-		'oldfieldname': 'fiscal_year',
-		'oldfieldtype': 'Select',
-		'options': 'link:Fiscal Year',
+		'label': u'Fiscal Year',
+		'oldfieldname': u'fiscal_year',
+		'oldfieldtype': u'Select',
+		'options': u'link:Fiscal Year',
 		'permlevel': 0,
 		'print_hide': 1,
 		'reqd': 1,
@@ -263,151 +246,140 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Column Break',
-		'idx': 13,
-		'oldfieldtype': 'Column Break',
+		'doctype': u'DocField',
+		'fieldtype': u'Column Break',
+		'oldfieldtype': u'Column Break',
 		'permlevel': 0,
-		'width': '50%'
+		'width': u'50%'
 	},
 
 	# DocField
 	{
-		'default': 'Today',
-		'doctype': 'DocField',
-		'fieldname': 'mntc_date',
-		'fieldtype': 'Date',
-		'idx': 14,
-		'label': 'Maintenance Date',
+		'default': u'Today',
+		'doctype': u'DocField',
+		'fieldname': u'mntc_date',
+		'fieldtype': u'Date',
+		'label': u'Maintenance Date',
 		'no_copy': 1,
-		'oldfieldname': 'mntc_date',
-		'oldfieldtype': 'Date',
+		'oldfieldname': u'mntc_date',
+		'oldfieldtype': u'Date',
 		'permlevel': 0,
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'mntc_time',
-		'fieldtype': 'Time',
-		'idx': 15,
-		'label': 'Maintenance Time',
+		'doctype': u'DocField',
+		'fieldname': u'mntc_time',
+		'fieldtype': u'Time',
+		'label': u'Maintenance Time',
 		'no_copy': 1,
-		'oldfieldname': 'mntc_time',
-		'oldfieldtype': 'Time',
+		'oldfieldname': u'mntc_time',
+		'oldfieldtype': u'Time',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'default': 'Draft',
-		'doctype': 'DocField',
-		'fieldname': 'status',
-		'fieldtype': 'Data',
-		'idx': 16,
-		'label': 'Status',
+		'colour': u'White:FFF',
+		'default': u'Draft',
+		'doctype': u'DocField',
+		'fieldname': u'status',
+		'fieldtype': u'Data',
+		'label': u'Status',
 		'no_copy': 1,
-		'oldfieldname': 'status',
-		'oldfieldtype': 'Data',
-		'options': '\nDraft\nCancelled\nSubmitted',
+		'oldfieldname': u'status',
+		'oldfieldtype': u'Data',
+		'options': u'\nDraft\nCancelled\nSubmitted',
 		'permlevel': 1,
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'amended_from',
-		'fieldtype': 'Data',
-		'idx': 17,
-		'label': 'Amended From',
+		'doctype': u'DocField',
+		'fieldname': u'amended_from',
+		'fieldtype': u'Data',
+		'label': u'Amended From',
 		'no_copy': 1,
-		'oldfieldname': 'amended_from',
-		'oldfieldtype': 'Data',
+		'oldfieldname': u'amended_from',
+		'oldfieldtype': u'Data',
 		'permlevel': 1,
 		'print_hide': 1,
-		'width': '150px'
+		'width': u'150px'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'amendment_date',
-		'fieldtype': 'Date',
-		'idx': 18,
-		'label': 'Amendment Date',
+		'doctype': u'DocField',
+		'fieldname': u'amendment_date',
+		'fieldtype': u'Date',
+		'label': u'Amendment Date',
 		'no_copy': 1,
-		'oldfieldname': 'amendment_date',
-		'oldfieldtype': 'Date',
+		'oldfieldname': u'amendment_date',
+		'oldfieldtype': u'Date',
 		'permlevel': 0,
 		'print_hide': 1,
-		'width': '100px'
+		'width': u'100px'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'territory',
-		'fieldtype': 'Link',
-		'idx': 19,
-		'label': 'Territory',
-		'options': 'Territory',
+		'doctype': u'DocField',
+		'fieldname': u'territory',
+		'fieldtype': u'Link',
+		'label': u'Territory',
+		'options': u'Territory',
 		'permlevel': 0,
 		'print_hide': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'customer_group',
-		'fieldtype': 'Link',
-		'idx': 20,
-		'label': 'Customer Group',
-		'options': 'Customer Group',
+		'doctype': u'DocField',
+		'fieldname': u'customer_group',
+		'fieldtype': u'Link',
+		'label': u'Customer Group',
+		'options': u'Customer Group',
 		'permlevel': 0,
 		'print_hide': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Section Break',
-		'idx': 21,
-		'label': 'Maintenance Details',
-		'oldfieldtype': 'Section Break',
-		'options': 'Simple',
+		'doctype': u'DocField',
+		'fieldtype': u'Section Break',
+		'label': u'Maintenance Details',
+		'oldfieldtype': u'Section Break',
+		'options': u'Simple',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'completion_status',
-		'fieldtype': 'Select',
-		'idx': 22,
-		'label': 'Completion Status',
-		'oldfieldname': 'completion_status',
-		'oldfieldtype': 'Select',
-		'options': '\nPartially Completed\nFully Completed',
+		'doctype': u'DocField',
+		'fieldname': u'completion_status',
+		'fieldtype': u'Select',
+		'label': u'Completion Status',
+		'oldfieldname': u'completion_status',
+		'oldfieldtype': u'Select',
+		'options': u'\nPartially Completed\nFully Completed',
 		'permlevel': 0,
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'default': 'Unscheduled',
-		'doctype': 'DocField',
-		'fieldname': 'maintenance_type',
-		'fieldtype': 'Select',
-		'idx': 23,
+		'colour': u'White:FFF',
+		'default': u'Unscheduled',
+		'doctype': u'DocField',
+		'fieldname': u'maintenance_type',
+		'fieldtype': u'Select',
 		'in_filter': 1,
-		'label': 'Maintenance Type',
-		'oldfieldname': 'maintenance_type',
-		'oldfieldtype': 'Select',
-		'options': '\nScheduled\nUnscheduled\nBreakdown',
+		'label': u'Maintenance Type',
+		'oldfieldname': u'maintenance_type',
+		'oldfieldtype': u'Select',
+		'options': u'\nScheduled\nUnscheduled\nBreakdown',
 		'permlevel': 0,
 		'reqd': 1,
 		'search_index': 0
@@ -415,56 +387,52 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Column Break',
-		'idx': 24,
-		'oldfieldtype': 'Column Break',
+		'doctype': u'DocField',
+		'fieldtype': u'Column Break',
+		'oldfieldtype': u'Column Break',
 		'permlevel': 0,
-		'width': '50%'
+		'width': u'50%'
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldname': 'sales_order_no',
-		'fieldtype': 'Link',
-		'idx': 25,
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldname': u'sales_order_no',
+		'fieldtype': u'Link',
 		'in_filter': 1,
-		'label': 'Sales Order No',
-		'oldfieldname': 'sales_order_no',
-		'oldfieldtype': 'Link',
-		'options': 'Sales Order',
+		'label': u'Sales Order No',
+		'oldfieldname': u'sales_order_no',
+		'oldfieldtype': u'Link',
+		'options': u'Sales Order',
 		'permlevel': 0,
 		'search_index': 1,
-		'trigger': 'Client'
+		'trigger': u'Client'
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldname': 'customer_issue_no',
-		'fieldtype': 'Link',
-		'idx': 26,
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldname': u'customer_issue_no',
+		'fieldtype': u'Link',
 		'in_filter': 1,
-		'label': 'Customer Issue No',
-		'oldfieldname': 'customer_issue_no',
-		'oldfieldtype': 'Link',
-		'options': 'Customer Issue',
+		'label': u'Customer Issue No',
+		'oldfieldname': u'customer_issue_no',
+		'oldfieldtype': u'Link',
+		'options': u'Customer Issue',
 		'permlevel': 0,
 		'search_index': 1,
-		'trigger': 'Client'
+		'trigger': u'Client'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Button',
-		'idx': 27,
-		'label': 'Get Items',
-		'oldfieldtype': 'Button',
-		'options': 'fetch_items',
+		'doctype': u'DocField',
+		'fieldtype': u'Button',
+		'label': u'Get Items',
+		'oldfieldtype': u'Button',
+		'options': u'fetch_items',
 		'permlevel': 0,
 		'print_hide': 1,
 		'report_hide': 1
@@ -472,46 +440,42 @@
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Section Break',
-		'idx': 28,
-		'oldfieldtype': 'Section Break',
-		'options': 'Simple',
+		'doctype': u'DocField',
+		'fieldtype': u'Section Break',
+		'oldfieldtype': u'Section Break',
+		'options': u'Simple',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'maintenance_visit_details',
-		'fieldtype': 'Table',
-		'idx': 29,
-		'label': 'Maintenance Visit Detail',
-		'oldfieldname': 'maintenance_visit_details',
-		'oldfieldtype': 'Table',
-		'options': 'Maintenance Visit Detail',
+		'doctype': u'DocField',
+		'fieldname': u'maintenance_visit_details',
+		'fieldtype': u'Table',
+		'label': u'Maintenance Visit Detail',
+		'oldfieldname': u'maintenance_visit_details',
+		'oldfieldtype': u'Table',
+		'options': u'Maintenance Visit Detail',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Section Break',
-		'idx': 30,
-		'label': 'Feedback',
-		'oldfieldtype': 'Section Break',
+		'doctype': u'DocField',
+		'fieldtype': u'Section Break',
+		'label': u'Feedback',
+		'oldfieldtype': u'Section Break',
 		'permlevel': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'customer_feedback',
-		'fieldtype': 'Small Text',
-		'idx': 31,
-		'label': 'Customer Feedback',
-		'oldfieldname': 'customer_feedback',
-		'oldfieldtype': 'Small Text',
+		'doctype': u'DocField',
+		'fieldname': u'customer_feedback',
+		'fieldtype': u'Small Text',
+		'label': u'Customer Feedback',
+		'oldfieldname': u'customer_feedback',
+		'oldfieldtype': u'Small Text',
 		'permlevel': 0
 	}
 ]
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/bulk_rename_tool/bulk_rename_tool.txt b/erpnext/utilities/doctype/bulk_rename_tool/bulk_rename_tool.txt
index 16058e7..0a5d877 100644
--- a/erpnext/utilities/doctype/bulk_rename_tool/bulk_rename_tool.txt
+++ b/erpnext/utilities/doctype/bulk_rename_tool/bulk_rename_tool.txt
@@ -3,59 +3,58 @@
 
 	# These values are common in all dictionaries
 	{
-		'creation': '2011-07-08 11:14:15',
+		'creation': '2011-07-07 17:47:52',
 		'docstatus': 0,
-		'modified': '2011-07-26 00:59:27',
-		'modified_by': 'Administrator',
-		'owner': 'Administrator'
+		'modified': '2012-03-21 14:56:46',
+		'modified_by': u'Administrator',
+		'owner': u'Administrator'
 	},
 
 	# These values are common for all DocType
 	{
-		'_last_update': '1311622167',
+		'_last_update': u'1322549701',
 		'allow_attach': 1,
-		'autoname': 'field:rename_doctype',
-		'colour': 'White:FFF',
+		'autoname': u'field:rename_doctype',
+		'colour': u'White:FFF',
+		'default_print_format': u'Standard',
 		'doctype': 'DocType',
-		'module': 'Utilities',
+		'module': u'Utilities',
 		'name': '__common__',
-		'section_style': 'Simple',
+		'section_style': u'Simple',
 		'show_in_menu': 0,
-		'version': 7
+		'version': 8
 	},
 
 	# These values are common for all DocField
 	{
-		'doctype': 'DocField',
+		'doctype': u'DocField',
 		'name': '__common__',
-		'parent': 'Bulk Rename Tool',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0
+		'parent': u'Bulk Rename Tool',
+		'parentfield': u'fields',
+		'parenttype': u'DocType'
 	},
 
 	# These values are common for all DocPerm
 	{
-		'doctype': 'DocPerm',
+		'doctype': u'DocPerm',
 		'name': '__common__',
-		'parent': 'Bulk Rename Tool',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
+		'parent': u'Bulk Rename Tool',
+		'parentfield': u'permissions',
+		'parenttype': u'DocType',
 		'read': 1,
-		'role': 'System Manager'
+		'role': u'System Manager'
 	},
 
 	# DocType, Bulk Rename Tool
 	{
 		'doctype': 'DocType',
-		'name': 'Bulk Rename Tool'
+		'name': u'Bulk Rename Tool'
 	},
 
 	# DocPerm
 	{
 		'create': 1,
-		'doctype': 'DocPerm',
-		'idx': 1,
+		'doctype': u'DocPerm',
 		'permlevel': 0,
 		'submit': 1,
 		'write': 1
@@ -63,37 +62,38 @@
 
 	# DocPerm
 	{
-		'doctype': 'DocPerm',
-		'idx': 2,
+		'doctype': u'DocPerm',
 		'permlevel': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'rename_doctype',
-		'fieldtype': 'Data',
-		'idx': 1,
-		'label': 'Rename DocType',
-		'options': 'Suggest',
+		'doctype': u'DocField',
+		'fieldname': u'rename_doctype',
+		'fieldtype': u'Data',
+		'label': u'Rename DocType',
+		'options': u'Suggest',
+		'permlevel': 0,
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'file_list',
-		'fieldtype': 'Text',
-		'idx': 2,
-		'label': 'File List'
+		'doctype': u'DocField',
+		'fieldname': u'file_list',
+		'fieldtype': u'Text',
+		'hidden': 1,
+		'label': u'File List',
+		'no_copy': 1,
+		'permlevel': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Button',
-		'idx': 3,
-		'label': 'Rename',
-		'options': 'do_rename'
+		'doctype': u'DocField',
+		'fieldtype': u'Button',
+		'label': u'Rename',
+		'options': u'do_rename',
+		'permlevel': 0
 	}
-]
+]
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/gl_mapper_detail/gl_mapper_detail.txt b/erpnext/utilities/doctype/gl_mapper_detail/gl_mapper_detail.txt
index bf77e7c..d35cc06 100644
--- a/erpnext/utilities/doctype/gl_mapper_detail/gl_mapper_detail.txt
+++ b/erpnext/utilities/doctype/gl_mapper_detail/gl_mapper_detail.txt
@@ -5,221 +5,204 @@
 	{
 		'creation': '2010-08-08 17:09:03',
 		'docstatus': 0,
-		'modified': '2010-09-20 14:06:57',
-		'modified_by': 'Administrator',
-		'owner': 'Administrator'
+		'modified': '2012-03-21 14:44:47',
+		'modified_by': u'Administrator',
+		'owner': u'Administrator'
 	},
 
 	# These values are common for all DocType
 	{
-		'autoname': 'GLMDetail.#####',
-		'colour': 'White:FFF',
+		'autoname': u'GLMDetail.#####',
+		'colour': u'White:FFF',
+		'default_print_format': u'Standard',
 		'doctype': 'DocType',
 		'istable': 1,
-		'module': 'Utilities',
+		'module': u'Utilities',
 		'name': '__common__',
-		'section_style': 'Tray',
-		'server_code_error': ' ',
+		'section_style': u'Tray',
+		'server_code_error': u' ',
 		'show_in_menu': 0,
-		'version': 3
+		'version': 4
 	},
 
 	# These values are common for all DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Data',
+		'doctype': u'DocField',
+		'fieldtype': u'Data',
 		'name': '__common__',
-		'oldfieldtype': 'Data',
-		'parent': 'GL Mapper Detail',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
+		'oldfieldtype': u'Data',
+		'parent': u'GL Mapper Detail',
+		'parentfield': u'fields',
+		'parenttype': u'DocType',
 		'permlevel': 0
 	},
 
 	# DocType, GL Mapper Detail
 	{
 		'doctype': 'DocType',
-		'name': 'GL Mapper Detail'
+		'name': u'GL Mapper Detail'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'table_field',
-		'idx': 1,
-		'label': 'Table Field',
-		'oldfieldname': 'table_field'
+		'doctype': u'DocField',
+		'fieldname': u'table_field',
+		'label': u'Table Field',
+		'oldfieldname': u'table_field'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'account',
-		'idx': 2,
-		'label': 'Account',
-		'oldfieldname': 'account',
+		'doctype': u'DocField',
+		'fieldname': u'account',
+		'label': u'Account',
+		'oldfieldname': u'account',
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'debit',
-		'idx': 3,
-		'label': 'Debit',
-		'oldfieldname': 'debit',
+		'doctype': u'DocField',
+		'fieldname': u'debit',
+		'label': u'Debit',
+		'oldfieldname': u'debit',
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'credit',
-		'idx': 4,
-		'label': 'Credit',
-		'oldfieldname': 'credit',
+		'doctype': u'DocField',
+		'fieldname': u'credit',
+		'label': u'Credit',
+		'oldfieldname': u'credit',
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'cost_center',
-		'idx': 5,
-		'label': 'Cost Center',
-		'oldfieldname': 'cost_center',
+		'doctype': u'DocField',
+		'fieldname': u'cost_center',
+		'label': u'Cost Center',
+		'oldfieldname': u'cost_center',
 		'reqd': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'against',
-		'idx': 6,
-		'label': 'Against',
-		'oldfieldname': 'against',
+		'doctype': u'DocField',
+		'fieldname': u'against',
+		'label': u'Against',
+		'oldfieldname': u'against',
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'remarks',
-		'idx': 7,
-		'label': 'Remarks',
+		'doctype': u'DocField',
+		'fieldname': u'remarks',
+		'label': u'Remarks',
 		'no_copy': 1,
-		'oldfieldname': 'remarks',
+		'oldfieldname': u'remarks',
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'voucher_type',
-		'idx': 8,
-		'label': 'Voucher Type',
-		'oldfieldname': 'voucher_type',
+		'doctype': u'DocField',
+		'fieldname': u'voucher_type',
+		'label': u'Voucher Type',
+		'oldfieldname': u'voucher_type',
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'voucher_no',
-		'idx': 9,
-		'label': 'Voucher No',
-		'oldfieldname': 'voucher_no',
+		'doctype': u'DocField',
+		'fieldname': u'voucher_no',
+		'label': u'Voucher No',
+		'oldfieldname': u'voucher_no',
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'description': 'The date at which current entry will get or has actually executed.',
-		'doctype': 'DocField',
-		'fieldname': 'posting_date',
-		'idx': 10,
-		'label': 'Posting Date',
-		'oldfieldname': 'posting_date',
+		'description': u'The date at which current entry will get or has actually executed.',
+		'doctype': u'DocField',
+		'fieldname': u'posting_date',
+		'label': u'Posting Date',
+		'oldfieldname': u'posting_date',
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'description': 'The date at which current entry is made in system.',
-		'doctype': 'DocField',
-		'fieldname': 'transaction_date',
-		'idx': 11,
-		'label': 'Transaction Date',
-		'oldfieldname': 'transaction_date',
+		'description': u'The date at which current entry is made in system.',
+		'doctype': u'DocField',
+		'fieldname': u'transaction_date',
+		'label': u'Transaction Date',
+		'oldfieldname': u'transaction_date',
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'aging_date',
-		'idx': 12,
-		'label': 'Aging Date',
-		'oldfieldname': 'aging_date',
+		'doctype': u'DocField',
+		'fieldname': u'aging_date',
+		'label': u'Aging Date',
+		'oldfieldname': u'aging_date',
 		'reqd': 1
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'fiscal_year',
-		'idx': 13,
+		'doctype': u'DocField',
+		'fieldname': u'fiscal_year',
 		'in_filter': 1,
-		'label': 'Fiscal Year',
-		'oldfieldname': 'fiscal_year',
+		'label': u'Fiscal Year',
+		'oldfieldname': u'fiscal_year',
 		'reqd': 1,
 		'search_index': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'against_voucher',
-		'idx': 14,
-		'label': 'Against Voucher',
-		'oldfieldname': 'against_voucher'
+		'doctype': u'DocField',
+		'fieldname': u'against_voucher',
+		'label': u'Against Voucher',
+		'oldfieldname': u'against_voucher'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'against_voucher_type',
-		'idx': 15,
-		'label': 'Against Voucher Type',
-		'oldfieldname': 'against_voucher_type'
+		'doctype': u'DocField',
+		'fieldname': u'against_voucher_type',
+		'label': u'Against Voucher Type',
+		'oldfieldname': u'against_voucher_type'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'company',
-		'idx': 16,
+		'doctype': u'DocField',
+		'fieldname': u'company',
 		'in_filter': 1,
-		'label': 'Company',
-		'oldfieldname': 'company',
+		'label': u'Company',
+		'oldfieldname': u'company',
 		'search_index': 0
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'is_opening',
-		'idx': 17,
-		'label': 'Is Opening',
-		'oldfieldname': 'is_opening'
+		'doctype': u'DocField',
+		'fieldname': u'is_opening',
+		'label': u'Is Opening',
+		'oldfieldname': u'is_opening'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'is_advance',
-		'idx': 18,
-		'label': 'Is Advance',
-		'oldfieldname': 'is_advance'
+		'doctype': u'DocField',
+		'fieldname': u'is_advance',
+		'label': u'Is Advance',
+		'oldfieldname': u'is_advance'
 	}
 ]
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/menu_control/__init__.py b/erpnext/utilities/doctype/menu_control/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/utilities/doctype/menu_control/__init__.py
+++ /dev/null
diff --git a/erpnext/utilities/doctype/menu_control/menu_control.js b/erpnext/utilities/doctype/menu_control/menu_control.js
deleted file mode 100644
index ce0b10f..0000000
--- a/erpnext/utilities/doctype/menu_control/menu_control.js
+++ /dev/null
@@ -1,98 +0,0 @@
-// ERPNext - web based ERP (http://erpnext.com)
-// Copyright (C) 2012 Web Notes Technologies Pvt Ltd
-// 
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-class DocType:
-  def __init__(self, d, dl):
-    self.doc, self.doclist = d,dl
-
-  def get_children(self, arg='', only_type='', in_roles=[]):
-
-    type_cond = only_type and (" and menu_item_type='%s'" % only_type) or ''
-    
-    if globals().has_key('version') and version=='v170':
-      import webnotes
-      roles = webnotes.user.get_roles()
-      all_read = webnotes.user.can_read
-    else:    
-      roles = in_roles or session['data']['roles']
-      all_read = session['data']['all_readtypes']
-      
-    cl = sql("select name, menu_item_label, menu_item_type, link_id, link_content, has_children, icon, `order`, criteria_name, doctype_fields, onload from `tabMenu Item` where ifnull(disabled,'No')!='Yes' and ifnull(parent_menu_item,'')='%s' %s order by `order` asc" % (arg, type_cond), as_dict=1)
-    ol = []
-    for c in cl:
-      c['has_children'] = cint(c['has_children'])
-      c['order'] = cint(c['order'])
-      for k in c.keys(): 
-        if c[k]==None: c[k] = ''
-
-      # check permission
-      if c['menu_item_type'] in ('DocType','Single','Report'):
-        if c['link_id'] in all_read:
-          ol.append(c)
-      elif c['menu_item_type']=='Page':
-        # page
-        if c['link_id'].startswith('_'):
-          ol.append(c)
-        elif has_common([r[0] for r in sql("select role from `tabPage Role` where parent=%s", c['link_id'])], roles):
-          ol.append(c)
-      elif cstr(c['menu_item_type'])=='':
-        # sections
-        if has_common([r[0] for r in sql("select role from `tabMenu Item Role` where parent=%s", c['name'])], roles):
-          ol.append(c)
-      else:
-        ol.append(c)
-    
-    return ol
-
-  def get_dt_details(self, arg):
-    dt, fl = arg.split('~~~')    
-
-    out = {}
-
-    # filters
-    # -------
-
-    sf = sql("select search_fields from tabDocType where name=%s", dt)[0][0] or ''
-    sf = [s.strip() for s in sf.split(',')]
-    if sf and sf[0]:
-      res = sql("select fieldname, label, fieldtype, options from tabDocField where parent='%s' and fieldname in (%s)" % (dt, '"'+'","'.join(sf)+'"'))
-    else:
-      res = []
-
-    res = [[c or '' for c in r] for r in res]
-    for r in res:
-      if r[2]=='Select' and r[3] and r[3].startswith('link:'):
-        tdt = r[3][5:]
-        ol = sql("select name from `tab%s` where docstatus!=2 order by name asc" % tdt)
-        r[3] = NEWLINE.join([''] + [o[0] for o in ol])
-
-    if not res:
-      out['filters'] = [['name', 'ID', 'Data', '']]
-    else:
-      out['filters'] = res
-    
-    # columns
-    # -------
-    fl = fl.split(NEWLINE)
-    fl = [f.split(',')[0] for f in fl]
-    res = []
-    for f in fl:
-      res += [[c or '' for c in r] for r in sql("select fieldname, label, fieldtype, options from tabDocField where parent='%s' and fieldname='%s'" % (dt, f))]
-
-    out['columns'] = [['name', 'ID', 'Link', dt]] + res
-
-    return out
- 
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/menu_control/menu_control.py b/erpnext/utilities/doctype/menu_control/menu_control.py
deleted file mode 100644
index a6ab09a..0000000
--- a/erpnext/utilities/doctype/menu_control/menu_control.py
+++ /dev/null
@@ -1,281 +0,0 @@
-# ERPNext - web based ERP (http://erpnext.com)
-# Copyright (C) 2012 Web Notes Technologies Pvt Ltd
-# 
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Please edit this list and import only required elements
-import webnotes
-
-from webnotes.utils import cint, cstr
-from webnotes.model.doc import Document
-from webnotes.model.code import get_obj
-from webnotes import session, form, msgprint, errprint
-
-sql = webnotes.conn.sql
-convert_to_lists = webnotes.conn.convert_to_lists
-	
-# -----------------------------------------------------------------------------------------
-
-
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d,dl
-
-	# --------------------------------------------------------------
-	def get_children(self, arg='', only_type='', in_roles=[]):
-
-		type_cond = only_type and (" and menu_item_type='%s'" % only_type) or ''
-		
-		import webnotes
-		roles = webnotes.user.get_roles()
-		all_read = webnotes.user.can_get_report
-			
-		cl = sql("select name, menu_item_label, menu_item_type, link_id, link_content, has_children, icon, `order`, criteria_name, doctype_fields, onload from `tabMenu Item` where ifnull(disabled,'No')!='Yes' and ifnull(parent_menu_item,'')='%s' %s order by `order` asc" % (arg, type_cond), as_dict=1)
-		ol = []
-		for c in cl:
-			c['has_children'] = cint(c['has_children'])
-			c['order'] = cint(c['order'])
-			for k in c.keys(): 
-				if c[k]==None: c[k] = ''
-
-			# check permission
-			if c['menu_item_type'] in ('DocType','Single','Report'):
-				if c['link_id'] in all_read:
-					ol.append(c)
-			elif c['menu_item_type']=='Page':
-				# page
-				if c['link_id'].startswith('_'):
-					ol.append(c)
-				elif has_common([r[0] for r in sql("select role from `tabPage Role` where parent=%s", c['link_id'])], roles):
-					ol.append(c)
-			elif cstr(c['menu_item_type'])=='':
-				# sections
-				if has_common([r[0] for r in sql("select role from `tabMenu Item Role` where parent=%s", c['name'])], roles):
-					ol.append(c)
-			else:
-				ol.append(c)
-		
-		return ol
-
-	# --------------------------------------------------------------
-	def has_result(self, dt):
-		return sql("select name from `tab%s` limit 1" % dt) and 'Yes' or 'No'
-
-	# --------------------------------------------------------------
-
-	def is_submittable(self, dt):
-		return sql("select name from tabDocPerm where parent=%s and ifnull(submit,0)=1 and docstatus<1 limit 1", dt)
-
-	# --------------------------------------------------------------
-
-	def can_cancel(self, dt):
-		return sql('select name from tabDocPerm where parent="%s" and ifnull(cancel,0)=1 and docstatus<1 and role in ("%s") limit 1' % (dt, '", "'.join(webnotes.user.get_roles())))
-
-	# --------------------------------------------------------------
-	def get_dt_trend(self, dt):
-		ret = {}
-		for r in sql("select datediff(now(),modified), count(*) from `tab%s` where datediff(now(),modified) between 0 and 30 group by date(modified)" % dt):
-			ret[cint(r[0])] = cint(r[1])
-		return ret
-
-	# --------------------------------------------------------------
-
-	def get_columns(self, out, sf, fl, dt):
-		if not fl:
-			fl = sf
-
-		res = []
-		for f in fl:
-			if f:
-				res += [[c or '' for c in r] for r in sql("select fieldname, label, fieldtype, options from tabDocField where parent='%s' and fieldname='%s'" % (dt, f))]
-				
-		return res
-
-	# --------------------------------------------------------------
-
-	def check_user_tags(self, dt):
-		try:
-			sql("select `_user_tags` from `tab%s` limit 1" % dt)
-		except Exception, e:
-			if e.args[0] == 1054:
-				webnotes.conn.commit()
-				sql("alter table `tab%s` add column `_user_tags` varchar(180)" % dt)
-				webnotes.conn.begin()
-
-	# --------------------------------------------------------------
-	# NOTE: THIS SHOULD BE CACHED IN DOCTYPE CACHE
-	# --------------------------------------------------------------
-	
-	def get_dt_details(self, arg):
-		dt, fl, color_map = eval(arg)
-		submittable = self.is_submittable(dt) and 1 or 0
-	 
-		out = {
-			'submittable':(self.is_submittable(dt) and 1 or 0), 
-			'can_cancel':(self.can_cancel(dt) and 1 or 0)
-		}
-
-		# filters
-		# -------
-
-		sf = sql("select search_fields from tabDocType where name=%s", dt)[0][0] or ''
-
-		# get fields from in_filter (if not in search_fields)
-		if not sf.strip():
-			res = sql("select fieldname, label, fieldtype, options from tabDocField where parent=%s and `in_filter` = 1 and ifnull(fieldname,'') != ''", dt)
-			sf = [s[0] for s in res]
-		else:
-			sf = [s.strip() for s in sf.split(',')]
-			res = sql("select fieldname, label, fieldtype, options from tabDocField where parent='%s' and fieldname in (%s)" % (dt, '"'+'","'.join(sf)+'"'))
-
-		# select "link" options
-		res = [[c or '' for c in r] for r in res]
-		for r in res:
-			if r[2]=='Select' and r[3] and r[3].startswith('link:'):
-				tdt = r[3][5:]
-				ol = sql("select name from `tab%s` where docstatus!=2 order by name asc" % tdt)
-				r[3] = "\n".join([''] + [o[0] for o in ol])
-
-		if not res:
-			out['filters'] = [['name', 'ID', 'Data', '']]
-		else:
-			out['filters'] = [['name', 'ID', 'Data', '']] + res
-		
-		# columns
-		# -------
-		res = self.get_columns(out, sf, fl, dt)
-		
-		self.check_user_tags(dt)
-		
-		out['columns'] = [['name', 'ID', 'Link', dt], ['modified', 'Modified', 'Data', ''], ['_user_tags', 'Tags', 'Data', '']] + res
-		
-		if cint(color_map):
-			out['color_map'] = self.get_color_map()
-			
-		return out
-
-	# --------------------------------------------------------------
-
-	def get_color_map(self):
-		d={}
-		try:
-			for tag in sql("select name, tag_color from tabTag"):
-				d[tag[0]] = tag[1]
-		except Exception, e:
-			if e.args[0] in (1146, 1054):
-				return {}
-			else:
-				raise e
-		return d
-
-	# --------------------------------------------------------------
-
-	def get_trend(self, dt):
-		return {'trend': self.get_dt_trend(dt)}
-
-	# --------------------------------------------------------------
-
-	def get_tags(self, dt, dn):
-		tl = sql("select ifnull(_user_tags,'') from tab%s where name=%s" % (dt,'%s'), dn)[0][0]
-		return tl and tl.split(',') or []
-	
-	# --------------------------------------------------------------
-
-	def update_tags(self, dt, dn, tl):
-		if len(','.join(tl)) > 179:
-			msgprint("Too many tags")
-			raise Exception
-		
-		tl = filter(lambda x: x, tl)
-		
-		# update in table
-		sql("update tab%s set _user_tags=%s where name=%s" % (dt,'%s','%s'), (',' + ','.join(tl), dn))
-		
-		# update in feed (if present)
-		sql("update tabFeed set _user_tags=%s where doc_label=%s and doc_name=%s", (',' + ','.join(tl), dt, dn))
-
-	# --------------------------------------------------------------
-
-	def _add_tag_to_master(self, tag, color):
-		if color:
-			t, cond = color, ("on duplicate key update tag_color='%s'" % color)
-		else:
-			t, cond = 'Default', ''
-			
-		sql("insert ignore into tabTag(name, tag_color) values ('%s', '%s') %s" % (tag, t, cond))
-		
-	def create_tag(self, tag, color):
-		try:
-			self._add_tag_to_master(tag, color)
-		except Exception, e:
-			# add the table
-			if e.args[0]==1146:
-				webnotes.conn.commit()
-				sql("create table `tabTag`(`name` varchar(180), tag_color varchar(180), primary key (`name`))")
-				webnotes.conn.begin()
-				self._add_tag_to_master(tag, color)
-
-			# udpate the color column
-			if e.args[0]==1054:
-				webnotes.conn.commit()
-				sql("alter table tabTag add column tag_color varchar(180)")
-				webnotes.conn.begin()
-				self._add_tag_to_master(tag, color)
-				
-			else:
-				raise e
-
-	# --------------------------------------------------------------
-
-	def add_tag(self,arg):
-		dt, dn, tag, color = eval(arg)
-		
-		# create tag in tag table
-		self.create_tag(tag, color)
-		
-		# add in _user_tags
-		tl = self.get_tags(dt, dn)
-		
-		if not tag in tl:
-			tl.append(tag)
-			self.update_tags(dt, dn, tl)
-			
-		return tag
- 
- 	# --------------------------------------------------------------
-
-	def remove_tag(self,arg):
-		dt, dn, tag = eval(arg)
-		tl = self.get_tags(dt, dn)				
-		self.update_tags(dt, dn, filter(lambda x:x!=tag, tl))
-		
-	# --------------------------------------------------------------
-
-	def delete_items(self,arg):
-		il = eval(arg)
-		from webnotes.model import delete_doc
-		for d in il:
-			dt_obj = get_obj(d[0], d[1])
-			if hasattr(dt_obj, 'on_trash'):
-				dt_obj.on_trash()
-			delete_doc(d[0], d[1])
-
-	# --------------------------------------------------------------
-
-	def archive_items(self,arg):
-		arg = eval(arg)
-		
-		from webnotes.utils.archive import archive_doc
-		for d in arg['items']:
-			archive_doc(d[0], d[1], arg['action']=='Restore' and 1 or 0)
diff --git a/erpnext/utilities/doctype/menu_control/menu_control.txt b/erpnext/utilities/doctype/menu_control/menu_control.txt
deleted file mode 100644
index 37d63ad..0000000
--- a/erpnext/utilities/doctype/menu_control/menu_control.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-# DocType, Menu Control
-[
-
-	# These values are common in all dictionaries
-	{
-		'creation': '2009-06-09 13:43:49',
-		'docstatus': 0,
-		'modified': '2011-01-03 12:01:42',
-		'modified_by': 'sneha@webnotestech.com',
-		'owner': 'Administrator'
-	},
-
-	# These values are common for all DocType
-	{
-		'colour': 'White:FFF',
-		'doctype': 'DocType',
-		'issingle': 1,
-		'module': 'Utilities',
-		'name': '__common__',
-		'section_style': 'Simple',
-		'server_code_error': ' ',
-		'show_in_menu': 0,
-		'version': 38
-	},
-
-	# DocType, Menu Control
-	{
-		'doctype': 'DocType',
-		'name': 'Menu Control'
-	}
-]
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/reposting_tool/reposting_tool.txt b/erpnext/utilities/doctype/reposting_tool/reposting_tool.txt
index 788b11f..ba165de 100644
--- a/erpnext/utilities/doctype/reposting_tool/reposting_tool.txt
+++ b/erpnext/utilities/doctype/reposting_tool/reposting_tool.txt
@@ -5,92 +5,88 @@
 	{
 		'creation': '2010-08-08 17:09:19',
 		'docstatus': 0,
-		'modified': '2011-04-19 11:50:09',
-		'modified_by': 'Administrator',
-		'owner': 'Administrator'
+		'modified': '2012-03-21 14:56:21',
+		'modified_by': u'Administrator',
+		'owner': u'Administrator'
 	},
 
 	# These values are common for all DocType
 	{
-		'_last_update': '1308741898',
 		'allow_copy': 1,
 		'allow_email': 1,
 		'allow_print': 1,
-		'colour': 'Light Blue:DEF',
+		'colour': u'Light Blue:DEF',
+		'default_print_format': u'Standard',
 		'doctype': 'DocType',
 		'hide_toolbar': 1,
 		'in_create': 0,
 		'issingle': 1,
-		'module': 'Utilities',
+		'module': u'Utilities',
 		'name': '__common__',
 		'read_only': 1,
-		'section_style': 'Simple',
-		'server_code_error': ' ',
+		'section_style': u'Simple',
+		'server_code_error': u' ',
 		'show_in_menu': 1,
-		'version': 174
+		'version': 173
 	},
 
 	# These values are common for all DocField
 	{
-		'doctype': 'DocField',
+		'doctype': u'DocField',
 		'name': '__common__',
-		'parent': 'Reposting Tool',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
+		'parent': u'Reposting Tool',
+		'parentfield': u'fields',
+		'parenttype': u'DocType',
 		'permlevel': 0
 	},
 
 	# These values are common for all DocPerm
 	{
 		'create': 1,
-		'doctype': 'DocPerm',
-		'idx': 1,
+		'doctype': u'DocPerm',
 		'name': '__common__',
-		'parent': 'Reposting Tool',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
+		'parent': u'Reposting Tool',
+		'parentfield': u'permissions',
+		'parenttype': u'DocType',
 		'permlevel': 0,
 		'read': 1,
-		'role': 'System Manager',
+		'role': u'System Manager',
 		'write': 1
 	},
 
 	# DocType, Reposting Tool
 	{
 		'doctype': 'DocType',
-		'name': 'Reposting Tool'
+		'name': u'Reposting Tool'
 	},
 
 	# DocPerm
 	{
-		'doctype': 'DocPerm'
+		'doctype': u'DocPerm'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldname': 'recalculate_mar_&_actual_qty',
-		'fieldtype': 'Data',
-		'idx': 1,
-		'label': 'Recalculate MAR & Actual Qty'
+		'doctype': u'DocField',
+		'fieldname': u'recalculate_mar_&_actual_qty',
+		'fieldtype': u'Data',
+		'label': u'Recalculate MAR & Actual Qty'
 	},
 
 	# DocField
 	{
-		'colour': 'White:FFF',
-		'doctype': 'DocField',
-		'fieldtype': 'Button',
-		'idx': 2,
-		'label': 'Repost Bin',
-		'trigger': 'Client'
+		'colour': u'White:FFF',
+		'doctype': u'DocField',
+		'fieldtype': u'Button',
+		'label': u'Repost Bin',
+		'trigger': u'Client'
 	},
 
 	# DocField
 	{
-		'doctype': 'DocField',
-		'fieldtype': 'Button',
-		'idx': 3,
-		'label': 'Repost Account Balances',
-		'trigger': 'Client'
+		'doctype': u'DocField',
+		'fieldtype': u'Button',
+		'label': u'Repost Account Balances',
+		'trigger': u'Client'
 	}
 ]
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/sms_center/__init__.py b/erpnext/utilities/doctype/sms_center/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/utilities/doctype/sms_center/__init__.py
+++ /dev/null
diff --git a/erpnext/utilities/doctype/sms_center/sms_center.js b/erpnext/utilities/doctype/sms_center/sms_center.js
deleted file mode 100644
index 45a6073..0000000
--- a/erpnext/utilities/doctype/sms_center/sms_center.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// ERPNext - web based ERP (http://erpnext.com)
-// Copyright (C) 2012 Web Notes Technologies Pvt Ltd
-// 
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-cur_frm.cscript.refresh = function(doc, cdt, cdn) {
-  if(doc.send_to == 'Customer Group')
-    unhide_field('customer_group_name');
-  else
-    hide_field('customer_group_name');
-}
-
-cur_frm.cscript.send_to = cur_frm.cscript.refresh;
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/sms_center/sms_center.py b/erpnext/utilities/doctype/sms_center/sms_center.py
deleted file mode 100644
index a65c4cb..0000000
--- a/erpnext/utilities/doctype/sms_center/sms_center.py
+++ /dev/null
@@ -1,75 +0,0 @@
-# ERPNext - web based ERP (http://erpnext.com)
-# Copyright (C) 2012 Web Notes Technologies Pvt Ltd
-# 
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Please edit this list and import only required elements
-import webnotes
-
-from webnotes.utils import add_days, add_months, add_years, cint, cstr, date_diff, default_fields, flt, fmt_money, formatdate, generate_hash, getTraceback, get_defaults, get_first_day, get_last_day, getdate, has_common, month_name, now, nowdate, replace_newlines, sendmail, set_default, str_esc_quote, user_format, validate_email_add
-from webnotes.model import db_exists
-from webnotes.model.doc import Document, addchild, removechild, getchildren, make_autoname, SuperDocType
-from webnotes.model.doclist import getlist, copy_doclist
-from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax
-from webnotes import session, form, is_testing, msgprint, errprint
-
-set = webnotes.conn.set
-sql = webnotes.conn.sql
-get_value = webnotes.conn.get_value
-in_transaction = webnotes.conn.in_transaction
-convert_to_lists = webnotes.conn.convert_to_lists
-	
-# -----------------------------------------------------------------------------------------
-
-
-class DocType:
-  def __init__(self, doc, doclist=[]):
-    self.doc = doc
-    self.doclist = doclist
-      
-  def create_receiver_table(self):
-    if self.doc.send_to:
-      self.doc.clear_table(self.doclist, 'receiver_details')
-      rec = ''
-      if self.doc.send_to == 'All Customer':
-        rec = sql("select customer_name, CONCAT(ifnull(first_name,''),'',ifnull(last_name,'')), mobile_no from `tabContact` where ifnull(customer_name,'') !='' and ifnull(mobile_no,'')!=''")
-
-      elif self.doc.send_to == 'Customer Group' and self.doc.customer_group_name:
-       
-        rec = sql("select t2.customer_name, CONCAT(ifnull(first_name,''),'',ifnull(last_name,'')), t1.mobile_no from `tabContact` t1, `tabCustomer` t2 where t2.name = t1.customer_name and ifnull(t1.mobile_no,'')!='' and t2.customer_group = '%s'"%self.doc.customer_group_name)
-      if not rec:
-        msgprint("Either customer having no contact or customer's contact does not have mobile no")
-        raise Exception 
-
-      for d in rec:
-        ch = addchild(self.doc, 'receiver_details', 'Receiver Detail', 1, self.doclist)
-        ch.customer_name = d[0]
-        ch.receiver_name = d[1]
-        ch.mobile_no = d[2]
-    else:
-      msgprint("Please select 'Send To' field")
-        
-        
-  def send_sms(self):
-    if not self.doc.message:
-      msgprint("Please type the message before sending")
-    elif not getlist(self.doclist, 'receiver_details'):
-      msgprint("Receiver Table is blank.")
-    else:
-      receiver_list = []
-      for d in getlist(self.doclist, 'receiver_details'):
-        if d.mobile_no:
-          receiver_list.append(d.mobile_no)
-      if receiver_list:
-        msgprint(get_obj('SMS Control', 'SMS Control').send_sms(receiver_list, self.doc.message))
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/sms_center/sms_center.txt b/erpnext/utilities/doctype/sms_center/sms_center.txt
deleted file mode 100644
index 20ecbda..0000000
--- a/erpnext/utilities/doctype/sms_center/sms_center.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{'section_style': 'Simple', 'is_transaction_doc': None, 'creation': '2009-03-12 16:21:14', 'search_fields': None, 'module': 'Application Internal', 'doctype': 'DocType', 'change_log': None, 'print_outline': '', 'owner': 'Administrator', 'in_dialog': None, 'in_create': 0, 'read_only': 1, 'allow_email': None, 'dt_template': None, 'hide_heading': 0, 'issingle': 1, 'allow_rename': None, 'smallicon': '', 'allow_attach': None, 'show_in_menu': 0, 'max_attachments': None, 'version': 20, 'menu_index': 4, 'docstatus': 0, 'allow_copy': 0, 'istable': None, 'description': None, 'parent': None, 'server_code': None, 'allow_trash': None, 'allow_print': None, 'autoname': None, 'client_script_core': None, 'client_string': None, 'use_template': None, 'modified_by': 'saumil@webnotestech.com', 'document_type': None, 'name': 'SMS Center', 'idx': None, 'hide_toolbar': 0, 'colour': 'White:FFF', 'client_script': None, 'modified': '2010-09-20 14:06:57', 'server_code_error': ' ', 'name_case': '', 'parenttype': None, 'read_only_onload': None, 'server_code_core': None, 'server_code_compiled': None, 'parent_node': None, 'parentfield': None}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00225', 'parent': 'SMS Center', 'read': 1, 'create': 1, 'creation': '2009-03-12 16:56:43', 'modified': '2010-08-08 15:03:13', 'submit': None, 'doctype': 'DocPerm', 'write': 1, 'idx': 1, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 0, 'match': None, 'parentfield': 'permissions'}, {'cancel': None, 'amend': None, 'execute': None, 'modified_by': 'saumil@webnotestech.com', 'name': 'PERM00226', 'parent': 'SMS Center', 'read': 1, 'create': 0, 'creation': '2009-03-12 16:56:43', 'modified': '2010-08-08 15:03:13', 'submit': None, 'doctype': 'DocPerm', 'write': 0, 'idx': 2, 'parenttype': 'DocType', 'role': 'Administrator', 'owner': 'Administrator', 'docstatus': 0, 'permlevel': 1, 'match': None, 'parentfield': 'permissions'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-03-12 17:16:47', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': '', 'width': '50%', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'SMS Center', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01352', 'idx': 1, 'default': None, 'colour': None, 'modified': '2010-08-08 15:03:13', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-03-12 17:16:47', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Send To', 'width': '', 'trigger': 'Client', 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'SMS Center', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01349', 'idx': 2, 'default': None, 'colour': None, 'modified': '2010-08-08 15:03:13', 'parenttype': 'DocType', 'fieldname': 'send_to', 'fieldtype': 'Select', 'options': '\nAll Customer\nCustomer Group', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-03-12 17:16:47', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Customer Group Name', 'width': '', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'SMS Center', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01351', 'idx': 3, 'default': None, 'colour': None, 'modified': '2010-08-08 15:03:13', 'parenttype': 'DocType', 'fieldname': 'customer_group_name', 'fieldtype': 'Select', 'options': 'link:Customer Group', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-03-12 17:16:47', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': 1, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Message', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': 'Message greater than 160 character will be splitted into multiple mesage', 'parent': 'SMS Center', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01346', 'idx': 4, 'default': None, 'colour': None, 'modified': '2010-08-08 15:03:13', 'parenttype': 'DocType', 'fieldname': 'message', 'fieldtype': 'Small Text', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-03-12 17:16:47', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': '', 'width': '50%', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'SMS Center', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01353', 'idx': 5, 'default': None, 'colour': None, 'modified': '2010-08-08 15:03:13', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Column Break', 'options': None, 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-03-12 17:16:47', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Create Receiver Table', 'width': '', 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'SMS Center', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01350', 'idx': 6, 'default': None, 'colour': None, 'modified': '2010-08-08 15:03:13', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Button', 'options': 'create_receiver_table', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-03-12 17:23:49', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Send SMS', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'SMS Center', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01354', 'idx': 7, 'default': None, 'colour': None, 'modified': '2010-08-08 15:03:13', 'parenttype': 'DocType', 'fieldname': '', 'fieldtype': 'Button', 'options': 'send_sms', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-03-12 17:16:47', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': '', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'SMS Center', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01348', 'idx': 8, 'default': None, 'colour': None, 'modified': '2010-08-08 15:03:13', 'parenttype': 'DocType', 'fieldname': None, 'fieldtype': 'Section Break', 'options': 'Simple', 'report_hide': None, 'parentfield': 'fields'}, {'no_copy': None, 'oldfieldtype': None, 'creation': '2009-03-12 17:16:47', 'doctype': 'DocField', 'oldfieldname': None, 'owner': 'Administrator', 'reqd': None, 'in_filter': None, 'print_hide': None, 'modified_by': 'saumil@webnotestech.com', 'label': 'Receiver Details', 'width': None, 'trigger': None, 'depends_on': None, 'docstatus': 0, 'hidden': None, 'permlevel': 0, 'description': None, 'parent': 'SMS Center', 'search_index': None, 'allow_on_submit': None, 'icon': None, 'name': 'FL01347', 'idx': 9, 'default': None, 'colour': None, 'modified': '2010-08-08 15:03:13', 'parenttype': 'DocType', 'fieldname': 'receiver_details', 'fieldtype': 'Table', 'options': 'Receiver Detail', 'report_hide': None, 'parentfield': 'fields'}]
\ No newline at end of file