diff --git a/erpnext/patches/patch.py b/erpnext/patches/patch.py
index 1924fdd..a3093c1 100644
--- a/erpnext/patches/patch.py
+++ b/erpnext/patches/patch.py
@@ -1,7 +1,7 @@
 # REMEMBER to update this
 # ========================
 
-last_patch = 383
+last_patch = 384
 
 #-------------------------------------------
 
@@ -450,3 +450,7 @@
 		clear_cache(webnotes.session['user'])
 	elif patch_no == 383:
 		reload_doc('accounts', 'doctype', 'cost_center')
+	elif patch_no == 384:
+		reload_doc('stock', 'Module Def', 'Stock')
+		sql("delete from `tabModule Def Item` where display_name = 'Serial No' and parent = 'Support'")
+		sql("update `tabDocType` set subject = 'Item Code: %(item_code)s, Warehouse: %(warehouse)s' where name = 'Serial No'")
diff --git a/erpnext/stock/Module Def/Stock/Stock.txt b/erpnext/stock/Module Def/Stock/Stock.txt
index eae0a2e..4fc8790 100644
--- a/erpnext/stock/Module Def/Stock/Stock.txt
+++ b/erpnext/stock/Module Def/Stock/Stock.txt
@@ -1,421 +1,232 @@
+# Module Def, Stock
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': None,
-		'creation': '2011-06-30 15:49:38',
-		'disabled': 'No',
+		'creation': '2011-07-01 17:40:49',
 		'docstatus': 0,
+		'modified': '2011-10-10 17:01:34',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Module Def Role
+	{
+		'doctype': 'Module Def Role',
+		'name': '__common__',
+		'parent': 'Stock',
+		'parentfield': 'roles',
+		'parenttype': 'Module Def'
+	},
+
+	# These values are common for all Module Def Item
+	{
+		'doctype': 'Module Def Item',
+		'name': '__common__',
+		'parent': 'Stock',
+		'parentfield': 'items',
+		'parenttype': 'Module Def'
+	},
+
+	# These values are common for all Module Def
+	{
+		'disabled': 'No',
 		'doctype': u'Module Def',
 		'doctype_list': 'DocType Label, QA Inspection Report',
-		'file_list': None,
-		'idx': None,
 		'is_hidden': 'No',
-		'last_updated_date': None,
-		'modified': '2011-07-01 09:36:22',
-		'modified_by': 'Administrator',
 		'module_desc': 'Material Management',
 		'module_icon': 'Stock.gif',
 		'module_label': 'Stock',
 		'module_name': 'Stock',
-		'module_page': None,
 		'module_seq': 7,
-		'name': 'Stock',
-		'owner': 'Administrator',
-		'parent': None,
-		'parentfield': None,
-		'parenttype': None,
-		'trash_reason': None,
-		'widget_code': None
+		'name': '__common__'
 	},
+
+	# Module Def, Stock
 	{
-		'click_function': None,
-		'creation': '2011-06-30 15:49:38',
+		'doctype': u'Module Def',
+		'name': 'Stock'
+	},
+
+	# Module Def Item
+	{
 		'description': 'Item master',
 		'display_name': 'Item',
 		'doc_name': 'Item',
 		'doc_type': 'Forms',
-		'docstatus': 0,
 		'doctype': 'Module Def Item',
-		'fields': 'name\nitem_group\ndescription',
-		'hide': None,
-		'icon': None,
-		'idx': 1,
-		'modified': '2011-07-01 09:36:22',
-		'modified_by': 'Administrator',
-		'name': 'MDI01321',
-		'owner': 'Administrator',
-		'parent': 'Stock',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
+		'fields': 'name\nitem_group\ndescription'
 	},
+
+	# Module Def Item
 	{
-		'click_function': None,
-		'creation': '2011-06-30 15:49:38',
+		'description': 'A unique number identifying each entity of an item',
+		'display_name': 'Serial No',
+		'doc_name': 'Serial No',
+		'doc_type': 'Forms',
+		'doctype': 'Module Def Item',
+		'fields': 'item_code\nstatus\nwarehouse\npr_no\ndelivery_note_no\ncustomer'
+	},
+
+	# Module Def Item
+	{
 		'description': 'Record of items added, removed or moved from one warehouse to another.',
 		'display_name': 'Stock Entry',
 		'doc_name': 'Stock Entry',
 		'doc_type': 'Forms',
-		'docstatus': 0,
 		'doctype': 'Module Def Item',
-		'fields': 'transfer_date\npurpose\nfrom_warehouse\nto_warehouse\nremarks',
-		'hide': None,
-		'icon': None,
-		'idx': 2,
-		'modified': '2011-07-01 09:36:22',
-		'modified_by': 'Administrator',
-		'name': 'MDI01322',
-		'owner': 'Administrator',
-		'parent': 'Stock',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
+		'fields': 'transfer_date\npurpose\nfrom_warehouse\nto_warehouse\nremarks'
 	},
+
+	# Module Def Item
 	{
-		'click_function': None,
-		'creation': '2011-06-30 15:49:38',
 		'description': 'Record of items delivered to your customers along with the Printed Note',
 		'display_name': 'Delivery Note',
 		'doc_name': 'Delivery Note',
 		'doc_type': 'Forms',
-		'docstatus': 0,
 		'doctype': 'Module Def Item',
-		'fields': 'status\ntransaction_date\ncustomer\nterritory\ngrand_total\nper_billed',
-		'hide': None,
-		'icon': None,
-		'idx': 3,
-		'modified': '2011-07-01 09:36:22',
-		'modified_by': 'Administrator',
-		'name': 'MDI01323',
-		'owner': 'Administrator',
-		'parent': 'Stock',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
+		'fields': 'status\ntransaction_date\ncustomer\nterritory\ngrand_total\nper_billed'
 	},
+
+	# Module Def Item
 	{
-		'click_function': None,
-		'creation': '2011-06-30 15:49:38',
 		'description': 'Record of incoming material from your suppliers',
 		'display_name': 'Purchase Receipt',
 		'doc_name': 'Purchase Receipt',
 		'doc_type': 'Forms',
-		'docstatus': 0,
 		'doctype': 'Module Def Item',
-		'fields': 'status\ntransaction_date\nsupplier\ngrand_total\nper_billed',
-		'hide': None,
-		'icon': None,
-		'idx': 4,
-		'modified': '2011-07-01 09:36:22',
-		'modified_by': 'Administrator',
-		'name': 'MDI01324',
-		'owner': 'Administrator',
-		'parent': 'Stock',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
+		'fields': 'status\ntransaction_date\nsupplier\ngrand_total\nper_billed'
 	},
+
+	# Module Def Item
 	{
-		'click_function': None,
-		'creation': '2011-06-30 15:49:38',
 		'description': 'Details of Installation done after delivery',
 		'display_name': 'Installation Note',
 		'doc_name': 'Installation Note',
 		'doc_type': 'Forms',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 5,
-		'modified': '2011-07-01 09:36:22',
-		'modified_by': 'Administrator',
-		'name': 'MDI01325',
-		'owner': 'Administrator',
-		'parent': 'Stock',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
+		'doctype': 'Module Def Item'
 	},
+
+	# Module Def Item
 	{
-		'click_function': None,
-		'creation': '2011-06-30 15:49:38',
 		'description': 'Create Quality Inspection Report for any item',
 		'display_name': 'Inspection Report',
 		'doc_name': 'QA Inspection Report',
 		'doc_type': 'Forms',
-		'docstatus': 0,
 		'doctype': 'Module Def Item',
-		'fields': 'inspection_type\nitem_code\nreport_date\npurchase_receipt_no\ndelivery_note_no',
-		'hide': None,
-		'icon': None,
-		'idx': 6,
-		'modified': '2011-07-01 09:36:22',
-		'modified_by': 'Administrator',
-		'name': 'MDI01326',
-		'owner': 'Administrator',
-		'parent': 'Stock',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
+		'fields': 'inspection_type\nitem_code\nreport_date\npurchase_receipt_no\ndelivery_note_no'
 	},
+
+	# Module Def Item
 	{
-		'click_function': None,
-		'creation': '2011-06-30 15:49:38',
 		'description': 'Reconcile your stock by uploading it form an excel file',
 		'display_name': 'Stock Reconciliation',
 		'doc_name': 'Stock Reconciliation',
 		'doc_type': 'Forms',
-		'docstatus': 0,
 		'doctype': 'Module Def Item',
-		'fields': 'reconciliation_date\nreconciliation_time\nremark',
-		'hide': None,
-		'icon': None,
-		'idx': 7,
-		'modified': '2011-07-01 09:36:22',
-		'modified_by': 'Administrator',
-		'name': 'MDI01327',
-		'owner': 'Administrator',
-		'parent': 'Stock',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
+		'fields': 'reconciliation_date\nreconciliation_time\nremark'
 	},
+
+	# Module Def Item
 	{
-		'click_function': None,
-		'creation': '2011-06-30 15:49:38',
 		'description': 'This utility tool will update Stock UOM in Item and will respectively update Actual Qty in Stock Ledger as per Conversion Factor.',
 		'display_name': 'Stock UOM Replace Utility',
 		'doc_name': 'Stock UOM Replace Utility',
 		'doc_type': 'Single DocType',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 8,
-		'modified': '2011-07-01 09:36:22',
-		'modified_by': 'Administrator',
-		'name': 'MDI01328',
-		'owner': 'Administrator',
-		'parent': 'Stock',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
+		'doctype': 'Module Def Item'
 	},
+
+	# Module Def Item
 	{
-		'click_function': None,
-		'creation': '2011-06-30 15:49:38',
 		'description': 'This utility will help in tracking stock for Sales Return and Purchase Return.',
 		'display_name': 'Sales and Purchase Return Wizard',
 		'doc_name': 'Sales and Purchase Return Wizard',
 		'doc_type': 'Single DocType',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 9,
-		'modified': '2011-07-01 09:36:22',
-		'modified_by': 'Administrator',
-		'name': 'MDI01329',
-		'owner': 'Administrator',
-		'parent': 'Stock',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
+		'doctype': 'Module Def Item'
 	},
+
+	# Module Def Item
 	{
-		'click_function': None,
-		'creation': '2011-06-30 18:57:58',
 		'description': 'You can create master template for landed cost wizard',
 		'display_name': 'Landed Cost Master',
 		'doc_name': 'Landed Cost Master',
 		'doc_type': 'Forms',
-		'docstatus': 0,
 		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': 'accept.gif',
-		'idx': 10,
-		'modified': '2011-07-01 09:36:22',
-		'modified_by': 'Administrator',
-		'name': 'MDI01372',
-		'owner': 'Administrator',
-		'parent': 'Stock',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
+		'icon': 'accept.gif'
 	},
+
+	# Module Def Item
 	{
-		'click_function': None,
-		'creation': '2011-06-30 18:57:58',
 		'description': 'Add extra expenses into Purchase Receipt which should be consider for item valuation. The cost will be added proportionately as per purchase receipt value.',
 		'display_name': 'Landed Cost Wizard',
 		'doc_name': 'Landed Cost Wizard',
 		'doc_type': 'Forms',
-		'docstatus': 0,
 		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': 'accept.gif',
-		'idx': 11,
-		'modified': '2011-07-01 09:36:22',
-		'modified_by': 'Administrator',
-		'name': 'MDI01371',
-		'owner': 'Administrator',
-		'parent': 'Stock',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
+		'icon': 'accept.gif'
 	},
+
+	# Module Def Item
 	{
-		'click_function': None,
-		'creation': '2011-06-30 15:49:38',
-		'description': None,
 		'display_name': 'Stock Ledger',
 		'doc_name': 'Stock Ledger Entry',
 		'doc_type': 'Reports',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 12,
-		'modified': '2011-07-01 09:36:22',
-		'modified_by': 'Administrator',
-		'name': 'MDI01330',
-		'owner': 'Administrator',
-		'parent': 'Stock',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
+		'doctype': 'Module Def Item'
 	},
+
+	# Module Def Item
 	{
-		'click_function': None,
-		'creation': '2011-06-30 15:49:38',
-		'description': None,
 		'display_name': 'Stock Level',
 		'doc_name': 'Bin',
 		'doc_type': 'Reports',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 13,
-		'modified': '2011-07-01 09:36:22',
-		'modified_by': 'Administrator',
-		'name': 'MDI01331',
-		'owner': 'Administrator',
-		'parent': 'Stock',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
+		'doctype': 'Module Def Item'
 	},
+
+	# Module Def Item
 	{
-		'click_function': None,
-		'creation': '2011-06-30 15:49:38',
-		'description': None,
 		'display_name': 'Shortage To Indent',
 		'doc_name': 'Item',
 		'doc_type': 'Reports',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 14,
-		'modified': '2011-07-01 09:36:22',
-		'modified_by': 'Administrator',
-		'name': 'MDI01332',
-		'owner': 'Administrator',
-		'parent': 'Stock',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
+		'doctype': 'Module Def Item'
 	},
+
+	# Module Def Item
 	{
-		'click_function': None,
-		'creation': '2011-06-30 15:49:38',
 		'description': 'Stock Value as per Item and Warehouse',
 		'display_name': 'Stock Report',
 		'doc_name': 'Stock Ledger Entry',
 		'doc_type': 'Reports',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 15,
-		'modified': '2011-07-01 09:36:22',
-		'modified_by': 'Administrator',
-		'name': 'MDI01333',
-		'owner': 'Administrator',
-		'parent': 'Stock',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
+		'doctype': 'Module Def Item'
 	},
+
+	# Module Def Item
 	{
-		'click_function': None,
-		'creation': '2011-06-30 15:49:38',
-		'description': None,
 		'display_name': 'Stock Aging Report',
 		'doc_name': 'Serial No',
 		'doc_type': 'Reports',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 16,
-		'modified': '2011-07-01 09:36:22',
-		'modified_by': 'Administrator',
-		'name': 'MDI01334',
-		'owner': 'Administrator',
-		'parent': 'Stock',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
+		'doctype': 'Module Def Item'
 	},
+
+	# Module Def Role
 	{
-		'creation': '2011-06-30 15:49:38',
-		'docstatus': 0,
 		'doctype': 'Module Def Role',
-		'idx': 1,
-		'modified': '2011-07-01 09:36:22',
-		'modified_by': 'Administrator',
-		'name': 'MDR00336',
-		'owner': 'Administrator',
-		'parent': 'Stock',
-		'parentfield': 'roles',
-		'parenttype': 'Module Def',
 		'role': 'Material User'
 	},
+
+	# Module Def Role
 	{
-		'creation': '2011-06-30 15:49:38',
-		'docstatus': 0,
 		'doctype': 'Module Def Role',
-		'idx': 2,
-		'modified': '2011-07-01 09:36:22',
-		'modified_by': 'Administrator',
-		'name': 'MDR00337',
-		'owner': 'Administrator',
-		'parent': 'Stock',
-		'parentfield': 'roles',
-		'parenttype': 'Module Def',
 		'role': 'Material Master Manager'
 	},
+
+	# Module Def Role
 	{
-		'creation': '2011-06-30 15:49:38',
-		'docstatus': 0,
 		'doctype': 'Module Def Role',
-		'idx': 3,
-		'modified': '2011-07-01 09:36:22',
-		'modified_by': 'Administrator',
-		'name': 'MDR00338',
-		'owner': 'Administrator',
-		'parent': 'Stock',
-		'parentfield': 'roles',
-		'parenttype': 'Module Def',
 		'role': 'Material Manager'
 	},
+
+	# Module Def Role
 	{
-		'creation': '2011-06-30 15:49:38',
-		'docstatus': 0,
 		'doctype': 'Module Def Role',
-		'idx': 4,
-		'modified': '2011-07-01 09:36:22',
-		'modified_by': 'Administrator',
-		'name': 'MDR00339',
-		'owner': 'Administrator',
-		'parent': 'Stock',
-		'parentfield': 'roles',
-		'parenttype': 'Module Def',
 		'role': 'Quality Manager'
 	}
 ]
\ No newline at end of file
diff --git a/erpnext/stock/doctype/serial_no/serial_no.txt b/erpnext/stock/doctype/serial_no/serial_no.txt
index 9aa6119..277a2ec 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.txt
+++ b/erpnext/stock/doctype/serial_no/serial_no.txt
@@ -5,17 +5,18 @@
 	{
 		'creation': '2010-08-08 17:09:23',
 		'docstatus': 0,
-		'modified': '2011-05-17 12:38:15',
+		'modified': '2011-10-10 17:08:57',
 		'modified_by': 'Administrator',
 		'owner': 'Administrator'
 	},
 
 	# These values are common for all DocType
 	{
-		'_last_update': '1305616095',
+		'_last_update': '1317365120',
 		'allow_trash': 1,
 		'autoname': 'field:serial_no',
 		'colour': 'White:FFF',
+		'default_print_format': 'Standard',
 		'doctype': 'DocType',
 		'document_type': 'Master',
 		'module': 'Stock',
@@ -24,9 +25,8 @@
 		'section_style': 'Tabbed',
 		'server_code_error': ' ',
 		'show_in_menu': 0,
-		'subject': '%(item_code)s',
 		'tag_fields': 'status',
-		'version': 188
+		'version': 190
 	},
 
 	# These values are common for all DocField
@@ -60,7 +60,6 @@
 		'cancel': 0,
 		'create': 0,
 		'doctype': 'DocPerm',
-		'idx': 1,
 		'permlevel': 1,
 		'role': 'Material Manager',
 		'submit': 0,
@@ -73,7 +72,6 @@
 		'cancel': 0,
 		'create': 0,
 		'doctype': 'DocPerm',
-		'idx': 2,
 		'permlevel': 0,
 		'role': 'Material Manager',
 		'submit': 0,
@@ -86,7 +84,6 @@
 		'cancel': 0,
 		'create': 0,
 		'doctype': 'DocPerm',
-		'idx': 3,
 		'permlevel': 1,
 		'role': 'Material User',
 		'submit': 0,
@@ -99,7 +96,6 @@
 		'cancel': 0,
 		'create': 0,
 		'doctype': 'DocPerm',
-		'idx': 4,
 		'permlevel': 0,
 		'role': 'Material User',
 		'submit': 0,
@@ -111,7 +107,6 @@
 		'cancel': 1,
 		'create': 1,
 		'doctype': 'DocPerm',
-		'idx': 5,
 		'permlevel': 0,
 		'role': 'System Manager',
 		'write': 1
@@ -122,7 +117,6 @@
 		'cancel': 1,
 		'create': 1,
 		'doctype': 'DocPerm',
-		'idx': 6,
 		'permlevel': 0,
 		'role': 'Material Master Manager',
 		'write': 1
@@ -131,7 +125,6 @@
 	# DocPerm
 	{
 		'doctype': 'DocPerm',
-		'idx': 7,
 		'permlevel': 1,
 		'role': 'System Manager'
 	},
@@ -139,7 +132,6 @@
 	# DocPerm
 	{
 		'doctype': 'DocPerm',
-		'idx': 8,
 		'permlevel': 1,
 		'role': 'Sales Master Manager'
 	},
@@ -148,7 +140,6 @@
 	{
 		'doctype': 'DocField',
 		'fieldtype': 'Section Break',
-		'idx': 1,
 		'label': 'Details',
 		'oldfieldtype': 'Section Break',
 		'permlevel': 0
@@ -158,7 +149,6 @@
 	{
 		'doctype': 'DocField',
 		'fieldtype': 'Column Break',
-		'idx': 2,
 		'permlevel': 0
 	},
 
@@ -168,7 +158,6 @@
 		'doctype': 'DocField',
 		'fieldname': 'status',
 		'fieldtype': 'Select',
-		'idx': 3,
 		'in_filter': 1,
 		'label': 'Status',
 		'no_copy': 1,
@@ -185,7 +174,6 @@
 		'doctype': 'DocField',
 		'fieldname': 'serial_no',
 		'fieldtype': 'Data',
-		'idx': 4,
 		'in_filter': 0,
 		'label': 'Serial No',
 		'no_copy': 1,
@@ -193,7 +181,7 @@
 		'oldfieldtype': 'Data',
 		'permlevel': 0,
 		'reqd': 1,
-		'search_index': 0
+		'search_index': 1
 	},
 
 	# DocField
@@ -202,7 +190,6 @@
 		'doctype': 'DocField',
 		'fieldname': 'item_code',
 		'fieldtype': 'Link',
-		'idx': 5,
 		'in_filter': 1,
 		'label': 'Item Code',
 		'oldfieldname': 'item_code',
@@ -218,7 +205,6 @@
 	{
 		'doctype': 'DocField',
 		'fieldtype': 'Column Break',
-		'idx': 6,
 		'permlevel': 0
 	},
 
@@ -227,7 +213,6 @@
 		'doctype': 'DocField',
 		'fieldname': 'item_name',
 		'fieldtype': 'Data',
-		'idx': 7,
 		'label': 'Item Name',
 		'permlevel': 1
 	},
@@ -237,13 +222,11 @@
 		'doctype': 'DocField',
 		'fieldname': 'description',
 		'fieldtype': 'Text',
-		'idx': 8,
 		'in_filter': 1,
 		'label': 'Description',
 		'oldfieldname': 'description',
 		'oldfieldtype': 'Text',
 		'permlevel': 1,
-		'reqd': 1,
 		'search_index': 0,
 		'width': '300px'
 	},
@@ -253,14 +236,13 @@
 		'doctype': 'DocField',
 		'fieldname': 'item_group',
 		'fieldtype': 'Link',
-		'idx': 9,
 		'in_filter': 0,
 		'label': 'Item Group',
 		'oldfieldname': 'item_group',
 		'oldfieldtype': 'Link',
 		'options': 'Item Group',
 		'permlevel': 1,
-		'reqd': 0,
+		'reqd': 1,
 		'search_index': 0
 	},
 
@@ -269,7 +251,6 @@
 		'doctype': 'DocField',
 		'fieldname': 'brand',
 		'fieldtype': 'Link',
-		'idx': 10,
 		'in_filter': 0,
 		'label': 'Brand',
 		'oldfieldname': 'brand',
@@ -284,7 +265,6 @@
 	{
 		'doctype': 'DocField',
 		'fieldtype': 'Section Break',
-		'idx': 11,
 		'label': 'Purchase Details',
 		'permlevel': 0
 	},
@@ -293,7 +273,6 @@
 	{
 		'doctype': 'DocField',
 		'fieldtype': 'Column Break',
-		'idx': 12,
 		'permlevel': 0,
 		'width': '50%'
 	},
@@ -303,7 +282,6 @@
 		'doctype': 'DocField',
 		'fieldname': 'purchase_document_type',
 		'fieldtype': 'Select',
-		'idx': 13,
 		'label': 'Purchase Document Type',
 		'no_copy': 1,
 		'options': '\nPurchase Receipt\nStock Entry',
@@ -316,7 +294,6 @@
 		'fieldname': 'purchase_document_no',
 		'fieldtype': 'Data',
 		'hidden': 0,
-		'idx': 14,
 		'label': 'Purchase Document No',
 		'no_copy': 1,
 		'permlevel': 0
@@ -328,7 +305,6 @@
 		'doctype': 'DocField',
 		'fieldname': 'purchase_date',
 		'fieldtype': 'Date',
-		'idx': 15,
 		'in_filter': 1,
 		'label': 'Purchase Date',
 		'no_copy': 1,
@@ -345,7 +321,6 @@
 		'doctype': 'DocField',
 		'fieldname': 'purchase_time',
 		'fieldtype': 'Time',
-		'idx': 16,
 		'label': 'Incoming Time',
 		'no_copy': 1,
 		'permlevel': 0,
@@ -357,7 +332,6 @@
 		'doctype': 'DocField',
 		'fieldname': 'purchase_rate',
 		'fieldtype': 'Currency',
-		'idx': 17,
 		'in_filter': 0,
 		'label': 'Incoming Rate',
 		'no_copy': 1,
@@ -372,7 +346,6 @@
 	{
 		'doctype': 'DocField',
 		'fieldtype': 'Column Break',
-		'idx': 18,
 		'permlevel': 0,
 		'width': '50%'
 	},
@@ -382,7 +355,6 @@
 		'doctype': 'DocField',
 		'fieldname': 'warehouse',
 		'fieldtype': 'Link',
-		'idx': 19,
 		'in_filter': 1,
 		'label': 'Warehouse',
 		'no_copy': 1,
@@ -399,7 +371,6 @@
 		'doctype': 'DocField',
 		'fieldname': 'supplier',
 		'fieldtype': 'Link',
-		'idx': 20,
 		'in_filter': 1,
 		'label': 'Supplier',
 		'no_copy': 1,
@@ -412,7 +383,6 @@
 		'doctype': 'DocField',
 		'fieldname': 'supplier_name',
 		'fieldtype': 'Data',
-		'idx': 21,
 		'in_filter': 1,
 		'label': 'Supplier Name',
 		'no_copy': 1,
@@ -424,7 +394,6 @@
 		'doctype': 'DocField',
 		'fieldname': 'address_display',
 		'fieldtype': 'Text',
-		'idx': 22,
 		'label': 'Supplier Address',
 		'no_copy': 1,
 		'permlevel': 1
@@ -434,7 +403,6 @@
 	{
 		'doctype': 'DocField',
 		'fieldtype': 'Section Break',
-		'idx': 23,
 		'label': 'Delivery Details',
 		'oldfieldtype': 'Column Break',
 		'permlevel': 0
@@ -444,7 +412,6 @@
 	{
 		'doctype': 'DocField',
 		'fieldtype': 'Column Break',
-		'idx': 24,
 		'permlevel': 0,
 		'width': '50%'
 	},
@@ -454,7 +421,6 @@
 		'doctype': 'DocField',
 		'fieldname': 'delivery_document_type',
 		'fieldtype': 'Select',
-		'idx': 25,
 		'in_filter': 1,
 		'label': 'Delivery Document Type',
 		'no_copy': 1,
@@ -467,7 +433,6 @@
 		'doctype': 'DocField',
 		'fieldname': 'delivery_document_no',
 		'fieldtype': 'Data',
-		'idx': 26,
 		'in_filter': 1,
 		'label': 'Delivery Document No',
 		'no_copy': 1,
@@ -479,7 +444,6 @@
 		'doctype': 'DocField',
 		'fieldname': 'customer_address',
 		'fieldtype': 'Text',
-		'idx': 27,
 		'label': 'Customer Address',
 		'oldfieldname': 'customer_address',
 		'oldfieldtype': 'Text',
@@ -491,7 +455,6 @@
 		'doctype': 'DocField',
 		'fieldname': 'delivery_date',
 		'fieldtype': 'Date',
-		'idx': 28,
 		'label': 'Delivery Date',
 		'no_copy': 1,
 		'oldfieldname': 'delivery_date',
@@ -505,7 +468,6 @@
 		'doctype': 'DocField',
 		'fieldname': 'delivery_time',
 		'fieldtype': 'Time',
-		'idx': 29,
 		'label': 'Delivery Time',
 		'no_copy': 1,
 		'permlevel': 1
@@ -517,7 +479,6 @@
 		'fieldname': 'is_cancelled',
 		'fieldtype': 'Select',
 		'hidden': 1,
-		'idx': 30,
 		'label': 'Is Cancelled',
 		'oldfieldname': 'is_cancelled',
 		'oldfieldtype': 'Select',
@@ -530,7 +491,6 @@
 	{
 		'doctype': 'DocField',
 		'fieldtype': 'Column Break',
-		'idx': 31,
 		'permlevel': 0,
 		'width': '50%'
 	},
@@ -540,7 +500,6 @@
 		'doctype': 'DocField',
 		'fieldname': 'customer',
 		'fieldtype': 'Link',
-		'idx': 32,
 		'in_filter': 1,
 		'label': 'Customer',
 		'no_copy': 1,
@@ -559,7 +518,6 @@
 		'doctype': 'DocField',
 		'fieldname': 'customer_name',
 		'fieldtype': 'Data',
-		'idx': 33,
 		'in_filter': 1,
 		'label': 'Customer Name',
 		'no_copy': 1,
@@ -574,7 +532,6 @@
 		'doctype': 'DocField',
 		'fieldname': 'delivery_address',
 		'fieldtype': 'Text',
-		'idx': 34,
 		'label': 'Delivery Address',
 		'no_copy': 1,
 		'permlevel': 1
@@ -585,7 +542,6 @@
 		'doctype': 'DocField',
 		'fieldname': 'territory',
 		'fieldtype': 'Link',
-		'idx': 35,
 		'in_filter': 1,
 		'label': 'Territory',
 		'no_copy': 1,
@@ -601,7 +557,6 @@
 	{
 		'doctype': 'DocField',
 		'fieldtype': 'Section Break',
-		'idx': 36,
 		'label': 'Warranty / AMC Details',
 		'permlevel': 0
 	},
@@ -610,7 +565,6 @@
 	{
 		'doctype': 'DocField',
 		'fieldtype': 'Column Break',
-		'idx': 37,
 		'permlevel': 0,
 		'width': '50%'
 	},
@@ -620,7 +574,6 @@
 		'doctype': 'DocField',
 		'fieldname': 'maintenance_status',
 		'fieldtype': 'Select',
-		'idx': 38,
 		'in_filter': 1,
 		'label': 'Maintenance Status',
 		'no_copy': 0,
@@ -628,7 +581,7 @@
 		'oldfieldtype': 'Select',
 		'options': '\nUnder Warranty\nOut of Warranty\nUnder AMC\nOut of AMC',
 		'permlevel': 0,
-		'search_index': 0,
+		'search_index': 1,
 		'width': '150px'
 	},
 
@@ -638,7 +591,6 @@
 		'doctype': 'DocField',
 		'fieldname': 'warranty_period',
 		'fieldtype': 'Int',
-		'idx': 39,
 		'label': 'Warranty Period (Days)',
 		'oldfieldname': 'warranty_period',
 		'oldfieldtype': 'Int',
@@ -651,7 +603,6 @@
 	{
 		'doctype': 'DocField',
 		'fieldtype': 'Column Break',
-		'idx': 40,
 		'permlevel': 0,
 		'width': '50%'
 	},
@@ -661,7 +612,6 @@
 		'doctype': 'DocField',
 		'fieldname': 'warranty_expiry_date',
 		'fieldtype': 'Date',
-		'idx': 41,
 		'in_filter': 1,
 		'label': 'Warranty Expiry Date',
 		'oldfieldname': 'warranty_expiry_date',
@@ -675,7 +625,6 @@
 		'doctype': 'DocField',
 		'fieldname': 'amc_expiry_date',
 		'fieldtype': 'Date',
-		'idx': 42,
 		'in_filter': 1,
 		'label': 'AMC Expiry Date',
 		'oldfieldname': 'amc_expiry_date',
@@ -689,7 +638,6 @@
 	{
 		'doctype': 'DocField',
 		'fieldtype': 'Section Break',
-		'idx': 43,
 		'label': 'More Info',
 		'permlevel': 0
 	},
@@ -699,7 +647,6 @@
 		'doctype': 'DocField',
 		'fieldname': 'serial_no_details',
 		'fieldtype': 'Text Editor',
-		'idx': 44,
 		'label': 'Serial No Details',
 		'permlevel': 0
 	},
@@ -709,13 +656,12 @@
 		'doctype': 'DocField',
 		'fieldname': 'company',
 		'fieldtype': 'Select',
-		'idx': 45,
 		'in_filter': 1,
 		'label': 'Company',
 		'options': 'link:Company',
 		'permlevel': 0,
 		'reqd': 1,
-		'search_index': 0
+		'search_index': 1
 	},
 
 	# DocField
@@ -723,13 +669,12 @@
 		'doctype': 'DocField',
 		'fieldname': 'fiscal_year',
 		'fieldtype': 'Select',
-		'idx': 46,
 		'in_filter': 1,
 		'label': 'Fiscal Year',
 		'options': 'link:Fiscal Year',
 		'permlevel': 0,
 		'reqd': 1,
-		'search_index': 0
+		'search_index': 1
 	},
 
 	# DocField
@@ -737,7 +682,6 @@
 		'doctype': 'DocField',
 		'fieldname': 'trash_reason',
 		'fieldtype': 'Small Text',
-		'idx': 47,
 		'label': 'Trash Reason',
 		'oldfieldname': 'trash_reason',
 		'oldfieldtype': 'Small Text',
diff --git a/erpnext/support/Module Def/Support/Support.txt b/erpnext/support/Module Def/Support/Support.txt
index 9b39572..9c66c3d 100644
--- a/erpnext/support/Module Def/Support/Support.txt
+++ b/erpnext/support/Module Def/Support/Support.txt
@@ -1,281 +1,149 @@
+# Module Def, Support
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': None,
-		'creation': '2011-06-30 15:51:59',
-		'disabled': 'No',
+		'creation': '2011-07-01 17:42:15',
 		'docstatus': 0,
+		'modified': '2011-10-10 16:59:49',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Module Def Role
+	{
+		'doctype': 'Module Def Role',
+		'name': '__common__',
+		'parent': 'Support',
+		'parentfield': 'roles',
+		'parenttype': 'Module Def'
+	},
+
+	# These values are common for all Module Def Item
+	{
+		'doctype': 'Module Def Item',
+		'name': '__common__',
+		'parent': 'Support',
+		'parentfield': 'items',
+		'parenttype': 'Module Def'
+	},
+
+	# These values are common for all Module Def
+	{
+		'disabled': 'No',
 		'doctype': u'Module Def',
 		'doctype_list': 'DocType Label, Ticket',
-		'file_list': None,
-		'idx': None,
 		'is_hidden': 'No',
-		'last_updated_date': None,
-		'modified': '2011-07-01 09:36:38',
-		'modified_by': 'Administrator',
 		'module_desc': 'Manage maintenance quotes, orders, schedule etc.',
 		'module_icon': 'Maintenance.gif',
 		'module_label': 'Support',
 		'module_name': 'Support',
-		'module_page': None,
 		'module_seq': 8,
-		'name': 'Support',
-		'owner': 'Administrator',
-		'parent': None,
-		'parentfield': None,
-		'parenttype': None,
-		'trash_reason': None,
-		'widget_code': None
+		'name': '__common__'
 	},
+
+	# Module Def, Support
 	{
-		'click_function': None,
-		'creation': '2011-06-30 15:51:59',
-		'description': 'A unique number identifying each entity of an item',
-		'display_name': 'Serial No',
-		'doc_name': 'Serial No',
-		'doc_type': 'Forms',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': 'item_code\nstatus\npr_no\ndelivery_note_no\ncustomer',
-		'hide': None,
-		'icon': None,
-		'idx': 1,
-		'modified': '2011-07-01 09:36:38',
-		'modified_by': 'Administrator',
-		'name': 'MDI01361',
-		'owner': 'Administrator',
-		'parent': 'Support',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
+		'doctype': u'Module Def',
+		'name': 'Support'
 	},
+
+	# Module Def Item
 	{
-		'click_function': None,
-		'creation': '2011-06-30 15:51:59',
 		'description': "Database of Support Ticket's raised by Customers",
 		'display_name': 'Support Ticket',
 		'doc_name': 'Support Ticket',
 		'doc_type': 'Forms',
-		'docstatus': 0,
 		'doctype': 'Module Def Item',
-		'fields': 'status\nopening_date\ncustomer\nallocated_to',
-		'hide': None,
-		'icon': None,
-		'idx': 2,
-		'modified': '2011-07-01 09:36:38',
-		'modified_by': 'Administrator',
-		'name': 'MDI01362',
-		'owner': 'Administrator',
-		'parent': 'Support',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
+		'fields': 'status\nopening_date\ncustomer\nallocated_to'
 	},
+
+	# Module Def Item
 	{
-		'click_function': None,
-		'creation': '2011-06-30 15:51:59',
 		'description': 'Create schedule based on maintenance order',
 		'display_name': 'Maintenance Schedule',
 		'doc_name': 'Maintenance Schedule',
 		'doc_type': 'Forms',
-		'docstatus': 0,
 		'doctype': 'Module Def Item',
-		'fields': 'status\ntransaction_date\ncustomer\nsales_order_no',
-		'hide': None,
-		'icon': None,
-		'idx': 3,
-		'modified': '2011-07-01 09:36:38',
-		'modified_by': 'Administrator',
-		'name': 'MDI01363',
-		'owner': 'Administrator',
-		'parent': 'Support',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
+		'fields': 'status\ntransaction_date\ncustomer\nsales_order_no'
 	},
+
+	# Module Def Item
 	{
-		'click_function': None,
-		'creation': '2011-06-30 15:51:59',
 		'description': 'Database of issues raised your Customers',
 		'display_name': 'Customer Issue',
 		'doc_name': 'Customer Issue',
 		'doc_type': 'Forms',
-		'docstatus': 0,
 		'doctype': 'Module Def Item',
-		'fields': 'status\ncomplaint_date\ncustomer\nallocated_to\nallocated_on',
-		'hide': None,
-		'icon': None,
-		'idx': 4,
-		'modified': '2011-07-01 09:36:38',
-		'modified_by': 'Administrator',
-		'name': 'MDI01364',
-		'owner': 'Administrator',
-		'parent': 'Support',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
+		'fields': 'status\ncomplaint_date\ncustomer\nallocated_to\nallocated_on'
 	},
+
+	# Module Def Item
 	{
-		'click_function': None,
-		'creation': '2011-06-30 15:51:59',
-		'description': None,
 		'display_name': 'Maintenance Visit',
 		'doc_name': 'Maintenance Visit',
 		'doc_type': 'Forms',
-		'docstatus': 0,
 		'doctype': 'Module Def Item',
-		'fields': 'status\nmntc_date\ncustomer\nmaintenance_type\ncompletion_status',
-		'hide': None,
-		'icon': None,
-		'idx': 5,
-		'modified': '2011-07-01 09:36:38',
-		'modified_by': 'Administrator',
-		'name': 'MDI01365',
-		'owner': 'Administrator',
-		'parent': 'Support',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
+		'fields': 'status\nmntc_date\ncustomer\nmaintenance_type\ncompletion_status'
 	},
+
+	# Module Def Item
 	{
-		'click_function': None,
-		'creation': '2011-06-30 15:51:59',
 		'description': 'List of all scheduled mainteance. You can filter by sales person, date, serial no etc. ',
 		'display_name': 'Maintenance Schedule Details',
 		'doc_name': 'Maintenance Schedule Detail',
 		'doc_type': 'Reports',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 6,
-		'modified': '2011-07-01 09:36:38',
-		'modified_by': 'Administrator',
-		'name': 'MDI01366',
-		'owner': 'Administrator',
-		'parent': 'Support',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
+		'doctype': 'Module Def Item'
 	},
+
+	# Module Def Item
 	{
-		'click_function': None,
-		'creation': '2011-06-30 15:51:59',
 		'description': 'List of all issues raised by customer',
 		'display_name': 'Customer Issues',
 		'doc_name': 'Customer Issue',
 		'doc_type': 'Reports',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 7,
-		'modified': '2011-07-01 09:36:38',
-		'modified_by': 'Administrator',
-		'name': 'MDI01367',
-		'owner': 'Administrator',
-		'parent': 'Support',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
+		'doctype': 'Module Def Item'
 	},
+
+	# Module Def Item
 	{
-		'click_function': None,
-		'creation': '2011-06-30 15:51:59',
-		'description': None,
 		'display_name': 'Warranty/AMC Expiry Details',
 		'doc_name': 'Serial No',
 		'doc_type': 'Reports',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 8,
-		'modified': '2011-07-01 09:36:38',
-		'modified_by': 'Administrator',
-		'name': 'MDI01368',
-		'owner': 'Administrator',
-		'parent': 'Support',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
+		'doctype': 'Module Def Item'
 	},
+
+	# Module Def Item
 	{
-		'click_function': None,
-		'creation': '2011-06-30 15:51:59',
-		'description': None,
 		'display_name': 'Warranty/AMC Summary',
 		'doc_name': 'Serial No',
 		'doc_type': 'Reports',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 9,
-		'modified': '2011-07-01 09:36:38',
-		'modified_by': 'Administrator',
-		'name': 'MDI01369',
-		'owner': 'Administrator',
-		'parent': 'Support',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
+		'doctype': 'Module Def Item'
 	},
+
+	# Module Def Item
 	{
-		'click_function': None,
-		'creation': '2011-06-30 15:51:59',
-		'description': None,
 		'display_name': 'Maintenance Orderwise Pending Amount To Bill',
 		'doc_name': 'Sales Order Detail',
 		'doc_type': 'Reports',
-		'docstatus': 0,
-		'doctype': 'Module Def Item',
-		'fields': None,
-		'hide': None,
-		'icon': None,
-		'idx': 10,
-		'modified': '2011-07-01 09:36:38',
-		'modified_by': 'Administrator',
-		'name': 'MDI01370',
-		'owner': 'Administrator',
-		'parent': 'Support',
-		'parentfield': 'items',
-		'parenttype': 'Module Def'
+		'doctype': 'Module Def Item'
 	},
+
+	# Module Def Role
 	{
-		'creation': '2011-06-30 15:51:59',
-		'docstatus': 0,
 		'doctype': 'Module Def Role',
-		'idx': 1,
-		'modified': '2011-07-01 09:36:38',
-		'modified_by': 'Administrator',
-		'name': 'MDR00342',
-		'owner': 'Administrator',
-		'parent': 'Support',
-		'parentfield': 'roles',
-		'parenttype': 'Module Def',
 		'role': 'Administrator'
 	},
+
+	# Module Def Role
 	{
-		'creation': '2011-06-30 15:51:59',
-		'docstatus': 0,
 		'doctype': 'Module Def Role',
-		'idx': 2,
-		'modified': '2011-07-01 09:36:38',
-		'modified_by': 'Administrator',
-		'name': 'MDR00343',
-		'owner': 'Administrator',
-		'parent': 'Support',
-		'parentfield': 'roles',
-		'parenttype': 'Module Def',
 		'role': 'Maintenance User'
 	},
+
+	# Module Def Role
 	{
-		'creation': '2011-06-30 15:51:59',
-		'docstatus': 0,
 		'doctype': 'Module Def Role',
-		'idx': 3,
-		'modified': '2011-07-01 09:36:38',
-		'modified_by': 'Administrator',
-		'name': 'MDR00344',
-		'owner': 'Administrator',
-		'parent': 'Support',
-		'parentfield': 'roles',
-		'parenttype': 'Module Def',
 		'role': 'Maintenance Manager'
 	}
 ]
\ No newline at end of file