diff --git a/accounts/DocType Mapper/Delivery Note-Receivable Voucher/Delivery Note-Receivable Voucher.txt b/accounts/DocType Mapper/Delivery Note-Receivable Voucher/Delivery Note-Receivable Voucher.txt
index 6f05fdc..3ceb9b2 100644
--- a/accounts/DocType Mapper/Delivery Note-Receivable Voucher/Delivery Note-Receivable Voucher.txt
+++ b/accounts/DocType Mapper/Delivery Note-Receivable Voucher/Delivery Note-Receivable Voucher.txt
@@ -1,1219 +1,649 @@
+# DocType Mapper, Delivery Note-Receivable Voucher
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': None,
-		'_user_tags': None,
 		'creation': '2010-08-08 17:09:34',
 		'docstatus': 0,
-		'doctype': u'DocType Mapper',
-		'from_doctype': 'Delivery Note',
-		'idx': None,
-		'modified': '2011-05-16 17:48:12',
+		'modified': '2011-06-15 14:42:33',
 		'modified_by': 'Administrator',
-		'module': 'Mapper',
-		'name': 'Delivery Note-Receivable Voucher',
-		'owner': 'Administrator',
-		'parent': None,
-		'parentfield': None,
-		'parenttype': None,
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'name': '__common__',
+		'parent': 'Delivery Note-Receivable Voucher',
+		'parentfield': 'table_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'map': 'Yes',
+		'name': '__common__',
+		'parent': 'Delivery Note-Receivable Voucher',
+		'parentfield': 'field_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all DocType Mapper
+	{
+		'doctype': 'DocType Mapper',
+		'from_doctype': 'Delivery Note',
+		'module': 'Accounts',
+		'name': '__common__',
 		'ref_doc_submitted': 1,
 		'to_doctype': 'Receivable Voucher'
 	},
+
+	# DocType Mapper, Delivery Note-Receivable Voucher
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'customer',
-		'idx': 1,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00039',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'customer'
+		'doctype': 'DocType Mapper',
+		'name': 'Delivery Note-Receivable Voucher'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:24',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_person',
-		'idx': 3,
-		'map': 'Yes',
+		'idx': 1,
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': '000003483',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_person'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-09-01 15:48:10',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'customer',
-		'idx': 4,
-		'map': 'Yes',
+		'idx': 2,
 		'match_id': 0,
-		'modified': '2010-09-01 15:48:10',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00557',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'customer'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-09-01 15:48:10',
-		'docstatus': 0,
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'customer',
+		'idx': 3,
+		'match_id': 0,
+		'to_field': 'customer'
+	},
+
+	# Field Mapper Detail
+	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'customer_name',
 		'idx': 4,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00558',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'customer_name'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:24',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'address_display',
 		'idx': 5,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': '000003484',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'address_display'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:24',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_display',
 		'idx': 6,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': '000003485',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_display'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:24',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_mobile',
 		'idx': 7,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': '000003486',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_mobile'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:24',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_email',
 		'idx': 8,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': '000003487',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_email'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:24',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'customer_group',
-		'idx': 10,
-		'map': 'Yes',
+		'idx': 9,
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': '000003488',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'customer_group'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'currency',
-		'idx': 11,
-		'map': 'Yes',
+		'idx': 10,
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00036',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'currency'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'conversion_rate',
-		'idx': 12,
-		'map': 'Yes',
+		'idx': 11,
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00041',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'conversion_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'company',
-		'idx': 13,
-		'map': 'Yes',
+		'idx': 12,
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00037',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'company'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'fiscal_year',
-		'idx': 14,
-		'map': 'Yes',
+		'idx': 13,
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00038',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'fiscal_year'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'price_list_name',
-		'idx': 15,
-		'map': 'Yes',
+		'idx': 14,
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00040',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'price_list_name'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'charge',
-		'idx': 16,
-		'map': 'Yes',
+		'idx': 15,
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00042',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'charge'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_code',
-		'idx': 17,
-		'map': 'Yes',
+		'idx': 16,
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00043',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_code'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-09 09:44:02',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'terms',
-		'idx': 18,
-		'map': 'Yes',
+		'idx': 17,
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00552',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'terms'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_name',
-		'idx': 19,
-		'map': 'Yes',
+		'idx': 18,
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00044',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_name'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'brand',
-		'idx': 20,
-		'map': 'Yes',
+		'idx': 19,
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00045',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'brand'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'description',
-		'idx': 21,
-		'map': 'Yes',
+		'idx': 20,
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00046',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'description'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-03-31 13:35:57',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'batch_no',
-		'idx': 22,
-		'map': 'Yes',
+		'idx': 21,
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': '000002189',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'batch_no'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'export_rate',
-		'idx': 22,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2010-08-08 17:09:34',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00057',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'export_rate'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2011-03-31 13:35:57',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'serial_no',
-		'idx': 23,
-		'map': 'Yes',
+		'idx': 22,
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': '000002190',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'serial_no'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_group',
-		'idx': 24,
-		'map': 'Yes',
+		'idx': 23,
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00047',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_group'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval: flt(obj.qty) - flt(obj.billed_qty)',
-		'idx': 25,
-		'map': 'Yes',
+		'idx': 24,
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00048',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'qty'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'export_rate',
+		'idx': 25,
+		'match_id': 1,
+		'to_field': 'export_rate'
+	},
+
+	# Field Mapper Detail
+	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'base_ref_rate',
 		'idx': 26,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00049',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'base_ref_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'ref_rate',
 		'idx': 27,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00050',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'ref_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'basic_rate',
 		'idx': 28,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00051',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'basic_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'parent',
 		'idx': 29,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00053',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'delivery_note'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'name',
-		'idx': 31,
-		'map': 'Yes',
+		'idx': 30,
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00054',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'dn_detail'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'prevdoc_docname',
-		'idx': 32,
-		'map': 'Yes',
+		'idx': 31,
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00055',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'sales_order'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'prevdoc_detail_docname',
-		'idx': 33,
-		'map': 'Yes',
+		'idx': 32,
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00056',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'so_detail'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'export_rate',
-		'idx': 34,
-		'map': 'Yes',
+		'idx': 33,
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00052',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'export_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-03-15 14:26:12',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'stock_uom',
-		'idx': 35,
-		'map': 'Yes',
+		'idx': 34,
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': '000001853',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'stock_uom'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.basic_rate)',
-		'idx': 36,
-		'map': 'Yes',
+		'idx': 35,
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00058',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'amount'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.export_rate)',
-		'idx': 37,
-		'map': 'Yes',
+		'idx': 36,
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00059',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'export_amount'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'adj_rate',
-		'idx': 38,
-		'map': 'Yes',
+		'idx': 37,
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00060',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'adj_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_tax_rate',
-		'idx': 39,
-		'map': 'Yes',
+		'idx': 38,
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00061',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_tax_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'charge_type',
-		'idx': 40,
-		'map': 'Yes',
+		'idx': 39,
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00062',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'charge_type'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'row_id',
-		'idx': 41,
-		'map': 'Yes',
+		'idx': 40,
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00063',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'row_id'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_wise_tax_detail',
-		'idx': 42,
-		'map': 'Yes',
+		'idx': 41,
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00064',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_wise_tax_detail'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'description',
-		'idx': 43,
-		'map': 'Yes',
+		'idx': 42,
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00065',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'description'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'account_head',
-		'idx': 44,
-		'map': 'Yes',
+		'idx': 43,
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00066',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'account_head'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'rate',
-		'idx': 45,
-		'map': 'Yes',
+		'idx': 44,
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00067',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'tax_amount',
-		'idx': 46,
-		'map': 'Yes',
+		'idx': 45,
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00068',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'tax_amount'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'total',
-		'idx': 47,
-		'map': 'Yes',
+		'idx': 46,
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00069',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'total'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'sales_person',
-		'idx': 48,
-		'map': 'Yes',
+		'idx': 47,
 		'match_id': 3,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00070',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'sales_person'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-02-15 18:38:11',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'sales_designation',
-		'idx': 49,
-		'map': 'Yes',
+		'idx': 48,
 		'match_id': 3,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00671',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'sales_designation'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'allocated_percentage',
-		'idx': 50,
-		'map': 'Yes',
+		'idx': 49,
 		'match_id': 3,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00071',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'allocated_percentage'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'allocated_amount',
-		'idx': 51,
-		'map': 'Yes',
+		'idx': 50,
 		'match_id': 3,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00072',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'allocated_amount'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-02-15 18:38:11',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'incentives',
-		'idx': 52,
-		'map': 'Yes',
+		'idx': 51,
 		'match_id': 3,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00672',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'incentives'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'source',
-		'idx': 53,
-		'map': 'Yes',
+		'idx': 52,
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00073',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'source'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'campaign',
-		'idx': 54,
-		'map': 'Yes',
+		'idx': 53,
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00074',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'campaign'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'territory',
 		'idx': 54,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00079',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'territory'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'sales_partner',
 		'idx': 55,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00075',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'sales_partner'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-02-15 18:38:11',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'commission_rate',
 		'idx': 56,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00673',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'commission_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-02-15 18:38:11',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'total_commission',
 		'idx': 57,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00674',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'total_commission'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'customer_address',
 		'idx': 58,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00076',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'customer_address'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'net_total',
 		'idx': 59,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00077',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'net_total'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'grand_total',
 		'idx': 60,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00078',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'grand_total'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-09-01 15:48:10',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'project_name',
 		'idx': 61,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00559',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'project_name'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-06 17:41:54',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'warehouse',
 		'idx': 62,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': '000002944',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'warehouse'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
-		'from_field': None,
 		'from_table': 'Delivery Note',
 		'idx': 1,
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000007',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
-		'reference_key': None,
-		'to_field': None,
 		'to_table': 'Receivable Voucher',
 		'validation_logic': 'docstatus=1'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
 		'from_field': 'delivery_note_details',
 		'from_table': 'Delivery Note Detail',
 		'idx': 2,
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000008',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
-		'reference_key': None,
 		'to_field': 'entries',
 		'to_table': 'RV Detail',
 		'validation_logic': '(qty > ifnull(billed_qty, 0) or amount > ifnull(billed_amt, 0)) and docstatus = 1'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
 		'from_field': 'other_charges',
 		'from_table': 'RV Tax Detail',
 		'idx': 3,
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000009',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
-		'reference_key': None,
 		'to_field': 'other_charges',
 		'to_table': 'RV Tax Detail',
 		'validation_logic': 'name is not null'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
 		'from_field': 'sales_team',
 		'from_table': 'Sales Team',
 		'idx': 4,
 		'match_id': 3,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000010',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Receivable Voucher',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
-		'reference_key': None,
 		'to_field': 'sales_team',
 		'to_table': 'Sales Team',
 		'validation_logic': 'name is not null'
diff --git a/accounts/DocType Mapper/Project-Receivable Voucher/Project-Receivable Voucher.txt b/accounts/DocType Mapper/Project-Receivable Voucher/Project-Receivable Voucher.txt
index 1a067d6..2a77358 100644
--- a/accounts/DocType Mapper/Project-Receivable Voucher/Project-Receivable Voucher.txt
+++ b/accounts/DocType Mapper/Project-Receivable Voucher/Project-Receivable Voucher.txt
@@ -1 +1,90 @@
-[{'modified_by': 'ashwini@webnotestech.com', 'name': 'Project-Receivable Voucher', 'parent': None, 'to_doctype': 'Receivable Voucher', 'creation': '2010-08-19 13:08:47', 'modified': '2010-09-01 14:24:38', 'module': 'Mapper', 'doctype': 'DocType Mapper', 'idx': None, 'parenttype': None, 'ref_doc_submitted': None, 'owner': 'ashwini@webnotestech.com', 'docstatus': 0, 'from_doctype': 'Project', 'parentfield': None}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00893', 'parent': 'Project-Receivable Voucher', 'to_field': 'customer', 'creation': '2010-08-26 13:30:32', 'modified': '2010-09-01 14:24:38', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 1, 'parenttype': 'DocType Mapper', 'checking_operator': '=', 'check_reference_value': None, 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'from_field': 'customer', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00880', 'parent': 'Project-Receivable Voucher', 'to_field': 'customer_name', 'creation': '2010-08-19 13:08:47', 'modified': '2010-09-01 14:24:38', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 2, 'parenttype': 'DocType Mapper', 'checking_operator': '', 'check_reference_value': None, 'owner': 'ashwini@webnotestech.com', 'docstatus': 0, 'from_field': 'customer_name', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00881', 'parent': 'Project-Receivable Voucher', 'to_field': 'customer_address', 'creation': '2010-08-19 13:08:47', 'modified': '2010-09-01 14:24:38', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 3, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'ashwini@webnotestech.com', 'docstatus': 0, 'from_field': 'customer_address', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00882', 'parent': 'Project-Receivable Voucher', 'to_field': 'territory', 'creation': '2010-08-19 13:08:47', 'modified': '2010-09-01 14:24:38', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 4, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'ashwini@webnotestech.com', 'docstatus': 0, 'from_field': 'territory', 'parentfield': 'field_mapper_details'}, {'reference_key': '', 'modified_by': 'ashwini@webnotestech.com', 'name': 'TMD/0000088', 'parent': 'Project-Receivable Voucher', 'is_reference_table': None, 'to_field': None, 'creation': '2010-08-19 13:08:47', 'reference_doctype_key': '', 'modified': '2010-09-01 14:24:38', 'doctype': 'Table Mapper Detail', 'match_id': 0, 'idx': 1, 'parenttype': 'DocType Mapper', 'from_table': 'Project', 'owner': 'ashwini@webnotestech.com', 'docstatus': 0, 'to_table': 'Receivable Voucher', 'from_field': None, 'validation_logic': 'name is not null', 'parentfield': 'table_mapper_details'}]
\ No newline at end of file
+# DocType Mapper, Project-Receivable Voucher
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-09-01 15:48:10',
+		'docstatus': 0,
+		'modified': '2010-09-01 14:24:38',
+		'modified_by': 'Administrator',
+		'owner': 'ashwini@webnotestech.com'
+	},
+
+	# These values are common for all Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'from_table': 'Project',
+		'idx': 1,
+		'match_id': 0,
+		'name': '__common__',
+		'parent': 'Project-Receivable Voucher',
+		'parentfield': 'table_mapper_details',
+		'parenttype': 'DocType Mapper',
+		'to_table': 'Receivable Voucher',
+		'validation_logic': 'name is not null'
+	},
+
+	# These values are common for all Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'map': 'Yes',
+		'match_id': 0,
+		'name': '__common__',
+		'parent': 'Project-Receivable Voucher',
+		'parentfield': 'field_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all DocType Mapper
+	{
+		'doctype': 'DocType Mapper',
+		'from_doctype': 'Project',
+		'module': 'Accounts',
+		'name': '__common__',
+		'to_doctype': 'Receivable Voucher'
+	},
+
+	# DocType Mapper, Project-Receivable Voucher
+	{
+		'doctype': 'DocType Mapper',
+		'name': 'Project-Receivable Voucher'
+	},
+
+	# Field Mapper Detail
+	{
+		'checking_operator': '=',
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'customer',
+		'idx': 1,
+		'to_field': 'customer'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'customer_name',
+		'idx': 2,
+		'to_field': 'customer_name'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'customer_address',
+		'idx': 3,
+		'to_field': 'customer_address'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'territory',
+		'idx': 4,
+		'to_field': 'territory'
+	},
+
+	# Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail'
+	}
+]
\ No newline at end of file
diff --git a/accounts/DocType Mapper/Purchase Order-Payable Voucher/Purchase Order-Payable Voucher.txt b/accounts/DocType Mapper/Purchase Order-Payable Voucher/Purchase Order-Payable Voucher.txt
index 2becbe3..76bdd1e 100644
--- a/accounts/DocType Mapper/Purchase Order-Payable Voucher/Purchase Order-Payable Voucher.txt
+++ b/accounts/DocType Mapper/Purchase Order-Payable Voucher/Purchase Order-Payable Voucher.txt
@@ -1,730 +1,403 @@
+# DocType Mapper, Purchase Order-Payable Voucher
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': None,
-		'_user_tags': None,
 		'creation': '2010-08-08 17:09:35',
 		'docstatus': 0,
-		'doctype': u'DocType Mapper',
-		'from_doctype': 'Purchase Order',
-		'idx': None,
 		'modified': '2011-05-13 11:26:20',
 		'modified_by': 'Administrator',
-		'module': 'Mapper',
-		'name': 'Purchase Order-Payable Voucher',
-		'owner': 'Administrator',
-		'parent': None,
-		'parentfield': None,
-		'parenttype': None,
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'name': '__common__',
+		'parent': 'Purchase Order-Payable Voucher',
+		'parentfield': 'table_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'map': 'Yes',
+		'name': '__common__',
+		'parent': 'Purchase Order-Payable Voucher',
+		'parentfield': 'field_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all DocType Mapper
+	{
+		'doctype': 'DocType Mapper',
+		'from_doctype': 'Purchase Order',
+		'module': 'Accounts',
+		'name': '__common__',
 		'ref_doc_submitted': 1,
 		'to_doctype': 'Payable Voucher'
 	},
+
+	# DocType Mapper, Purchase Order-Payable Voucher
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
+		'doctype': 'DocType Mapper',
+		'name': 'Purchase Order-Payable Voucher'
+	},
+
+	# Field Mapper Detail
+	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'company',
 		'idx': 1,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00171',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'company'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'fiscal_year',
 		'idx': 2,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00172',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'fiscal_year'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'conversion_rate',
 		'idx': 3,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00173',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'conversion_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'currency',
 		'idx': 4,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00174',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'currency'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'supplier',
 		'idx': 5,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00175',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'supplier'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:25',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'supplier_name',
 		'idx': 6,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': '000003494',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'supplier_name'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-09-01 15:48:10',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'supplier_name',
-		'idx': 6,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2010-09-01 15:48:10',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00584',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'supplier_name'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:25',
-		'docstatus': 0,
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'supplier_name',
+		'idx': 6,
+		'match_id': 1,
+		'to_field': 'supplier_name'
+	},
+
+	# Field Mapper Detail
+	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'supplier_address',
 		'idx': 7,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': '000003495',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'supplier_address'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:25',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_person',
 		'idx': 8,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': '000003496',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_person'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:25',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'address_display',
 		'idx': 9,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': '000003497',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'address_display'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:25',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_display',
 		'idx': 10,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': '000003498',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_display'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:25',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_mobile',
 		'idx': 11,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': '000003499',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_mobile'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:25',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_email',
 		'idx': 12,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': '000003500',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_email'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_code',
 		'idx': 13,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00176',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_code'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_name',
 		'idx': 14,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00177',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_name'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'brand',
 		'idx': 15,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00178',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'brand'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval: flt(obj.qty) - flt(obj.billed_qty)',
 		'idx': 16,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00179',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'qty'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'purchase_rate',
 		'idx': 17,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00180',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.purchase_rate)',
 		'idx': 18,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00181',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'amount'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'import_rate',
 		'idx': 19,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00182',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'import_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.import_rate)',
 		'idx': 20,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00183',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'import_amount'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'description',
 		'idx': 21,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00184',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'description'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'parent',
 		'idx': 22,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00185',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'purchase_order'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'name',
 		'idx': 23,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00186',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'po_detail'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_group',
 		'idx': 24,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00187',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_group'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-03-23 15:14:10',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_tax_rate',
 		'idx': 25,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': '000001917',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_tax_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'category',
 		'idx': 26,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00188',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'category'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'add_deduct_tax',
 		'idx': 27,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00189',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'add_deduct_tax'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'charge_type',
 		'idx': 28,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00190',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'charge_type'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'row_id',
 		'idx': 29,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00191',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'row_id'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_wise_tax_detail',
 		'idx': 30,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00192',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_wise_tax_detail'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'description',
 		'idx': 31,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00193',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'description'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'account_head',
 		'idx': 32,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00194',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'account_head'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'cost_center',
 		'idx': 33,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00195',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'cost_center'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'rate',
 		'idx': 34,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00196',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-09-01 15:48:10',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'project_name',
 		'idx': 35,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00585',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'project_name'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
-		'from_field': None,
 		'from_table': 'Purchase Order',
 		'idx': 1,
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000022',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
-		'reference_key': None,
-		'to_field': None,
 		'to_table': 'Payable Voucher',
 		'validation_logic': 'docstatus =1'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
 		'from_field': 'po_details',
 		'from_table': 'PO Detail',
 		'idx': 2,
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000023',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
-		'reference_key': None,
 		'to_field': 'entries',
 		'to_table': 'PV Detail',
 		'validation_logic': 'ifnull(billed_qty,0)  < qty'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
 		'from_field': 'purchase_tax_details',
 		'from_table': 'Purchase Tax Detail',
 		'idx': 3,
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000024',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order-Payable Voucher',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
-		'reference_key': None,
 		'to_field': 'purchase_tax_details',
 		'to_table': 'Purchase Tax Detail',
 		'validation_logic': 'docstatus =1'
diff --git a/accounts/DocType Mapper/Purchase Receipt-Payable Voucher/Purchase Receipt-Payable Voucher.txt b/accounts/DocType Mapper/Purchase Receipt-Payable Voucher/Purchase Receipt-Payable Voucher.txt
index fbf66c3..73967d9 100644
--- a/accounts/DocType Mapper/Purchase Receipt-Payable Voucher/Purchase Receipt-Payable Voucher.txt
+++ b/accounts/DocType Mapper/Purchase Receipt-Payable Voucher/Purchase Receipt-Payable Voucher.txt
@@ -1,748 +1,412 @@
+# DocType Mapper, Purchase Receipt-Payable Voucher
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': None,
-		'_user_tags': None,
 		'creation': '2010-08-08 17:09:35',
 		'docstatus': 0,
-		'doctype': u'DocType Mapper',
-		'from_doctype': 'Purchase Receipt',
-		'idx': None,
 		'modified': '2011-05-13 12:18:34',
 		'modified_by': 'Administrator',
-		'module': 'Mapper',
-		'name': 'Purchase Receipt-Payable Voucher',
-		'owner': 'Administrator',
-		'parent': None,
-		'parentfield': None,
-		'parenttype': None,
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'name': '__common__',
+		'parent': 'Purchase Receipt-Payable Voucher',
+		'parentfield': 'table_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'map': 'Yes',
+		'name': '__common__',
+		'parent': 'Purchase Receipt-Payable Voucher',
+		'parentfield': 'field_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all DocType Mapper
+	{
+		'doctype': 'DocType Mapper',
+		'from_doctype': 'Purchase Receipt',
+		'module': 'Accounts',
+		'name': '__common__',
 		'ref_doc_submitted': 1,
 		'to_doctype': 'Payable Voucher'
 	},
+
+	# DocType Mapper, Purchase Receipt-Payable Voucher
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
+		'doctype': 'DocType Mapper',
+		'name': 'Purchase Receipt-Payable Voucher'
+	},
+
+	# Field Mapper Detail
+	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'company',
 		'idx': 1,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00233',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'company'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'fiscal_year',
 		'idx': 2,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00234',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'fiscal_year'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'supplier',
 		'idx': 3,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00235',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'supplier'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-09-01 15:48:10',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'supplier_name',
 		'idx': 4,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00588',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'supplier_name'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:26',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'supplier_address',
 		'idx': 5,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': '000003505',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'supplier_address'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:26',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_person',
 		'idx': 6,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': '000003506',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_person'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:26',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'address_display',
 		'idx': 7,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': '000003507',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'address_display'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:26',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_display',
 		'idx': 8,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': '000003508',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_display'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:26',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_mobile',
 		'idx': 9,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': '000003509',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_mobile'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:26',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_email',
 		'idx': 10,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': '000003510',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_email'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'currency',
 		'idx': 11,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00236',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'currency'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'conversion_rate',
 		'idx': 12,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00237',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'conversion_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_code',
 		'idx': 13,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00238',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_code'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_name',
 		'idx': 14,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00239',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_name'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'brand',
 		'idx': 15,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00240',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'brand'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'description',
 		'idx': 16,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00241',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'description'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval: flt(obj.qty) - flt(obj.billed_qty)',
 		'idx': 17,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00242',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'qty'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'purchase_rate',
 		'idx': 18,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00243',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.purchase_rate)',
 		'idx': 19,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00244',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'amount'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'import_rate',
 		'idx': 20,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00245',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'import_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.import_rate)',
 		'idx': 21,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00246',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'import_amount'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'parent',
 		'idx': 22,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00247',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'purchase_receipt'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'prevdoc_docname',
 		'idx': 23,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00248',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'purchase_order'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'name',
 		'idx': 24,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00249',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'pr_detail'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'prevdoc_detail_docname',
 		'idx': 25,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00250',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'po_detail'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_group',
 		'idx': 26,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00251',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_group'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-03-23 15:14:10',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_tax_rate',
 		'idx': 27,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': '000001918',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_tax_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'category',
 		'idx': 28,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00252',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'category'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'add_deduct_tax',
 		'idx': 29,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00253',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'add_deduct_tax'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'charge_type',
 		'idx': 30,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00254',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'charge_type'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'row_id',
 		'idx': 31,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00255',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'row_id'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_wise_tax_detail',
 		'idx': 32,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00256',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_wise_tax_detail'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'description',
 		'idx': 33,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00257',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'description'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'account_head',
 		'idx': 34,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00258',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'account_head'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'cost_center',
 		'idx': 35,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00259',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'cost_center'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'rate',
 		'idx': 36,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00260',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-09-01 15:48:10',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'project_name',
 		'idx': 37,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00589',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'project_name'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
 		'from_field': 'purchase_receipt_details',
 		'from_table': 'Purchase Receipt Detail',
 		'idx': 1,
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000028',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
-		'reference_key': None,
 		'to_field': 'entries',
 		'to_table': 'PV Detail',
 		'validation_logic': 'ifnull(billed_qty,0)  < qty'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
-		'from_field': None,
 		'from_table': 'Purchase Receipt',
 		'idx': 2,
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000029',
-		'owner': 'Administrator',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
-		'reference_key': None,
-		'to_field': None,
 		'to_table': 'Payable Voucher',
 		'validation_logic': 'docstatus=1'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
 		'from_field': 'purchase_tax_details',
 		'from_table': 'Purchase Tax Detail',
 		'idx': 3,
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000030',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Purchase Receipt-Payable Voucher',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
-		'reference_key': None,
 		'to_field': 'purchase_tax_details',
 		'to_table': 'Purchase Tax Detail',
 		'validation_logic': 'docstatus=1'
diff --git a/accounts/DocType Mapper/Sales Order-Receivable Voucher/Sales Order-Receivable Voucher.txt b/accounts/DocType Mapper/Sales Order-Receivable Voucher/Sales Order-Receivable Voucher.txt
index c0c5e44..7280ba5 100644
--- a/accounts/DocType Mapper/Sales Order-Receivable Voucher/Sales Order-Receivable Voucher.txt
+++ b/accounts/DocType Mapper/Sales Order-Receivable Voucher/Sales Order-Receivable Voucher.txt
@@ -1,1345 +1,714 @@
+# DocType Mapper, Sales Order-Receivable Voucher
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': None,
-		'_user_tags': None,
 		'creation': '2010-08-08 17:09:36',
 		'docstatus': 0,
-		'doctype': u'DocType Mapper',
-		'from_doctype': 'Sales Order',
-		'idx': None,
 		'modified': '2011-05-16 17:34:21',
 		'modified_by': 'Administrator',
-		'module': 'Mapper',
-		'name': 'Sales Order-Receivable Voucher',
-		'owner': 'Administrator',
-		'parent': None,
-		'parentfield': None,
-		'parenttype': None,
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'name': '__common__',
+		'parent': 'Sales Order-Receivable Voucher',
+		'parentfield': 'table_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'map': 'Yes',
+		'name': '__common__',
+		'parent': 'Sales Order-Receivable Voucher',
+		'parentfield': 'field_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all DocType Mapper
+	{
+		'doctype': 'DocType Mapper',
+		'from_doctype': 'Sales Order',
+		'module': 'Accounts',
+		'name': '__common__',
 		'ref_doc_submitted': 1,
 		'to_doctype': 'Receivable Voucher'
 	},
+
+	# DocType Mapper, Sales Order-Receivable Voucher
+	{
+		'doctype': 'DocType Mapper',
+		'name': 'Sales Order-Receivable Voucher'
+	},
+
+	# Field Mapper Detail
 	{
 		'checking_operator': '=',
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'customer',
 		'idx': 1,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00427',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'customer'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'customer_address',
 		'idx': 2,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00428',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'customer_address'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:28',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_person',
 		'idx': 3,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': '000003528',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_person'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-09-25 12:28:22',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'customer_name',
 		'idx': 4,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00595',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'customer_name'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:28',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'address_display',
 		'idx': 5,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': '000003529',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'address_display'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:28',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_display',
 		'idx': 6,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': '000003530',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_display'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:28',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_mobile',
 		'idx': 7,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': '000003531',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_mobile'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:28',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_email',
 		'idx': 8,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': '000003532',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_email'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:28',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'customer_group',
 		'idx': 10,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': '000003533',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'customer_group'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'company',
 		'idx': 11,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00429',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'company'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'fiscal_year',
 		'idx': 12,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00430',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'fiscal_year'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'charge',
 		'idx': 13,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00431',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'charge'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'conversion_rate',
 		'idx': 14,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00432',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'conversion_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'price_list_name',
 		'idx': 15,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00433',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'price_list_name'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'currency',
 		'idx': 16,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00434',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'currency'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_code',
 		'idx': 17,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00435',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_code'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_name',
 		'idx': 18,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00436',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_name'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'brand',
 		'idx': 19,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00437',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'brand'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'description',
 		'idx': 20,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00438',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'description'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval: flt(obj.qty) - flt(obj.billed_qty)',
 		'idx': 21,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00439',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'qty'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'base_ref_rate',
 		'idx': 22,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00440',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'base_ref_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
-		'from_field': 'export_rate',
+		'from_field': 'name',
 		'idx': 22,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-02-15 16:03:10',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00447',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'export_rate'
+		'to_field': 'so_detail'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'ref_rate',
 		'idx': 23,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00441',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'ref_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'export_rate',
+		'idx': 23,
+		'match_id': 1,
+		'to_field': 'export_rate'
+	},
+
+	# Field Mapper Detail
+	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'basic_rate',
 		'idx': 24,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00442',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'basic_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_group',
 		'idx': 25,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00443',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_group'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'parent',
 		'idx': 26,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00445',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'sales_order'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-03-15 14:26:12',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'stock_uom',
 		'idx': 27,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': '000001851',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'stock_uom'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'name',
 		'idx': 29,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00446',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'so_detail'
+		'to_field': 'export_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'export_rate',
 		'idx': 30,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00444',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'export_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.basic_rate)',
 		'idx': 31,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00448',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'amount'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.export_rate)',
 		'idx': 32,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00449',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'export_amount'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'adj_rate',
 		'idx': 33,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00450',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'adj_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_tax_rate',
 		'idx': 34,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00451',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_tax_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'charge_type',
 		'idx': 35,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00452',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'charge_type'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'row_id',
 		'idx': 36,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00453',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'row_id'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'description',
 		'idx': 37,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00454',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'description'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'account_head',
 		'idx': 38,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00455',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'account_head'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'total_amount',
 		'idx': 39,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00456',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'total_amount'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'territory',
 		'idx': 39,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00463',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'territory'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'total_tax_amount',
 		'idx': 40,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00457',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'total_tax_amount'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_wise_tax_detail',
 		'idx': 41,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00458',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_wise_tax_detail'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'cost_center_other_charges',
 		'idx': 42,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00459',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'cost_center_other_charges'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'rate',
 		'idx': 43,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00460',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'tax_amount',
 		'idx': 44,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00461',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'tax_amount'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'total',
 		'idx': 45,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00462',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'total'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'source',
 		'idx': 46,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00464',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'source'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'campaign',
 		'idx': 47,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00465',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'campaign'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'tc_name',
 		'idx': 48,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00466',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'tc_name'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'select_print_heading',
 		'idx': 49,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00467',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'select_print_heading'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'terms',
 		'idx': 50,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00468',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'terms'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'net_total',
 		'idx': 51,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00469',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'net_total'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'grand_total',
 		'idx': 52,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00470',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'grand_total'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'other_charges_total',
 		'idx': 53,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00471',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'other_charges_total'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'rounded_total',
 		'idx': 54,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00472',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'rounded_total'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'in_words',
 		'idx': 55,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00473',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'in_words'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'grand_total_export',
 		'idx': 56,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00474',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'grand_total_export'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-03-15 14:26:12',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'contact_no',
-		'idx': 57,
-		'map': 'Yes',
-		'match_id': 3,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': '000001852',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'contact_no'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'rounded_total_export',
 		'idx': 57,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00475',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'rounded_total_export'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'in_words_export',
 		'idx': 58,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00476',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'in_words_export'
 	},
+
+	# Field Mapper Detail
 	{
 		'checking_operator': '=',
-		'creation': '2010-09-01 15:48:10',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'project_name',
 		'idx': 59,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00591',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'project_name'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-02-15 18:38:11',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'sales_partner',
 		'idx': 60,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00663',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'sales_partner'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-02-15 18:38:11',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'sales_designation',
 		'idx': 61,
-		'map': 'Yes',
 		'match_id': 3,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00667',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'sales_designation'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-02-15 18:38:11',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'commission_rate',
 		'idx': 62,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00664',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'commission_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-02-15 18:38:11',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'total_commission',
 		'idx': 63,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00665',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'total_commission'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-02-15 18:38:11',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'allocated_percentage',
 		'idx': 64,
-		'map': 'Yes',
 		'match_id': 3,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00668',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'allocated_percentage'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-02-15 18:38:11',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'sales_person',
 		'idx': 65,
-		'map': 'Yes',
 		'match_id': 3,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00666',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'sales_person'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-02-15 18:38:11',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'allocated_amount',
 		'idx': 66,
-		'map': 'Yes',
 		'match_id': 3,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00669',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'allocated_amount'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-02-15 18:38:11',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'incentives',
 		'idx': 67,
-		'map': 'Yes',
 		'match_id': 3,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00670',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'incentives'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-06 17:41:54',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'reserved_warehouse',
 		'idx': 68,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': '000002943',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'warehouse'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
-		'from_field': None,
 		'from_table': 'Sales Order',
 		'idx': 1,
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000047',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
-		'reference_key': None,
-		'to_field': None,
 		'to_table': 'Receivable Voucher',
 		'validation_logic': 'docstatus=1'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
 		'from_field': 'sales_order_detail',
 		'from_table': 'Sales Order Detail',
 		'idx': 2,
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000048',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
-		'reference_key': None,
 		'to_field': 'entries',
 		'to_table': 'RV Detail',
 		'validation_logic': '(qty > ifnull(billed_qty, 0) or amount > ifnull(billed_amt, 0)) and docstatus = 1'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
 		'from_field': 'other_charges',
 		'from_table': 'RV Tax Detail',
 		'idx': 3,
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000049',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
-		'reference_key': None,
 		'to_field': 'other_charges',
 		'to_table': 'RV Tax Detail',
 		'validation_logic': 'name is not null'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2011-02-15 18:38:11',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
 		'from_field': 'sales_team',
 		'from_table': 'Sales Team',
 		'idx': 4,
 		'match_id': 3,
-		'modified': '2011-05-20 15:54:28',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000070',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Receivable Voucher',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
-		'reference_key': None,
 		'to_field': 'sales_team',
 		'to_table': 'Sales Team',
 		'validation_logic': 'name is not null'
diff --git a/accounts/Print Format/Cheque Printing Format/Cheque Printing Format.txt b/accounts/Print Format/Cheque Printing Format/Cheque Printing Format.txt
index 7f6137d..e0d2bce 100755
--- a/accounts/Print Format/Cheque Printing Format/Cheque Printing Format.txt
+++ b/accounts/Print Format/Cheque Printing Format/Cheque Printing Format.txt
@@ -1,18 +1,27 @@
+# Print Format, Cheque Printing Format
 [
+
+	# These values are common in all dictionaries
 	{
 		'creation': '2011-03-25 15:26:02',
 		'docstatus': 0,
-		'doctype': 'Print Format',
-		'html': '<!--  p.big {line-height: 200%}  .noborder td { border: 0px solid #fff; }   -->\n<div style="position: relative;">\n<h3><script>doc.company</script><br /> <br /> \n<hr />\nPAYMENT ADVICE</h3>\n<table class="noborder" style="width: 100%;">\n<tbody>\n<tr>\n<td style="vertical-align: top;" width="50%">To :<br />\n<script type="text/javascript">// <![CDATA[\ndoc.pay_to_recd_from\n// ]]></script>\n</td>\n<td width="50%">\n<table class="noborder" width="100%">\n<tbody>\n<tr>\n<td width="30%">Voucher No :</td>\n<td width="70%">\n<script type="text/javascript">// <![CDATA[\ndoc.name\n// ]]></script>\n</td>\n</tr>\n<tr>\n<td width="30%">Voucher Date :</td>\n<td width="70%">\n<script type="text/javascript">// <![CDATA[\ndate.str_to_user(doc.voucher_date)\n// ]]></script>\n</td>\n</tr>\n<tr>\n<td width="30%">Cheque No :</td>\n<td width="70%">\n<script type="text/javascript">// <![CDATA[\ndate.str_to_user(doc.cheque_no)\n// ]]></script>\n</td>\n</tr>\n<tr>\n<td width="30%">Cheque Date :</td>\n<td width="70%">\n<script type="text/javascript">// <![CDATA[\ndate.str_to_user(doc.cheque_date)\n// ]]></script>\n</td>\n</tr>\n</tbody>\n</table>\n</td>\n</tr>\n</tbody>\n</table>\n<br /> <strong>We are pleased to enclose our cheque in full/part Settlement of your under noted bills</strong> <br /> \n<hr />\n<table class="noborder" width="100%">\n<tbody>\n<tr>\n<td width="70%">&nbsp;</td>\n<td width="15%">Total :</td>\n<td class="pos_left" width="15%">\n<script type="text/javascript">// <![CDATA[\ndoc.total_amount\n// ]]></script>\n</td>\n</tr>\n<tr>\n<td colspan="3">Narration :\n<script type="text/javascript">// <![CDATA[\nreplace_newlines(doc.remark)\n// ]]></script>\n<br /><br /><br /></td>\n</tr>\n</tbody>\n</table>\n<div style="position: absolute; top: 14cm; left: 0cm;">Prepared By</div>\n<div style="position: absolute; top: 14cm; left: 5.5cm;">Authorised Signatory</div>\n<div style="position: absolute; top: 14cm; left: 11cm;">Received Payment as Above</div>\n<div style="position: absolute; top: 16.4cm; left: 5.9cm;"><strong>_____________</strong></div>\n<div style="position: absolute; top: 16.7cm; left: 6cm;"><strong>A/c Payee</strong></div>\n<div style="position: absolute; top: 16.7cm; left: 5.9cm;"><strong>_____________</strong></div>\n<div style="position: absolute; top: 16.9cm; left: 12cm;">\n<script type="text/javascript">// <![CDATA[\ndate.str_to_user(doc.cheque_date)\n// ]]></script>\n</div>\n<div style="position: absolute; top: 17.9cm; left: 1cm;">\n<script type="text/javascript">// <![CDATA[\ndoc.pay_to_recd_from\n// ]]></script>\n</div>\n<div style="position: absolute; top: 18.6cm; left: 1cm; width: 7cm;">\n<script type="text/javascript">// <![CDATA[\ndoc.total_amount_in_words\n// ]]></script>\n</div>\n<div style="position: absolute; top: 19.7cm; left: 12cm;">\n<script type="text/javascript">// <![CDATA[\ndoc.total_amount\n// ]]></script>\n</div>\n</div>',
-		'idx': None,
 		'modified': '2011-03-28 12:33:24',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Print Format
+	{
+		'doctype': 'Print Format',
+		'html': '<!--  p.big {line-height: 200%}  .noborder td { border: 0px solid #fff; }   -->\n<div style="position: relative;">\n<h3><script>doc.company</script><br /> <br /> \n<hr />\nPAYMENT ADVICE</h3>\n<table class="noborder" style="width: 100%;">\n<tbody>\n<tr>\n<td style="vertical-align: top;" width="50%">To :<br />\n<script type="text/javascript">// <![CDATA[\ndoc.pay_to_recd_from\n// ]]></script>\n</td>\n<td width="50%">\n<table class="noborder" width="100%">\n<tbody>\n<tr>\n<td width="30%">Voucher No :</td>\n<td width="70%">\n<script type="text/javascript">// <![CDATA[\ndoc.name\n// ]]></script>\n</td>\n</tr>\n<tr>\n<td width="30%">Voucher Date :</td>\n<td width="70%">\n<script type="text/javascript">// <![CDATA[\ndate.str_to_user(doc.voucher_date)\n// ]]></script>\n</td>\n</tr>\n<tr>\n<td width="30%">Cheque No :</td>\n<td width="70%">\n<script type="text/javascript">// <![CDATA[\ndate.str_to_user(doc.cheque_no)\n// ]]></script>\n</td>\n</tr>\n<tr>\n<td width="30%">Cheque Date :</td>\n<td width="70%">\n<script type="text/javascript">// <![CDATA[\ndate.str_to_user(doc.cheque_date)\n// ]]></script>\n</td>\n</tr>\n</tbody>\n</table>\n</td>\n</tr>\n</tbody>\n</table>\n<br /> <strong>We are pleased to enclose our cheque in full/part Settlement of your under noted bills</strong> <br /> \n<hr />\n<table class="noborder" width="100%">\n<tbody>\n<tr>\n<td width="70%">&nbsp;</td>\n<td width="15%">Total :</td>\n<td class="pos_left" width="15%">\n<script type="text/javascript">// <![CDATA[\ndoc.total_amount\n// ]]></script>\n</td>\n</tr>\n<tr>\n<td colspan="3">Narration :\n<script type="text/javascript">// <![CDATA[\nreplace_newlines(doc.remark)\n// ]]></script>\n<br /><br /><br /></td>\n</tr>\n</tbody>\n</table>\n<div style="position: absolute; top: 14cm; left: 0cm;">Prepared By</div>\n<div style="position: absolute; top: 14cm; left: 5.5cm;">Authorised Signatory</div>\n<div style="position: absolute; top: 14cm; left: 11cm;">Received Payment as Above</div>\n<div style="position: absolute; top: 16.4cm; left: 5.9cm;"><strong>_____________</strong></div>\n<div style="position: absolute; top: 16.7cm; left: 6cm;"><strong>A/c Payee</strong></div>\n<div style="position: absolute; top: 16.7cm; left: 5.9cm;"><strong>_____________</strong></div>\n<div style="position: absolute; top: 16.9cm; left: 12cm;">\n<script type="text/javascript">// <![CDATA[\ndate.str_to_user(doc.cheque_date)\n// ]]></script>\n</div>\n<div style="position: absolute; top: 17.9cm; left: 1cm;">\n<script type="text/javascript">// <![CDATA[\ndoc.pay_to_recd_from\n// ]]></script>\n</div>\n<div style="position: absolute; top: 18.6cm; left: 1cm; width: 7cm;">\n<script type="text/javascript">// <![CDATA[\ndoc.total_amount_in_words\n// ]]></script>\n</div>\n<div style="position: absolute; top: 19.7cm; left: 12cm;">\n<script type="text/javascript">// <![CDATA[\ndoc.total_amount\n// ]]></script>\n</div>\n</div>',
 		'module': 'Accounts',
-		'name': 'Cheque Printing Format',
-		'owner': 'Administrator',
-		'parent': None,
-		'parentfield': None,
-		'parenttype': None,
+		'name': '__common__',
 		'standard': 'Yes'
+	},
+
+	# Print Format, Cheque Printing Format
+	{
+		'doctype': 'Print Format',
+		'name': 'Cheque Printing Format'
 	}
 ]
\ No newline at end of file
diff --git a/accounts/Print Format/Form 16A Print Format/Form 16A Print Format.txt b/accounts/Print Format/Form 16A Print Format/Form 16A Print Format.txt
index e8cb6c6..8316306 100644
--- a/accounts/Print Format/Form 16A Print Format/Form 16A Print Format.txt
+++ b/accounts/Print Format/Form 16A Print Format/Form 16A Print Format.txt
@@ -1 +1,27 @@
-[{'modified_by': 'Administrator', 'name': 'Form 16A Print Format', 'parent': None, 'creation': '2009-05-29 12:23:01', 'modified': '2010-09-27 17:27:06', 'module': 'Accounts', 'doctype': 'Print Format', 'idx': None, 'parenttype': None, 'html': '<html>\n  <script>\n    function get_letter_head(){\n      var cp = locals[\'Control Panel\'][\'Control Panel\'];\n  \t  if(cp.letter_head !=\'None\' && cp.letter_head !=\'\') {return cp.letter_head; }\n    }\n  </script>\n<body>\n<table border = "1" style=\'border-collapse: collapse;\'>\n <tr>\n   <td>\n    <div style="border-bottom: 1px solid; padding-bottom: 5px; width:100%"><script>get_letter_head()</script></div>\n   </td>\n </tr>\n <tr>\n   <td colspan = "3"><h1 align = "center"><b>FORM No. 16 A</b></h1>\n   <p align="right">Certificate No:<script>doc.name</script></p>\n   <p align = "center">[See rule 31 (1)(b)]</p>\n   <h2 align = "center"><b>Certifiction of deduction of tax at source under section 203 of the Income-tax Act, 1961</b></h2>\n   <p>[For interest on securities; dividends; interests other than \'interests on securities\';winnings from lottery or crossword puzzle;\n      winnings from horse race; payments to contractors and sub-contractors;insurance comission;payments to\n      \n      non-resident sportsmen/ sports associations;payments in respect of deposits under National Savings Scheme:\n      payments on account of repurchase of units by Mutual Fund or Unit Trust of India; commission, remuneration or prize\n     \n      on sale of lottery tickets; comission or brokerage;rent;fees for professional or technical services;royalty and any sum \n      under section 28(va);income in respect of units; payment of compensation on acquisition of certain immovable property;\n\n      other sums under section 195; income in respect of units of non-residents referred to in section 196A; income from units\n      referred to in section 196B;income from foreign currency bonds or shares of an Indian Company referred to in section</p>\n      196C; income of Foreign Institutional Investors from securities referred to in section 196D]\n   </td> \n  </tr>\n\n  <tr>\n    <td width="30%">Name and address of person deducing tax</td>\n    <td width="40%">Acknowledgement No.s of all quarterly statements of TDS under sub-section(3) of section 200 as provided by TIN Facilitation Centre or NSDL web-site</td>\n    <td width="30%">Name and address of the person to whom payment is made or in whose account it is credited</td>\n  </tr>\n  \n  <tr>\n    <td>\n      <table>\n        <tr><script>doc.company</script></tr><br><br>\n        <tr><script>replace_newlines(doc.company_address)</script></tr>\n      </table>\n    </td>\n    <td>\n      <script>print_table(\'Form 16A\', doc.name, \'form_16A_ack_details\',\'Form 16A Ack Detail\',  [\'quarter\',\'ack_no\'], [\'Quarter\' , \'Acknowledgement No.\'] , [\'40%\',\'60%\']).innerHTML</script>\n    </td>\n    <td>\n      <table>\n        <tr><script>doc.party_name</script></tr><br><br>\n        <tr><script>replace_newlines(doc.party_address)</script></tr>\n      </table>\n    </td>\n  </tr>\n  \n  <tr>\n    <td>\n      <table>\n        <tr><b>Registration Details OF THE DEDUCTOR</b></tr><br>\n        <tr><script>replace_newlines(doc.registration_details)</script></tr>\n      </table>\n    </td>\n    \n    <td>\n      <table>\n        <tr><b><center>NATURE OF PAYMENT</center></b></tr><br><br>\n        <tr><b><center><script>doc.tds_category</script></center></b></tr>\n        \n      </table>\n    </td>\n    \n    <td>\n      <table>\n        <tr><b>PAN NO. OF THE PAYEE</b></tr><br>\n        <tr><script>doc.pan_number</script></tr>\n        \n      </table>\n    </td>\n  </tr>\n  \n  <tr>\n    <td align = "center" colspan ="3"><b>DETAILS OF PAYMENT, TAX DEDUCTION AND DEPOSIT OF TAX INTO CENTRAL GOVERNMENT ACCOUNT</b>\n    <p align = "center">(The deductor is to provide transaction wise details of tax deducted and deposited)</p>\n  </tr>\n  \n  <tr>\n    <td colspan="3">\n      <script>print_table(\'Form 16A\', doc.name, \'form_16A_tax_details\',\'Form 16A Tax Detail\', [\'SR\',\'amount_paid\', \'date_of_payment\',\'tds_main\',\'surcharge\',\'cess_on_tds\',\'total_tax_deposited\',\'cheque_no\',\'bsr_code\',\'tax_deposited_date\',\'challan_no\'], [\'S No.\' , \'Amount paid / credited\',\'Date of payment / credit\',\'TDS (Rs.)\',\'Surcharge (Rs.)\',\'Cess on TDS(Rs.)\',\'Total Tax Deposited (Rs.)\',\'Cheque/DD no.(if any)\',\'BSR code on bank branch\', \'Date on which tax deposited(dd/mm/yy)\',\'Transfer Voucher/Challan Identification no.\'] ,  [\'3%\', \'10%\',\'10%\', \'10%\',\'10%\',\'6%\',\'10%\' ,\'10%\',\'7%\' ,\'10%\',\'7%\',\'7%\'] ).innerHTML</script>\n    </td>\n  </tr>\n  \n  <tr>\n    <td colspan="3">\n      Certified that a sum of Rs. <script>doc.total_amount</script> has been deducted at source and paid to the credit of the Central Government as per details given above <br><br><br><br>\n      <p align="right"> Signature of person responsible for deduction of tax \n    </td>\n  </tr>\n  \n  <tr>\n    <td colspan="3">\n      <table width="100%" border="0">\n        <tr>\n          <td width="50%">Place: <script>doc.place</script></td>\n          <td width="50%" align="right">Full Name: <script>doc.full_name</script></td>\n        </tr>\n        <tr>\n          <td width="50%">Date: <script>date.str_to_user(doc.dt)</script></td>\n          <td width="50%" align="right">Designation: <script>doc.designation</script></td>\n        </tr>\n      </table>\n    </td>\n  </tr>\n  \n</table>\n</body>\n</html>', 'owner': 'Administrator', 'docstatus': 0, 'standard': 'Yes', 'parentfield': None}]
\ No newline at end of file
+# Print Format, Form 16A Print Format
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-09-27 17:30:34',
+		'docstatus': 0,
+		'modified': '2011-06-15 13:36:06',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Print Format
+	{
+		'doctype': 'Print Format',
+		'html': '<html>\n  \n<body>\n<table border = "1" style=\'border-collapse: collapse;\'>\n \n <tr>\n   <td colspan = "3"><h1 align = "center"><b>FORM No. 16 A</b></h1>\n   <p align="right">Certificate No:<script>doc.name</script></p>\n   <p align = "center">[See rule 31 (1)(b)]</p>\n   <h2 align = "center"><b>Certifiction of deduction of tax at source under section 203 of the Income-tax Act, 1961</b></h2>\n   <p>[For interest on securities; dividends; interests other than \'interests on securities\';winnings from lottery or crossword puzzle;\n      winnings from horse race; payments to contractors and sub-contractors;insurance comission;payments to\n      \n      non-resident sportsmen/ sports associations;payments in respect of deposits under National Savings Scheme:\n      payments on account of repurchase of units by Mutual Fund or Unit Trust of India; commission, remuneration or prize\n     \n      on sale of lottery tickets; comission or brokerage;rent;fees for professional or technical services;royalty and any sum \n      under section 28(va);income in respect of units; payment of compensation on acquisition of certain immovable property;\n\n      other sums under section 195; income in respect of units of non-residents referred to in section 196A; income from units\n      referred to in section 196B;income from foreign currency bonds or shares of an Indian Company referred to in section</p>\n      196C; income of Foreign Institutional Investors from securities referred to in section 196D]\n   </td> \n  </tr>\n\n  <tr>\n    <td width="30%">Name and address of person deducing tax</td>\n    <td width="40%">Acknowledgement No.s of all quarterly statements of TDS under sub-section(3) of section 200 as provided by TIN Facilitation Centre or NSDL web-site</td>\n    <td width="30%">Name and address of the person to whom payment is made or in whose account it is credited</td>\n  </tr>\n  \n  <tr>\n    <td>\n      <table>\n        <tr><script>doc.company</script></tr><br><br>\n        <tr><script>replace_newlines(doc.company_address)</script></tr>\n      </table>\n    </td>\n    <td>\n      <script>print_table(\'Form 16A\', doc.name, \'form_16A_ack_details\',\'Form 16A Ack Detail\',  [\'quarter\',\'ack_no\'], [\'Quarter\' , \'Acknowledgement No.\'] , [\'40%\',\'60%\']).innerHTML</script>\n    </td>\n    <td>\n      <table>\n        <tr><script>doc.party_name</script></tr><br><br>\n        <tr><script>replace_newlines(doc.party_address)</script></tr>\n      </table>\n    </td>\n  </tr>\n  \n  <tr>\n    <td>\n      <table>\n        <tr><b>Registration Details OF THE DEDUCTOR</b></tr><br>\n        <tr><script>replace_newlines(doc.registration_details)</script></tr>\n      </table>\n    </td>\n    \n    <td>\n      <table>\n        <tr><b><center>NATURE OF PAYMENT</center></b></tr><br><br>\n        <tr><b><center><script>doc.tds_category</script></center></b></tr>\n        \n      </table>\n    </td>\n    \n    <td>\n      <table>\n        <tr><b>PAN NO. OF THE PAYEE</b></tr><br>\n        <tr><script>doc.pan_number</script></tr>\n        \n      </table>\n    </td>\n  </tr>\n  \n  <tr>\n    <td align = "center" colspan ="3"><b>DETAILS OF PAYMENT, TAX DEDUCTION AND DEPOSIT OF TAX INTO CENTRAL GOVERNMENT ACCOUNT</b>\n    <p align = "center">(The deductor is to provide transaction wise details of tax deducted and deposited)</p>\n  </tr>\n  \n  <tr>\n    <td colspan="3">\n      <script>print_table(\'Form 16A\', doc.name, \'form_16A_tax_details\',\'Form 16A Tax Detail\', [\'SR\',\'amount_paid\', \'date_of_payment\',\'tds_main\',\'surcharge\',\'cess_on_tds\',\'total_tax_deposited\',\'cheque_no\',\'bsr_code\',\'tax_deposited_date\',\'challan_no\'], [\'S No.\' , \'Amount paid / credited\',\'Date of payment / credit\',\'TDS (Rs.)\',\'Surcharge (Rs.)\',\'Cess on TDS(Rs.)\',\'Total Tax Deposited (Rs.)\',\'Cheque/DD no.(if any)\',\'BSR code on bank branch\', \'Date on which tax deposited(dd/mm/yy)\',\'Transfer Voucher/Challan Identification no.\'] ,  [\'3%\', \'10%\',\'10%\', \'10%\',\'10%\',\'6%\',\'10%\' ,\'10%\',\'7%\' ,\'10%\',\'7%\',\'7%\'] ).innerHTML</script>\n    </td>\n  </tr>\n  \n  <tr>\n    <td colspan="3">\n      Certified that a sum of Rs. <script>doc.total_amount</script> has been deducted at source and paid to the credit of the Central Government as per details given above <br><br><br><br>\n      <p align="right"> Signature of person responsible for deduction of tax \n    </td>\n  </tr>\n  \n  <tr>\n    <td colspan="3">\n      <table width="100%" border="0">\n        <tr>\n          <td width="50%">Place: <script>doc.place</script></td>\n          <td width="50%" align="right">Full Name: <script>doc.full_name</script></td>\n        </tr>\n        <tr>\n          <td width="50%">Date: <script>date.str_to_user(doc.dt)</script></td>\n          <td width="50%" align="right">Designation: <script>doc.designation</script></td>\n        </tr>\n      </table>\n    </td>\n  </tr>\n  \n</table>\n</body>\n</html>',
+		'module': 'Accounts',
+		'name': '__common__',
+		'standard': 'Yes'
+	},
+
+	# Print Format, Form 16A Print Format
+	{
+		'doctype': 'Print Format',
+		'name': 'Form 16A Print Format'
+	}
+]
\ No newline at end of file
diff --git a/accounts/Print Format/Payment Receipt Voucher/Payment Receipt Voucher.txt b/accounts/Print Format/Payment Receipt Voucher/Payment Receipt Voucher.txt
index a7c0847..fa0145a 100755
--- a/accounts/Print Format/Payment Receipt Voucher/Payment Receipt Voucher.txt
+++ b/accounts/Print Format/Payment Receipt Voucher/Payment Receipt Voucher.txt
@@ -1,18 +1,27 @@
+# Print Format, Payment Receipt Voucher
 [
+
+	# These values are common in all dictionaries
 	{
 		'creation': '2011-03-25 17:30:45',
 		'docstatus': 0,
-		'doctype': 'Print Format',
-		'html': '<div style="position: relative;">\n<h3 align="center"><script>doc.company</script>\n</div>\n\n<font size="4">\n<table class=\'simpletable\'>\n<tr>\n<td><b> Receipt No.: </b></td>\n<td><script>doc.name</script></td>\n</tr>\n<tr>\n<td><b> Date : </b></td>\n<td><script>date.str_to_user(doc.voucher_date)</script></td>\n</tr>      \n<tr>\n<td><b> Remark: </b></td>\n<td><script> doc.remark </script></td>\n</tr>\n<tr>\n<td><b> Received From: </b></td>\n<td><b><script> doc.pay_to_rec_from </script></b></td>\n</tr>\n</table>\n<br>\n\n<div><b><script>doc.total_amount</script></b> </td></div><br>\n<div style="text-align:left"><b><script>doc.total_amount_in_words</script></b></div><br>\n<div>This receipt is issued subject to realization of the Cheque</div>\n</font>\n<br>\n<table class="noborder">\n<tr>\n<td style = "text-align = right;"><h3>For <script>doc.company</script>,</h3><br><div>(Authorised Signatory)</div></td>\n</tr>\n</table>',
-		'idx': None,
-		'modified': '2011-03-28 12:31:40',
+		'modified': '2011-04-27 11:44:30',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Print Format
+	{
+		'doctype': 'Print Format',
+		'html': '<div style="position: relative;">\n<h3 align="center"><script>doc.company</script>\n</div>\n\n<font size="4">\n<table class=\'simpletable\'>\n<tr>\n<td><b> Receipt No.: </b></td>\n<td><script>doc.name</script></td>\n</tr>\n<tr>\n<td><b> Date : </b></td>\n<td><script>date.str_to_user(doc.voucher_date)</script></td>\n</tr>      \n<tr>\n<td><b> Remark: </b></td>\n<td><script> doc.remark </script></td>\n</tr>\n<tr>\n<td><b> Received From: </b></td>\n<td><b><script> doc.pay_to_rec_from </script></b></td>\n</tr>\n</table>\n<br>\n\n<div><b><script>doc.total_amount</script></b> </td></div><br>\n<div style="text-align:left"><b><script>doc.total_amount_in_words</script></b></div><br>\n<div>This receipt is issued subject to realization of the <script>if(doc.cheque_no){\'Cheque\'}else{\'Cash\'}</script></div>\n</font>\n<br>\n<table class="noborder">\n<tr>\n<td style = "text-align = right;"><h3>For <script>doc.company</script>,</h3><br><div>(Authorised Signatory)</div></td>\n</tr>\n</table>',
 		'module': 'Accounts',
-		'name': 'Payment Receipt Voucher',
-		'owner': 'Administrator',
-		'parent': None,
-		'parentfield': None,
-		'parenttype': None,
+		'name': '__common__',
 		'standard': 'Yes'
+	},
+
+	# Print Format, Payment Receipt Voucher
+	{
+		'doctype': 'Print Format',
+		'name': 'Payment Receipt Voucher'
 	}
 ]
\ No newline at end of file
diff --git a/accounts/Role/Accounts Manager/Accounts Manager.txt b/accounts/Role/Accounts Manager/Accounts Manager.txt
index b347d61..6f6759c 100644
--- a/accounts/Role/Accounts Manager/Accounts Manager.txt
+++ b/accounts/Role/Accounts Manager/Accounts Manager.txt
@@ -1 +1,26 @@
-[{'modified_by': 'Administrator', 'name': 'Accounts Manager', 'parent': None, 'creation': '2009-03-19 14:57:46', 'modified': '2009-03-19 14:57:46', 'module': 'Roles', 'doctype': 'Role', 'idx': None, 'parenttype': None, 'role_name': 'Accounts Manager', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': None}]
\ No newline at end of file
+# Role, Accounts Manager
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:51',
+		'docstatus': 0,
+		'modified': '2009-03-19 14:57:46',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Role
+	{
+		'doctype': 'Role',
+		'module': 'Accounts',
+		'name': '__common__',
+		'role_name': 'Accounts Manager'
+	},
+
+	# Role, Accounts Manager
+	{
+		'doctype': 'Role',
+		'name': 'Accounts Manager'
+	}
+]
\ No newline at end of file
diff --git a/accounts/Role/Accounts User/Accounts User.txt b/accounts/Role/Accounts User/Accounts User.txt
index 67994a3..519924e 100644
--- a/accounts/Role/Accounts User/Accounts User.txt
+++ b/accounts/Role/Accounts User/Accounts User.txt
@@ -1 +1,26 @@
-[{'modified_by': 'Guest', 'name': 'Accounts User', 'parent': None, 'creation': '2010-04-08 12:05:21', 'modified': '2010-04-08 12:05:21', 'module': 'Roles', 'doctype': 'Role', 'idx': None, 'parenttype': None, 'role_name': 'Accounts User', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': None}]
\ No newline at end of file
+# Role, Accounts User
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:51',
+		'docstatus': 0,
+		'modified': '2010-04-08 12:05:21',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Role
+	{
+		'doctype': 'Role',
+		'module': 'Accounts',
+		'name': '__common__',
+		'role_name': 'Accounts User'
+	},
+
+	# Role, Accounts User
+	{
+		'doctype': 'Role',
+		'name': 'Accounts User'
+	}
+]
\ No newline at end of file
diff --git a/accounts/search_criteria/accounts_payable/accounts_payable.txt b/accounts/search_criteria/accounts_payable/accounts_payable.txt
index 26f8199..08c8bc3 100644
--- a/accounts/search_criteria/accounts_payable/accounts_payable.txt
+++ b/accounts/search_criteria/accounts_payable/accounts_payable.txt
@@ -1,37 +1,32 @@
+# Search Criteria, accounts_payable
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': '',
-		'add_tab': '',
-		'columns': 'GL Entry\x01Posting Date,GL Entry\x01Account,GL Entry\x01Against Voucher,GL Entry\x01Voucher No',
-		'creation': '2010-10-22 16:29:40',
-		'criteria_name': 'Accounts Payable',
-		'custom_query': None,
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'GL Entry',
+		'creation': '2010-10-22 16:28:49',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'GL Entry\x01Is Cancelled':'','GL Entry\x01Fiscal Year':'','GL Entry\x01Company':'','Payable Voucher\x01Aging Based On':'Posting Date','GL Entry\x01Range 1':'30','GL Entry\x01Range 2':'45','GL Entry\x01Range 3':'60','GL Entry\x01Range 4':'90'}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-10-22 15:16:03',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'GL Entry\x01Posting Date,GL Entry\x01Account,GL Entry\x01Against Voucher,GL Entry\x01Voucher No',
+		'criteria_name': 'Accounts Payable',
+		'doc_type': 'GL Entry',
+		'doctype': 'Search Criteria',
+		'filters': "{'GL Entry\x01Is Cancelled':'','GL Entry\x01Fiscal Year':'','GL Entry\x01Company':'','Payable Voucher\x01Aging Based On':'Posting Date','GL Entry\x01Range 1':'30','GL Entry\x01Range 2':'45','GL Entry\x01Range 3':'60','GL Entry\x01Range 4':'90'}",
 		'module': 'Accounts',
-		'name': 'accounts_payable',
-		'owner': 'Administrator',
-		'page_len': None,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
+		'name': '__common__',
 		'sort_by': '`tabGL Entry`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, accounts_payable
+	{
+		'doctype': 'Search Criteria',
+		'name': 'accounts_payable'
 	}
 ]
\ No newline at end of file
diff --git a/accounts/search_criteria/accounts_receivable/accounts_receivable.txt b/accounts/search_criteria/accounts_receivable/accounts_receivable.txt
index ae1d51b..2474eb7 100644
--- a/accounts/search_criteria/accounts_receivable/accounts_receivable.txt
+++ b/accounts/search_criteria/accounts_receivable/accounts_receivable.txt
@@ -1,37 +1,32 @@
+# Search Criteria, accounts_receivable
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': '',
-		'add_tab': '',
-		'columns': 'GL Entry\x01Posting Date,GL Entry\x01Transaction Date,GL Entry\x01Account,GL Entry\x01Against Voucher,GL Entry\x01Voucher No',
-		'creation': '2010-10-19 10:32:38',
-		'criteria_name': 'Accounts Receivable',
-		'custom_query': None,
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'GL Entry',
+		'creation': '2010-10-19 10:32:39',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'GL Entry\x01Is Cancelled':'No','GL Entry\x01Fiscal Year':'','GL Entry\x01Company':'','GL Entry\x01Range 1':'30','GL Entry\x01Range 2':'45','GL Entry\x01Range 3':'60','GL Entry\x01Range 4':'90'}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-10-19 10:29:38',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'GL Entry\x01Posting Date,GL Entry\x01Transaction Date,GL Entry\x01Account,GL Entry\x01Against Voucher,GL Entry\x01Voucher No',
+		'criteria_name': 'Accounts Receivable',
+		'doc_type': 'GL Entry',
+		'doctype': 'Search Criteria',
+		'filters': "{'GL Entry\x01Is Cancelled':'No','GL Entry\x01Fiscal Year':'','GL Entry\x01Company':'','GL Entry\x01Range 1':'30','GL Entry\x01Range 2':'45','GL Entry\x01Range 3':'60','GL Entry\x01Range 4':'90'}",
 		'module': 'Accounts',
-		'name': 'accounts_receivable',
-		'owner': 'Administrator',
-		'page_len': None,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
+		'name': '__common__',
 		'sort_by': '`tabGL Entry`.`name`',
 		'sort_order': 'ASC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, accounts_receivable
+	{
+		'doctype': 'Search Criteria',
+		'name': 'accounts_receivable'
 	}
 ]
\ No newline at end of file
diff --git a/accounts/search_criteria/bank_clearance_report/bank_clearance_report.txt b/accounts/search_criteria/bank_clearance_report/bank_clearance_report.txt
index b0506d9..5103fd7 100644
--- a/accounts/search_criteria/bank_clearance_report/bank_clearance_report.txt
+++ b/accounts/search_criteria/bank_clearance_report/bank_clearance_report.txt
@@ -1,37 +1,36 @@
+# Search Criteria, bank_clearance_report
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Journal Voucher\x01ID,Journal Voucher Detail\x01Account,Journal Voucher Detail\x01Debit,Journal Voucher Detail\x01Credit,Journal Voucher\x01Clearance Date,Journal Voucher\x01Cheque No,Journal Voucher\x01Cheque Date,Journal Voucher\x01Voucher Date,Journal Voucher\x01Posting Date,Journal Voucher Detail\x01Against Payable,Journal Voucher Detail\x01Against Receivable',
 		'creation': '2010-08-08 17:09:31',
-		'criteria_name': 'Bank Clearance report',
-		'custom_query': '',
-		'description': 'Bank Clearance report',
-		'dis_filters': 'fiscal_year',
-		'disabled': None,
-		'doc_type': 'Journal Voucher Detail',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Journal Voucher\x01Submitted':1,'Journal Voucher\x01Voucher Type':'','Journal Voucher\x01Is Opening':'','Journal Voucher\x01Fiscal Year':'','Journal Voucher\x01Company':'','Journal Voucher\x01TDS Applicable':'','Journal Voucher\x01TDS Category':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-06-09 16:14:13',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Journal Voucher\x01ID,Journal Voucher Detail\x01Account,Journal Voucher Detail\x01Debit,Journal Voucher Detail\x01Credit,Journal Voucher\x01Clearance Date,Journal Voucher\x01Cheque No,Journal Voucher\x01Cheque Date,Journal Voucher\x01Voucher Date,Journal Voucher\x01Posting Date,Journal Voucher Detail\x01Against Payable,Journal Voucher Detail\x01Against Receivable',
+		'criteria_name': 'Bank Clearance report',
+		'description': 'Bank Clearance report',
+		'dis_filters': 'fiscal_year',
+		'doc_type': 'Journal Voucher Detail',
+		'doctype': 'Search Criteria',
+		'filters': "{'Journal Voucher\x01Submitted':1,'Journal Voucher\x01Voucher Type':'','Journal Voucher\x01Is Opening':'','Journal Voucher\x01Fiscal Year':'','Journal Voucher\x01Company':'','Journal Voucher\x01TDS Applicable':'','Journal Voucher\x01TDS Category':''}",
 		'module': 'Accounts',
-		'name': 'bank_clearance_report',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Journal Voucher',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': 'ID',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, bank_clearance_report
+	{
+		'doctype': 'Search Criteria',
+		'name': 'bank_clearance_report'
 	}
 ]
\ No newline at end of file
diff --git a/accounts/search_criteria/bank_reconciliation_statement/bank_reconciliation_statement.txt b/accounts/search_criteria/bank_reconciliation_statement/bank_reconciliation_statement.txt
index 91dc0cc..26566cc 100644
--- a/accounts/search_criteria/bank_reconciliation_statement/bank_reconciliation_statement.txt
+++ b/accounts/search_criteria/bank_reconciliation_statement/bank_reconciliation_statement.txt
@@ -1,37 +1,36 @@
+# Search Criteria, bank_reconciliation_statement
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': "(`tabJournal Voucher Detail`.credit >= 0 or `tabJournal Voucher Detail`.credit is null)\n(`tabJournal Voucher`.cheque_no is not null or `tabJournal Voucher`.cheque_no != '')\n(ifnull(`tabJournal Voucher`.clearance_date, '0000-00-00') >'%(clearance_date1)s' or `tabJournal Voucher`.clearance_date is null or `tabJournal Voucher`.clearance_date = '0000-00-00')\n(`tabJournal Voucher`.posting_date <= '%(clearance_date1)s')",
-		'add_tab': None,
-		'columns': 'Journal Voucher\x01ID,Journal Voucher\x01Posting Date,Journal Voucher\x01Cheque No,Journal Voucher\x01Cheque Date,Journal Voucher\x01Clearance Date,Journal Voucher Detail\x01Account,Journal Voucher Detail\x01Debit,Journal Voucher Detail\x01Credit,Journal Voucher Detail\x01Against Account',
-		'creation': '2010-11-01 10:56:13',
-		'criteria_name': 'Bank Reconciliation Statement',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': 'clearance_date\nfiscal_year',
-		'disabled': None,
-		'doc_type': 'Journal Voucher Detail',
+		'creation': '2010-11-01 10:56:14',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Journal Voucher\x01Submitted':1,'Journal Voucher\x01Voucher Type':'','Journal Voucher\x01Is Opening':'','Journal Voucher\x01Company':'','Journal Voucher\x01TDS Applicable':'','Journal Voucher\x01TDS Category':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-10-29 16:36:00',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': "(`tabJournal Voucher Detail`.credit >= 0 or `tabJournal Voucher Detail`.credit is null)\n(`tabJournal Voucher`.cheque_no is not null or `tabJournal Voucher`.cheque_no != '')\n(ifnull(`tabJournal Voucher`.clearance_date, '0000-00-00') >'%(clearance_date1)s' or `tabJournal Voucher`.clearance_date is null or `tabJournal Voucher`.clearance_date = '0000-00-00')\n(`tabJournal Voucher`.posting_date <= '%(clearance_date1)s')",
+		'columns': 'Journal Voucher\x01ID,Journal Voucher\x01Posting Date,Journal Voucher\x01Cheque No,Journal Voucher\x01Cheque Date,Journal Voucher\x01Clearance Date,Journal Voucher Detail\x01Account,Journal Voucher Detail\x01Debit,Journal Voucher Detail\x01Credit,Journal Voucher Detail\x01Against Account',
+		'criteria_name': 'Bank Reconciliation Statement',
+		'dis_filters': 'clearance_date\nfiscal_year',
+		'doc_type': 'Journal Voucher Detail',
+		'doctype': 'Search Criteria',
+		'filters': "{'Journal Voucher\x01Submitted':1,'Journal Voucher\x01Voucher Type':'','Journal Voucher\x01Is Opening':'','Journal Voucher\x01Company':'','Journal Voucher\x01TDS Applicable':'','Journal Voucher\x01TDS Category':''}",
 		'module': 'Accounts',
-		'name': 'bank_reconciliation_statement',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Journal Voucher',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabJournal Voucher`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, bank_reconciliation_statement
+	{
+		'doctype': 'Search Criteria',
+		'name': 'bank_reconciliation_statement'
 	}
 ]
\ No newline at end of file
diff --git a/accounts/search_criteria/budget_variance_report/budget_variance_report.txt b/accounts/search_criteria/budget_variance_report/budget_variance_report.txt
index 688b64a..00467ea 100644
--- a/accounts/search_criteria/budget_variance_report/budget_variance_report.txt
+++ b/accounts/search_criteria/budget_variance_report/budget_variance_report.txt
@@ -1,37 +1,33 @@
+# Search Criteria, budget_variance_report
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': '',
-		'creation': '2010-09-01 15:47:57',
-		'criteria_name': 'Budget Variance Report',
-		'custom_query': None,
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Budget Detail',
+		'creation': '2010-09-01 15:48:09',
 		'docstatus': 0,
+		'modified': '2011-05-23 16:07:41',
+		'modified_by': 'Administrator',
+		'owner': 'harshada@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'criteria_name': 'Budget Variance Report',
+		'doc_type': 'Budget Detail',
 		'doctype': 'Search Criteria',
 		'filters': "{'Budget Detail\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2010-09-01 15:05:50',
-		'modified_by': 'Administrator',
 		'module': 'Accounts',
-		'name': 'budget_variance_report',
-		'owner': 'harshada@webnotestech.com',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Cost Center',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabCost Center`.`lft`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, budget_variance_report
+	{
+		'doctype': 'Search Criteria',
+		'name': 'budget_variance_report'
 	}
 ]
\ No newline at end of file
diff --git a/accounts/search_criteria/business_associate_commission_report/business_associate_commission_report.txt b/accounts/search_criteria/business_associate_commission_report/business_associate_commission_report.txt
index f68295a..34f1f97 100644
--- a/accounts/search_criteria/business_associate_commission_report/business_associate_commission_report.txt
+++ b/accounts/search_criteria/business_associate_commission_report/business_associate_commission_report.txt
@@ -1,37 +1,36 @@
+# Search Criteria, business_associate_commission_report
 [
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-26 11:52:28',
+		'docstatus': 0,
+		'modified': '2010-08-26 11:49:50',
+		'modified_by': 'Administrator',
+		'owner': 'saumil@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
 	{
 		'add_col': "SUM(`tabReceivable Voucher`.`total_commission`) AS 'Total Commission'\nSUM(`tabReceivable Voucher`.`net_total`) AS 'Net Total'\n((SUM(`tabReceivable Voucher`.`total_commission`) / SUM(`tabReceivable Voucher`.`net_total`)) * 100) AS 'Average Commission Rate'",
 		'add_cond': '`tabReceivable Voucher`.`net_total` > 0\n`tabReceivable Voucher`.`total_commission` > 0',
-		'add_tab': None,
 		'columns': 'Receivable Voucher\x01Business Associate',
-		'creation': '2010-08-26 11:52:27',
 		'criteria_name': 'Business Associate Commission Report',
-		'custom_query': '',
 		'description': 'Track total commission given to your Business Associate',
-		'dis_filters': None,
-		'disabled': None,
 		'doc_type': 'Receivable Voucher',
-		'docstatus': 0,
 		'doctype': 'Search Criteria',
 		'filters': "{'Receivable Voucher\x01Submitted':1}",
-		'graph_series': None,
-		'graph_values': None,
 		'group_by': '`tabReceivable Voucher`.sales_partner',
-		'idx': None,
-		'modified': '2010-08-26 11:49:50',
-		'modified_by': 'Administrator',
 		'module': 'Accounts',
-		'name': 'business_associate_commission_report',
-		'owner': 'saumil@webnotestech.com',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
-		'sort_by': '',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, business_associate_commission_report
+	{
+		'doctype': 'Search Criteria',
+		'name': 'business_associate_commission_report'
 	}
 ]
\ No newline at end of file
diff --git a/accounts/search_criteria/cash_flow_statement/cash_flow_statement.txt b/accounts/search_criteria/cash_flow_statement/cash_flow_statement.txt
index b39efd8..dc3d985 100644
--- a/accounts/search_criteria/cash_flow_statement/cash_flow_statement.txt
+++ b/accounts/search_criteria/cash_flow_statement/cash_flow_statement.txt
@@ -1,37 +1,33 @@
+# Search Criteria, cash_flow_statement
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': '',
-		'add_tab': None,
-		'columns': 'Account\x01ID',
-		'creation': '2010-11-01 10:56:13',
-		'criteria_name': 'Cash Flow Statement',
-		'custom_query': None,
-		'description': '',
-		'dis_filters': 'fiscal_year\ntransaction_date',
-		'disabled': None,
-		'doc_type': 'Account',
+		'creation': '2010-11-01 10:56:14',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Account\x01Group or Ledger':'Ledger','Account\x01Is PL Account':'','Account\x01Is Active':'','Account\x01Account Type':'','Account\x01Company':'','Account\x01Fiscal Year':'','Account\x01Show Group Balance':'','Account\x01Level':'2'}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-10-29 16:39:19',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Account\x01ID',
+		'criteria_name': 'Cash Flow Statement',
+		'dis_filters': 'fiscal_year\ntransaction_date',
+		'doc_type': 'Account',
+		'doctype': 'Search Criteria',
+		'filters': "{'Account\x01Group or Ledger':'Ledger','Account\x01Is PL Account':'','Account\x01Is Active':'','Account\x01Account Type':'','Account\x01Company':'','Account\x01Fiscal Year':'','Account\x01Show Group Balance':'','Account\x01Level':'2'}",
 		'module': 'Accounts',
-		'name': 'cash_flow_statement',
-		'owner': 'Administrator',
-		'page_len': None,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
+		'name': '__common__',
 		'sort_by': '`tabAccount`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, cash_flow_statement
+	{
+		'doctype': 'Search Criteria',
+		'name': 'cash_flow_statement'
 	}
 ]
\ No newline at end of file
diff --git a/accounts/search_criteria/cenvat_credit___input_or_capital_goods/cenvat_credit___input_or_capital_goods.txt b/accounts/search_criteria/cenvat_credit___input_or_capital_goods/cenvat_credit___input_or_capital_goods.txt
index 6be62ed..b80e239 100644
--- a/accounts/search_criteria/cenvat_credit___input_or_capital_goods/cenvat_credit___input_or_capital_goods.txt
+++ b/accounts/search_criteria/cenvat_credit___input_or_capital_goods/cenvat_credit___input_or_capital_goods.txt
@@ -1,37 +1,34 @@
+# Search Criteria, cenvat_credit_-_input_or_capital_goods
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': '',
-		'creation': '2010-11-01 10:56:13',
-		'criteria_name': 'Cenvat Credit - Input or Capital Goods',
-		'custom_query': None,
-		'description': None,
-		'dis_filters': 'fiscal_year',
-		'disabled': None,
-		'doc_type': 'Journal Voucher Detail',
+		'creation': '2010-11-01 10:56:14',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Journal Voucher\x01Submitted':1,'Journal Voucher\x01Voucher Type':'','Journal Voucher\x01Is Opening':'','Journal Voucher\x01Fiscal Year':'','Journal Voucher\x01Company':'','Journal Voucher\x01TDS Applicable':'','Journal Voucher\x01TDS Category':'','Receivable Voucher\x01Aging Based On':'','Payable Voucher\x01Aging Based On':'Transaction Date','Journal Voucher Detail\x01Report Type':'CENVAT CREDIT ACCOUNT - INPUTS (R.G.23 A - PART II)'}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-10-29 16:42:14',
 		'modified_by': 'Administrator',
+		'owner': 'jai@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'criteria_name': 'Cenvat Credit - Input or Capital Goods',
+		'dis_filters': 'fiscal_year',
+		'doc_type': 'Journal Voucher Detail',
+		'doctype': 'Search Criteria',
+		'filters': "{'Journal Voucher\x01Submitted':1,'Journal Voucher\x01Voucher Type':'','Journal Voucher\x01Is Opening':'','Journal Voucher\x01Fiscal Year':'','Journal Voucher\x01Company':'','Journal Voucher\x01TDS Applicable':'','Journal Voucher\x01TDS Category':'','Receivable Voucher\x01Aging Based On':'','Payable Voucher\x01Aging Based On':'Transaction Date','Journal Voucher Detail\x01Report Type':'CENVAT CREDIT ACCOUNT - INPUTS (R.G.23 A - PART II)'}",
 		'module': 'Accounts',
-		'name': 'cenvat_credit_-_input_or_capital_goods',
-		'owner': 'jai@webnotestech.com',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Journal Voucher',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': 'ID',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, cenvat_credit_-_input_or_capital_goods
+	{
+		'doctype': 'Search Criteria',
+		'name': 'cenvat_credit_-_input_or_capital_goods'
 	}
 ]
\ No newline at end of file
diff --git a/accounts/search_criteria/collection_report/collection_report.txt b/accounts/search_criteria/collection_report/collection_report.txt
index 2a3f76b..21c143f 100644
--- a/accounts/search_criteria/collection_report/collection_report.txt
+++ b/accounts/search_criteria/collection_report/collection_report.txt
@@ -1,37 +1,33 @@
+# Search Criteria, collection_report
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Journal Voucher\x01ID,Journal Voucher\x01Posting Date,Journal Voucher\x01Company,Journal Voucher\x01Cheque No,Journal Voucher\x01Cheque Date,Journal Voucher Detail\x01Account,Journal Voucher Detail\x01Credit,Journal Voucher Detail\x01Against Receivable,Journal Voucher Detail\x01Is Advance',
-		'creation': '2010-10-05 12:51:18',
-		'criteria_name': 'Collection Report',
-		'custom_query': None,
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Journal Voucher Detail',
+		'creation': '2010-10-05 12:51:20',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Journal Voucher\x01Saved':1,'Journal Voucher\x01Submitted':1,'Journal Voucher\x01Voucher Type':'','Journal Voucher\x01Is Opening':'','Journal Voucher\x01Company':'','Journal Voucher\x01TDS Applicable':'','Journal Voucher\x01TDS Category':'','GL Entry\x01Range 1':'30','GL Entry\x01Range 2':'45','GL Entry\x01Range 3':'60','GL Entry\x01Range 4':'90'}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-10-01 11:29:51',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Journal Voucher\x01ID,Journal Voucher\x01Posting Date,Journal Voucher\x01Company,Journal Voucher\x01Cheque No,Journal Voucher\x01Cheque Date,Journal Voucher Detail\x01Account,Journal Voucher Detail\x01Credit,Journal Voucher Detail\x01Against Receivable,Journal Voucher Detail\x01Is Advance',
+		'criteria_name': 'Collection Report',
+		'doc_type': 'Journal Voucher Detail',
+		'doctype': 'Search Criteria',
+		'filters': "{'Journal Voucher\x01Saved':1,'Journal Voucher\x01Submitted':1,'Journal Voucher\x01Voucher Type':'','Journal Voucher\x01Is Opening':'','Journal Voucher\x01Company':'','Journal Voucher\x01TDS Applicable':'','Journal Voucher\x01TDS Category':'','GL Entry\x01Range 1':'30','GL Entry\x01Range 2':'45','GL Entry\x01Range 3':'60','GL Entry\x01Range 4':'90'}",
 		'module': 'Accounts',
-		'name': 'collection_report',
-		'owner': 'Administrator',
-		'page_len': None,
-		'parent': None,
+		'name': '__common__',
 		'parent_doc_type': 'Journal Voucher',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabJournal Voucher`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, collection_report
+	{
+		'doctype': 'Search Criteria',
+		'name': 'collection_report'
 	}
 ]
\ No newline at end of file
diff --git a/accounts/search_criteria/cost_center_wise_expense/cost_center_wise_expense.txt b/accounts/search_criteria/cost_center_wise_expense/cost_center_wise_expense.txt
index 411bb30..72d173e 100644
--- a/accounts/search_criteria/cost_center_wise_expense/cost_center_wise_expense.txt
+++ b/accounts/search_criteria/cost_center_wise_expense/cost_center_wise_expense.txt
@@ -1,37 +1,33 @@
+# Search Criteria, cost_center_wise_expense
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': '',
 		'creation': '2010-08-08 17:09:31',
-		'criteria_name': 'Cost Center wise Expense',
-		'custom_query': None,
-		'description': None,
-		'dis_filters': 'fiscal_year',
-		'disabled': None,
-		'doc_type': 'GL Entry',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Fiscal Year':'','GL Entry\x01Company':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-06-10 13:19:39',
 		'modified_by': 'Administrator',
+		'owner': 'swarnalata@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'criteria_name': 'Cost Center wise Expense',
+		'dis_filters': 'fiscal_year',
+		'doc_type': 'GL Entry',
+		'doctype': 'Search Criteria',
+		'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Fiscal Year':'','GL Entry\x01Company':''}",
 		'module': 'Accounts',
-		'name': 'cost_center_wise_expense',
-		'owner': 'swarnalata@webnotestech.com',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabGL Entry`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, cost_center_wise_expense
+	{
+		'doctype': 'Search Criteria',
+		'name': 'cost_center_wise_expense'
 	}
 ]
\ No newline at end of file
diff --git a/accounts/search_criteria/creditors_ledger/creditors_ledger.txt b/accounts/search_criteria/creditors_ledger/creditors_ledger.txt
index a1aef33..aa7751a 100644
--- a/accounts/search_criteria/creditors_ledger/creditors_ledger.txt
+++ b/accounts/search_criteria/creditors_ledger/creditors_ledger.txt
@@ -1,37 +1,31 @@
+# Search Criteria, creditors_ledger
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': '',
-		'creation': '2010-12-14 10:33:09',
-		'criteria_name': "Creditor's Ledger",
-		'custom_query': None,
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'GL Entry',
+		'creation': '2010-12-14 10:23:28',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-11-22 17:05:46',
 		'modified_by': 'Administrator',
+		'owner': 'nabin@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'criteria_name': "Creditor's Ledger",
+		'doc_type': 'GL Entry',
+		'doctype': 'Search Criteria',
+		'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}",
 		'module': 'Accounts',
-		'name': 'creditors_ledger',
-		'owner': 'nabin@webnotestech.com',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
-		'sort_by': '',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, creditors_ledger
+	{
+		'doctype': 'Search Criteria',
+		'name': 'creditors_ledger'
 	}
 ]
\ No newline at end of file
diff --git a/accounts/search_criteria/debtors_ledger/debtors_ledger.txt b/accounts/search_criteria/debtors_ledger/debtors_ledger.txt
index 1042a9d..4ba71f0 100644
--- a/accounts/search_criteria/debtors_ledger/debtors_ledger.txt
+++ b/accounts/search_criteria/debtors_ledger/debtors_ledger.txt
@@ -1,37 +1,31 @@
+# Search Criteria, debtors_ledger
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': '',
-		'creation': '2010-12-14 10:33:09',
-		'criteria_name': "Debtor's Ledger",
-		'custom_query': None,
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'GL Entry',
+		'creation': '2010-12-14 10:23:28',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'No','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-11-22 17:02:05',
 		'modified_by': 'Administrator',
+		'owner': 'nabin@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'criteria_name': "Debtor's Ledger",
+		'doc_type': 'GL Entry',
+		'doctype': 'Search Criteria',
+		'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'No','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}",
 		'module': 'Accounts',
-		'name': 'debtors_ledger',
-		'owner': 'nabin@webnotestech.com',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
-		'sort_by': '',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, debtors_ledger
+	{
+		'doctype': 'Search Criteria',
+		'name': 'debtors_ledger'
 	}
 ]
\ No newline at end of file
diff --git a/accounts/search_criteria/general_ledger/general_ledger.txt b/accounts/search_criteria/general_ledger/general_ledger.txt
index 2e23fee..6401ff4 100644
--- a/accounts/search_criteria/general_ledger/general_ledger.txt
+++ b/accounts/search_criteria/general_ledger/general_ledger.txt
@@ -1,37 +1,32 @@
+# Search Criteria, general_ledger
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': '',
-		'creation': '2010-12-14 10:33:08',
-		'criteria_name': 'General Ledger',
-		'custom_query': None,
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'GL Entry',
+		'creation': '2010-12-14 10:23:28',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'GL Entry\x01From Posting Date\x01lower':'','GL Entry\x01To Posting Date\x01upper':'','GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'No','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':'','GL Entry\x01Company':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': '',
-		'idx': None,
 		'modified': '2010-11-30 16:26:42',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'criteria_name': 'General Ledger',
+		'doc_type': 'GL Entry',
+		'doctype': 'Search Criteria',
+		'filters': "{'GL Entry\x01From Posting Date\x01lower':'','GL Entry\x01To Posting Date\x01upper':'','GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'No','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':'','GL Entry\x01Company':''}",
 		'module': 'Accounts',
-		'name': 'general_ledger',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabGL Entry`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, general_ledger
+	{
+		'doctype': 'Search Criteria',
+		'name': 'general_ledger'
 	}
 ]
\ No newline at end of file
diff --git a/accounts/search_criteria/itemwise_purchase_register/itemwise_purchase_register.txt b/accounts/search_criteria/itemwise_purchase_register/itemwise_purchase_register.txt
index 9b216c9..e6b1983 100644
--- a/accounts/search_criteria/itemwise_purchase_register/itemwise_purchase_register.txt
+++ b/accounts/search_criteria/itemwise_purchase_register/itemwise_purchase_register.txt
@@ -1,37 +1,36 @@
+# Search Criteria, itemwise_purchase_register
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Payable Voucher\x01ID,Payable Voucher\x01Credit To,Payable Voucher\x01Company,PV Detail\x01Item,PV Detail\x01Item Name,PV Detail\x01Expense Head,PV Detail\x01Cost Center,PV Detail\x01Qty,PV Detail\x01Rate (Default Curr.),PV Detail\x01Amount (Default Curr.)',
 		'creation': '2010-09-10 16:53:49',
-		'criteria_name': 'Itemwise Purchase Register',
-		'custom_query': '',
-		'description': 'Itemwise Purchase Register',
-		'dis_filters': 'fiscal_year',
-		'disabled': None,
-		'doc_type': 'PV Detail',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Payable Voucher\x01Submitted':1,'Payable Voucher\x01Is Opening':'No','Payable Voucher\x01Company':'','Payable Voucher\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2011-06-20 13:25:29',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Payable Voucher\x01ID,Payable Voucher\x01Credit To,Payable Voucher\x01Company,PV Detail\x01Item,PV Detail\x01Item Name,PV Detail\x01Expense Head,PV Detail\x01Cost Center,PV Detail\x01Qty,PV Detail\x01Rate (Default Curr.),PV Detail\x01Amount (Default Curr.)',
+		'criteria_name': 'Itemwise Purchase Register',
+		'description': 'Itemwise Purchase Register',
+		'dis_filters': 'fiscal_year',
+		'doc_type': 'PV Detail',
+		'doctype': 'Search Criteria',
+		'filters': "{'Payable Voucher\x01Submitted':1,'Payable Voucher\x01Is Opening':'No','Payable Voucher\x01Company':'','Payable Voucher\x01Fiscal Year':''}",
 		'module': 'Accounts',
-		'name': 'itemwise_purchase_register',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Payable Voucher',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabPayable Voucher`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, itemwise_purchase_register
+	{
+		'doctype': 'Search Criteria',
+		'name': 'itemwise_purchase_register'
 	}
 ]
\ No newline at end of file
diff --git a/accounts/search_criteria/itemwise_sales_register/itemwise_sales_register.txt b/accounts/search_criteria/itemwise_sales_register/itemwise_sales_register.txt
index 60c3e6a..24882e6 100644
--- a/accounts/search_criteria/itemwise_sales_register/itemwise_sales_register.txt
+++ b/accounts/search_criteria/itemwise_sales_register/itemwise_sales_register.txt
@@ -1,37 +1,34 @@
+# Search Criteria, itemwise_sales_register
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'RV Detail\x01Item,RV Detail\x01Item Name,RV Detail\x01Item Group,Receivable Voucher\x01ID,Receivable Voucher\x01Voucher Date,Receivable Voucher\x01Posting Date,Receivable Voucher\x01Debit To,RV Detail\x01Cost Center,Receivable Voucher\x01Territory,RV Detail\x01Income Account,RV Detail\x01Qty,RV Detail\x01Basic Rate*,RV Detail\x01Amount*',
 		'creation': '2011-01-19 17:33:33',
-		'criteria_name': 'Itemwise Sales Register',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'RV Detail',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Receivable Voucher\x01Submitted':1,'Receivable Voucher\x01From Posting Date\x01lower':'','Receivable Voucher\x01To Posting Date\x01upper':'','Receivable Voucher\x01Is Opening':'','Receivable Voucher\x01Company':'','Receivable Voucher\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2011-06-20 16:30:41',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'RV Detail\x01Item,RV Detail\x01Item Name,RV Detail\x01Item Group,Receivable Voucher\x01ID,Receivable Voucher\x01Voucher Date,Receivable Voucher\x01Posting Date,Receivable Voucher\x01Debit To,RV Detail\x01Cost Center,Receivable Voucher\x01Territory,RV Detail\x01Income Account,RV Detail\x01Qty,RV Detail\x01Basic Rate*,RV Detail\x01Amount*',
+		'criteria_name': 'Itemwise Sales Register',
+		'doc_type': 'RV Detail',
+		'doctype': 'Search Criteria',
+		'filters': "{'Receivable Voucher\x01Submitted':1,'Receivable Voucher\x01From Posting Date\x01lower':'','Receivable Voucher\x01To Posting Date\x01upper':'','Receivable Voucher\x01Is Opening':'','Receivable Voucher\x01Company':'','Receivable Voucher\x01Fiscal Year':''}",
 		'module': 'Accounts',
-		'name': 'itemwise_sales_register',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Receivable Voucher',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabRV Detail`.`income_account`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, itemwise_sales_register
+	{
+		'doctype': 'Search Criteria',
+		'name': 'itemwise_sales_register'
 	}
 ]
\ No newline at end of file
diff --git a/accounts/search_criteria/monthly_ledger_summary_report/monthly_ledger_summary_report.txt b/accounts/search_criteria/monthly_ledger_summary_report/monthly_ledger_summary_report.txt
index 193a5a8..fa527bb 100644
--- a/accounts/search_criteria/monthly_ledger_summary_report/monthly_ledger_summary_report.txt
+++ b/accounts/search_criteria/monthly_ledger_summary_report/monthly_ledger_summary_report.txt
@@ -1,37 +1,36 @@
+# Search Criteria, monthly_ledger_summary_report
 [
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:31',
+		'docstatus': 0,
+		'modified': '2010-06-09 16:30:43',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
 	{
 		'add_col': "month(`tabGL Entry`.posting_date) AS 'Fiscal Month'\nsum(`tabGL Entry`.debit) AS 'Debit'\nsum(`tabGL Entry`.credit) AS 'Credit'",
 		'add_cond': '(`tabGL Entry`.debit > 0 or `tabGL Entry`.credit > 0)',
-		'add_tab': None,
-		'columns': '',
-		'creation': '2010-08-08 17:09:31',
 		'criteria_name': 'Monthly Ledger Summary Report',
-		'custom_query': '',
-		'description': None,
 		'dis_filters': 'company',
-		'disabled': None,
 		'doc_type': 'GL Entry',
-		'docstatus': 0,
 		'doctype': 'Search Criteria',
 		'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':''}",
-		'graph_series': None,
-		'graph_values': None,
 		'group_by': 'month(`tabGL Entry`.posting_date)',
-		'idx': None,
-		'modified': '2010-06-09 16:30:43',
-		'modified_by': 'Administrator',
 		'module': 'Accounts',
-		'name': 'monthly_ledger_summary_report',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`Fiscal Month`',
 		'sort_order': 'ASC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, monthly_ledger_summary_report
+	{
+		'doctype': 'Search Criteria',
+		'name': 'monthly_ledger_summary_report'
 	}
 ]
\ No newline at end of file
diff --git a/accounts/search_criteria/payment_receipt_report/payment_receipt_report.txt b/accounts/search_criteria/payment_receipt_report/payment_receipt_report.txt
index df79a3f..4a10aae 100644
--- a/accounts/search_criteria/payment_receipt_report/payment_receipt_report.txt
+++ b/accounts/search_criteria/payment_receipt_report/payment_receipt_report.txt
@@ -1,37 +1,33 @@
+# Search Criteria, payment_receipt_report
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'GL Entry\x01ID,GL Entry\x01Owner,GL Entry\x01Posting Date,GL Entry\x01Account,GL Entry\x01Cost Center,GL Entry\x01Against Voucher,GL Entry\x01Voucher Type,GL Entry\x01Voucher No,GL Entry\x01Remarks,GL Entry\x01Is Cancelled,GL Entry\x01Is Opening,GL Entry\x01Fiscal Year,GL Entry\x01Company',
 		'creation': '2010-08-08 17:09:31',
-		'criteria_name': 'Payment Receipt Report',
-		'custom_query': None,
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'GL Entry',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-06-11 17:00:54',
 		'modified_by': 'Administrator',
+		'owner': 'jai@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'GL Entry\x01ID,GL Entry\x01Owner,GL Entry\x01Posting Date,GL Entry\x01Account,GL Entry\x01Cost Center,GL Entry\x01Against Voucher,GL Entry\x01Voucher Type,GL Entry\x01Voucher No,GL Entry\x01Remarks,GL Entry\x01Is Cancelled,GL Entry\x01Is Opening,GL Entry\x01Fiscal Year,GL Entry\x01Company',
+		'criteria_name': 'Payment Receipt Report',
+		'doc_type': 'GL Entry',
+		'doctype': 'Search Criteria',
+		'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}",
 		'module': 'Accounts',
-		'name': 'payment_receipt_report',
-		'owner': 'jai@webnotestech.com',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabGL Entry`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, payment_receipt_report
+	{
+		'doctype': 'Search Criteria',
+		'name': 'payment_receipt_report'
 	}
 ]
\ No newline at end of file
diff --git a/accounts/search_criteria/payment_report/payment_report.txt b/accounts/search_criteria/payment_report/payment_report.txt
index 0812f00..1059e8b 100644
--- a/accounts/search_criteria/payment_report/payment_report.txt
+++ b/accounts/search_criteria/payment_report/payment_report.txt
@@ -1,37 +1,33 @@
+# Search Criteria, payment_report
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Journal Voucher\x01ID,Journal Voucher\x01Posting Date,Journal Voucher\x01Company,Journal Voucher\x01Cheque No,Journal Voucher\x01Cheque Date,Journal Voucher Detail\x01Account,Journal Voucher Detail\x01Debit,Journal Voucher Detail\x01Against Payable,Journal Voucher Detail\x01Is Advance',
 		'creation': '2010-08-08 17:09:31',
-		'criteria_name': 'Payment Report',
-		'custom_query': None,
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Journal Voucher Detail',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Journal Voucher\x01Submitted':1,'Journal Voucher\x01Voucher Type':'','Journal Voucher\x01Is Opening':'','Journal Voucher\x01Company':'','Journal Voucher\x01TDS Applicable':'','Journal Voucher\x01TDS Category':'','GL Entry\x01Range 1':'30','GL Entry\x01Range 2':'45','GL Entry\x01Range 3':'60','GL Entry\x01Range 4':'90','Receivable Voucher\x01Aging Based On':'','Payable Voucher\x01Aging Based On':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-06-10 09:48:52',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Journal Voucher\x01ID,Journal Voucher\x01Posting Date,Journal Voucher\x01Company,Journal Voucher\x01Cheque No,Journal Voucher\x01Cheque Date,Journal Voucher Detail\x01Account,Journal Voucher Detail\x01Debit,Journal Voucher Detail\x01Against Payable,Journal Voucher Detail\x01Is Advance',
+		'criteria_name': 'Payment Report',
+		'doc_type': 'Journal Voucher Detail',
+		'doctype': 'Search Criteria',
+		'filters': "{'Journal Voucher\x01Submitted':1,'Journal Voucher\x01Voucher Type':'','Journal Voucher\x01Is Opening':'','Journal Voucher\x01Company':'','Journal Voucher\x01TDS Applicable':'','Journal Voucher\x01TDS Category':'','GL Entry\x01Range 1':'30','GL Entry\x01Range 2':'45','GL Entry\x01Range 3':'60','GL Entry\x01Range 4':'90','Receivable Voucher\x01Aging Based On':'','Payable Voucher\x01Aging Based On':''}",
 		'module': 'Accounts',
-		'name': 'payment_report',
-		'owner': 'Administrator',
-		'page_len': None,
-		'parent': None,
+		'name': '__common__',
 		'parent_doc_type': 'Journal Voucher',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabJournal Voucher`.`aging_date`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, payment_report
+	{
+		'doctype': 'Search Criteria',
+		'name': 'payment_report'
 	}
 ]
\ No newline at end of file
diff --git a/accounts/search_criteria/progressive_total_excise_duty/progressive_total_excise_duty.txt b/accounts/search_criteria/progressive_total_excise_duty/progressive_total_excise_duty.txt
index cb9065f..0748ba2 100644
--- a/accounts/search_criteria/progressive_total_excise_duty/progressive_total_excise_duty.txt
+++ b/accounts/search_criteria/progressive_total_excise_duty/progressive_total_excise_duty.txt
@@ -1,37 +1,34 @@
+# Search Criteria, progressive_total_excise_duty
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Journal Voucher\x01ID,Journal Voucher\x01Owner,Journal Voucher\x01Voucher Type,Journal Voucher\x01Voucher Date,Journal Voucher\x01Posting Date,Journal Voucher\x01Is Opening,Journal Voucher\x01Fiscal Year,Journal Voucher\x01Company,Journal Voucher\x01Cheque No,Journal Voucher\x01Clearance Date,Journal Voucher\x01TDS Applicable,Journal Voucher\x01TDS Category,Journal Voucher Detail\x01Account,Journal Voucher Detail\x01Cost Center,Journal Voucher Detail\x01Against Payable,Journal Voucher Detail\x01Against Receivable',
-		'creation': '2010-11-01 10:56:13',
-		'criteria_name': 'Progressive Total Excise Duty',
-		'custom_query': None,
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Journal Voucher Detail',
+		'creation': '2010-11-01 10:56:14',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Journal Voucher\x01Saved':1,'Journal Voucher\x01Submitted':1,'Journal Voucher\x01Voucher Type':'','Journal Voucher\x01Is Opening':'','Journal Voucher\x01Fiscal Year':'','Journal Voucher\x01Company':'','Journal Voucher\x01TDS Applicable':'','Journal Voucher\x01TDS Category':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-10-29 16:44:43',
 		'modified_by': 'Administrator',
+		'owner': 'jai@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Journal Voucher\x01ID,Journal Voucher\x01Owner,Journal Voucher\x01Voucher Type,Journal Voucher\x01Voucher Date,Journal Voucher\x01Posting Date,Journal Voucher\x01Is Opening,Journal Voucher\x01Fiscal Year,Journal Voucher\x01Company,Journal Voucher\x01Cheque No,Journal Voucher\x01Clearance Date,Journal Voucher\x01TDS Applicable,Journal Voucher\x01TDS Category,Journal Voucher Detail\x01Account,Journal Voucher Detail\x01Cost Center,Journal Voucher Detail\x01Against Payable,Journal Voucher Detail\x01Against Receivable',
+		'criteria_name': 'Progressive Total Excise Duty',
+		'doc_type': 'Journal Voucher Detail',
+		'doctype': 'Search Criteria',
+		'filters': "{'Journal Voucher\x01Saved':1,'Journal Voucher\x01Submitted':1,'Journal Voucher\x01Voucher Type':'','Journal Voucher\x01Is Opening':'','Journal Voucher\x01Fiscal Year':'','Journal Voucher\x01Company':'','Journal Voucher\x01TDS Applicable':'','Journal Voucher\x01TDS Category':''}",
 		'module': 'Accounts',
-		'name': 'progressive_total_excise_duty',
-		'owner': 'jai@webnotestech.com',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Journal Voucher',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': 'ID',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, progressive_total_excise_duty
+	{
+		'doctype': 'Search Criteria',
+		'name': 'progressive_total_excise_duty'
 	}
 ]
\ No newline at end of file
diff --git a/accounts/search_criteria/purchase_register/purchase_register.txt b/accounts/search_criteria/purchase_register/purchase_register.txt
index 7fe3cdc..4ae2751 100644
--- a/accounts/search_criteria/purchase_register/purchase_register.txt
+++ b/accounts/search_criteria/purchase_register/purchase_register.txt
@@ -1,37 +1,31 @@
+# Search Criteria, purchase_register
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': "`tabPayable Voucher`.is_opening != 'Yes'\n`tabPayable Voucher`.name not like 'OP/%'",
-		'add_tab': None,
-		'columns': 'Payable Voucher\x01ID,Payable Voucher\x01Voucher Date,Payable Voucher\x01Posting Date,Payable Voucher\x01Credit To,Payable Voucher\x01Expense Head',
 		'creation': '2010-12-15 08:39:24',
-		'criteria_name': 'Purchase Register',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Payable Voucher',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Payable Voucher\x01Submitted':1}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2011-06-06 14:37:00',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': "`tabPayable Voucher`.is_opening != 'Yes'\n`tabPayable Voucher`.name not like 'OP/%'",
+		'columns': 'Payable Voucher\x01ID,Payable Voucher\x01Voucher Date,Payable Voucher\x01Posting Date,Payable Voucher\x01Credit To,Payable Voucher\x01Expense Head',
+		'criteria_name': 'Purchase Register',
+		'doc_type': 'Payable Voucher',
+		'doctype': 'Search Criteria',
+		'filters': "{'Payable Voucher\x01Submitted':1}",
 		'module': 'Accounts',
-		'name': 'purchase_register',
-		'owner': 'Administrator',
-		'page_len': None,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
-		'sort_by': None,
-		'sort_order': None,
+		'name': '__common__',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, purchase_register
+	{
+		'doctype': 'Search Criteria',
+		'name': 'purchase_register'
 	}
 ]
\ No newline at end of file
diff --git a/accounts/search_criteria/sales_register/sales_register.txt b/accounts/search_criteria/sales_register/sales_register.txt
index 79536b0..c780fbd 100644
--- a/accounts/search_criteria/sales_register/sales_register.txt
+++ b/accounts/search_criteria/sales_register/sales_register.txt
@@ -1,37 +1,37 @@
+# Search Criteria, sales_register
 [
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-12-15 08:39:24',
+		'docstatus': 0,
+		'modified': '2010-08-10 10:48:01',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
 	{
 		'add_col': "`tabAccount`.`parent_account` AS 'Parent Account'\n`tabCustomer`.`territory` AS 'Territory'\n`tabCustomer`.`customer_details` AS 'Customer Details'",
 		'add_cond': "ifnull(`tabReceivable Voucher`.`is_opening`, 'No') = 'No'\n`tabAccount`.name =`tabReceivable Voucher`.debit_to\n`tabCustomer`.`name` = `tabAccount`.`master_name`",
 		'add_tab': '`tabAccount`\n`tabCustomer`',
 		'columns': 'Receivable Voucher\x01ID,Receivable Voucher\x01Posting Date,Receivable Voucher\x01Debit To',
-		'creation': '2010-12-14 10:33:09',
 		'criteria_name': 'Sales Register',
-		'custom_query': '',
-		'description': None,
 		'dis_filters': 'fiscal_year',
-		'disabled': None,
 		'doc_type': 'Receivable Voucher',
-		'docstatus': 0,
 		'doctype': 'Search Criteria',
 		'filters': "{'Receivable Voucher\x01Submitted':1,'Receivable Voucher\x01Is Opening':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2010-08-10 10:48:01',
-		'modified_by': 'Administrator',
 		'module': 'Accounts',
-		'name': 'sales_register',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`Parent Account`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, sales_register
+	{
+		'doctype': 'Search Criteria',
+		'name': 'sales_register'
 	}
 ]
\ No newline at end of file
diff --git a/accounts/search_criteria/service_tax_credit_account___inputs/service_tax_credit_account___inputs.txt b/accounts/search_criteria/service_tax_credit_account___inputs/service_tax_credit_account___inputs.txt
index acdd8fd..f4b9fed 100644
--- a/accounts/search_criteria/service_tax_credit_account___inputs/service_tax_credit_account___inputs.txt
+++ b/accounts/search_criteria/service_tax_credit_account___inputs/service_tax_credit_account___inputs.txt
@@ -1,37 +1,34 @@
+# Search Criteria, service_tax_credit_account_-_inputs
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Journal Voucher\x01ID,Journal Voucher\x01Owner,Journal Voucher\x01Voucher Type,Journal Voucher\x01Voucher Date,Journal Voucher\x01Posting Date,Journal Voucher\x01Is Opening,Journal Voucher\x01Fiscal Year,Journal Voucher\x01Company,Journal Voucher\x01Cheque No,Journal Voucher\x01Clearance Date,Journal Voucher\x01TDS Applicable,Journal Voucher\x01TDS Category,Journal Voucher Detail\x01Account,Journal Voucher Detail\x01Cost Center,Journal Voucher Detail\x01Against Payable,Journal Voucher Detail\x01Against Receivable',
-		'creation': '2010-11-01 10:56:13',
-		'criteria_name': 'Service Tax Credit Account - Inputs',
-		'custom_query': None,
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Journal Voucher Detail',
+		'creation': '2010-11-01 10:56:14',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Journal Voucher\x01Saved':1,'Journal Voucher\x01Submitted':1,'Journal Voucher\x01Voucher Type':'','Journal Voucher\x01Is Opening':'','Journal Voucher\x01Fiscal Year':'','Journal Voucher\x01Company':'','Journal Voucher\x01TDS Applicable':'','Journal Voucher\x01TDS Category':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-10-29 16:42:59',
 		'modified_by': 'Administrator',
+		'owner': 'jai@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Journal Voucher\x01ID,Journal Voucher\x01Owner,Journal Voucher\x01Voucher Type,Journal Voucher\x01Voucher Date,Journal Voucher\x01Posting Date,Journal Voucher\x01Is Opening,Journal Voucher\x01Fiscal Year,Journal Voucher\x01Company,Journal Voucher\x01Cheque No,Journal Voucher\x01Clearance Date,Journal Voucher\x01TDS Applicable,Journal Voucher\x01TDS Category,Journal Voucher Detail\x01Account,Journal Voucher Detail\x01Cost Center,Journal Voucher Detail\x01Against Payable,Journal Voucher Detail\x01Against Receivable',
+		'criteria_name': 'Service Tax Credit Account - Inputs',
+		'doc_type': 'Journal Voucher Detail',
+		'doctype': 'Search Criteria',
+		'filters': "{'Journal Voucher\x01Saved':1,'Journal Voucher\x01Submitted':1,'Journal Voucher\x01Voucher Type':'','Journal Voucher\x01Is Opening':'','Journal Voucher\x01Fiscal Year':'','Journal Voucher\x01Company':'','Journal Voucher\x01TDS Applicable':'','Journal Voucher\x01TDS Category':''}",
 		'module': 'Accounts',
-		'name': 'service_tax_credit_account_-_inputs',
-		'owner': 'jai@webnotestech.com',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Journal Voucher',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': 'ID',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, service_tax_credit_account_-_inputs
+	{
+		'doctype': 'Search Criteria',
+		'name': 'service_tax_credit_account_-_inputs'
 	}
 ]
\ No newline at end of file
diff --git a/accounts/search_criteria/tds_return/tds_return.txt b/accounts/search_criteria/tds_return/tds_return.txt
index 371a80e..5c200e5 100644
--- a/accounts/search_criteria/tds_return/tds_return.txt
+++ b/accounts/search_criteria/tds_return/tds_return.txt
@@ -1,37 +1,31 @@
+# Search Criteria, tds_return
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': '',
-		'add_cond': '',
-		'add_tab': '',
-		'columns': '',
 		'creation': '2010-08-08 17:09:31',
-		'criteria_name': 'TDS Return',
-		'custom_query': None,
-		'description': None,
-		'dis_filters': 'fiscal_year',
-		'disabled': None,
-		'doc_type': 'TDS Payment Detail',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'TDS Payment\x01Submitted':1}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-06-30 14:38:18',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'criteria_name': 'TDS Return',
+		'dis_filters': 'fiscal_year',
+		'doc_type': 'TDS Payment Detail',
+		'doctype': 'Search Criteria',
+		'filters': "{'TDS Payment\x01Submitted':1}",
 		'module': 'Accounts',
-		'name': 'tds_return',
-		'owner': 'Administrator',
-		'page_len': None,
-		'parent': None,
+		'name': '__common__',
 		'parent_doc_type': 'TDS Payment',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
-		'sort_by': '',
-		'sort_order': '',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, tds_return
+	{
+		'doctype': 'Search Criteria',
+		'name': 'tds_return'
 	}
 ]
\ No newline at end of file
diff --git a/accounts/search_criteria/total_amout_collection_for_a_period___customerwise/total_amout_collection_for_a_period___customerwise.txt b/accounts/search_criteria/total_amout_collection_for_a_period___customerwise/total_amout_collection_for_a_period___customerwise.txt
index 67e9cde..aa3e2ea 100644
--- a/accounts/search_criteria/total_amout_collection_for_a_period___customerwise/total_amout_collection_for_a_period___customerwise.txt
+++ b/accounts/search_criteria/total_amout_collection_for_a_period___customerwise/total_amout_collection_for_a_period___customerwise.txt
@@ -1,37 +1,36 @@
+# Search Criteria, total_amout_collection_for_a_period_-_customerwise
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': '(master_type = "Customer" or parent_account like "Sundry Debtors%" or parent_account like "Accounts Receivable%")',
-		'add_tab': None,
-		'columns': 'Account\x01ID',
 		'creation': '2010-08-08 17:09:31',
+		'docstatus': 0,
+		'modified': '2010-06-09 18:09:34',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': '(master_type = "Customer" or parent_account like "Sundry Debtors%" or parent_account like "Accounts Receivable%")',
+		'columns': 'Account\x01ID',
 		'criteria_name': 'Total amout collection for a period - Customerwise',
-		'custom_query': '',
-		'description': None,
 		'dis_filters': 'transaction_date',
 		'disabled': 0,
 		'doc_type': 'Account',
-		'docstatus': 0,
 		'doctype': 'Search Criteria',
 		'filters': "{'Account\x01Saved':1,'Account\x01Group or Ledger':'','Account\x01Is PL Account':'','Account\x01Account Type':'','Account\x01From Date\x01lower':'2010-04-01','Account\x01To Date\x01upper':'2010-06-09'}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2010-06-09 18:09:34',
-		'modified_by': 'Administrator',
 		'module': 'Accounts',
-		'name': 'total_amout_collection_for_a_period_-_customerwise',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabAccount`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, total_amout_collection_for_a_period_-_customerwise
+	{
+		'doctype': 'Search Criteria',
+		'name': 'total_amout_collection_for_a_period_-_customerwise'
 	}
 ]
\ No newline at end of file
diff --git a/accounts/search_criteria/trial_balance/trial_balance.txt b/accounts/search_criteria/trial_balance/trial_balance.txt
index a29c5a2..16bac7c 100644
--- a/accounts/search_criteria/trial_balance/trial_balance.txt
+++ b/accounts/search_criteria/trial_balance/trial_balance.txt
@@ -1,37 +1,35 @@
+# Search Criteria, trial_balance
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Account\x01ID',
 		'creation': '2010-12-14 10:23:28',
-		'criteria_name': 'Trial Balance',
-		'custom_query': '',
-		'description': 'Trial Balance',
-		'dis_filters': 'transaction_date',
-		'disabled': None,
-		'doc_type': 'Account',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Account\x01Is PL Account':'','Account\x01Account Type':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2011-06-22 12:29:43',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Account\x01ID',
+		'criteria_name': 'Trial Balance',
+		'description': 'Trial Balance',
+		'dis_filters': 'transaction_date',
+		'doc_type': 'Account',
+		'doctype': 'Search Criteria',
+		'filters': "{'Account\x01Group or Ledger':'Ledger','Account\x01Is PL Account':'','Account\x01Account Type':'','Account\x01Show Group Balance':''}",
 		'module': 'Accounts',
-		'name': 'trial_balance',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabAccount`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, trial_balance
+	{
+		'doctype': 'Search Criteria',
+		'name': 'trial_balance'
 	}
-]
+]
\ No newline at end of file
diff --git a/analysis/search_criteria/monthly_transaction_summary/monthly_transaction_summary.txt b/analysis/search_criteria/monthly_transaction_summary/monthly_transaction_summary.txt
index 506518c..19a5866 100644
--- a/analysis/search_criteria/monthly_transaction_summary/monthly_transaction_summary.txt
+++ b/analysis/search_criteria/monthly_transaction_summary/monthly_transaction_summary.txt
@@ -1,37 +1,32 @@
+# Search Criteria, monthly_transaction_summary
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Profile\x01ID',
-		'creation': '2010-09-20 13:00:41',
-		'criteria_name': 'Monthly Transaction Summary',
-		'custom_query': None,
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Profile',
+		'creation': '2010-09-20 13:00:43',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'DocType\x01Period':'Monthly'}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-09-17 16:02:25',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Profile\x01ID',
+		'criteria_name': 'Monthly Transaction Summary',
+		'doc_type': 'Profile',
+		'doctype': 'Search Criteria',
+		'filters': "{'DocType\x01Period':'Monthly'}",
 		'module': 'Analysis',
-		'name': 'monthly_transaction_summary',
-		'owner': 'Administrator',
-		'page_len': None,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
+		'name': '__common__',
 		'sort_by': '`tabProfile`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, monthly_transaction_summary
+	{
+		'doctype': 'Search Criteria',
+		'name': 'monthly_transaction_summary'
 	}
 ]
\ No newline at end of file
diff --git a/analysis/search_criteria/trend_analyzer/trend_analyzer.txt b/analysis/search_criteria/trend_analyzer/trend_analyzer.txt
index 91a355b..a099c97 100644
--- a/analysis/search_criteria/trend_analyzer/trend_analyzer.txt
+++ b/analysis/search_criteria/trend_analyzer/trend_analyzer.txt
@@ -1,37 +1,33 @@
+# Search Criteria, trend_analyzer
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Profile\x01ID,Profile\x01Owner',
-		'creation': '2010-12-14 10:33:09',
-		'criteria_name': 'Trend Analyzer',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Profile',
+		'creation': '2010-12-14 10:23:18',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': '{}',
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-11-10 11:06:06',
 		'modified_by': 'Administrator',
+		'owner': 'saumil@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Profile\x01ID,Profile\x01Owner',
+		'criteria_name': 'Trend Analyzer',
+		'doc_type': 'Profile',
+		'doctype': 'Search Criteria',
+		'filters': '{}',
 		'module': 'Analysis',
-		'name': 'trend_analyzer',
-		'owner': 'saumil@webnotestech.com',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabProfile`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, trend_analyzer
+	{
+		'doctype': 'Search Criteria',
+		'name': 'trend_analyzer'
 	}
 ]
\ No newline at end of file
diff --git a/analysis/search_criteria/yearly_transaction_summary/yearly_transaction_summary.txt b/analysis/search_criteria/yearly_transaction_summary/yearly_transaction_summary.txt
index 91cba25..2f55a1f 100644
--- a/analysis/search_criteria/yearly_transaction_summary/yearly_transaction_summary.txt
+++ b/analysis/search_criteria/yearly_transaction_summary/yearly_transaction_summary.txt
@@ -1,37 +1,32 @@
+# Search Criteria, yearly_transaction_summary
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Profile\x01ID',
-		'creation': '2010-09-20 13:00:41',
-		'criteria_name': 'Yearly Transaction Summary',
-		'custom_query': None,
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Profile',
+		'creation': '2010-09-20 13:00:43',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'DocType\x01Fiscal Year':'2009-2010','DocType\x01Company':'Alpha Company','DocType\x01Period':'Monthly'}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-09-17 16:03:04',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Profile\x01ID',
+		'criteria_name': 'Yearly Transaction Summary',
+		'doc_type': 'Profile',
+		'doctype': 'Search Criteria',
+		'filters': "{'DocType\x01Fiscal Year':'2009-2010','DocType\x01Company':'Alpha Company','DocType\x01Period':'Monthly'}",
 		'module': 'Analysis',
-		'name': 'yearly_transaction_summary',
-		'owner': 'Administrator',
-		'page_len': None,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
+		'name': '__common__',
 		'sort_by': '`tabProfile`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, yearly_transaction_summary
+	{
+		'doctype': 'Search Criteria',
+		'name': 'yearly_transaction_summary'
 	}
 ]
\ No newline at end of file
diff --git a/buying/DocType Mapper/Indent-Purchase Order/Indent-Purchase Order.txt b/buying/DocType Mapper/Indent-Purchase Order/Indent-Purchase Order.txt
index 04659ff..d8d4f34 100644
--- a/buying/DocType Mapper/Indent-Purchase Order/Indent-Purchase Order.txt
+++ b/buying/DocType Mapper/Indent-Purchase Order/Indent-Purchase Order.txt
@@ -1 +1,225 @@
-[{'modified_by': 'jai@webnotestech.com', 'name': 'Indent-Purchase Order', 'parent': None, 'to_doctype': 'Purchase Order', 'creation': '2009-03-12 12:10:22', 'modified': '2009-12-30 16:55:33', 'module': 'SRM', 'doctype': 'DocType Mapper', 'idx': None, 'parenttype': '', 'ref_doc_submitted': 1, 'owner': 'Administrator', 'docstatus': 0, 'from_doctype': 'Indent', 'parentfield': ''}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00165', 'parent': 'Indent-Purchase Order', 'to_field': 'fiscal_year', 'creation': '2009-03-12 12:10:22', 'modified': '2009-12-30 16:55:33', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 1, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'fiscal_year', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00164', 'parent': 'Indent-Purchase Order', 'to_field': 'company', 'creation': '2009-03-12 12:10:22', 'modified': '2009-12-30 16:55:33', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 2, 'parenttype': 'DocType Mapper', 'checking_operator': '=', 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'company', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00544', 'parent': 'Indent-Purchase Order', 'to_field': 'prevdoc_doctype', 'creation': '2009-09-21 13:13:48', 'modified': '2009-12-30 16:55:33', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 3, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'parenttype', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00163', 'parent': 'Indent-Purchase Order', 'to_field': 'prevdoc_docname', 'creation': '2009-03-12 12:10:22', 'modified': '2009-12-30 16:55:33', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 4, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'parent', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00162', 'parent': 'Indent-Purchase Order', 'to_field': 'prevdoc_detail_docname', 'creation': '2009-03-12 12:10:22', 'modified': '2009-12-30 16:55:33', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 5, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'name', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00155', 'parent': 'Indent-Purchase Order', 'to_field': 'stock_uom', 'creation': '2009-03-12 12:10:22', 'modified': '2009-12-30 16:55:33', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 6, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'uom', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00168', 'parent': 'Indent-Purchase Order', 'to_field': 'conversion_factor', 'creation': '2009-03-13 13:18:32', 'modified': '2009-12-30 16:55:33', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 7, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'eval:flt(1)', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00166', 'parent': 'Indent-Purchase Order', 'to_field': 'uom', 'creation': '2009-03-12 17:24:05', 'modified': '2009-12-30 16:55:33', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 8, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'uom', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00157', 'parent': 'Indent-Purchase Order', 'to_field': 'warehouse', 'creation': '2009-03-12 12:10:22', 'modified': '2009-12-30 16:55:33', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 9, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'warehouse', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00160', 'parent': 'Indent-Purchase Order', 'to_field': 'schedule_date', 'creation': '2009-03-12 12:10:22', 'modified': '2009-12-30 16:55:33', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 10, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'schedule_date', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00159', 'parent': 'Indent-Purchase Order', 'to_field': 'item_code', 'creation': '2009-03-12 12:10:22', 'modified': '2009-12-30 16:55:33', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 11, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'item_code', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00244', 'parent': 'Indent-Purchase Order', 'to_field': 'item_name', 'creation': '2009-03-25 17:36:50', 'modified': '2009-12-30 16:55:33', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 12, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'item_name', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00243', 'parent': 'Indent-Purchase Order', 'to_field': 'brand', 'creation': '2009-03-25 17:36:50', 'modified': '2009-12-30 16:55:33', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 13, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'brand', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00158', 'parent': 'Indent-Purchase Order', 'to_field': 'description', 'creation': '2009-03-12 12:10:22', 'modified': '2009-12-30 16:55:33', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 14, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'description', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00649', 'parent': 'Indent-Purchase Order', 'to_field': 'item_group', 'creation': '2009-12-22 14:59:02', 'modified': '2009-12-30 16:55:33', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 15, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'from_field': 'item_group', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00253', 'parent': 'Indent-Purchase Order', 'to_field': 'stock_qty', 'creation': '2009-03-30 10:55:56', 'modified': '2009-12-30 16:55:33', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 16, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'eval:flt(obj.qty) - flt(obj.ordered_qty)', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00602', 'parent': 'Indent-Purchase Order', 'to_field': 'qty', 'creation': '2009-11-18 15:10:27', 'modified': '2009-12-30 16:55:33', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 17, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'from_field': 'eval:flt(obj.qty) - flt(obj.ordered_qty)', 'parentfield': 'field_mapper_details'}, {'reference_key': 'prevdoc_docname', 'modified_by': 'jai@webnotestech.com', 'name': 'TMD/0000017', 'parent': 'Indent-Purchase Order', 'is_reference_table': None, 'to_field': '', 'creation': '2009-03-12 12:10:22', 'reference_doctype_key': '', 'modified': '2009-12-30 16:55:33', 'doctype': 'Table Mapper Detail', 'match_id': 0, 'idx': 1, 'parenttype': 'DocType Mapper', 'from_table': 'Indent', 'owner': 'Administrator', 'docstatus': 0, 'to_table': 'Purchase Order', 'from_field': '', 'validation_logic': 'docstatus = 1', 'parentfield': 'table_mapper_details'}, {'reference_key': '', 'modified_by': 'jai@webnotestech.com', 'name': 'TMD/0000018', 'parent': 'Indent-Purchase Order', 'is_reference_table': 1, 'to_field': 'po_details', 'creation': '2009-03-12 12:10:22', 'reference_doctype_key': 'prevdoc_doctype', 'modified': '2009-12-30 16:55:33', 'doctype': 'Table Mapper Detail', 'match_id': 1, 'idx': 2, 'parenttype': 'DocType Mapper', 'from_table': 'Indent Detail', 'owner': 'Administrator', 'docstatus': 0, 'to_table': 'PO Detail', 'from_field': 'indent_details', 'validation_logic': 'qty > ifnull(ordered_qty,0) and docstatus =1', 'parentfield': 'table_mapper_details'}]
\ No newline at end of file
+# DocType Mapper, Indent-Purchase Order
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:34',
+		'docstatus': 0,
+		'modified': '2009-12-30 16:55:33',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'name': '__common__',
+		'parent': 'Indent-Purchase Order',
+		'parentfield': 'table_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'map': 'Yes',
+		'name': '__common__',
+		'parent': 'Indent-Purchase Order',
+		'parentfield': 'field_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all DocType Mapper
+	{
+		'doctype': 'DocType Mapper',
+		'from_doctype': 'Indent',
+		'module': 'Buying',
+		'name': '__common__',
+		'ref_doc_submitted': 1,
+		'to_doctype': 'Purchase Order'
+	},
+
+	# DocType Mapper, Indent-Purchase Order
+	{
+		'doctype': 'DocType Mapper',
+		'name': 'Indent-Purchase Order'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'fiscal_year',
+		'idx': 1,
+		'match_id': 0,
+		'to_field': 'fiscal_year'
+	},
+
+	# Field Mapper Detail
+	{
+		'checking_operator': '=',
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'company',
+		'idx': 2,
+		'match_id': 0,
+		'to_field': 'company'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'parenttype',
+		'idx': 3,
+		'match_id': 1,
+		'to_field': 'prevdoc_doctype'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'parent',
+		'idx': 4,
+		'match_id': 1,
+		'to_field': 'prevdoc_docname'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'name',
+		'idx': 5,
+		'match_id': 1,
+		'to_field': 'prevdoc_detail_docname'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'uom',
+		'idx': 6,
+		'match_id': 1,
+		'to_field': 'stock_uom'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'eval:flt(1)',
+		'idx': 7,
+		'match_id': 1,
+		'to_field': 'conversion_factor'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'uom',
+		'idx': 8,
+		'match_id': 1,
+		'to_field': 'uom'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'warehouse',
+		'idx': 9,
+		'match_id': 1,
+		'to_field': 'warehouse'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'schedule_date',
+		'idx': 10,
+		'match_id': 1,
+		'to_field': 'schedule_date'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'item_code',
+		'idx': 11,
+		'match_id': 1,
+		'to_field': 'item_code'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'item_name',
+		'idx': 12,
+		'match_id': 1,
+		'to_field': 'item_name'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'brand',
+		'idx': 13,
+		'match_id': 1,
+		'to_field': 'brand'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'description',
+		'idx': 14,
+		'match_id': 1,
+		'to_field': 'description'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'item_group',
+		'idx': 15,
+		'match_id': 1,
+		'to_field': 'item_group'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'eval:flt(obj.qty) - flt(obj.ordered_qty)',
+		'idx': 16,
+		'match_id': 1,
+		'to_field': 'stock_qty'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'eval:flt(obj.qty) - flt(obj.ordered_qty)',
+		'idx': 17,
+		'match_id': 1,
+		'to_field': 'qty'
+	},
+
+	# Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'from_table': 'Indent',
+		'idx': 1,
+		'match_id': 0,
+		'reference_key': 'prevdoc_docname',
+		'to_table': 'Purchase Order',
+		'validation_logic': 'docstatus = 1'
+	},
+
+	# Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'from_field': 'indent_details',
+		'from_table': 'Indent Detail',
+		'idx': 2,
+		'match_id': 1,
+		'reference_doctype_key': 'prevdoc_doctype',
+		'to_field': 'po_details',
+		'to_table': 'PO Detail',
+		'validation_logic': 'qty > ifnull(ordered_qty,0) and docstatus =1'
+	}
+]
\ No newline at end of file
diff --git a/buying/DocType Mapper/Sales Order-Indent/Sales Order-Indent.txt b/buying/DocType Mapper/Sales Order-Indent/Sales Order-Indent.txt
index 4094ddd..349603c 100755
--- a/buying/DocType Mapper/Sales Order-Indent/Sales Order-Indent.txt
+++ b/buying/DocType Mapper/Sales Order-Indent/Sales Order-Indent.txt
@@ -1,330 +1,222 @@
+# DocType Mapper, Sales Order-Indent
 [
+
+	# These values are common in all dictionaries
 	{
-		'creation': '2011-05-09 16:46:12',
+		'creation': '2011-04-06 15:33:09',
 		'docstatus': 0,
-		'doctype': 'DocType Mapper',
-		'from_doctype': 'Sales Order',
-		'idx': None,
 		'modified': '2011-05-04 14:49:55',
 		'modified_by': 'Administrator',
-		'module': 'Mapper',
-		'name': 'Sales Order-Indent',
-		'owner': 'Administrator',
-		'parent': None,
-		'parentfield': None,
-		'parenttype': None,
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'name': '__common__',
+		'parent': 'Sales Order-Indent',
+		'parentfield': 'table_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'name': '__common__',
+		'parent': 'Sales Order-Indent',
+		'parentfield': 'field_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all DocType Mapper
+	{
+		'doctype': 'DocType Mapper',
+		'from_doctype': 'Sales Order',
+		'module': 'Buying',
+		'name': '__common__',
 		'ref_doc_submitted': 1,
 		'to_doctype': 'Indent'
 	},
+
+	# DocType Mapper, Sales Order-Indent
+	{
+		'doctype': 'DocType Mapper',
+		'name': 'Sales Order-Indent'
+	},
+
+	# Field Mapper Detail
 	{
 		'checking_operator': '>=',
-		'creation': '2011-05-09 16:46:12',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'transaction_date',
 		'idx': 1,
 		'map': 'No',
 		'match_id': 0,
-		'modified': '2011-05-09 16:46:12',
-		'modified_by': 'Administrator',
-		'name': '000000724',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Indent',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'transaction_date'
 	},
+
+	# Field Mapper Detail
 	{
 		'checking_operator': '=',
-		'creation': '2011-05-09 16:46:12',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'company',
 		'idx': 2,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-09 16:46:12',
-		'modified_by': 'Administrator',
-		'name': '000000725',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Indent',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'company'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-09 16:46:12',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'fiscal_year',
 		'idx': 3,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-09 16:46:12',
-		'modified_by': 'Administrator',
-		'name': '000000726',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Indent',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'fiscal_year'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-09 16:46:12',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'tc_name',
 		'idx': 4,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-09 16:46:12',
-		'modified_by': 'Administrator',
-		'name': '000000727',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Indent',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'tc_name'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-09 16:46:12',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'terms',
 		'idx': 5,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-09 16:46:12',
-		'modified_by': 'Administrator',
-		'name': '000000728',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Indent',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'terms'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-09 16:46:12',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'letter_head',
 		'idx': 6,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-09 16:46:12',
-		'modified_by': 'Administrator',
-		'name': '000000729',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Indent',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'letter_head'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-09 16:46:12',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'parent',
 		'idx': 7,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-09 16:46:12',
-		'modified_by': 'Administrator',
-		'name': '000000730',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Indent',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'sales_order_no'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-09 16:46:12',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_code',
 		'idx': 8,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-09 16:46:12',
-		'modified_by': 'Administrator',
-		'name': '000000731',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Indent',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_code'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-09 16:46:12',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_name',
 		'idx': 9,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-09 16:46:12',
-		'modified_by': 'Administrator',
-		'name': '000000732',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Indent',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_name'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-09 16:46:12',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'description',
 		'idx': 10,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-09 16:46:12',
-		'modified_by': 'Administrator',
-		'name': '000000733',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Indent',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'description'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-09 16:46:12',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_group',
 		'idx': 11,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-09 16:46:12',
-		'modified_by': 'Administrator',
-		'name': '000000734',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Indent',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_group'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-09 16:46:12',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'stock_uom',
 		'idx': 12,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-09 16:46:12',
-		'modified_by': 'Administrator',
-		'name': '000000735',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Indent',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'uom'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-09 16:46:12',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'qty',
 		'idx': 13,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-09 16:46:12',
-		'modified_by': 'Administrator',
-		'name': '000000736',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Indent',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'qty'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-09 16:46:12',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'reserved_warehouse',
 		'idx': 14,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-09 16:46:12',
-		'modified_by': 'Administrator',
-		'name': '000000737',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Indent',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'warehouse'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-09 16:46:12',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'brand',
 		'idx': 15,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-09 16:46:12',
-		'modified_by': 'Administrator',
-		'name': '000000738',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Indent',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'brand'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2011-05-09 16:46:12',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
 		'from_field': 'sales_order_details',
 		'from_table': 'Sales Order Detail',
 		'idx': 1,
 		'match_id': 1,
-		'modified': '2011-05-09 16:46:12',
-		'modified_by': 'Administrator',
-		'name': '000000739',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Indent',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'reference_doctype_key': 'prevdoc_doctype',
 		'reference_key': 'prevdoc_detail_docname',
 		'to_field': 'indent_details',
 		'to_table': 'Indent Detail',
-		'validation_logic': 'qty > ifnull(indented_qty,0) and docstatus = 1'
+		'validation_logic': 'docstatus=1'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2011-05-09 16:46:12',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
-		'from_field': None,
 		'from_table': 'Sales Order',
 		'idx': 2,
 		'match_id': 0,
-		'modified': '2011-05-09 16:46:12',
-		'modified_by': 'Administrator',
-		'name': '000000740',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Indent',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
 		'reference_key': 'prevdoc_docname',
-		'to_field': None,
 		'to_table': 'Indent',
 		'validation_logic': 'docstatus = 1'
 	}
diff --git a/buying/Role/Purchase Manager/Purchase Manager.txt b/buying/Role/Purchase Manager/Purchase Manager.txt
index 0372549..b02d186 100644
--- a/buying/Role/Purchase Manager/Purchase Manager.txt
+++ b/buying/Role/Purchase Manager/Purchase Manager.txt
@@ -1 +1,26 @@
-[{'modified_by': 'Administrator', 'name': 'Purchase Manager', 'parent': None, 'creation': '2010-04-08 12:07:53', 'modified': '2010-04-08 12:07:53', 'module': 'Roles', 'doctype': 'Role', 'idx': None, 'parenttype': None, 'role_name': 'Purchase Manager', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': None}]
\ No newline at end of file
+# Role, Purchase Manager
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:51',
+		'docstatus': 0,
+		'modified': '2010-04-08 12:07:53',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Role
+	{
+		'doctype': 'Role',
+		'module': 'Buying',
+		'name': '__common__',
+		'role_name': 'Purchase Manager'
+	},
+
+	# Role, Purchase Manager
+	{
+		'doctype': 'Role',
+		'name': 'Purchase Manager'
+	}
+]
\ No newline at end of file
diff --git a/buying/Role/Purchase Master Manager/Purchase Master Manager.txt b/buying/Role/Purchase Master Manager/Purchase Master Manager.txt
index 5d516ce..41d9f23 100644
--- a/buying/Role/Purchase Master Manager/Purchase Master Manager.txt
+++ b/buying/Role/Purchase Master Manager/Purchase Master Manager.txt
@@ -1 +1,26 @@
-[{'modified_by': 'Administrator', 'name': 'Purchase Master Manager', 'parent': None, 'creation': '2010-04-08 13:50:20', 'modified': '2010-04-08 13:50:20', 'module': 'Roles', 'doctype': 'Role', 'idx': None, 'parenttype': None, 'role_name': 'Purchase Master Manager', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': None}]
\ No newline at end of file
+# Role, Purchase Master Manager
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:51',
+		'docstatus': 0,
+		'modified': '2010-04-08 13:50:20',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Role
+	{
+		'doctype': 'Role',
+		'module': 'Buying',
+		'name': '__common__',
+		'role_name': 'Purchase Master Manager'
+	},
+
+	# Role, Purchase Master Manager
+	{
+		'doctype': 'Role',
+		'name': 'Purchase Master Manager'
+	}
+]
\ No newline at end of file
diff --git a/buying/Role/Purchase User/Purchase User.txt b/buying/Role/Purchase User/Purchase User.txt
index 94cb25e..1495c84 100644
--- a/buying/Role/Purchase User/Purchase User.txt
+++ b/buying/Role/Purchase User/Purchase User.txt
@@ -1 +1,26 @@
-[{'modified_by': 'Administrator', 'name': 'Purchase User', 'parent': None, 'creation': '2010-04-08 12:08:01', 'modified': '2010-04-08 12:08:01', 'module': 'Roles', 'doctype': 'Role', 'idx': None, 'parenttype': None, 'role_name': 'Purchase User', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': None}]
\ No newline at end of file
+# Role, Purchase User
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:51',
+		'docstatus': 0,
+		'modified': '2010-04-08 12:08:01',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Role
+	{
+		'doctype': 'Role',
+		'module': 'Buying',
+		'name': '__common__',
+		'role_name': 'Purchase User'
+	},
+
+	# Role, Purchase User
+	{
+		'doctype': 'Role',
+		'name': 'Purchase User'
+	}
+]
\ No newline at end of file
diff --git a/buying/Role/Supplier/Supplier.txt b/buying/Role/Supplier/Supplier.txt
index ffae145..97f4d09 100644
--- a/buying/Role/Supplier/Supplier.txt
+++ b/buying/Role/Supplier/Supplier.txt
@@ -1 +1,26 @@
-[{'modified_by': 'Administrator', 'name': 'Supplier', 'parent': None, 'creation': '2009-06-26 14:42:19', 'modified': '2009-06-26 14:42:19', 'module': 'Roles', 'doctype': 'Role', 'idx': None, 'parenttype': None, 'role_name': 'Supplier', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': None}]
\ No newline at end of file
+# Role, Supplier
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:51',
+		'docstatus': 0,
+		'modified': '2009-06-26 14:42:19',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Role
+	{
+		'doctype': 'Role',
+		'module': 'Buying',
+		'name': '__common__',
+		'role_name': 'Supplier'
+	},
+
+	# Role, Supplier
+	{
+		'doctype': 'Role',
+		'name': 'Supplier'
+	}
+]
\ No newline at end of file
diff --git a/buying/search_criteria/itemwise_purchase_details/itemwise_purchase_details.txt b/buying/search_criteria/itemwise_purchase_details/itemwise_purchase_details.txt
index 25e1124..1628060 100644
--- a/buying/search_criteria/itemwise_purchase_details/itemwise_purchase_details.txt
+++ b/buying/search_criteria/itemwise_purchase_details/itemwise_purchase_details.txt
@@ -1,37 +1,33 @@
+# Search Criteria, itemwise_purchase_details
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Purchase Order\x01ID,Purchase Order\x01PO Date,Purchase Order\x01Grand Total,PO Detail\x01Item Code,PO Detail\x01Item Name,PO Detail\x01Quantity,PO Detail\x01Stock UOM,PO Detail\x01Purchase Rate,PO Detail\x01Amount,PO Detail\x01Warehouse',
 		'creation': '2010-08-08 17:09:31',
-		'criteria_name': 'Itemwise Purchase Details',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'PO Detail',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Purchase Order\x01Saved':1,'Purchase Order\x01Submitted':1,'Purchase Order\x01Status':'','Purchase Order\x01Company Name':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-03-31 12:39:57',
 		'modified_by': 'Administrator',
-		'module': 'SRM',
-		'name': 'itemwise_purchase_details',
-		'owner': 'Administrator',
-		'page_len': None,
-		'parent': None,
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Purchase Order\x01ID,Purchase Order\x01PO Date,Purchase Order\x01Grand Total,PO Detail\x01Item Code,PO Detail\x01Item Name,PO Detail\x01Quantity,PO Detail\x01Stock UOM,PO Detail\x01Purchase Rate,PO Detail\x01Amount,PO Detail\x01Warehouse',
+		'criteria_name': 'Itemwise Purchase Details',
+		'doc_type': 'PO Detail',
+		'doctype': 'Search Criteria',
+		'filters': "{'Purchase Order\x01Saved':1,'Purchase Order\x01Submitted':1,'Purchase Order\x01Status':'','Purchase Order\x01Company Name':''}",
+		'module': 'Buying',
+		'name': '__common__',
 		'parent_doc_type': 'Purchase Order',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabPurchase Order`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, itemwise_purchase_details
+	{
+		'doctype': 'Search Criteria',
+		'name': 'itemwise_purchase_details'
 	}
 ]
\ No newline at end of file
diff --git a/buying/search_criteria/itemwise_receipt_details/itemwise_receipt_details.txt b/buying/search_criteria/itemwise_receipt_details/itemwise_receipt_details.txt
index d851dc5..cacbb78 100644
--- a/buying/search_criteria/itemwise_receipt_details/itemwise_receipt_details.txt
+++ b/buying/search_criteria/itemwise_receipt_details/itemwise_receipt_details.txt
@@ -1,37 +1,34 @@
+# Search Criteria, itemwise_receipt_details
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Purchase Receipt\x01ID,Purchase Receipt\x01Posting Date,Purchase Receipt Detail\x01Item Code,Purchase Receipt Detail\x01Item Name,Purchase Receipt Detail\x01Accepted Quantity,Purchase Receipt Detail\x01Rejected Quantity,Purchase Receipt Detail\x01Accepted Warehouse,Purchase Receipt Detail\x01Rejected Warehouse,Purchase Receipt Detail\x01Amount',
-		'creation': '2010-12-14 10:33:08',
-		'criteria_name': 'Itemwise Receipt Details',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Purchase Receipt Detail',
+		'creation': '2010-12-14 10:23:19',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Purchase Receipt\x01Saved':1,'Purchase Receipt\x01Submitted':1,'Purchase Receipt\x01Status':'','Purchase Receipt\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-10-22 14:36:11',
 		'modified_by': 'Administrator',
-		'module': 'SRM',
-		'name': 'itemwise_receipt_details',
-		'owner': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Purchase Receipt\x01ID,Purchase Receipt\x01Posting Date,Purchase Receipt Detail\x01Item Code,Purchase Receipt Detail\x01Item Name,Purchase Receipt Detail\x01Accepted Quantity,Purchase Receipt Detail\x01Rejected Quantity,Purchase Receipt Detail\x01Accepted Warehouse,Purchase Receipt Detail\x01Rejected Warehouse,Purchase Receipt Detail\x01Amount',
+		'criteria_name': 'Itemwise Receipt Details',
+		'doc_type': 'Purchase Receipt Detail',
+		'doctype': 'Search Criteria',
+		'filters': "{'Purchase Receipt\x01Saved':1,'Purchase Receipt\x01Submitted':1,'Purchase Receipt\x01Status':'','Purchase Receipt\x01Fiscal Year':''}",
+		'module': 'Buying',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Purchase Receipt',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabPurchase Receipt`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, itemwise_receipt_details
+	{
+		'doctype': 'Search Criteria',
+		'name': 'itemwise_receipt_details'
 	}
 ]
\ No newline at end of file
diff --git a/buying/search_criteria/pending_po_items_to_bill/pending_po_items_to_bill.txt b/buying/search_criteria/pending_po_items_to_bill/pending_po_items_to_bill.txt
index 98847a8..be0beb3 100644
--- a/buying/search_criteria/pending_po_items_to_bill/pending_po_items_to_bill.txt
+++ b/buying/search_criteria/pending_po_items_to_bill/pending_po_items_to_bill.txt
@@ -1,37 +1,37 @@
+# Search Criteria, pending_po_items_to_bill
 [
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2011-03-30 11:03:20',
+		'docstatus': 0,
+		'modified': '2011-03-29 14:26:49',
+		'modified_by': 'Administrator',
+		'owner': 'dhanalekshmi@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
 	{
 		'add_col': '(CASE WHEN (`tabPO Detail`.qty- ifnull(`tabPO Detail`.billed_qty, 0) > 0 ) THEN (`tabPO Detail`.qty-ifnull(`tabPO Detail`.billed_qty, 0) ) ELSE 0 END) AS "Pending To Bill"',
 		'add_cond': '(`tabPO Detail`.qty - ifnull(`tabPO Detail`.received_qty, 0) > 0 or `tabPO Detail`.qty - ifnull(`tabPO Detail`.billed_qty, 0) > 0)\n`tabPurchase Order`.status != "Stopped"',
-		'add_tab': None,
 		'columns': 'Purchase Order\x01ID,Purchase Order\x01Supplier,Purchase Order\x01Supplier Name,Purchase Order\x01Status,Purchase Order\x01PO Date,Purchase Order\x01Fiscal Year,PO Detail\x01Indent No,PO Detail\x01Item Code,PO Detail\x01Item Name,PO Detail\x01Description,PO Detail\x01Quantity,PO Detail\x01UOM,PO Detail\x01Received Qty',
-		'creation': '2011-05-09 11:04:19',
 		'criteria_name': 'Pending PO Items To Bill',
-		'custom_query': '',
 		'description': 'Pending PO Items To Bill',
-		'dis_filters': None,
-		'disabled': None,
 		'doc_type': 'PO Detail',
-		'docstatus': 0,
 		'doctype': 'Search Criteria',
 		'filters': "{'Purchase Order\x01Saved':1,'Purchase Order\x01Submitted':1,'Purchase Order\x01Status':'','Purchase Order\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2011-03-29 14:26:49',
-		'modified_by': 'Administrator',
-		'module': 'SRM',
-		'name': 'pending_po_items_to_bill',
-		'owner': 'dhanalekshmi@webnotestech.com',
+		'module': 'Buying',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Purchase Order',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabPurchase Order`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, pending_po_items_to_bill
+	{
+		'doctype': 'Search Criteria',
+		'name': 'pending_po_items_to_bill'
 	}
 ]
\ No newline at end of file
diff --git a/buying/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.txt b/buying/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.txt
index 563711f..062e385 100644
--- a/buying/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.txt
+++ b/buying/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.txt
@@ -1,37 +1,37 @@
+# Search Criteria, pending_po_items_to_receive
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': '`tabPO Detail`.qty - ifnull(`tabPO Detail`.received_qty, 0) AS "Pending Quantity To Receive"\n(`tabPO Detail`.qty - ifnull(`tabPO Detail`.received_qty, 0)) * `tabPO Detail`.purchase_rate AS "Pending Amount To Receive"',
-		'add_cond': '`tabPO Detail`.qty - ifnull(`tabPO Detail`.received_qty, 0) > 0 \n`tabPurchase Order`.status != "Stopped"',
-		'add_tab': None,
-		'columns': 'Purchase Order\x01ID,Purchase Order\x01Supplier,Purchase Order\x01Supplier Name,Purchase Order\x01Status,Purchase Order\x01PO Date,Purchase Order\x01Fiscal Year,PO Detail\x01Indent No,PO Detail\x01Item Code,PO Detail\x01Item Name,PO Detail\x01Description,PO Detail\x01Quantity,PO Detail\x01UOM,PO Detail\x01Received Qty',
-		'creation': '2011-05-09 11:04:19',
-		'criteria_name': 'Pending PO Items To Receive',
-		'custom_query': '',
-		'description': 'Pending PO Items To Receive',
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'PO Detail',
+		'creation': '2011-03-30 11:03:20',
 		'docstatus': 0,
+		'modified': '2011-03-29 14:26:16',
+		'modified_by': 'Administrator',
+		'owner': 'dhanalekshmi@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_col': '`tabPO Detail`.qty - ifnull(`tabPO Detail`.received_qty, 0) AS "Pending Quantity To Receive"\n(`tabPO Detail`.qty - ifnull(`tabPO Detail`.received_qty, 0)) * `tabPO Detail`.purchase_rate AS "Pending Amount To Receive\'"',
+		'add_cond': '`tabPO Detail`.qty - ifnull(`tabPO Detail`.received_qty, 0) > 0 \n`tabPurchase Order`.status != "Stopped"',
+		'columns': 'Purchase Order\x01ID,Purchase Order\x01Supplier,Purchase Order\x01Supplier Name,Purchase Order\x01Status,Purchase Order\x01PO Date,Purchase Order\x01Fiscal Year,PO Detail\x01Indent No,PO Detail\x01Item Code,PO Detail\x01Item Name,PO Detail\x01Description,PO Detail\x01Quantity,PO Detail\x01UOM,PO Detail\x01Received Qty',
+		'criteria_name': 'Pending PO Items To Receive',
+		'description': 'Pending PO Items To Receive',
+		'doc_type': 'PO Detail',
 		'doctype': 'Search Criteria',
 		'filters': "{'Purchase Order\x01Saved':1,'Purchase Order\x01Submitted':1,'Purchase Order\x01Status':'','Purchase Order\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2011-04-01 17:19:03',
-		'modified_by': 'Administrator',
-		'module': 'SRM',
-		'name': 'pending_po_items_to_receive',
-		'owner': 'dhanalekshmi@webnotestech.com',
+		'module': 'Buying',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Purchase Order',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabPurchase Order`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, pending_po_items_to_receive
+	{
+		'doctype': 'Search Criteria',
+		'name': 'pending_po_items_to_receive'
 	}
 ]
\ No newline at end of file
diff --git a/buying/search_criteria/purchase_in_transit/purchase_in_transit.txt b/buying/search_criteria/purchase_in_transit/purchase_in_transit.txt
index c8c32aa..028d9d5 100644
--- a/buying/search_criteria/purchase_in_transit/purchase_in_transit.txt
+++ b/buying/search_criteria/purchase_in_transit/purchase_in_transit.txt
@@ -1,37 +1,39 @@
+# Search Criteria, purchase_in_transit
 [
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-09-01 15:48:09',
+		'docstatus': 0,
+		'modified': '2010-08-30 13:04:44',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
 	{
 		'add_col': "`tabPurchase Receipt`.`posting_date` AS 'PR Posting Date'",
 		'add_cond': "`tabPV Detail`.`purchase_receipt`  = `tabPurchase Receipt`.`name`\n`tabPurchase Receipt`.`posting_date` >= '%(pr_posting_date)s'\n`tabPurchase Receipt`.`posting_date` <= '%(pr_posting_date1)s'\n`tabPurchase Receipt`.`posting_date` > `tabPayable Voucher`.`posting_date`",
 		'add_tab': '`tabPurchase Receipt`',
 		'columns': 'Payable Voucher\x01ID,Payable Voucher\x01Voucher Date,Payable Voucher\x01Posting Date,Payable Voucher\x01Credit To,PV Detail\x01Rate,PV Detail\x01Qty,PV Detail\x01Amount,PV Detail\x01Pur Order,PV Detail\x01Pur Receipt',
-		'creation': '2010-09-01 15:47:57',
 		'criteria_name': 'Purchase in Transit',
-		'custom_query': '',
 		'description': 'List of PR whose posting date is after PV posting date',
 		'dis_filters': '`tabPurchase Receipt`.`pr_posting_date`',
-		'disabled': None,
 		'doc_type': 'PV Detail',
-		'docstatus': 0,
 		'doctype': 'Search Criteria',
 		'filters': "{'Payable Voucher\x01Submitted':1,'Payable Voucher\x01From Posting Date\x01lower':'2009-04-01','Payable Voucher\x01To Posting Date\x01upper':'2010-01-11','Payable Voucher\x01Is Opening':'','Payable Voucher\x01Fiscal Year':'','Payable Voucher\x01Company':'','Purchase Receipt\x01From PR Posting Date\x01lower':'2009-04-01','Purchase Receipt\x01To PR Posting Date\x01upper':'2010-01-11'}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': '',
-		'idx': None,
-		'modified': '2010-08-30 13:04:44',
-		'modified_by': 'Administrator',
-		'module': 'SRM',
-		'name': 'purchase_in_transit',
-		'owner': 'Administrator',
+		'module': 'Buying',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Payable Voucher',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabPayable Voucher`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, purchase_in_transit
+	{
+		'doctype': 'Search Criteria',
+		'name': 'purchase_in_transit'
 	}
 ]
\ No newline at end of file
diff --git a/home/search_criteria/bills_to_be_paid/bills_to_be_paid.txt b/home/search_criteria/bills_to_be_paid/bills_to_be_paid.txt
index d0df7ae..d3acd84 100644
--- a/home/search_criteria/bills_to_be_paid/bills_to_be_paid.txt
+++ b/home/search_criteria/bills_to_be_paid/bills_to_be_paid.txt
@@ -1,37 +1,34 @@
+# Search Criteria, bills-to_be_paid
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': '`tabPayable Voucher`.outstanding_amount!=0\n`tabPayable Voucher`.docstatus=1',
-		'add_tab': None,
-		'columns': 'Payable Voucher\x01ID,Payable Voucher\x01Voucher Date,Payable Voucher\x01Due Date,Payable Voucher\x01Credit To,Payable Voucher\x01Bill Date,Payable Voucher\x01Outstanding Amount',
 		'creation': '2010-08-08 17:09:32',
-		'criteria_name': 'Bills-To be paid',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Payable Voucher',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Payable Voucher\x01Submitted':1,'Payable Voucher\x01Is Opening':'','Payable Voucher\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-05-13 17:26:48',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': '`tabPayable Voucher`.outstanding_amount!=0\n`tabPayable Voucher`.docstatus=1',
+		'columns': 'Payable Voucher\x01ID,Payable Voucher\x01Voucher Date,Payable Voucher\x01Due Date,Payable Voucher\x01Credit To,Payable Voucher\x01Bill Date,Payable Voucher\x01Outstanding Amount',
+		'criteria_name': 'Bills-To be paid',
+		'doc_type': 'Payable Voucher',
+		'doctype': 'Search Criteria',
+		'filters': "{'Payable Voucher\x01Submitted':1,'Payable Voucher\x01Is Opening':'','Payable Voucher\x01Fiscal Year':''}",
 		'module': 'Home',
-		'name': 'bills-to_be_paid',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabPayable Voucher`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, bills-to_be_paid
+	{
+		'doctype': 'Search Criteria',
+		'name': 'bills-to_be_paid'
 	}
 ]
\ No newline at end of file
diff --git a/home/search_criteria/bills_to_be_submitted/bills_to_be_submitted.txt b/home/search_criteria/bills_to_be_submitted/bills_to_be_submitted.txt
index 69273bd..0849dbe 100644
--- a/home/search_criteria/bills_to_be_submitted/bills_to_be_submitted.txt
+++ b/home/search_criteria/bills_to_be_submitted/bills_to_be_submitted.txt
@@ -1,37 +1,33 @@
+# Search Criteria, bills-to_be_submitted
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Payable Voucher\x01ID,Payable Voucher\x01Voucher Date,Payable Voucher\x01Due Date,Payable Voucher\x01Credit To,Payable Voucher\x01Bill No,Payable Voucher\x01Bill Date,Payable Voucher\x01Outstanding Amount',
 		'creation': '2010-08-08 17:09:32',
-		'criteria_name': 'Bills-To be submitted',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Payable Voucher',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Payable Voucher\x01Saved':1,'Payable Voucher\x01Is Opening':'','Payable Voucher\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-05-03 12:24:43',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Payable Voucher\x01ID,Payable Voucher\x01Voucher Date,Payable Voucher\x01Due Date,Payable Voucher\x01Credit To,Payable Voucher\x01Bill No,Payable Voucher\x01Bill Date,Payable Voucher\x01Outstanding Amount',
+		'criteria_name': 'Bills-To be submitted',
+		'doc_type': 'Payable Voucher',
+		'doctype': 'Search Criteria',
+		'filters': "{'Payable Voucher\x01Saved':1,'Payable Voucher\x01Is Opening':'','Payable Voucher\x01Fiscal Year':''}",
 		'module': 'Home',
-		'name': 'bills-to_be_submitted',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabPayable Voucher`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, bills-to_be_submitted
+	{
+		'doctype': 'Search Criteria',
+		'name': 'bills-to_be_submitted'
 	}
 ]
\ No newline at end of file
diff --git a/home/search_criteria/delivery_note_to_be_billed/delivery_note_to_be_billed.txt b/home/search_criteria/delivery_note_to_be_billed/delivery_note_to_be_billed.txt
index 05fd4f4..d96981c 100644
--- a/home/search_criteria/delivery_note_to_be_billed/delivery_note_to_be_billed.txt
+++ b/home/search_criteria/delivery_note_to_be_billed/delivery_note_to_be_billed.txt
@@ -1,37 +1,34 @@
+# Search Criteria, delivery_note-to_be_billed
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': 'ifnull(`tabDelivery Note`.per_billed, 0) < 100',
-		'add_tab': None,
-		'columns': 'Delivery Note\x01ID,Delivery Note\x01Owner,Delivery Note\x01Customer Name,Delivery Note\x01% Billed,Delivery Note\x01Company',
 		'creation': '2010-08-08 17:09:32',
-		'criteria_name': 'Delivery Note-To be billed',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Delivery Note',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Delivery Note\x01Submitted':1,'Delivery Note\x01Status':'Submitted','Delivery Note\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-05-13 17:24:34',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': 'ifnull(`tabDelivery Note`.per_billed, 0) < 100',
+		'columns': 'Delivery Note\x01ID,Delivery Note\x01Owner,Delivery Note\x01Customer Name,Delivery Note\x01% Billed,Delivery Note\x01Company',
+		'criteria_name': 'Delivery Note-To be billed',
+		'doc_type': 'Delivery Note',
+		'doctype': 'Search Criteria',
+		'filters': "{'Delivery Note\x01Submitted':1,'Delivery Note\x01Status':'Submitted','Delivery Note\x01Fiscal Year':''}",
 		'module': 'Home',
-		'name': 'delivery_note-to_be_billed',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabDelivery Note`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, delivery_note-to_be_billed
+	{
+		'doctype': 'Search Criteria',
+		'name': 'delivery_note-to_be_billed'
 	}
 ]
\ No newline at end of file
diff --git a/home/search_criteria/delivery_note_to_be_submitted/delivery_note_to_be_submitted.txt b/home/search_criteria/delivery_note_to_be_submitted/delivery_note_to_be_submitted.txt
index 1a7a1ef..85fd748 100644
--- a/home/search_criteria/delivery_note_to_be_submitted/delivery_note_to_be_submitted.txt
+++ b/home/search_criteria/delivery_note_to_be_submitted/delivery_note_to_be_submitted.txt
@@ -1,37 +1,33 @@
+# Search Criteria, delivery_note-to_be_submitted
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Delivery Note\x01ID,Delivery Note\x01Owner,Delivery Note\x01Customer Name,Delivery Note\x01Posting Date,Delivery Note\x01Company',
 		'creation': '2010-08-08 17:09:32',
-		'criteria_name': 'Delivery Note-To be submitted',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Delivery Note',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Delivery Note\x01Saved':1,'Delivery Note\x01Status':'Draft','Delivery Note\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-05-13 17:17:58',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Delivery Note\x01ID,Delivery Note\x01Owner,Delivery Note\x01Customer Name,Delivery Note\x01Posting Date,Delivery Note\x01Company',
+		'criteria_name': 'Delivery Note-To be submitted',
+		'doc_type': 'Delivery Note',
+		'doctype': 'Search Criteria',
+		'filters': "{'Delivery Note\x01Saved':1,'Delivery Note\x01Status':'Draft','Delivery Note\x01Fiscal Year':''}",
 		'module': 'Home',
-		'name': 'delivery_note-to_be_submitted',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabDelivery Note`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, delivery_note-to_be_submitted
+	{
+		'doctype': 'Search Criteria',
+		'name': 'delivery_note-to_be_submitted'
 	}
 ]
\ No newline at end of file
diff --git a/home/search_criteria/enquiry_quotations_to_be_sent/enquiry_quotations_to_be_sent.txt b/home/search_criteria/enquiry_quotations_to_be_sent/enquiry_quotations_to_be_sent.txt
index d65dd98..4e62558 100644
--- a/home/search_criteria/enquiry_quotations_to_be_sent/enquiry_quotations_to_be_sent.txt
+++ b/home/search_criteria/enquiry_quotations_to_be_sent/enquiry_quotations_to_be_sent.txt
@@ -1,37 +1,35 @@
+# Search Criteria, enquiry-quotations_to_be_sent
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
+		'creation': '2010-08-08 17:09:31',
+		'docstatus': 0,
+		'modified': '2010-07-16 13:29:58',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
 		'add_cond': '`tabQuotation`.enq_no!=`tabEnquiry`.name\n',
 		'add_tab': 'tabQuotation',
 		'columns': 'Enquiry\x01ID,Enquiry\x01Owner',
-		'creation': '2010-08-08 17:09:31',
 		'criteria_name': 'Enquiry-Quotations to be sent',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
 		'doc_type': 'Enquiry',
-		'docstatus': 0,
 		'doctype': 'Search Criteria',
 		'filters': '{}',
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2010-07-16 13:29:58',
-		'modified_by': 'Administrator',
 		'module': 'Home',
-		'name': 'enquiry-quotations_to_be_sent',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabEnquiry`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, enquiry-quotations_to_be_sent
+	{
+		'doctype': 'Search Criteria',
+		'name': 'enquiry-quotations_to_be_sent'
 	}
 ]
\ No newline at end of file
diff --git a/home/search_criteria/enquiry_to_follow_up/enquiry_to_follow_up.txt b/home/search_criteria/enquiry_to_follow_up/enquiry_to_follow_up.txt
index e16a8f6..504e7f2 100644
--- a/home/search_criteria/enquiry_to_follow_up/enquiry_to_follow_up.txt
+++ b/home/search_criteria/enquiry_to_follow_up/enquiry_to_follow_up.txt
@@ -1,37 +1,34 @@
+# Search Criteria, enquiry-to_follow_up
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': '',
-		'add_cond': "`tabEnquiry`.name=`tabQuotation`.enq_no\n`tabEnquiry`.docstatus=1\n`tabQuotation`.status='Submitted'",
-		'add_tab': None,
-		'columns': 'Enquiry\x01ID,Enquiry\x01Owner,Enquiry\x01Company,Enquiry\x01Fiscal Year',
-		'creation': '2010-09-01 15:47:57',
-		'criteria_name': 'Enquiry-To follow up',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Enquiry',
+		'creation': '2010-09-01 15:48:09',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Enquiry\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-08-30 12:08:00',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': "`tabEnquiry`.name=`tabQuotation`.enq_no\n`tabEnquiry`.docstatus=1\n`tabQuotation`.status='Submitted'",
+		'columns': 'Enquiry\x01ID,Enquiry\x01Owner,Enquiry\x01Company,Enquiry\x01Fiscal Year',
+		'criteria_name': 'Enquiry-To follow up',
+		'doc_type': 'Enquiry',
+		'doctype': 'Search Criteria',
+		'filters': "{'Enquiry\x01Fiscal Year':''}",
 		'module': 'Home',
-		'name': 'enquiry-to_follow_up',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabEnquiry`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, enquiry-to_follow_up
+	{
+		'doctype': 'Search Criteria',
+		'name': 'enquiry-to_follow_up'
 	}
 ]
\ No newline at end of file
diff --git a/home/search_criteria/indent_purchase_order_to_be_made/indent_purchase_order_to_be_made.txt b/home/search_criteria/indent_purchase_order_to_be_made/indent_purchase_order_to_be_made.txt
index 31949d6..be45e27 100644
--- a/home/search_criteria/indent_purchase_order_to_be_made/indent_purchase_order_to_be_made.txt
+++ b/home/search_criteria/indent_purchase_order_to_be_made/indent_purchase_order_to_be_made.txt
@@ -1,37 +1,34 @@
+# Search Criteria, indent-purchase_order_to_be_made
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': "`tabIndent`.status='Submitted'\nifnull(`tabIndent`.per_ordered,0)<100",
-		'add_tab': '',
-		'columns': 'Indent\x01ID,Indent\x01Indent Date,Indent\x01Requested By,Indent\x01Owner,Indent\x01% Ordered',
 		'creation': '2010-08-08 17:09:32',
-		'criteria_name': 'Indent-Purchase Order to be made',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Indent',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Indent\x01Submitted':1,'Indent\x01Status':'Submitted','Indent\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-05-13 17:37:18',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': "`tabIndent`.status='Submitted'\nifnull(`tabIndent`.per_ordered,0)<100",
+		'columns': 'Indent\x01ID,Indent\x01Indent Date,Indent\x01Requested By,Indent\x01Owner,Indent\x01% Ordered',
+		'criteria_name': 'Indent-Purchase Order to be made',
+		'doc_type': 'Indent',
+		'doctype': 'Search Criteria',
+		'filters': "{'Indent\x01Submitted':1,'Indent\x01Status':'Submitted','Indent\x01Fiscal Year':''}",
 		'module': 'Home',
-		'name': 'indent-purchase_order_to_be_made',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabIndent`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, indent-purchase_order_to_be_made
+	{
+		'doctype': 'Search Criteria',
+		'name': 'indent-purchase_order_to_be_made'
 	}
 ]
\ No newline at end of file
diff --git a/home/search_criteria/indent_to_be_submitted/indent_to_be_submitted.txt b/home/search_criteria/indent_to_be_submitted/indent_to_be_submitted.txt
index 09768c0..7cacf7d 100644
--- a/home/search_criteria/indent_to_be_submitted/indent_to_be_submitted.txt
+++ b/home/search_criteria/indent_to_be_submitted/indent_to_be_submitted.txt
@@ -1,37 +1,34 @@
+# Search Criteria, indent-to_be_submitted
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': "`tabIndent`.status='Draft'",
-		'add_tab': None,
-		'columns': 'Indent\x01ID,Indent\x01Owner,Indent\x01Indent Date,Indent\x01Remarks',
 		'creation': '2010-08-08 17:09:32',
-		'criteria_name': 'Indent-To be submitted',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Indent',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Indent\x01Saved':1,'Indent\x01Status':'Draft','Indent\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-05-13 17:38:49',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': "`tabIndent`.status='Draft'",
+		'columns': 'Indent\x01ID,Indent\x01Owner,Indent\x01Indent Date,Indent\x01Remarks',
+		'criteria_name': 'Indent-To be submitted',
+		'doc_type': 'Indent',
+		'doctype': 'Search Criteria',
+		'filters': "{'Indent\x01Saved':1,'Indent\x01Status':'Draft','Indent\x01Fiscal Year':''}",
 		'module': 'Home',
-		'name': 'indent-to_be_submitted',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabIndent`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, indent-to_be_submitted
+	{
+		'doctype': 'Search Criteria',
+		'name': 'indent-to_be_submitted'
 	}
 ]
\ No newline at end of file
diff --git a/home/search_criteria/invoices_overdue/invoices_overdue.txt b/home/search_criteria/invoices_overdue/invoices_overdue.txt
index 077d3c1..74716c7 100644
--- a/home/search_criteria/invoices_overdue/invoices_overdue.txt
+++ b/home/search_criteria/invoices_overdue/invoices_overdue.txt
@@ -1,37 +1,34 @@
+# Search Criteria, invoices-overdue
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': '`tabReceivable Voucher`.due_date<now()\n`tabReceivable Voucher`.outstanding_amount!=0\n`tabReceivable Voucher`.docstatus=1',
-		'add_tab': None,
-		'columns': 'Receivable Voucher\x01ID,Receivable Voucher\x01Debit To,Receivable Voucher\x01Voucher Date,Receivable Voucher\x01Due Date,Receivable Voucher\x01Outstanding Amount',
 		'creation': '2010-08-08 17:09:31',
-		'criteria_name': 'Invoices-Overdue',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Receivable Voucher',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Receivable Voucher\x01Saved':1,'Receivable Voucher\x01Submitted':1,'Receivable Voucher\x01Is Opening':'','Receivable Voucher\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-04-30 17:08:52',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': '`tabReceivable Voucher`.due_date<now()\n`tabReceivable Voucher`.outstanding_amount!=0\n`tabReceivable Voucher`.docstatus=1',
+		'columns': 'Receivable Voucher\x01ID,Receivable Voucher\x01Debit To,Receivable Voucher\x01Voucher Date,Receivable Voucher\x01Due Date,Receivable Voucher\x01Outstanding Amount',
+		'criteria_name': 'Invoices-Overdue',
+		'doc_type': 'Receivable Voucher',
+		'doctype': 'Search Criteria',
+		'filters': "{'Receivable Voucher\x01Saved':1,'Receivable Voucher\x01Submitted':1,'Receivable Voucher\x01Is Opening':'','Receivable Voucher\x01Fiscal Year':''}",
 		'module': 'Home',
-		'name': 'invoices-overdue',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabReceivable Voucher`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, invoices-overdue
+	{
+		'doctype': 'Search Criteria',
+		'name': 'invoices-overdue'
 	}
 ]
\ No newline at end of file
diff --git a/home/search_criteria/invoices_to_be_submitted/invoices_to_be_submitted.txt b/home/search_criteria/invoices_to_be_submitted/invoices_to_be_submitted.txt
index 3a887c8..dc4f5e5 100644
--- a/home/search_criteria/invoices_to_be_submitted/invoices_to_be_submitted.txt
+++ b/home/search_criteria/invoices_to_be_submitted/invoices_to_be_submitted.txt
@@ -1,37 +1,33 @@
+# Search Criteria, invoices-to_be_submitted
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': '',
-		'add_tab': None,
-		'columns': 'Receivable Voucher\x01ID,Receivable Voucher\x01Debit To,Receivable Voucher\x01Voucher Date,Receivable Voucher\x01Due Date',
 		'creation': '2010-08-08 17:09:31',
-		'criteria_name': 'Invoices-To be submitted',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Receivable Voucher',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Receivable Voucher\x01Saved':1,'Receivable Voucher\x01Is Opening':'','Receivable Voucher\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-05-03 10:18:56',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Receivable Voucher\x01ID,Receivable Voucher\x01Debit To,Receivable Voucher\x01Voucher Date,Receivable Voucher\x01Due Date',
+		'criteria_name': 'Invoices-To be submitted',
+		'doc_type': 'Receivable Voucher',
+		'doctype': 'Search Criteria',
+		'filters': "{'Receivable Voucher\x01Saved':1,'Receivable Voucher\x01Is Opening':'','Receivable Voucher\x01Fiscal Year':''}",
 		'module': 'Home',
-		'name': 'invoices-to_be_submitted',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabReceivable Voucher`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, invoices-to_be_submitted
+	{
+		'doctype': 'Search Criteria',
+		'name': 'invoices-to_be_submitted'
 	}
 ]
\ No newline at end of file
diff --git a/home/search_criteria/invoices_to_receive_payment/invoices_to_receive_payment.txt b/home/search_criteria/invoices_to_receive_payment/invoices_to_receive_payment.txt
index 1ccb571..a1ce7ef 100644
--- a/home/search_criteria/invoices_to_receive_payment/invoices_to_receive_payment.txt
+++ b/home/search_criteria/invoices_to_receive_payment/invoices_to_receive_payment.txt
@@ -1,37 +1,34 @@
+# Search Criteria, invoices-to_receive_payment
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': '`tabReceivable Voucher`.due_date>now() \n`tabReceivable Voucher`.outstanding_amount!=0\n`tabReceivable Voucher`.docstatus=1',
-		'add_tab': None,
-		'columns': 'Receivable Voucher\x01ID,Receivable Voucher\x01Owner,Receivable Voucher\x01Debit To,Receivable Voucher\x01Voucher Date,Receivable Voucher\x01Due Date,Receivable Voucher\x01Outstanding Amount',
 		'creation': '2010-08-08 17:09:31',
-		'criteria_name': 'Invoices-To receive payment',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Receivable Voucher',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Receivable Voucher\x01Submitted':1,'Receivable Voucher\x01Is Opening':'','Receivable Voucher\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-04-30 16:54:26',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': '`tabReceivable Voucher`.due_date>now() \n`tabReceivable Voucher`.outstanding_amount!=0\n`tabReceivable Voucher`.docstatus=1',
+		'columns': 'Receivable Voucher\x01ID,Receivable Voucher\x01Owner,Receivable Voucher\x01Debit To,Receivable Voucher\x01Voucher Date,Receivable Voucher\x01Due Date,Receivable Voucher\x01Outstanding Amount',
+		'criteria_name': 'Invoices-To receive payment',
+		'doc_type': 'Receivable Voucher',
+		'doctype': 'Search Criteria',
+		'filters': "{'Receivable Voucher\x01Submitted':1,'Receivable Voucher\x01Is Opening':'','Receivable Voucher\x01Fiscal Year':''}",
 		'module': 'Home',
-		'name': 'invoices-to_receive_payment',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabReceivable Voucher`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, invoices-to_receive_payment
+	{
+		'doctype': 'Search Criteria',
+		'name': 'invoices-to_receive_payment'
 	}
 ]
\ No newline at end of file
diff --git a/home/search_criteria/lead_to_follow_up/lead_to_follow_up.txt b/home/search_criteria/lead_to_follow_up/lead_to_follow_up.txt
index 2d4bd28..0754bf7 100644
--- a/home/search_criteria/lead_to_follow_up/lead_to_follow_up.txt
+++ b/home/search_criteria/lead_to_follow_up/lead_to_follow_up.txt
@@ -1,37 +1,34 @@
+# Search Criteria, lead-to_follow_up
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': "`tabLead`.status!='Converted' \n`tabLead`.status!='Lead Lost' \n`tabLead`.status!='Not Interested'",
-		'add_tab': None,
-		'columns': 'Lead\x01ID,Lead\x01Status,Lead\x01Lead Name,Lead\x01Lead Date,Lead\x01Lead Owner,Lead\x01Next Contact Date',
-		'creation': '2010-09-01 15:47:57',
-		'criteria_name': 'Lead-To follow up',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Lead',
+		'creation': '2010-09-01 15:48:09',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Lead\x01Status':'','Lead\x01Source':'','Lead\x01Expected Month':'','Lead\x01Industry':'','Lead\x01Market Segment':'','Lead\x01Rating':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-08-30 12:01:19',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': "`tabLead`.status!='Converted' \n`tabLead`.status!='Lead Lost' \n`tabLead`.status!='Not Interested'",
+		'columns': 'Lead\x01ID,Lead\x01Status,Lead\x01Lead Name,Lead\x01Lead Date,Lead\x01Lead Owner,Lead\x01Next Contact Date',
+		'criteria_name': 'Lead-To follow up',
+		'doc_type': 'Lead',
+		'doctype': 'Search Criteria',
+		'filters': "{'Lead\x01Status':'','Lead\x01Source':'','Lead\x01Expected Month':'','Lead\x01Industry':'','Lead\x01Market Segment':'','Lead\x01Rating':''}",
 		'module': 'Home',
-		'name': 'lead-to_follow_up',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabLead`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, lead-to_follow_up
+	{
+		'doctype': 'Search Criteria',
+		'name': 'lead-to_follow_up'
 	}
 ]
\ No newline at end of file
diff --git a/home/search_criteria/purchase_order_to_be_billed/purchase_order_to_be_billed.txt b/home/search_criteria/purchase_order_to_be_billed/purchase_order_to_be_billed.txt
index b9d28e3..5ed4d3f 100644
--- a/home/search_criteria/purchase_order_to_be_billed/purchase_order_to_be_billed.txt
+++ b/home/search_criteria/purchase_order_to_be_billed/purchase_order_to_be_billed.txt
@@ -1,37 +1,34 @@
+# Search Criteria, purchase_order-to_be_billed
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': "ifnull(`tabPurchase Order`.per_billed,0)<100\n`tabPurchase Order`.status='Submitted'",
-		'add_tab': None,
-		'columns': 'Purchase Order\x01ID,Purchase Order\x01Supplier,Purchase Order\x01PO Date,Purchase Order\x01Company,Purchase Order\x01Grand Total',
 		'creation': '2010-08-08 17:09:32',
-		'criteria_name': 'Purchase Order-To be billed',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Purchase Order',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Purchase Order\x01Submitted':1,'Purchase Order\x01Status':'Submitted','Purchase Order\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-05-13 17:31:42',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': "ifnull(`tabPurchase Order`.per_billed,0)<100\n`tabPurchase Order`.status='Submitted'",
+		'columns': 'Purchase Order\x01ID,Purchase Order\x01Supplier,Purchase Order\x01PO Date,Purchase Order\x01Company,Purchase Order\x01Grand Total',
+		'criteria_name': 'Purchase Order-To be billed',
+		'doc_type': 'Purchase Order',
+		'doctype': 'Search Criteria',
+		'filters': "{'Purchase Order\x01Submitted':1,'Purchase Order\x01Status':'Submitted','Purchase Order\x01Fiscal Year':''}",
 		'module': 'Home',
-		'name': 'purchase_order-to_be_billed',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabPurchase Order`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, purchase_order-to_be_billed
+	{
+		'doctype': 'Search Criteria',
+		'name': 'purchase_order-to_be_billed'
 	}
 ]
\ No newline at end of file
diff --git a/home/search_criteria/purchase_order_to_be_submitted/purchase_order_to_be_submitted.txt b/home/search_criteria/purchase_order_to_be_submitted/purchase_order_to_be_submitted.txt
index 728d576..11422b8 100644
--- a/home/search_criteria/purchase_order_to_be_submitted/purchase_order_to_be_submitted.txt
+++ b/home/search_criteria/purchase_order_to_be_submitted/purchase_order_to_be_submitted.txt
@@ -1,37 +1,33 @@
+# Search Criteria, purchase_order-to_be_submitted
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Purchase Order\x01ID,Purchase Order\x01Supplier,Purchase Order\x01PO Date,Purchase Order\x01Company,Purchase Order\x01Grand Total',
 		'creation': '2010-08-08 17:09:32',
-		'criteria_name': 'Purchase Order-To be submitted',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Purchase Order',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Purchase Order\x01Saved':1,'Purchase Order\x01Submitted':0,'Purchase Order\x01Status':'Draft','Purchase Order\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-05-03 11:19:23',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Purchase Order\x01ID,Purchase Order\x01Supplier,Purchase Order\x01PO Date,Purchase Order\x01Company,Purchase Order\x01Grand Total',
+		'criteria_name': 'Purchase Order-To be submitted',
+		'doc_type': 'Purchase Order',
+		'doctype': 'Search Criteria',
+		'filters': "{'Purchase Order\x01Saved':1,'Purchase Order\x01Submitted':0,'Purchase Order\x01Status':'Draft','Purchase Order\x01Fiscal Year':''}",
 		'module': 'Home',
-		'name': 'purchase_order-to_be_submitted',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabPurchase Order`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, purchase_order-to_be_submitted
+	{
+		'doctype': 'Search Criteria',
+		'name': 'purchase_order-to_be_submitted'
 	}
 ]
\ No newline at end of file
diff --git a/home/search_criteria/purchase_order_to_receive_items/purchase_order_to_receive_items.txt b/home/search_criteria/purchase_order_to_receive_items/purchase_order_to_receive_items.txt
index a40e17e..ab747c7 100644
--- a/home/search_criteria/purchase_order_to_receive_items/purchase_order_to_receive_items.txt
+++ b/home/search_criteria/purchase_order_to_receive_items/purchase_order_to_receive_items.txt
@@ -1,37 +1,34 @@
+# Search Criteria, purchase_order-to_receive_items
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': "ifnull(`tabPurchase Order`.per_received,0)<100\n`tabPurchase Order`.status='Submitted'",
-		'add_tab': None,
-		'columns': 'Purchase Order\x01ID,Purchase Order\x01Supplier,Purchase Order\x01PO Date,Purchase Order\x01Company,Purchase Order\x01% Received,Purchase Order\x01Grand Total',
 		'creation': '2010-08-08 17:09:32',
-		'criteria_name': 'Purchase Order-To receive items',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Purchase Order',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Purchase Order\x01Submitted':1,'Purchase Order\x01Status':'Submitted','Purchase Order\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-05-13 17:34:22',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': "ifnull(`tabPurchase Order`.per_received,0)<100\n`tabPurchase Order`.status='Submitted'",
+		'columns': 'Purchase Order\x01ID,Purchase Order\x01Supplier,Purchase Order\x01PO Date,Purchase Order\x01Company,Purchase Order\x01% Received,Purchase Order\x01Grand Total',
+		'criteria_name': 'Purchase Order-To receive items',
+		'doc_type': 'Purchase Order',
+		'doctype': 'Search Criteria',
+		'filters': "{'Purchase Order\x01Submitted':1,'Purchase Order\x01Status':'Submitted','Purchase Order\x01Fiscal Year':''}",
 		'module': 'Home',
-		'name': 'purchase_order-to_receive_items',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabPurchase Order`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, purchase_order-to_receive_items
+	{
+		'doctype': 'Search Criteria',
+		'name': 'purchase_order-to_receive_items'
 	}
 ]
\ No newline at end of file
diff --git a/home/search_criteria/sales_order_overdue/sales_order_overdue.txt b/home/search_criteria/sales_order_overdue/sales_order_overdue.txt
index 4c5101f..416ee67 100644
--- a/home/search_criteria/sales_order_overdue/sales_order_overdue.txt
+++ b/home/search_criteria/sales_order_overdue/sales_order_overdue.txt
@@ -1,37 +1,34 @@
+# Search Criteria, sales_order-overdue
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': '`tabSales Order`.delivery_date<now()\nifnull(`tabSales Order`.per_delivered,0)<100',
-		'add_tab': None,
-		'columns': 'Sales Order\x01ID,Sales Order\x01Customer,Sales Order\x01Sales Order Date,Sales Order\x01Expected Delivery Date,Sales Order\x01Quotation No,Sales Order\x01Company,Sales Order\x01%  Delivered',
-		'creation': '2010-08-26 11:52:27',
-		'criteria_name': 'Sales Order-Overdue',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Sales Order',
+		'creation': '2010-08-26 11:52:28',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Sales Order\x01Submitted':1,'Sales Order\x01Status':'Submitted','Sales Order\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-08-26 11:52:09',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': '`tabSales Order`.delivery_date<now()\nifnull(`tabSales Order`.per_delivered,0)<100',
+		'columns': 'Sales Order\x01ID,Sales Order\x01Customer,Sales Order\x01Sales Order Date,Sales Order\x01Expected Delivery Date,Sales Order\x01Quotation No,Sales Order\x01Company,Sales Order\x01%  Delivered',
+		'criteria_name': 'Sales Order-Overdue',
+		'doc_type': 'Sales Order',
+		'doctype': 'Search Criteria',
+		'filters': "{'Sales Order\x01Submitted':1,'Sales Order\x01Status':'Submitted','Sales Order\x01Fiscal Year':''}",
 		'module': 'Home',
-		'name': 'sales_order-overdue',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabSales Order`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, sales_order-overdue
+	{
+		'doctype': 'Search Criteria',
+		'name': 'sales_order-overdue'
 	}
 ]
\ No newline at end of file
diff --git a/home/search_criteria/sales_order_to_be_billed/sales_order_to_be_billed.txt b/home/search_criteria/sales_order_to_be_billed/sales_order_to_be_billed.txt
index f321549..3de9f17 100644
--- a/home/search_criteria/sales_order_to_be_billed/sales_order_to_be_billed.txt
+++ b/home/search_criteria/sales_order_to_be_billed/sales_order_to_be_billed.txt
@@ -1,37 +1,34 @@
+# Search Criteria, sales_order-to_be_billed
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': "ifnull(`tabSales Order`.per_billed,0)<100\n`tabSales Order`.status='Submitted'",
-		'add_tab': None,
-		'columns': 'Sales Order\x01ID,Sales Order\x01Status,Sales Order\x01Quotation No,Sales Order\x01Sales Order Date,Sales Order\x01Expected Delivery Date,Sales Order\x01% Billed,Sales Order\x01Customer',
 		'creation': '2010-08-08 17:09:31',
-		'criteria_name': 'Sales Order-To be billed',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Sales Order',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Sales Order\x01Submitted':1,'Sales Order\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-05-13 17:45:37',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': "ifnull(`tabSales Order`.per_billed,0)<100\n`tabSales Order`.status='Submitted'",
+		'columns': 'Sales Order\x01ID,Sales Order\x01Status,Sales Order\x01Quotation No,Sales Order\x01Sales Order Date,Sales Order\x01Expected Delivery Date,Sales Order\x01% Billed,Sales Order\x01Customer',
+		'criteria_name': 'Sales Order-To be billed',
+		'doc_type': 'Sales Order',
+		'doctype': 'Search Criteria',
+		'filters': "{'Sales Order\x01Submitted':1,'Sales Order\x01Fiscal Year':''}",
 		'module': 'Home',
-		'name': 'sales_order-to_be_billed',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabSales Order`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, sales_order-to_be_billed
+	{
+		'doctype': 'Search Criteria',
+		'name': 'sales_order-to_be_billed'
 	}
 ]
\ No newline at end of file
diff --git a/home/search_criteria/sales_order_to_be_delivered/sales_order_to_be_delivered.txt b/home/search_criteria/sales_order_to_be_delivered/sales_order_to_be_delivered.txt
index 2c615b6..1018f46 100644
--- a/home/search_criteria/sales_order_to_be_delivered/sales_order_to_be_delivered.txt
+++ b/home/search_criteria/sales_order_to_be_delivered/sales_order_to_be_delivered.txt
@@ -1,37 +1,34 @@
+# Search Criteria, sales_order-to_be_delivered
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': "ifnull(`tabSales Order`.per_delivered,0)<100\n`tabSales Order`.status = 'Submitted'\n`tabSales Order`. delivery_date > now()",
-		'add_tab': None,
-		'columns': 'Sales Order\x01ID,Sales Order\x01Owner,Sales Order\x01Status,Sales Order\x01Customer,Sales Order\x01Sales Order Date,Sales Order\x01Expected Delivery Date,Sales Order\x01Quotation No',
 		'creation': '2010-08-08 17:09:31',
-		'criteria_name': 'Sales Order-To be delivered',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Sales Order',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Sales Order\x01Saved':1,'Sales Order\x01Submitted':1,'Sales Order\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-05-13 17:53:29',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': "ifnull(`tabSales Order`.per_delivered,0)<100\n`tabSales Order`.status = 'Submitted'\n`tabSales Order`. delivery_date > now()",
+		'columns': 'Sales Order\x01ID,Sales Order\x01Owner,Sales Order\x01Status,Sales Order\x01Customer,Sales Order\x01Sales Order Date,Sales Order\x01Expected Delivery Date,Sales Order\x01Quotation No',
+		'criteria_name': 'Sales Order-To be delivered',
+		'doc_type': 'Sales Order',
+		'doctype': 'Search Criteria',
+		'filters': "{'Sales Order\x01Saved':1,'Sales Order\x01Submitted':1,'Sales Order\x01Fiscal Year':''}",
 		'module': 'Home',
-		'name': 'sales_order-to_be_delivered',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 100,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': '',
 		'sort_by': '`tabSales Order`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, sales_order-to_be_delivered
+	{
+		'doctype': 'Search Criteria',
+		'name': 'sales_order-to_be_delivered'
 	}
 ]
\ No newline at end of file
diff --git a/home/search_criteria/sales_order_to_be_submitted/sales_order_to_be_submitted.txt b/home/search_criteria/sales_order_to_be_submitted/sales_order_to_be_submitted.txt
index c789c2c..9cc5106 100644
--- a/home/search_criteria/sales_order_to_be_submitted/sales_order_to_be_submitted.txt
+++ b/home/search_criteria/sales_order_to_be_submitted/sales_order_to_be_submitted.txt
@@ -1,37 +1,34 @@
+# Search Criteria, sales_order-to_be_submitted
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': "`tabSales Order`.status='Draft'",
-		'add_tab': None,
-		'columns': 'Sales Order\x01ID,Sales Order\x01Customer,Sales Order\x01Sales Order Date,Sales Order\x01Quotation No',
 		'creation': '2010-08-08 17:09:31',
-		'criteria_name': 'Sales Order-To be submitted',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Sales Order',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Sales Order\x01Saved':1,'Sales Order\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-05-13 17:47:45',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': "`tabSales Order`.status='Draft'",
+		'columns': 'Sales Order\x01ID,Sales Order\x01Customer,Sales Order\x01Sales Order Date,Sales Order\x01Quotation No',
+		'criteria_name': 'Sales Order-To be submitted',
+		'doc_type': 'Sales Order',
+		'doctype': 'Search Criteria',
+		'filters': "{'Sales Order\x01Saved':1,'Sales Order\x01Fiscal Year':''}",
 		'module': 'Home',
-		'name': 'sales_order-to_be_submitted',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 100,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabSales Order`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, sales_order-to_be_submitted
+	{
+		'doctype': 'Search Criteria',
+		'name': 'sales_order-to_be_submitted'
 	}
 ]
\ No newline at end of file
diff --git a/home/search_criteria/serial_no_amc_expiring_this_month/serial_no_amc_expiring_this_month.txt b/home/search_criteria/serial_no_amc_expiring_this_month/serial_no_amc_expiring_this_month.txt
index 336eaa7..e2ed6d1 100644
--- a/home/search_criteria/serial_no_amc_expiring_this_month/serial_no_amc_expiring_this_month.txt
+++ b/home/search_criteria/serial_no_amc_expiring_this_month/serial_no_amc_expiring_this_month.txt
@@ -1,37 +1,34 @@
+# Search Criteria, serial_no-amc_expiring_this_month
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': '',
-		'add_cond': '`tab Serial No`.month(amc_expiry_date)=month(now()) \n`tab Serial No`.year(amc_expiry_date)=year(now())',
-		'add_tab': None,
-		'columns': 'Serial No\x01ID,Serial No\x01Status,Serial No\x01AMC Expiry Date,Serial No\x01Customer Name',
 		'creation': '2010-08-08 17:09:32',
-		'criteria_name': 'Serial No-AMC expiring this month',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Serial No',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Serial No\x01Saved':1,'Serial No\x01Submitted':1,'Serial No\x01Status':'','Serial No\x01Warranty Status':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-07-29 15:01:33',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': '`tab Serial No`.month(amc_expiry_date)=month(now()) \n`tab Serial No`.year(amc_expiry_date)=year(now())',
+		'columns': 'Serial No\x01ID,Serial No\x01Status,Serial No\x01AMC Expiry Date,Serial No\x01Customer Name',
+		'criteria_name': 'Serial No-AMC expiring this month',
+		'doc_type': 'Serial No',
+		'doctype': 'Search Criteria',
+		'filters': "{'Serial No\x01Saved':1,'Serial No\x01Submitted':1,'Serial No\x01Status':'','Serial No\x01Warranty Status':''}",
 		'module': 'Home',
-		'name': 'serial_no-amc_expiring_this_month',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabSerial No`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, serial_no-amc_expiring_this_month
+	{
+		'doctype': 'Search Criteria',
+		'name': 'serial_no-amc_expiring_this_month'
 	}
 ]
\ No newline at end of file
diff --git a/home/search_criteria/serial_no_warranty_expiring_this_month/serial_no_warranty_expiring_this_month.txt b/home/search_criteria/serial_no_warranty_expiring_this_month/serial_no_warranty_expiring_this_month.txt
index f9713e0..406d8dd 100644
--- a/home/search_criteria/serial_no_warranty_expiring_this_month/serial_no_warranty_expiring_this_month.txt
+++ b/home/search_criteria/serial_no_warranty_expiring_this_month/serial_no_warranty_expiring_this_month.txt
@@ -1,37 +1,34 @@
+# Search Criteria, serial_no-warranty_expiring_this_month
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': '',
-		'add_cond': "`tab Serial No`.docstatus!=2\n`tab Serial No`.maintenance_status='Under Warranty'\n`tab Serial No`.status!='Scrapped'\n`tab Serial No`.status!='Not in Use'\n`tab Serial No`.month(ifnull(warranty_expiry_date,0)) = month(now()) \n`tab Serial No`.yearmonth(ifnull(warranty_expiry_date,0)) = year(now())",
-		'add_tab': None,
-		'columns': 'Serial No\x01ID,Serial No\x01Status,Serial No\x01Warranty Expiry Date,Serial No\x01Customer Name',
 		'creation': '2010-08-08 17:09:32',
-		'criteria_name': 'Serial No-Warranty expiring this month',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Serial No',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Serial No\x01Saved':1,'Serial No\x01Submitted':1,'Serial No\x01Status':'Issued','Serial No\x01Maintenance Status':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-07-23 09:57:51',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': "`tab Serial No`.docstatus!=2\n`tab Serial No`.maintenance_status='Under Warranty'\n`tab Serial No`.status!='Scrapped'\n`tab Serial No`.status!='Not in Use'\n`tab Serial No`.month(ifnull(warranty_expiry_date,0)) = month(now()) \n`tab Serial No`.yearmonth(ifnull(warranty_expiry_date,0)) = year(now())",
+		'columns': 'Serial No\x01ID,Serial No\x01Status,Serial No\x01Warranty Expiry Date,Serial No\x01Customer Name',
+		'criteria_name': 'Serial No-Warranty expiring this month',
+		'doc_type': 'Serial No',
+		'doctype': 'Search Criteria',
+		'filters': "{'Serial No\x01Saved':1,'Serial No\x01Submitted':1,'Serial No\x01Status':'Issued','Serial No\x01Maintenance Status':''}",
 		'module': 'Home',
-		'name': 'serial_no-warranty_expiring_this_month',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabSerial No`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, serial_no-warranty_expiring_this_month
+	{
+		'doctype': 'Search Criteria',
+		'name': 'serial_no-warranty_expiring_this_month'
 	}
 ]
\ No newline at end of file
diff --git a/home/search_criteria/task_open/task_open.txt b/home/search_criteria/task_open/task_open.txt
index f82a3fc..4d1998c 100644
--- a/home/search_criteria/task_open/task_open.txt
+++ b/home/search_criteria/task_open/task_open.txt
@@ -1,37 +1,34 @@
+# Search Criteria, task-open
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': "`tabTicket`.status='Open'",
-		'add_tab': None,
-		'columns': 'Ticket\x01ID,Ticket\x01Subject,Ticket\x01Priority,Ticket\x01Raised By,Ticket\x01Allocated To',
 		'creation': '2010-08-08 17:09:32',
-		'criteria_name': 'Task-Open',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Ticket',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Ticket\x01Priority':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-07-16 13:03:49',
 		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': "`tabTicket`.status='Open'",
+		'columns': 'Ticket\x01ID,Ticket\x01Subject,Ticket\x01Priority,Ticket\x01Raised By,Ticket\x01Allocated To',
+		'criteria_name': 'Task-Open',
+		'doc_type': 'Ticket',
+		'doctype': 'Search Criteria',
+		'filters': "{'Ticket\x01Priority':''}",
 		'module': 'Home',
-		'name': 'task-open',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabTicket`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, task-open
+	{
+		'doctype': 'Search Criteria',
+		'name': 'task-open'
 	}
 ]
\ No newline at end of file
diff --git a/hr/DocType Mapper/KRA Template-Appraisal/KRA Template-Appraisal.txt b/hr/DocType Mapper/KRA Template-Appraisal/KRA Template-Appraisal.txt
index 9e193d6..8145e4f 100644
--- a/hr/DocType Mapper/KRA Template-Appraisal/KRA Template-Appraisal.txt
+++ b/hr/DocType Mapper/KRA Template-Appraisal/KRA Template-Appraisal.txt
@@ -1 +1,75 @@
-[{'modified_by': 'ashwini@webnotestech.com', 'name': 'KRA Template-Appraisal', 'parent': None, 'to_doctype': 'Appraisal', 'creation': '2010-08-30 15:45:32', 'modified': '2010-09-01 14:25:40', 'module': 'Mapper', 'doctype': 'DocType Mapper', 'idx': None, 'parenttype': None, 'ref_doc_submitted': None, 'owner': 'ashwini@webnotestech.com', 'docstatus': 0, 'from_doctype': 'KRA Template', 'parentfield': None}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00901', 'parent': 'KRA Template-Appraisal', 'to_field': 'kra', 'creation': '2010-08-30 15:45:32', 'modified': '2010-09-01 14:25:40', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 1, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'ashwini@webnotestech.com', 'docstatus': 0, 'from_field': 'kra', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00902', 'parent': 'KRA Template-Appraisal', 'to_field': 'per_weightage', 'creation': '2010-08-30 15:45:32', 'modified': '2010-09-01 14:25:40', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 2, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'ashwini@webnotestech.com', 'docstatus': 0, 'from_field': 'per_weightage', 'parentfield': 'field_mapper_details'}, {'reference_key': '', 'modified_by': 'ashwini@webnotestech.com', 'name': 'TMD/0000090', 'parent': 'KRA Template-Appraisal', 'is_reference_table': None, 'to_field': 'appraisal_details', 'creation': '2010-08-30 15:45:32', 'reference_doctype_key': '', 'modified': '2010-09-01 14:25:40', 'doctype': 'Table Mapper Detail', 'match_id': 0, 'idx': 1, 'parenttype': 'DocType Mapper', 'from_table': 'KRA Sheet', 'owner': 'ashwini@webnotestech.com', 'docstatus': 0, 'to_table': 'Appraisal Detail', 'from_field': 'kra_sheet', 'validation_logic': 'name is not Null', 'parentfield': 'table_mapper_details'}]
\ No newline at end of file
+# DocType Mapper, KRA Template-Appraisal
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-09-01 15:48:10',
+		'docstatus': 0,
+		'modified': '2010-09-01 14:25:40',
+		'modified_by': 'Administrator',
+		'owner': 'ashwini@webnotestech.com'
+	},
+
+	# These values are common for all Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'from_field': 'kra_sheet',
+		'from_table': 'KRA Sheet',
+		'idx': 1,
+		'match_id': 0,
+		'name': '__common__',
+		'parent': 'KRA Template-Appraisal',
+		'parentfield': 'table_mapper_details',
+		'parenttype': 'DocType Mapper',
+		'to_field': 'appraisal_details',
+		'to_table': 'Appraisal Detail',
+		'validation_logic': 'name is not Null'
+	},
+
+	# These values are common for all Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'map': 'Yes',
+		'match_id': 0,
+		'name': '__common__',
+		'parent': 'KRA Template-Appraisal',
+		'parentfield': 'field_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all DocType Mapper
+	{
+		'doctype': 'DocType Mapper',
+		'from_doctype': 'KRA Template',
+		'module': 'HR',
+		'name': '__common__',
+		'to_doctype': 'Appraisal'
+	},
+
+	# DocType Mapper, KRA Template-Appraisal
+	{
+		'doctype': 'DocType Mapper',
+		'name': 'KRA Template-Appraisal'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'kra',
+		'idx': 1,
+		'to_field': 'kra'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'per_weightage',
+		'idx': 2,
+		'to_field': 'per_weightage'
+	},
+
+	# Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail'
+	}
+]
\ No newline at end of file
diff --git a/hr/DocType Mapper/Salary Structure-Salary Slip/Salary Structure-Salary Slip.txt b/hr/DocType Mapper/Salary Structure-Salary Slip/Salary Structure-Salary Slip.txt
index ebabada..2dbc46c 100644
--- a/hr/DocType Mapper/Salary Structure-Salary Slip/Salary Structure-Salary Slip.txt
+++ b/hr/DocType Mapper/Salary Structure-Salary Slip/Salary Structure-Salary Slip.txt
@@ -1,388 +1,231 @@
+# DocType Mapper, Salary Structure-Salary Slip
 [
+
+	# These values are common in all dictionaries
 	{
 		'creation': '2010-12-14 10:23:25',
 		'docstatus': 0,
-		'doctype': 'DocType Mapper',
-		'from_doctype': 'Salary Structure',
-		'idx': None,
 		'modified': '2011-02-12 18:31:40',
 		'modified_by': 'Administrator',
-		'module': 'Mapper',
-		'name': 'Salary Structure-Salary Slip',
-		'owner': 'harshada@webnotestech.com',
-		'parent': None,
-		'parentfield': None,
-		'parenttype': None,
-		'ref_doc_submitted': None,
-		'to_doctype': 'Salary Slip'
+		'owner': 'harshada@webnotestech.com'
 	},
+
+	# These values are common for all Table Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-12-14 10:23:25',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'employee',
-		'idx': 1,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-02-12 18:31:40',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00598',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Salary Structure-Salary Slip',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'employee'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-12-14 10:23:25',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'employee_name',
-		'idx': 2,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-02-12 18:31:40',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00599',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Salary Structure-Salary Slip',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'employee_name'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-12-14 10:23:25',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'department',
-		'idx': 3,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-02-12 18:31:40',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00600',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Salary Structure-Salary Slip',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'department'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-12-14 10:23:25',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'designation',
-		'idx': 4,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-02-12 18:31:40',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00601',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Salary Structure-Salary Slip',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'designation'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-12-14 10:23:25',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'branch',
-		'idx': 5,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-02-12 18:31:40',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00602',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Salary Structure-Salary Slip',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'branch'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-12-14 10:23:25',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'grade',
-		'idx': 6,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-02-12 18:31:40',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00603',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Salary Structure-Salary Slip',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'grade'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2011-02-10 15:57:32',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'total_earning',
-		'idx': 7,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-02-12 18:31:40',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00657',
-		'owner': 'Administrator',
-		'parent': 'Salary Structure-Salary Slip',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'gross_pay'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2011-02-10 15:57:32',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'total_deduction',
-		'idx': 8,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-02-12 18:31:40',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00656',
-		'owner': 'Administrator',
-		'parent': 'Salary Structure-Salary Slip',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'total_deduction'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2011-02-10 15:57:32',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'net_pay',
-		'idx': 9,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-02-12 18:31:40',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00658',
-		'owner': 'Administrator',
-		'parent': 'Salary Structure-Salary Slip',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'net_pay'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-12-14 10:23:25',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'e_type',
-		'idx': 10,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-02-12 18:31:40',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00604',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Salary Structure-Salary Slip',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'e_type'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-12-14 10:23:25',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'modified_value',
-		'idx': 11,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-02-12 18:31:40',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00605',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Salary Structure-Salary Slip',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'e_amount'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2011-02-10 15:57:32',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'modified_value',
-		'idx': 12,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-02-12 18:31:40',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00660',
-		'owner': 'Administrator',
-		'parent': 'Salary Structure-Salary Slip',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'e_modified_amount'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2011-02-11 12:50:51',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'depend_on_lwp',
-		'idx': 13,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-02-12 18:31:40',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00661',
-		'owner': 'Administrator',
-		'parent': 'Salary Structure-Salary Slip',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'e_depends_on_lwp'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-12-14 10:23:25',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'd_type',
-		'idx': 14,
-		'map': 'Yes',
-		'match_id': 2,
-		'modified': '2011-02-12 18:31:40',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00606',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Salary Structure-Salary Slip',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'd_type'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-12-14 10:23:25',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'd_modified_amt',
-		'idx': 15,
-		'map': 'Yes',
-		'match_id': 2,
-		'modified': '2011-02-12 18:31:40',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00607',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Salary Structure-Salary Slip',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'd_amount'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2011-02-10 15:57:32',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'd_modified_amt',
-		'idx': 16,
-		'map': 'Yes',
-		'match_id': 2,
-		'modified': '2011-02-12 18:31:40',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00659',
-		'owner': 'Administrator',
-		'parent': 'Salary Structure-Salary Slip',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'd_modified_amount'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2011-02-11 12:50:51',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'depend_on_lwp',
-		'idx': 17,
-		'map': 'Yes',
-		'match_id': 2,
-		'modified': '2011-02-12 18:31:40',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00662',
-		'owner': 'Administrator',
-		'parent': 'Salary Structure-Salary Slip',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'd_depends_on_lwp'
-	},
-	{
-		'creation': '2010-12-14 10:23:25',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
-		'from_field': None,
-		'from_table': 'Salary Structure',
-		'idx': 1,
-		'match_id': 0,
-		'modified': '2011-02-12 18:31:40',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000063',
-		'owner': 'harshada@webnotestech.com',
+		'name': '__common__',
 		'parent': 'Salary Structure-Salary Slip',
 		'parentfield': 'table_mapper_details',
 		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
-		'reference_key': None,
-		'to_field': None,
-		'to_table': 'Salary Slip',
 		'validation_logic': 'name is not null'
 	},
+
+	# These values are common for all Field Mapper Detail
 	{
-		'creation': '2010-12-14 10:23:25',
-		'docstatus': 0,
+		'doctype': 'Field Mapper Detail',
+		'map': 'Yes',
+		'name': '__common__',
+		'parent': 'Salary Structure-Salary Slip',
+		'parentfield': 'field_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all DocType Mapper
+	{
+		'doctype': 'DocType Mapper',
+		'from_doctype': 'Salary Structure',
+		'module': 'HR',
+		'name': '__common__',
+		'to_doctype': 'Salary Slip'
+	},
+
+	# DocType Mapper, Salary Structure-Salary Slip
+	{
+		'doctype': 'DocType Mapper',
+		'name': 'Salary Structure-Salary Slip'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'employee',
+		'idx': 1,
+		'match_id': 0,
+		'to_field': 'employee'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'employee_name',
+		'idx': 2,
+		'match_id': 0,
+		'to_field': 'employee_name'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'department',
+		'idx': 3,
+		'match_id': 0,
+		'to_field': 'department'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'designation',
+		'idx': 4,
+		'match_id': 0,
+		'to_field': 'designation'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'branch',
+		'idx': 5,
+		'match_id': 0,
+		'to_field': 'branch'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'grade',
+		'idx': 6,
+		'match_id': 0,
+		'to_field': 'grade'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'e_type',
+		'idx': 7,
+		'match_id': 1,
+		'to_field': 'e_type'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'total_earning',
+		'idx': 7,
+		'match_id': 0,
+		'to_field': 'gross_pay'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'modified_value',
+		'idx': 8,
+		'match_id': 1,
+		'to_field': 'e_amount'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'total_deduction',
+		'idx': 8,
+		'match_id': 0,
+		'to_field': 'total_deduction'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'd_type',
+		'idx': 9,
+		'match_id': 2,
+		'to_field': 'd_type'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'net_pay',
+		'idx': 9,
+		'match_id': 0,
+		'to_field': 'net_pay'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'd_modified_amt',
+		'idx': 10,
+		'match_id': 2,
+		'to_field': 'd_amount'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'modified_value',
+		'idx': 12,
+		'match_id': 1,
+		'to_field': 'e_modified_amount'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'depend_on_lwp',
+		'idx': 13,
+		'match_id': 1,
+		'to_field': 'e_depends_on_lwp'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'd_modified_amt',
+		'idx': 16,
+		'match_id': 2,
+		'to_field': 'd_modified_amount'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'depend_on_lwp',
+		'idx': 17,
+		'match_id': 2,
+		'to_field': 'd_depends_on_lwp'
+	},
+
+	# Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'from_table': 'Salary Structure',
+		'idx': 1,
+		'match_id': 0,
+		'to_table': 'Salary Slip'
+	},
+
+	# Table Mapper Detail
+	{
 		'doctype': 'Table Mapper Detail',
 		'from_field': 'earning_details',
 		'from_table': 'Earning Detail',
 		'idx': 2,
 		'match_id': 1,
-		'modified': '2011-02-12 18:31:40',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000064',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Salary Structure-Salary Slip',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
-		'reference_key': None,
 		'to_field': 'earning_details',
-		'to_table': 'SS Earning Detail',
-		'validation_logic': 'name is not null'
+		'to_table': 'SS Earning Detail'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2010-12-14 10:23:25',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
 		'from_field': 'deduction_details',
 		'from_table': 'Deduction Detail',
 		'idx': 3,
 		'match_id': 2,
-		'modified': '2011-02-12 18:31:40',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000065',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Salary Structure-Salary Slip',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
-		'reference_key': None,
 		'to_field': 'deduction_details',
-		'to_table': 'SS Deduction Detail',
-		'validation_logic': 'name is not null'
+		'to_table': 'SS Deduction Detail'
 	}
 ]
\ No newline at end of file
diff --git a/hr/Role/HR Manager/HR Manager.txt b/hr/Role/HR Manager/HR Manager.txt
index db31afc..d07db86 100644
--- a/hr/Role/HR Manager/HR Manager.txt
+++ b/hr/Role/HR Manager/HR Manager.txt
@@ -1 +1,26 @@
-[{'modified_by': 'Administrator', 'name': 'HR Manager', 'parent': None, 'creation': '2010-04-01 14:14:39', 'modified': '2010-04-01 10:19:09', 'module': 'Roles', 'doctype': 'Role', 'idx': None, 'parenttype': None, 'role_name': 'HR Manager', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': None}]
\ No newline at end of file
+# Role, HR Manager
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:51',
+		'docstatus': 0,
+		'modified': '2010-04-01 10:19:09',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Role
+	{
+		'doctype': 'Role',
+		'module': 'HR',
+		'name': '__common__',
+		'role_name': 'HR Manager'
+	},
+
+	# Role, HR Manager
+	{
+		'doctype': 'Role',
+		'name': 'HR Manager'
+	}
+]
\ No newline at end of file
diff --git a/hr/Role/HR User/HR User.txt b/hr/Role/HR User/HR User.txt
index e7134c5..b0c5b76 100644
--- a/hr/Role/HR User/HR User.txt
+++ b/hr/Role/HR User/HR User.txt
@@ -1 +1,26 @@
-[{'modified_by': 'Administrator', 'name': 'HR User', 'parent': None, 'creation': '2010-04-01 14:14:39', 'modified': '2010-04-01 10:18:55', 'module': 'Roles', 'doctype': 'Role', 'idx': None, 'parenttype': None, 'role_name': 'HR User', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': None}]
\ No newline at end of file
+# Role, HR User
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:51',
+		'docstatus': 0,
+		'modified': '2010-04-01 10:18:55',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Role
+	{
+		'doctype': 'Role',
+		'module': 'HR',
+		'name': '__common__',
+		'role_name': 'HR User'
+	},
+
+	# Role, HR User
+	{
+		'doctype': 'Role',
+		'name': 'HR User'
+	}
+]
\ No newline at end of file
diff --git a/hr/search_criteria/employee_appraisals/employee_appraisals.txt b/hr/search_criteria/employee_appraisals/employee_appraisals.txt
index fc1d3e1..31b5d45 100644
--- a/hr/search_criteria/employee_appraisals/employee_appraisals.txt
+++ b/hr/search_criteria/employee_appraisals/employee_appraisals.txt
@@ -1,37 +1,33 @@
+# Search Criteria, employee_appraisals
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Appraisal\x01ID,Appraisal\x01Status,Appraisal\x01Employee,Appraisal\x01Employee Name,Appraisal\x01Start Date,Appraisal\x01End Date,Appraisal\x01Approver,Appraisal\x01Total Score',
-		'creation': '2010-09-01 15:47:57',
-		'criteria_name': 'Employee Appraisals',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Appraisal',
+		'creation': '2010-09-01 15:48:09',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Appraisal\x01Saved':1,'Appraisal\x01Submitted':1,'Appraisal\x01Status':'','Appraisal\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-09-01 14:18:42',
 		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'employee_appraisals',
-		'owner': 'ashwini@webnotestech.com',
+		'owner': 'ashwini@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Appraisal\x01ID,Appraisal\x01Status,Appraisal\x01Employee,Appraisal\x01Employee Name,Appraisal\x01Start Date,Appraisal\x01End Date,Appraisal\x01Approver,Appraisal\x01Total Score',
+		'criteria_name': 'Employee Appraisals',
+		'doc_type': 'Appraisal',
+		'doctype': 'Search Criteria',
+		'filters': "{'Appraisal\x01Saved':1,'Appraisal\x01Submitted':1,'Appraisal\x01Status':'','Appraisal\x01Fiscal Year':''}",
+		'module': 'HR',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabAppraisal`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, employee_appraisals
+	{
+		'doctype': 'Search Criteria',
+		'name': 'employee_appraisals'
 	}
 ]
\ No newline at end of file
diff --git a/hr/search_criteria/employee_information/employee_information.txt b/hr/search_criteria/employee_information/employee_information.txt
index 5a96aed..edb68f8 100644
--- a/hr/search_criteria/employee_information/employee_information.txt
+++ b/hr/search_criteria/employee_information/employee_information.txt
@@ -1,37 +1,33 @@
+# Search Criteria, employee_information
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Employee\x01ID,Employee\x01Employee Name,Employee\x01Employee Number,Employee\x01Date of Joining,Employee\x01Gender,Employee\x01Date of Birth,Employee\x01Employment Type,Employee\x01Scheduled Confirmation Date,Employee\x01Contract End Date,Employee\x01Status,Employee\x01Branch,Employee\x01Department,Employee\x01Designation,Employee\x01Grade,Employee\x01Reports to,Employee\x01Email (By company),Employee\x01Bank Name,Employee\x01Relieving Date',
-		'creation': '2010-12-14 10:33:09',
-		'criteria_name': 'Employee Information',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Employee',
+		'creation': '2010-12-14 10:23:25',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Employee\x01Saved':1,'Employee\x01Submitted':1,'Employee\x01Gender':'','Employee\x01Month of Birth':'','Employee\x01Status':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-10-26 12:03:08',
 		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'employee_information',
-		'owner': 'harshada@webnotestech.com',
+		'owner': 'harshada@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Employee\x01ID,Employee\x01Employee Name,Employee\x01Employee Number,Employee\x01Date of Joining,Employee\x01Gender,Employee\x01Date of Birth,Employee\x01Employment Type,Employee\x01Scheduled Confirmation Date,Employee\x01Contract End Date,Employee\x01Status,Employee\x01Branch,Employee\x01Department,Employee\x01Designation,Employee\x01Grade,Employee\x01Reports to,Employee\x01Email (By company),Employee\x01Bank Name,Employee\x01Relieving Date',
+		'criteria_name': 'Employee Information',
+		'doc_type': 'Employee',
+		'doctype': 'Search Criteria',
+		'filters': "{'Employee\x01Saved':1,'Employee\x01Submitted':1,'Employee\x01Gender':'','Employee\x01Month of Birth':'','Employee\x01Status':''}",
+		'module': 'HR',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabEmployee`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, employee_information
+	{
+		'doctype': 'Search Criteria',
+		'name': 'employee_information'
 	}
 ]
\ No newline at end of file
diff --git a/hr/search_criteria/employees_birthday/employees_birthday.txt b/hr/search_criteria/employees_birthday/employees_birthday.txt
index 30932b9..ecbce74 100644
--- a/hr/search_criteria/employees_birthday/employees_birthday.txt
+++ b/hr/search_criteria/employees_birthday/employees_birthday.txt
@@ -1,37 +1,33 @@
+# Search Criteria, employees_birthday
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Employee\x01ID,Employee\x01Employee Name,Employee\x01Department,Employee\x01Gender,Employee\x01Date of Birth,Employee\x01Month of Birth',
-		'creation': '2010-12-14 10:33:09',
-		'criteria_name': "Employee's Birthday",
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Employee',
+		'creation': '2010-12-14 10:33:12',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Employee\x01Saved':1,'Employee\x01Gender':'','Employee\x01Month of Birth':'May','Employee\x01Status':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-08-04 13:15:28',
 		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'employees_birthday',
-		'owner': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Employee\x01ID,Employee\x01Employee Name,Employee\x01Department,Employee\x01Gender,Employee\x01Date of Birth,Employee\x01Month of Birth',
+		'criteria_name': "Employee's Birthday",
+		'doc_type': 'Employee',
+		'doctype': 'Search Criteria',
+		'filters': "{'Employee\x01Saved':1,'Employee\x01Gender':'','Employee\x01Month of Birth':'May','Employee\x01Status':''}",
+		'module': 'HR',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabEmployee`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, employees_birthday
+	{
+		'doctype': 'Search Criteria',
+		'name': 'employees_birthday'
 	}
 ]
\ No newline at end of file
diff --git a/hr/search_criteria/employeewise_balance_leave_report/employeewise_balance_leave_report.txt b/hr/search_criteria/employeewise_balance_leave_report/employeewise_balance_leave_report.txt
index 4f8d503..48ef3bf 100644
--- a/hr/search_criteria/employeewise_balance_leave_report/employeewise_balance_leave_report.txt
+++ b/hr/search_criteria/employeewise_balance_leave_report/employeewise_balance_leave_report.txt
@@ -1,37 +1,33 @@
+# Search Criteria, employeewise_balance_leave_report
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Employee\x01ID',
-		'creation': '2010-12-14 10:33:09',
-		'criteria_name': 'Employeewise Balance Leave Report',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Employee',
+		'creation': '2010-12-14 10:23:25',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Employee\x01Saved':1,'Employee\x01Submitted':1,'Employee\x01Gender':'','Employee\x01Month of Birth':'','Employee\x01Status':'Active'}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-12-01 10:39:56',
 		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'employeewise_balance_leave_report',
-		'owner': 'harshada@webnotestech.com',
+		'owner': 'harshada@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Employee\x01ID',
+		'criteria_name': 'Employeewise Balance Leave Report',
+		'doc_type': 'Employee',
+		'doctype': 'Search Criteria',
+		'filters': "{'Employee\x01Saved':1,'Employee\x01Submitted':1,'Employee\x01Gender':'','Employee\x01Month of Birth':'','Employee\x01Status':'Active'}",
+		'module': 'HR',
+		'name': '__common__',
 		'page_len': 100,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabEmployee`.`name`',
 		'sort_order': 'ASC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, employeewise_balance_leave_report
+	{
+		'doctype': 'Search Criteria',
+		'name': 'employeewise_balance_leave_report'
 	}
 ]
\ No newline at end of file
diff --git a/hr/search_criteria/employeewise_leave_transaction_details/employeewise_leave_transaction_details.txt b/hr/search_criteria/employeewise_leave_transaction_details/employeewise_leave_transaction_details.txt
index 67672d6..fb54227 100644
--- a/hr/search_criteria/employeewise_leave_transaction_details/employeewise_leave_transaction_details.txt
+++ b/hr/search_criteria/employeewise_leave_transaction_details/employeewise_leave_transaction_details.txt
@@ -1,37 +1,33 @@
+# Search Criteria, employeewise_leave_transaction_details
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Leave Transaction\x01ID,Leave Transaction\x01Fiscal Year,Leave Transaction\x01Employee,Leave Transaction\x01Leave Type,Leave Transaction\x01Previous Balance,Leave Transaction\x01Leave Transaction Type,Leave Transaction\x01Allocation Type,Leave Transaction\x01Deduction Type,Leave Transaction\x01Half Day,Leave Transaction\x01From Date,Leave Transaction\x01To Date,Leave Transaction\x01Encashment Date,Leave Transaction\x01Total Leave Days,Leave Transaction\x01Status',
 		'creation': '2010-08-08 17:09:32',
-		'criteria_name': 'Employeewise Leave Transaction Details',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Leave Transaction',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Leave Transaction\x01Saved':1,'Leave Transaction\x01Submitted':1}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-08-04 08:56:43',
 		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'employeewise_leave_transaction_details',
-		'owner': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Leave Transaction\x01ID,Leave Transaction\x01Fiscal Year,Leave Transaction\x01Employee,Leave Transaction\x01Leave Type,Leave Transaction\x01Previous Balance,Leave Transaction\x01Leave Transaction Type,Leave Transaction\x01Allocation Type,Leave Transaction\x01Deduction Type,Leave Transaction\x01Half Day,Leave Transaction\x01From Date,Leave Transaction\x01To Date,Leave Transaction\x01Encashment Date,Leave Transaction\x01Total Leave Days,Leave Transaction\x01Status',
+		'criteria_name': 'Employeewise Leave Transaction Details',
+		'doc_type': 'Leave Transaction',
+		'doctype': 'Search Criteria',
+		'filters': "{'Leave Transaction\x01Saved':1,'Leave Transaction\x01Submitted':1}",
+		'module': 'HR',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabLeave Transaction`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, employeewise_leave_transaction_details
+	{
+		'doctype': 'Search Criteria',
+		'name': 'employeewise_leave_transaction_details'
 	}
 ]
\ No newline at end of file
diff --git a/hr/search_criteria/expense_vouchers/expense_vouchers.txt b/hr/search_criteria/expense_vouchers/expense_vouchers.txt
index ffc57cb..eeca0e0 100644
--- a/hr/search_criteria/expense_vouchers/expense_vouchers.txt
+++ b/hr/search_criteria/expense_vouchers/expense_vouchers.txt
@@ -1,37 +1,33 @@
+# Search Criteria, expense_vouchers
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Expense Voucher\x01ID,Expense Voucher\x01Approval Status,Expense Voucher\x01From Employee,Expense Voucher\x01Employee Name,Expense Voucher\x01Approver,Expense Voucher\x01Posting Date,Expense Voucher\x01Total Claimed Amount,Expense Voucher\x01Total Sanctioned Amount',
-		'creation': '2010-09-03 16:45:06',
-		'criteria_name': 'Expense Vouchers',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Expense Voucher',
+		'creation': '2010-09-03 16:45:09',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Expense Voucher\x01Saved':1,'Expense Voucher\x01Submitted':1,'Expense Voucher\x01Approval Status':'','Expense Voucher\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-09-02 11:05:37',
 		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'expense_vouchers',
-		'owner': 'ashwini@webnotestech.com',
+		'owner': 'ashwini@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Expense Voucher\x01ID,Expense Voucher\x01Approval Status,Expense Voucher\x01From Employee,Expense Voucher\x01Employee Name,Expense Voucher\x01Approver,Expense Voucher\x01Posting Date,Expense Voucher\x01Total Claimed Amount,Expense Voucher\x01Total Sanctioned Amount',
+		'criteria_name': 'Expense Vouchers',
+		'doc_type': 'Expense Voucher',
+		'doctype': 'Search Criteria',
+		'filters': "{'Expense Voucher\x01Saved':1,'Expense Voucher\x01Submitted':1,'Expense Voucher\x01Approval Status':'','Expense Voucher\x01Fiscal Year':''}",
+		'module': 'HR',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabExpense Voucher`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, expense_vouchers
+	{
+		'doctype': 'Search Criteria',
+		'name': 'expense_vouchers'
 	}
 ]
\ No newline at end of file
diff --git a/hr/search_criteria/monthly_attendance_details/monthly_attendance_details.txt b/hr/search_criteria/monthly_attendance_details/monthly_attendance_details.txt
index 5817aa9..23e4063 100644
--- a/hr/search_criteria/monthly_attendance_details/monthly_attendance_details.txt
+++ b/hr/search_criteria/monthly_attendance_details/monthly_attendance_details.txt
@@ -1,37 +1,33 @@
+# Search Criteria, monthly_attendance_details
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Attendance\x01Employee',
-		'creation': '2010-12-14 10:33:09',
-		'criteria_name': 'Monthly Attendance Details',
-		'custom_query': None,
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Attendance',
+		'creation': '2010-12-14 10:23:25',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Attendance\x01Status':'','Attendance\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-11-30 18:03:56',
 		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'monthly_attendance_details',
-		'owner': 'harshada@webnotestech.com',
+		'owner': 'harshada@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Attendance\x01Employee',
+		'criteria_name': 'Monthly Attendance Details',
+		'doc_type': 'Attendance',
+		'doctype': 'Search Criteria',
+		'filters': "{'Attendance\x01Status':'','Attendance\x01Fiscal Year':''}",
+		'module': 'HR',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabAttendance`.`employee`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, monthly_attendance_details
+	{
+		'doctype': 'Search Criteria',
+		'name': 'monthly_attendance_details'
 	}
 ]
\ No newline at end of file
diff --git a/hr/search_criteria/monthly_salary_register/monthly_salary_register.txt b/hr/search_criteria/monthly_salary_register/monthly_salary_register.txt
index 7aa5420..e480563 100644
--- a/hr/search_criteria/monthly_salary_register/monthly_salary_register.txt
+++ b/hr/search_criteria/monthly_salary_register/monthly_salary_register.txt
@@ -1,37 +1,33 @@
+# Search Criteria, monthly_salary_register
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Salary Slip\x01ID,Salary Slip\x01Employee,Salary Slip\x01Employee Name,Salary Slip\x01Leave Without Pay,Salary Slip\x01Arrear Amount',
-		'creation': '2010-12-14 10:33:09',
-		'criteria_name': 'Monthly Salary Register',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Salary Slip',
+		'creation': '2010-12-14 10:33:12',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Salary Slip\x01Month':'','Salary Slip\x01Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-04-05 14:43:08',
 		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'monthly_salary_register',
-		'owner': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Salary Slip\x01ID,Salary Slip\x01Employee,Salary Slip\x01Employee Name,Salary Slip\x01Leave Without Pay,Salary Slip\x01Arrear Amount',
+		'criteria_name': 'Monthly Salary Register',
+		'doc_type': 'Salary Slip',
+		'doctype': 'Search Criteria',
+		'filters': "{'Salary Slip\x01Month':'','Salary Slip\x01Year':''}",
+		'module': 'HR',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': 'ID',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, monthly_salary_register
+	{
+		'doctype': 'Search Criteria',
+		'name': 'monthly_salary_register'
 	}
 ]
\ No newline at end of file
diff --git a/hr/search_criteria/new_or_left_employees_for_a_month/new_or_left_employees_for_a_month.txt b/hr/search_criteria/new_or_left_employees_for_a_month/new_or_left_employees_for_a_month.txt
index 6074220..f58984c 100644
--- a/hr/search_criteria/new_or_left_employees_for_a_month/new_or_left_employees_for_a_month.txt
+++ b/hr/search_criteria/new_or_left_employees_for_a_month/new_or_left_employees_for_a_month.txt
@@ -1,37 +1,33 @@
+# Search Criteria, new_or_left_employees_for_a_month
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Employee\x01ID',
-		'creation': '2010-12-14 10:33:09',
-		'criteria_name': 'New or left employees for a month',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Employee',
+		'creation': '2010-12-14 10:23:25',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Employee\x01Saved':1,'Employee\x01Submitted':1,'Employee\x01Gender':'','Employee\x01Month of Birth':'','Employee\x01Status':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-12-01 09:54:34',
 		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'new_or_left_employees_for_a_month',
-		'owner': 'harshada@webnotestech.com',
+		'owner': 'harshada@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Employee\x01ID',
+		'criteria_name': 'New or left employees for a month',
+		'doc_type': 'Employee',
+		'doctype': 'Search Criteria',
+		'filters': "{'Employee\x01Saved':1,'Employee\x01Submitted':1,'Employee\x01Gender':'','Employee\x01Month of Birth':'','Employee\x01Status':''}",
+		'module': 'HR',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabEmployee`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, new_or_left_employees_for_a_month
+	{
+		'doctype': 'Search Criteria',
+		'name': 'new_or_left_employees_for_a_month'
 	}
 ]
\ No newline at end of file
diff --git a/hr/search_criteria/pending_appraisals/pending_appraisals.txt b/hr/search_criteria/pending_appraisals/pending_appraisals.txt
index f732974..3010bc9 100644
--- a/hr/search_criteria/pending_appraisals/pending_appraisals.txt
+++ b/hr/search_criteria/pending_appraisals/pending_appraisals.txt
@@ -1,37 +1,33 @@
+# Search Criteria, pending_appraisals
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': '',
-		'add_tab': None,
-		'columns': '',
-		'creation': '2010-09-01 15:47:57',
-		'criteria_name': 'Pending Appraisals',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': 0,
-		'doc_type': 'Appraisal',
+		'creation': '2010-09-01 15:48:09',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Appraisal\x01Submitted':1,'Appraisal\x01Status':'Submitted','Appraisal\x01Fiscal Year':'','Appraisal\x01Approver':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-09-01 14:19:02',
 		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'pending_appraisals',
-		'owner': 'ashwini@webnotestech.com',
+		'owner': 'ashwini@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'criteria_name': 'Pending Appraisals',
+		'disabled': 0,
+		'doc_type': 'Appraisal',
+		'doctype': 'Search Criteria',
+		'filters': "{'Appraisal\x01Submitted':1,'Appraisal\x01Status':'Submitted','Appraisal\x01Fiscal Year':'','Appraisal\x01Approver':''}",
+		'module': 'HR',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabAppraisal`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, pending_appraisals
+	{
+		'doctype': 'Search Criteria',
+		'name': 'pending_appraisals'
 	}
 ]
\ No newline at end of file
diff --git a/hr/search_criteria/pending_expense_vouchers/pending_expense_vouchers.txt b/hr/search_criteria/pending_expense_vouchers/pending_expense_vouchers.txt
index 2a4c809..423b614 100644
--- a/hr/search_criteria/pending_expense_vouchers/pending_expense_vouchers.txt
+++ b/hr/search_criteria/pending_expense_vouchers/pending_expense_vouchers.txt
@@ -1,37 +1,31 @@
+# Search Criteria, pending_expense_vouchers
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': '',
-		'creation': '2010-09-03 16:45:06',
-		'criteria_name': 'Pending Expense Vouchers',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Expense Voucher',
+		'creation': '2010-09-03 16:45:09',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Expense Voucher\x01Approval Status':'','Expense Voucher\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-09-02 11:04:41',
 		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'pending_expense_vouchers',
-		'owner': 'ashwini@webnotestech.com',
+		'owner': 'ashwini@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'criteria_name': 'Pending Expense Vouchers',
+		'doc_type': 'Expense Voucher',
+		'doctype': 'Search Criteria',
+		'filters': "{'Expense Voucher\x01Approval Status':'','Expense Voucher\x01Fiscal Year':''}",
+		'module': 'HR',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
-		'sort_by': '',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, pending_expense_vouchers
+	{
+		'doctype': 'Search Criteria',
+		'name': 'pending_expense_vouchers'
 	}
 ]
\ No newline at end of file
diff --git a/hr/search_criteria/salary_register/salary_register.txt b/hr/search_criteria/salary_register/salary_register.txt
index 87a3752..6d9c4fa 100644
--- a/hr/search_criteria/salary_register/salary_register.txt
+++ b/hr/search_criteria/salary_register/salary_register.txt
@@ -1,37 +1,33 @@
+# Search Criteria, salary_register
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Salary Slip\x01ID,Salary Slip\x01Employee,Salary Slip\x01Employee Name,Salary Slip\x01Year,Salary Slip\x01Month,Salary Slip\x01Total days in month,Salary Slip\x01Payment days',
 		'creation': '2010-12-29 12:30:57',
-		'criteria_name': 'Salary Register',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Salary Slip',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Salary Slip\x01Submitted':1,'Salary Slip\x01Month':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-12-29 12:11:18',
 		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'salary_register',
-		'owner': 'harshada@webnotestech.com',
+		'owner': 'harshada@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Salary Slip\x01ID,Salary Slip\x01Employee,Salary Slip\x01Employee Name,Salary Slip\x01Year,Salary Slip\x01Month,Salary Slip\x01Total days in month,Salary Slip\x01Payment days',
+		'criteria_name': 'Salary Register',
+		'doc_type': 'Salary Slip',
+		'doctype': 'Search Criteria',
+		'filters': "{'Salary Slip\x01Submitted':1,'Salary Slip\x01Month':''}",
+		'module': 'HR',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabSalary Slip`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, salary_register
+	{
+		'doctype': 'Search Criteria',
+		'name': 'salary_register'
 	}
 ]
\ No newline at end of file
diff --git a/hr/search_criteria/salary_slips/salary_slips.txt b/hr/search_criteria/salary_slips/salary_slips.txt
index 533cfe5..00e6d46 100644
--- a/hr/search_criteria/salary_slips/salary_slips.txt
+++ b/hr/search_criteria/salary_slips/salary_slips.txt
@@ -1,37 +1,33 @@
+# Search Criteria, salary_slips
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Salary Slip\x01ID,Salary Slip\x01Fiscal Year,Salary Slip\x01Month,Salary Slip\x01Employee,Salary Slip\x01Employee Name,Salary Slip\x01Department,Salary Slip\x01Designation,Salary Slip\x01Branch,Salary Slip\x01Grade,Salary Slip\x01PF No.,Salary Slip\x01ESIC No.,Salary Slip\x01Leave Without Pay,Salary Slip\x01Bank Name,Salary Slip\x01Bank Account No.,Salary Slip\x01Payment days,Salary Slip\x01Arrear Amount,Salary Slip\x01Encashment Amount,Salary Slip\x01Gross Pay,Salary Slip\x01Total Deduction,Salary Slip\x01Net Pay',
-		'creation': '2010-12-14 10:33:09',
-		'criteria_name': 'Salary Slips',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Salary Slip',
+		'creation': '2010-08-08 17:09:32',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Salary Slip\x01Saved':1,'Salary Slip\x01Submitted':1}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-08-04 13:07:29',
 		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'salary_slips',
-		'owner': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Salary Slip\x01ID,Salary Slip\x01Fiscal Year,Salary Slip\x01Month,Salary Slip\x01Employee,Salary Slip\x01Employee Name,Salary Slip\x01Department,Salary Slip\x01Designation,Salary Slip\x01Branch,Salary Slip\x01Grade,Salary Slip\x01PF No.,Salary Slip\x01ESIC No.,Salary Slip\x01Leave Without Pay,Salary Slip\x01Bank Name,Salary Slip\x01Bank Account No.,Salary Slip\x01Payment days,Salary Slip\x01Arrear Amount,Salary Slip\x01Encashment Amount,Salary Slip\x01Gross Pay,Salary Slip\x01Total Deduction,Salary Slip\x01Net Pay',
+		'criteria_name': 'Salary Slips',
+		'doc_type': 'Salary Slip',
+		'doctype': 'Search Criteria',
+		'filters': "{'Salary Slip\x01Saved':1,'Salary Slip\x01Submitted':1}",
+		'module': 'HR',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': '',
 		'sort_by': '`tabSalary Slip`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, salary_slips
+	{
+		'doctype': 'Search Criteria',
+		'name': 'salary_slips'
 	}
 ]
\ No newline at end of file
diff --git a/hr/search_criteria/salary_structure_details/salary_structure_details.txt b/hr/search_criteria/salary_structure_details/salary_structure_details.txt
index 58bc406..1111a38 100644
--- a/hr/search_criteria/salary_structure_details/salary_structure_details.txt
+++ b/hr/search_criteria/salary_structure_details/salary_structure_details.txt
@@ -1,37 +1,33 @@
+# Search Criteria, salary_structure_details
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Salary Structure\x01ID,Salary Structure\x01Employee,Salary Structure\x01From Date,Salary Structure\x01To Date,Salary Structure\x01Fiscal Year,Salary Structure\x01Branch,Salary Structure\x01Designation,Salary Structure\x01Department,Salary Structure\x01Grade,Salary Structure\x01Is Active,Salary Structure\x01Total Earning,Salary Structure\x01Total Deduction,Salary Structure\x01CTC,Salary Structure\x01Total',
-		'creation': '2010-12-14 17:56:47',
-		'criteria_name': 'Salary Structure Details',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Salary Structure',
+		'creation': '2010-12-14 10:23:25',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Salary Structure\x01Branch':'','Salary Structure\x01Designation':'','Salary Structure\x01Department':'','Salary Structure\x01Grade':'','Salary Structure\x01Is Active':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-08-04 09:19:01',
 		'modified_by': 'Administrator',
-		'module': 'Payroll',
-		'name': 'salary_structure_details',
-		'owner': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Salary Structure\x01ID,Salary Structure\x01Employee,Salary Structure\x01From Date,Salary Structure\x01To Date,Salary Structure\x01Fiscal Year,Salary Structure\x01Branch,Salary Structure\x01Designation,Salary Structure\x01Department,Salary Structure\x01Grade,Salary Structure\x01Is Active,Salary Structure\x01Total Earning,Salary Structure\x01Total Deduction,Salary Structure\x01CTC,Salary Structure\x01Total',
+		'criteria_name': 'Salary Structure Details',
+		'doc_type': 'Salary Structure',
+		'doctype': 'Search Criteria',
+		'filters': "{'Salary Structure\x01Branch':'','Salary Structure\x01Designation':'','Salary Structure\x01Department':'','Salary Structure\x01Grade':'','Salary Structure\x01Is Active':''}",
+		'module': 'HR',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': '',
 		'sort_by': '`tabSalary Structure`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, salary_structure_details
+	{
+		'doctype': 'Search Criteria',
+		'name': 'salary_structure_details'
 	}
 ]
\ No newline at end of file
diff --git a/knowledge_base/doctype/question_control/__init__.py b/knowledge_base/doctype/question_control/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/knowledge_base/doctype/question_control/__init__.py
diff --git a/knowledge_base/doctype/question_control/question_control.txt b/knowledge_base/doctype/question_control/question_control.txt
new file mode 100644
index 0000000..42b491b
--- /dev/null
+++ b/knowledge_base/doctype/question_control/question_control.txt
@@ -0,0 +1,30 @@
+# DocType, Question Control
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:17',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'issingle': 1,
+		'module': 'Knowledge Base',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'server_code_error': ' ',
+		'version': 1
+	},
+
+	# DocType, Question Control
+	{
+		'doctype': 'DocType',
+		'name': 'Question Control'
+	}
+]
\ No newline at end of file
diff --git a/knowledge_base/doctype/question_tag/__init__.py b/knowledge_base/doctype/question_tag/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/knowledge_base/doctype/question_tag/__init__.py
diff --git a/knowledge_base/doctype/question_tag/question_tag.txt b/knowledge_base/doctype/question_tag/question_tag.txt
new file mode 100644
index 0000000..e6e3d35
--- /dev/null
+++ b/knowledge_base/doctype/question_tag/question_tag.txt
@@ -0,0 +1,71 @@
+# DocType, Question Tag
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:17',
+		'docstatus': 0,
+		'modified': '2010-09-20 14:06:57',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
+	{
+		'autoname': 'field:tag_name',
+		'colour': 'White:FFF',
+		'doctype': 'DocType',
+		'module': 'Knowledge Base',
+		'name': '__common__',
+		'section_style': 'Simple',
+		'version': 1
+	},
+
+	# These values are common for all DocField
+	{
+		'doctype': 'DocField',
+		'fieldname': 'tag_name',
+		'fieldtype': 'Data',
+		'idx': 1,
+		'label': 'Tag Name',
+		'name': '__common__',
+		'oldfieldname': 'tag_name',
+		'oldfieldtype': 'Data',
+		'parent': 'Question Tag',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'reqd': 1
+	},
+
+	# These values are common for all DocPerm
+	{
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'name': '__common__',
+		'parent': 'Question Tag',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'role': 'All',
+		'write': 1
+	},
+
+	# DocType, Question Tag
+	{
+		'doctype': 'DocType',
+		'name': 'Question Tag'
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm'
+	},
+
+	# DocField
+	{
+		'doctype': 'DocField'
+	}
+]
\ No newline at end of file
diff --git a/patches/erpnext_structure_cleanup.py b/patches/erpnext_structure_cleanup.py
index ecbd85c..436f898 100644
--- a/patches/erpnext_structure_cleanup.py
+++ b/patches/erpnext_structure_cleanup.py
@@ -13,7 +13,7 @@
 def delete_unwanted_doctypes():
 	"deletes doctypes which are not used anymore"
 	
-	lst = ['Zone',  'WN Account Control', 'Wiki Page', 'Wiki History', 'Wiki Control', 'While You Were Out', 'Web Visitor', 'Tweet', 'Transfer Utility', 'Transfer Module', 'Transfer Control', 'Transfer Account', 'Tips Common', 'TestTabDT', 'TestDT', 'Test Type', 'Test Run', 'Test Record Detail', 'Test Record', 'Test Case', 'Supplier TDS Category Detail', 'Shopping Cart Control', 'Service Series', 'Series Detail', 'Rule Engine', 'RFQ', 'Report Filter Detail', 'Report Field Detail','Report Control', 'Rating Widget Record', 'Rating Widget Control', 'Rating Template Detail', 'Rating Template', 'PV Ded Tax Detail', 'PV Add Tax Detail', 'Product Variant', 'Product Variance', 'Product Group', 'Product Feature', 'Payroll Tips Common', 'Payroll Rule', 'Password Control', 'Page Visit', 'Patch', 'Multiple Transfer', 'Module Tip Control', 'Module Setter', 'Module Manager', 'Module Import', 'Module Detail', 'Message Control', 'Message', 'Mail Participant Details', 'Mail', 'Leave Type Detail', 'Leave Detail', 'Leave Applicable Detail', 'Lead Item Detail', 'Lead Attachment Detail', 'Item Attachments Detail', 'Instant Message', 'Impact Analysis', 'Forum Topic', 'Forum Control', 'Form Settings', 'Follower', 'ERP Setup', 'Enquiry Attachment Detail', 'Documentation', 'Condition Detail', 'Complaint Note', 'Code History', 'Code Editor', 'Code Backup Control', 'Code Backup', 'City', 'Change Log', 'Business Letter Type', 'Business Letter Template', 'Business Letter', 'Badge Settings Detail', 'Application Type', 'Application', 'Action Detail', 'Accounts Setup', 'Stock Common', 'Job Application', 'Service Schedule', ]
+	lst = ['Zone',  'WN Account Control', 'Wiki Page', 'Wiki History', 'Wiki Control', 'While You Were Out', 'Web Visitor', 'Tweet', 'Transfer Utility', 'Transfer Module', 'Transfer Control', 'Transfer Account', 'Tips Common', 'TestTabDT', 'TestDT', 'Test Type', 'Test Run', 'Test Record Detail', 'Test Record', 'Test Case', 'Supplier TDS Category Detail', 'Shopping Cart Control', 'Service Series', 'Series Detail', 'Rule Engine', 'RFQ', 'Report Filter Detail', 'Report Field Detail','Report Control', 'Rating Widget Record', 'Rating Widget Control', 'Rating Template Detail', 'Rating Template', 'PV Ded Tax Detail', 'PV Add Tax Detail', 'Product Variant', 'Product Variance', 'Product Group', 'Product Feature', 'Payroll Tips Common', 'Payroll Rule', 'Password Control', 'Page Visit', 'Patch', 'Multiple Transfer', 'Module Tip Control', 'Module Setter', 'Module Manager', 'Module Import', 'Module Detail', 'Message Control', 'Message', 'Mail Participant Details', 'Mail', 'Leave Type Detail', 'Leave Detail', 'Leave Applicable Detail', 'Lead Item Detail', 'Lead Attachment Detail', 'Item Attachments Detail', 'Instant Message', 'Impact Analysis', 'Forum Topic', 'Forum Control', 'Form Settings', 'Follower', 'ERP Setup', 'Enquiry Attachment Detail', 'Documentation', 'Condition Detail', 'Complaint Note', 'Code History', 'Code Editor', 'Code Backup Control', 'Code Backup', 'City', 'Change Log', 'Business Letter Type', 'Business Letter Template', 'Business Letter', 'Badge Settings Detail', 'Application Type', 'Application', 'Action Detail', 'Accounts Setup', 'Stock Common', 'Job Application', 'Service Schedule', 'Comment Control', 'Bank', 'Tag Widget Control'] # bank
 	for d in lst:
 		sql("delete from `tabProperty Setter` where select_doctype = '%s'" % d)
 		sql("delete from `tabCustom Script` where dt = '%s'" % d)
@@ -33,7 +33,7 @@
 	
 def delete_unwanted_pages():
 	"deletes pages which are not used anymore"
-	lst = ['Transaction Authorization', 'Prduct Display', 'Data Import', 'Partner Home', 'Product Display']
+	lst = ['Transaction Authorization', 'Prduct Display', 'Data Import', 'Partner Home', 'Product Display', 'Module Settings']
 	for d in lst:
 		delete_doc('Page', d)
 	
@@ -55,7 +55,7 @@
 		
 def delete_unwanted_modules():
 	"deletes unwanted modules"
-	lst = ['Developent', 'Recycle Bin', 'Testing', 'Testing System', 'Test', 'System', 'Partner Updates', 'My Company', 'Event Updates', 'E-Commerce']
+	lst = ['Development', 'Recycle Bin', 'Testing', 'Testing System', 'Test', 'System', 'Partner Updates', 'My Company', 'Event Updates', 'E-Commerce']
 	for d in lst:
 		delete_doc('Module Def', d)
 
@@ -129,7 +129,8 @@
 	delete_doc('Module Def', 'Mapper')
 	
 # --------------------------------------
-def export_docs():
+# function below will be run only in localhost
+'''def export_docs():
 	"""
 		Export all documents where module has been changed
 	"""
@@ -137,10 +138,11 @@
 		lst = sql("select name, module from `tab%s`" % dtype)
 		for rec in lst:
 			webnotes.msgprint(rec)
-			export_to_files(record_list = [[dtype, rec[0]]], record_module = rec[1])
+			if rec and rec[0] and rec[1]:
+				export_to_files(record_list = [[dtype, rec[0]]], record_module = rec[1])
 
 	#grep test company
-
+'''
 
 #---------------------------------------
 def run_patches():
@@ -158,7 +160,10 @@
 
 	# landed cost wizard link in stock
 	reload_doc('stock', 'Module Def', 'stock')
-	sql("update `tabDocType` set module = 'stock' where name in ('LC PR Detail', 'Landed Cost Detail')")
-
-	export_docs()
+	
+	# update module
+	dt_module = {'LC PR Detail':'Stock', 'Landed Cost Detail':'Stock', 'Comment Widget Record': 'Core', 'Tag':'Core', 'Tag Detail': 'Core'}
+	for d in dt_module.keys():
+		sql("update `tabDocType` set module = '%s' where name = '%s'" % (dt_module[d], d))
+	
 	sql("commit")
diff --git a/production/DocType Mapper/Production Forecast-Production Plan/Production Forecast-Production Plan.txt b/production/DocType Mapper/Production Forecast-Production Plan/Production Forecast-Production Plan.txt
index 8ca299ca..62306cc 100644
--- a/production/DocType Mapper/Production Forecast-Production Plan/Production Forecast-Production Plan.txt
+++ b/production/DocType Mapper/Production Forecast-Production Plan/Production Forecast-Production Plan.txt
@@ -1 +1,133 @@
-[{'modified_by': 'jai@webnotestech.com', 'name': 'Production Forecast-Production Plan', 'parent': None, 'to_doctype': 'Production Plan', 'creation': '2009-09-09 12:33:33', 'modified': '2010-01-27 16:03:20', 'module': 'Mapper', 'doctype': 'DocType Mapper', 'idx': None, 'parenttype': None, 'ref_doc_submitted': None, 'owner': 'Administrator', 'docstatus': 0, 'from_doctype': 'Production Forecast', 'parentfield': None}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00519', 'parent': 'Production Forecast-Production Plan', 'to_field': 'item_code', 'creation': '2009-09-09 12:33:33', 'modified': '2010-01-27 16:03:20', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 1, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'item_code', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00520', 'parent': 'Production Forecast-Production Plan', 'to_field': 'description', 'creation': '2009-09-09 12:33:33', 'modified': '2010-01-27 16:03:20', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 2, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'description', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00521', 'parent': 'Production Forecast-Production Plan', 'to_field': 'stock_uom', 'creation': '2009-09-09 12:33:33', 'modified': '2010-01-27 16:03:20', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 3, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'stock_uom', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00522', 'parent': 'Production Forecast-Production Plan', 'to_field': 'prevdoc_reqd_qty', 'creation': '2009-09-09 12:33:33', 'modified': '2010-01-27 16:03:20', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 4, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'eval:flt(obj.qty)-flt(obj.planned_qty)', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00523', 'parent': 'Production Forecast-Production Plan', 'to_field': 'against_document', 'creation': '2009-09-09 12:33:33', 'modified': '2010-01-27 16:03:20', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 5, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'parenttype', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00524', 'parent': 'Production Forecast-Production Plan', 'to_field': 'document_no', 'creation': '2009-09-09 12:33:33', 'modified': '2010-01-27 16:03:20', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 6, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'parent', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00525', 'parent': 'Production Forecast-Production Plan', 'to_field': 'document_date', 'creation': '2009-09-09 12:33:33', 'modified': '2010-01-27 16:03:20', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 7, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'start_date', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00526', 'parent': 'Production Forecast-Production Plan', 'to_field': 'confirmation_date', 'creation': '2009-09-09 12:33:33', 'modified': '2010-01-27 16:03:20', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 8, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'end_date', 'parentfield': 'field_mapper_details'}, {'reference_key': '', 'modified_by': 'jai@webnotestech.com', 'name': 'TMD/0000052', 'parent': 'Production Forecast-Production Plan', 'is_reference_table': None, 'to_field': None, 'creation': '2009-09-09 12:33:33', 'reference_doctype_key': '', 'modified': '2010-01-27 16:03:20', 'doctype': 'Table Mapper Detail', 'match_id': 0, 'idx': 1, 'parenttype': 'DocType Mapper', 'from_table': 'Production Forecast', 'owner': 'Administrator', 'docstatus': 0, 'to_table': 'Production Plan', 'from_field': None, 'validation_logic': 'docstatus =1', 'parentfield': 'table_mapper_details'}, {'reference_key': '', 'modified_by': 'jai@webnotestech.com', 'name': 'TMD/0000053', 'parent': 'Production Forecast-Production Plan', 'is_reference_table': None, 'to_field': 'pp_details', 'creation': '2009-09-09 12:33:33', 'reference_doctype_key': '', 'modified': '2010-01-27 16:03:20', 'doctype': 'Table Mapper Detail', 'match_id': 1, 'idx': 2, 'parenttype': 'DocType Mapper', 'from_table': 'PF Detail', 'owner': 'Administrator', 'docstatus': 0, 'to_table': 'PP Detail', 'from_field': 'pf_details', 'validation_logic': 'docstatus =1 and qty > planned_qty ', 'parentfield': 'table_mapper_details'}]
\ No newline at end of file
+# DocType Mapper, Production Forecast-Production Plan
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:35',
+		'docstatus': 0,
+		'modified': '2010-01-27 16:03:20',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'name': '__common__',
+		'parent': 'Production Forecast-Production Plan',
+		'parentfield': 'table_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'map': 'Yes',
+		'match_id': 1,
+		'name': '__common__',
+		'parent': 'Production Forecast-Production Plan',
+		'parentfield': 'field_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all DocType Mapper
+	{
+		'doctype': 'DocType Mapper',
+		'from_doctype': 'Production Forecast',
+		'module': 'Production',
+		'name': '__common__',
+		'to_doctype': 'Production Plan'
+	},
+
+	# DocType Mapper, Production Forecast-Production Plan
+	{
+		'doctype': 'DocType Mapper',
+		'name': 'Production Forecast-Production Plan'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'item_code',
+		'idx': 1,
+		'to_field': 'item_code'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'description',
+		'idx': 2,
+		'to_field': 'description'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'stock_uom',
+		'idx': 3,
+		'to_field': 'stock_uom'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'eval:flt(obj.qty)-flt(obj.planned_qty)',
+		'idx': 4,
+		'to_field': 'prevdoc_reqd_qty'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'parenttype',
+		'idx': 5,
+		'to_field': 'against_document'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'parent',
+		'idx': 6,
+		'to_field': 'document_no'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'start_date',
+		'idx': 7,
+		'to_field': 'document_date'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'end_date',
+		'idx': 8,
+		'to_field': 'confirmation_date'
+	},
+
+	# Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'from_table': 'Production Forecast',
+		'idx': 1,
+		'match_id': 0,
+		'to_table': 'Production Plan',
+		'validation_logic': 'docstatus =1'
+	},
+
+	# Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'from_field': 'pf_details',
+		'from_table': 'PF Detail',
+		'idx': 2,
+		'match_id': 1,
+		'to_field': 'pp_details',
+		'to_table': 'PP Detail',
+		'validation_logic': 'docstatus =1 and qty > planned_qty '
+	}
+]
\ No newline at end of file
diff --git a/production/DocType Mapper/Production Forecast-Production Planning Tool/Production Forecast-Production Planning Tool.txt b/production/DocType Mapper/Production Forecast-Production Planning Tool/Production Forecast-Production Planning Tool.txt
index c7b2ac6..5cab415 100644
--- a/production/DocType Mapper/Production Forecast-Production Planning Tool/Production Forecast-Production Planning Tool.txt
+++ b/production/DocType Mapper/Production Forecast-Production Planning Tool/Production Forecast-Production Planning Tool.txt
@@ -1 +1,125 @@
-[{'modified_by': 'jai@webnotestech.com', 'name': 'Production Forecast-Production Planning Tool', 'parent': None, 'to_doctype': 'Production Planning Tool', 'creation': '2010-02-12 12:27:36', 'modified': '2010-02-12 12:41:03', 'module': 'Mapper', 'doctype': 'DocType Mapper', 'idx': None, 'parenttype': None, 'ref_doc_submitted': None, 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'from_doctype': 'Production Forecast', 'parentfield': None}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00686', 'parent': 'Production Forecast-Production Planning Tool', 'to_field': 'item_code', 'creation': '2010-02-12 12:27:36', 'modified': '2010-02-12 12:41:03', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 1, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'from_field': 'item_code', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00687', 'parent': 'Production Forecast-Production Planning Tool', 'to_field': 'description', 'creation': '2010-02-12 12:27:36', 'modified': '2010-02-12 12:41:03', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 2, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'from_field': 'description', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00688', 'parent': 'Production Forecast-Production Planning Tool', 'to_field': 'stock_uom', 'creation': '2010-02-12 12:27:36', 'modified': '2010-02-12 12:41:03', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 3, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'from_field': 'stock_uom', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00689', 'parent': 'Production Forecast-Production Planning Tool', 'to_field': 'prevdoc_reqd_qty', 'creation': '2010-02-12 12:27:36', 'modified': '2010-02-12 12:41:03', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 4, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'from_field': 'eval:flt(obj.qty)-flt(obj.planned_qty)', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00690', 'parent': 'Production Forecast-Production Planning Tool', 'to_field': 'source_doctype', 'creation': '2010-02-12 12:27:36', 'modified': '2010-02-12 12:41:03', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 5, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'from_field': 'parenttype', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00691', 'parent': 'Production Forecast-Production Planning Tool', 'to_field': 'source_docname', 'creation': '2010-02-12 12:27:36', 'modified': '2010-02-12 12:41:03', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 6, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'from_field': 'parent', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'jai@webnotestech.com', 'name': 'FMD/00692', 'parent': 'Production Forecast-Production Planning Tool', 'to_field': 'confirmation_date', 'creation': '2010-02-12 12:27:36', 'modified': '2010-02-12 12:41:03', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 7, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'from_field': 'end_date', 'parentfield': 'field_mapper_details'}, {'reference_key': '', 'modified_by': 'jai@webnotestech.com', 'name': 'TMD/0000066', 'parent': 'Production Forecast-Production Planning Tool', 'is_reference_table': None, 'to_field': None, 'creation': '2010-02-12 12:27:36', 'reference_doctype_key': '', 'modified': '2010-02-12 12:41:03', 'doctype': 'Table Mapper Detail', 'match_id': 0, 'idx': 1, 'parenttype': 'DocType Mapper', 'from_table': 'Production Forecast', 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'to_table': 'Production Planning Tool', 'from_field': None, 'validation_logic': 'docstatus =1', 'parentfield': 'table_mapper_details'}, {'reference_key': '', 'modified_by': 'jai@webnotestech.com', 'name': 'TMD/0000067', 'parent': 'Production Forecast-Production Planning Tool', 'is_reference_table': None, 'to_field': 'pp_details', 'creation': '2010-02-12 12:27:36', 'reference_doctype_key': '', 'modified': '2010-02-12 12:41:03', 'doctype': 'Table Mapper Detail', 'match_id': 1, 'idx': 2, 'parenttype': 'DocType Mapper', 'from_table': 'PF Detail', 'owner': 'jai@webnotestech.com', 'docstatus': 0, 'to_table': 'PP Detail', 'from_field': 'pf_details', 'validation_logic': 'docstatus =1 and qty > planned_qty ', 'parentfield': 'table_mapper_details'}]
\ No newline at end of file
+# DocType Mapper, Production Forecast-Production Planning Tool
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:35',
+		'docstatus': 0,
+		'modified': '2010-02-12 12:41:03',
+		'modified_by': 'Administrator',
+		'owner': 'jai@webnotestech.com'
+	},
+
+	# These values are common for all Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'name': '__common__',
+		'parent': 'Production Forecast-Production Planning Tool',
+		'parentfield': 'table_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'map': 'Yes',
+		'match_id': 1,
+		'name': '__common__',
+		'parent': 'Production Forecast-Production Planning Tool',
+		'parentfield': 'field_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all DocType Mapper
+	{
+		'doctype': 'DocType Mapper',
+		'from_doctype': 'Production Forecast',
+		'module': 'Production',
+		'name': '__common__',
+		'to_doctype': 'Production Planning Tool'
+	},
+
+	# DocType Mapper, Production Forecast-Production Planning Tool
+	{
+		'doctype': 'DocType Mapper',
+		'name': 'Production Forecast-Production Planning Tool'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'item_code',
+		'idx': 1,
+		'to_field': 'item_code'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'description',
+		'idx': 2,
+		'to_field': 'description'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'stock_uom',
+		'idx': 3,
+		'to_field': 'stock_uom'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'eval:flt(obj.qty)-flt(obj.planned_qty)',
+		'idx': 4,
+		'to_field': 'prevdoc_reqd_qty'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'parenttype',
+		'idx': 5,
+		'to_field': 'source_doctype'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'parent',
+		'idx': 6,
+		'to_field': 'source_docname'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'end_date',
+		'idx': 7,
+		'to_field': 'confirmation_date'
+	},
+
+	# Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'from_table': 'Production Forecast',
+		'idx': 1,
+		'match_id': 0,
+		'to_table': 'Production Planning Tool',
+		'validation_logic': 'docstatus =1'
+	},
+
+	# Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'from_field': 'pf_details',
+		'from_table': 'PF Detail',
+		'idx': 2,
+		'match_id': 1,
+		'to_field': 'pp_details',
+		'to_table': 'PP Detail',
+		'validation_logic': 'docstatus =1 and qty > planned_qty '
+	}
+]
\ No newline at end of file
diff --git a/production/DocType Mapper/Sales Order-Production Plan/Sales Order-Production Plan.txt b/production/DocType Mapper/Sales Order-Production Plan/Sales Order-Production Plan.txt
index 04dc127..5132c78 100644
--- a/production/DocType Mapper/Sales Order-Production Plan/Sales Order-Production Plan.txt
+++ b/production/DocType Mapper/Sales Order-Production Plan/Sales Order-Production Plan.txt
@@ -1 +1,134 @@
-[{'modified_by': 'nabin@webnotestech.com', 'name': 'Sales Order-Production Plan', 'parent': None, 'to_doctype': 'Production Plan', 'creation': '2009-09-08 15:40:01', 'modified': '2009-12-21 13:16:59', 'module': 'Mapper', 'doctype': 'DocType Mapper', 'idx': None, 'parenttype': None, 'ref_doc_submitted': 1, 'owner': 'Administrator', 'docstatus': 0, 'from_doctype': 'Sales Order', 'parentfield': None}, {'map': 'Yes', 'modified_by': 'nabin@webnotestech.com', 'name': 'FMD/00515', 'parent': 'Sales Order-Production Plan', 'to_field': 'against_document', 'creation': '2009-09-08 15:40:01', 'modified': '2009-12-21 13:16:59', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 1, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'parenttype', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'nabin@webnotestech.com', 'name': 'FMD/00516', 'parent': 'Sales Order-Production Plan', 'to_field': 'document_no', 'creation': '2009-09-08 15:40:01', 'modified': '2009-12-21 13:16:59', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 2, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'parent', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'nabin@webnotestech.com', 'name': 'FMD/00511', 'parent': 'Sales Order-Production Plan', 'to_field': 'item_code', 'creation': '2009-09-08 15:40:01', 'modified': '2009-12-21 13:16:59', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 3, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'item_code', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'nabin@webnotestech.com', 'name': 'FMD/00512', 'parent': 'Sales Order-Production Plan', 'to_field': 'description', 'creation': '2009-09-08 15:40:01', 'modified': '2009-12-21 13:16:59', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 4, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'description', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'nabin@webnotestech.com', 'name': 'FMD/00513', 'parent': 'Sales Order-Production Plan', 'to_field': 'stock_uom', 'creation': '2009-09-08 15:40:01', 'modified': '2009-12-21 13:16:59', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 5, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'uom', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'nabin@webnotestech.com', 'name': 'FMD/00514', 'parent': 'Sales Order-Production Plan', 'to_field': 'prevdoc_total_qty', 'creation': '2009-09-08 15:40:01', 'modified': '2009-12-21 13:16:59', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 6, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'eval:flt(obj.qty)-flt(obj.planned_qty)', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'nabin@webnotestech.com', 'name': 'FMD/00517', 'parent': 'Sales Order-Production Plan', 'to_field': 'document_date', 'creation': '2009-09-08 15:40:01', 'modified': '2009-12-21 13:16:59', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 7, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'transaction_date', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'nabin@webnotestech.com', 'name': 'FMD/00518', 'parent': 'Sales Order-Production Plan', 'to_field': 'delivery_date', 'creation': '2009-09-08 15:40:01', 'modified': '2009-12-21 13:16:59', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 8, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'delivery_date', 'parentfield': 'field_mapper_details'}, {'reference_key': None, 'modified_by': 'nabin@webnotestech.com', 'name': 'TMD/0000050', 'parent': 'Sales Order-Production Plan', 'is_reference_table': None, 'to_field': None, 'creation': '2009-09-08 15:40:01', 'reference_doctype_key': None, 'modified': '2009-12-21 13:16:59', 'doctype': 'Table Mapper Detail', 'match_id': 0, 'idx': 1, 'parenttype': 'DocType Mapper', 'from_table': 'Sales Order', 'owner': 'Administrator', 'docstatus': 0, 'to_table': 'Production Plan', 'from_field': '', 'validation_logic': 'docstatus =1', 'parentfield': 'table_mapper_details'}, {'reference_key': None, 'modified_by': 'nabin@webnotestech.com', 'name': 'TMD/0000051', 'parent': 'Sales Order-Production Plan', 'is_reference_table': None, 'to_field': 'pp_details', 'creation': '2009-09-08 15:40:01', 'reference_doctype_key': None, 'modified': '2009-12-21 13:16:59', 'doctype': 'Table Mapper Detail', 'match_id': 1, 'idx': 2, 'parenttype': 'DocType Mapper', 'from_table': 'Delivery Note Packing Detail', 'owner': 'Administrator', 'docstatus': 0, 'to_table': 'PP Detail', 'from_field': 'packing_details', 'validation_logic': 'docstatus =1 and qty > planned_qty', 'parentfield': 'table_mapper_details'}]
\ No newline at end of file
+# DocType Mapper, Sales Order-Production Plan
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:36',
+		'docstatus': 0,
+		'modified': '2009-12-21 13:16:59',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'name': '__common__',
+		'parent': 'Sales Order-Production Plan',
+		'parentfield': 'table_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'map': 'Yes',
+		'match_id': 1,
+		'name': '__common__',
+		'parent': 'Sales Order-Production Plan',
+		'parentfield': 'field_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all DocType Mapper
+	{
+		'doctype': 'DocType Mapper',
+		'from_doctype': 'Sales Order',
+		'module': 'Production',
+		'name': '__common__',
+		'ref_doc_submitted': 1,
+		'to_doctype': 'Production Plan'
+	},
+
+	# DocType Mapper, Sales Order-Production Plan
+	{
+		'doctype': 'DocType Mapper',
+		'name': 'Sales Order-Production Plan'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'parenttype',
+		'idx': 1,
+		'to_field': 'against_document'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'parent',
+		'idx': 2,
+		'to_field': 'document_no'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'item_code',
+		'idx': 3,
+		'to_field': 'item_code'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'description',
+		'idx': 4,
+		'to_field': 'description'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'uom',
+		'idx': 5,
+		'to_field': 'stock_uom'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'eval:flt(obj.qty)-flt(obj.planned_qty)',
+		'idx': 6,
+		'to_field': 'prevdoc_total_qty'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'transaction_date',
+		'idx': 7,
+		'to_field': 'document_date'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'delivery_date',
+		'idx': 8,
+		'to_field': 'delivery_date'
+	},
+
+	# Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'from_table': 'Sales Order',
+		'idx': 1,
+		'match_id': 0,
+		'to_table': 'Production Plan',
+		'validation_logic': 'docstatus =1'
+	},
+
+	# Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'from_field': 'packing_details',
+		'from_table': 'Delivery Note Packing Detail',
+		'idx': 2,
+		'match_id': 1,
+		'to_field': 'pp_details',
+		'to_table': 'PP Detail',
+		'validation_logic': 'docstatus =1 and qty > planned_qty'
+	}
+]
\ No newline at end of file
diff --git a/production/Role/Production Manager/Production Manager.txt b/production/Role/Production Manager/Production Manager.txt
index b6cad1e..b87fc74 100644
--- a/production/Role/Production Manager/Production Manager.txt
+++ b/production/Role/Production Manager/Production Manager.txt
@@ -1 +1,26 @@
-[{'modified_by': 'Administrator', 'name': 'Production Manager', 'parent': None, 'creation': '2009-09-23 16:35:34', 'modified': '2009-09-23 16:35:35', 'module': 'Roles', 'doctype': 'Role', 'idx': None, 'parenttype': None, 'role_name': 'Production Manager', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': None}]
\ No newline at end of file
+# Role, Production Manager
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:51',
+		'docstatus': 0,
+		'modified': '2009-09-23 16:35:35',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Role
+	{
+		'doctype': 'Role',
+		'module': 'Production',
+		'name': '__common__',
+		'role_name': 'Production Manager'
+	},
+
+	# Role, Production Manager
+	{
+		'doctype': 'Role',
+		'name': 'Production Manager'
+	}
+]
\ No newline at end of file
diff --git a/production/Role/Production User/Production User.txt b/production/Role/Production User/Production User.txt
index 5d1e64e..ed6d6d6 100644
--- a/production/Role/Production User/Production User.txt
+++ b/production/Role/Production User/Production User.txt
@@ -1 +1,26 @@
-[{'modified_by': 'Administrator', 'name': 'Production User', 'parent': None, 'creation': '2009-09-23 16:36:08', 'modified': '2009-09-23 16:36:08', 'module': 'Roles', 'doctype': 'Role', 'idx': None, 'parenttype': None, 'role_name': 'Production User', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': None}]
\ No newline at end of file
+# Role, Production User
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:51',
+		'docstatus': 0,
+		'modified': '2009-09-23 16:36:08',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Role
+	{
+		'doctype': 'Role',
+		'module': 'Production',
+		'name': '__common__',
+		'role_name': 'Production User'
+	},
+
+	# Role, Production User
+	{
+		'doctype': 'Role',
+		'name': 'Production User'
+	}
+]
\ No newline at end of file
diff --git a/production/search_criteria/consumption_against_production/consumption_against_production.txt b/production/search_criteria/consumption_against_production/consumption_against_production.txt
index 152069e..a0da069 100644
--- a/production/search_criteria/consumption_against_production/consumption_against_production.txt
+++ b/production/search_criteria/consumption_against_production/consumption_against_production.txt
@@ -1,37 +1,37 @@
+# Search Criteria, consumption_against_production
 [
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:32',
+		'docstatus': 0,
+		'modified': '2010-06-11 16:32:48',
+		'modified_by': 'Administrator',
+		'owner': 'jai@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
 	{
 		'add_col': '`tabProduction Order`.consider_sa_items',
 		'add_cond': '`tabProduction Order`.name = `tabStock Entry`.production_order',
 		'add_tab': '`tabProduction Order`',
 		'columns': 'Stock Entry\x01ID,Stock Entry\x01Production Order,Stock Entry\x01Process,Stock Entry\x01Posting Date,Stock Entry\x01Company,Stock Entry Detail\x01Source Warehouse,Stock Entry Detail\x01Target Warehouse,Stock Entry Detail\x01FG Item,Stock Entry Detail\x01Item Code,Stock Entry Detail\x01Description,Stock Entry Detail\x01Reqd Qty,Stock Entry Detail\x01Transfer Quantity',
-		'creation': '2010-08-08 17:09:32',
 		'criteria_name': 'Consumption Against Production',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
 		'doc_type': 'Stock Entry Detail',
-		'docstatus': 0,
 		'doctype': 'Search Criteria',
 		'filters': "{'Stock Entry\x01Submitted':1,'Stock Entry\x01Purpose':'Production Order','Stock Entry\x01Process':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2010-06-11 16:32:48',
-		'modified_by': 'Administrator',
 		'module': 'Production',
-		'name': 'consumption_against_production',
-		'owner': 'jai@webnotestech.com',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Stock Entry',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabStock Entry`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, consumption_against_production
+	{
+		'doctype': 'Search Criteria',
+		'name': 'consumption_against_production'
 	}
 ]
\ No newline at end of file
diff --git a/production/search_criteria/delivery_plan/delivery_plan.txt b/production/search_criteria/delivery_plan/delivery_plan.txt
index ba35b90..683acb7 100644
--- a/production/search_criteria/delivery_plan/delivery_plan.txt
+++ b/production/search_criteria/delivery_plan/delivery_plan.txt
@@ -1,37 +1,37 @@
+# Search Criteria, delivery_plan
 [
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-09-01 15:48:09',
+		'docstatus': 0,
+		'modified': '2010-08-30 14:06:22',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
 	{
 		'add_col': "SUM(`tabSales Order Detail`.`pending_qty` * `tabSales Order Detail`.`basic_rate` ) AS 'Amount'",
 		'add_cond': "`tabSales Order Detail`.pending_qty > 0 and (`tabSales Order Detail`.confirmation_date is not null or `tabSales Order Detail`.confirmation_date!='' or `tabSales Order Detail`.confirmation_date != '00-00-0000')",
-		'add_tab': None,
 		'columns': 'Sales Order\x01ID,Sales Order\x01Customer,Sales Order\x01Customer Name',
-		'creation': '2010-09-01 15:47:57',
 		'criteria_name': 'Delivery Plan',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
 		'doc_type': 'Sales Order Detail',
-		'docstatus': 0,
 		'doctype': 'Search Criteria',
 		'filters': "{'Sales Order\x01Saved':1,'Sales Order\x01Submitted':1,'Sales Order\x01Status':'','Sales Order\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
 		'group_by': '`tabSales Order Detail`.`confirmation_date`, `tabSales Order`.`name`',
-		'idx': None,
-		'modified': '2010-08-30 14:06:22',
-		'modified_by': 'Administrator',
 		'module': 'Production',
-		'name': 'delivery_plan',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Sales Order',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': '',
 		'sort_by': '`tabSales Order`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, delivery_plan
+	{
+		'doctype': 'Search Criteria',
+		'name': 'delivery_plan'
 	}
 ]
\ No newline at end of file
diff --git a/production/search_criteria/itemwise_production_report/itemwise_production_report.txt b/production/search_criteria/itemwise_production_report/itemwise_production_report.txt
index 5058455..b861d17 100644
--- a/production/search_criteria/itemwise_production_report/itemwise_production_report.txt
+++ b/production/search_criteria/itemwise_production_report/itemwise_production_report.txt
@@ -1,37 +1,34 @@
+# Search Criteria, itemwise_production_report
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Stock Entry\x01ID,Stock Entry\x01Posting Date,Stock Entry\x01Production Order,Stock Entry\x01Process,Stock Entry\x01Company,Stock Entry Detail\x01Target Warehouse,Stock Entry Detail\x01Item Code,Stock Entry Detail\x01Description,Stock Entry Detail\x01Stock UOM,Stock Entry Detail\x01Transfer Quantity',
 		'creation': '2010-08-08 17:09:32',
-		'criteria_name': 'Itemwise Production Report',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Stock Entry Detail',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Stock Entry\x01Saved':1,'Stock Entry\x01Submitted':1,'Stock Entry\x01Purpose':'Production Order','Stock Entry\x01Process':'Backflush','Stock Entry Detail\x01FG Item':1}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-06-14 15:50:44',
 		'modified_by': 'Administrator',
+		'owner': 'jai@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Stock Entry\x01ID,Stock Entry\x01Posting Date,Stock Entry\x01Production Order,Stock Entry\x01Process,Stock Entry\x01Company,Stock Entry Detail\x01Target Warehouse,Stock Entry Detail\x01Item Code,Stock Entry Detail\x01Description,Stock Entry Detail\x01Stock UOM,Stock Entry Detail\x01Transfer Quantity',
+		'criteria_name': 'Itemwise Production Report',
+		'doc_type': 'Stock Entry Detail',
+		'doctype': 'Search Criteria',
+		'filters': "{'Stock Entry\x01Saved':1,'Stock Entry\x01Submitted':1,'Stock Entry\x01Purpose':'Production Order','Stock Entry\x01Process':'Backflush','Stock Entry Detail\x01FG Item':1}",
 		'module': 'Production',
-		'name': 'itemwise_production_report',
-		'owner': 'jai@webnotestech.com',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Stock Entry',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabStock Entry`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, itemwise_production_report
+	{
+		'doctype': 'Search Criteria',
+		'name': 'itemwise_production_report'
 	}
 ]
\ No newline at end of file
diff --git a/production/search_criteria/production_orders_in_process/production_orders_in_process.txt b/production/search_criteria/production_orders_in_process/production_orders_in_process.txt
index a84aedc..a5fd27d 100644
--- a/production/search_criteria/production_orders_in_process/production_orders_in_process.txt
+++ b/production/search_criteria/production_orders_in_process/production_orders_in_process.txt
@@ -1,37 +1,34 @@
+# Search Criteria, production_orders_in_process
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': '`tabProduction Order`.qty > `tabProduction Order`.produced_qty',
-		'add_tab': None,
-		'columns': 'Production Order\x01ID,Production Order\x01Origin,Production Order\x01Status,Production Order\x01Posting Date,Production Order\x01Production Item,Production Order\x01BOM No,Production Order\x01Description,Production Order\x01Stock UOM,Production Order\x01Qty,Production Order\x01Produced Qty,Production Order\x01FG Warehouse,Production Order\x01WIP Warehouse,Production Order\x01Consider SA Items,Production Order\x01Fiscal Year,Production Order\x01Company',
 		'creation': '2010-08-08 17:09:32',
-		'criteria_name': 'Production Orders In Process',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Production Order',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Production Order\x01Submitted':1,'Production Order\x01Origin':'','Production Order\x01Status':'','Production Order\x01Consider SA Items':'','Production Order\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-06-15 10:01:15',
 		'modified_by': 'Administrator',
+		'owner': 'jai@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': '`tabProduction Order`.qty > `tabProduction Order`.produced_qty',
+		'columns': 'Production Order\x01ID,Production Order\x01Origin,Production Order\x01Status,Production Order\x01Posting Date,Production Order\x01Production Item,Production Order\x01BOM No,Production Order\x01Description,Production Order\x01Stock UOM,Production Order\x01Qty,Production Order\x01Produced Qty,Production Order\x01FG Warehouse,Production Order\x01WIP Warehouse,Production Order\x01Consider SA Items,Production Order\x01Fiscal Year,Production Order\x01Company',
+		'criteria_name': 'Production Orders In Process',
+		'doc_type': 'Production Order',
+		'doctype': 'Search Criteria',
+		'filters': "{'Production Order\x01Submitted':1,'Production Order\x01Origin':'','Production Order\x01Status':'','Production Order\x01Consider SA Items':'','Production Order\x01Fiscal Year':''}",
 		'module': 'Production',
-		'name': 'production_orders_in_process',
-		'owner': 'jai@webnotestech.com',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabProduction Order`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, production_orders_in_process
+	{
+		'doctype': 'Search Criteria',
+		'name': 'production_orders_in_process'
 	}
 ]
\ No newline at end of file
diff --git a/projects/Role/Projects User/Projects User.txt b/projects/Role/Projects User/Projects User.txt
index 53f1216..61a5a3b 100644
--- a/projects/Role/Projects User/Projects User.txt
+++ b/projects/Role/Projects User/Projects User.txt
@@ -1 +1,26 @@
-[{'modified_by': 'Administrator', 'name': 'Projects User', 'parent': None, 'creation': '2010-05-08 09:40:07', 'modified': '2010-05-08 09:40:07', 'module': 'Roles', 'doctype': 'Role', 'idx': None, 'parenttype': None, 'role_name': 'Projects User', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': None}, {'modified_by': 'yogesh@webnotestech.com', 'name': 'DEF000253', 'parent': 'Projects User', 'defvalue': 'Public', 'creation': '2010-11-19 10:47:59', 'defkey': 'customer_group', 'modified': '2010-11-19 10:47:59', 'doctype': 'DefaultValue', 'idx': None, 'parenttype': 'Role', 'owner': 'yogesh@webnotestech.com', 'docstatus': 0, 'parentfield': 'defaults'}]
\ No newline at end of file
+# Role, Projects User
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:51',
+		'docstatus': 0,
+		'modified': '2010-05-08 09:40:07',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Role
+	{
+		'doctype': 'Role',
+		'module': 'Projects',
+		'name': '__common__',
+		'role_name': 'Projects User'
+	},
+
+	# Role, Projects User
+	{
+		'doctype': 'Role',
+		'name': 'Projects User'
+	}
+]
\ No newline at end of file
diff --git a/projects/search_criteria/dispatch_report/dispatch_report.txt b/projects/search_criteria/dispatch_report/dispatch_report.txt
index 7a56aee..fbd19fb 100644
--- a/projects/search_criteria/dispatch_report/dispatch_report.txt
+++ b/projects/search_criteria/dispatch_report/dispatch_report.txt
@@ -1,37 +1,34 @@
+# Search Criteria, dispatch_report
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Delivery Note\x01ID,Delivery Note\x01Project Name,Delivery Note\x01Customer,Delivery Note\x01Customer Name,Delivery Note\x01Posting Date,Delivery Note Detail\x01Item Code,Delivery Note Detail\x01Item Name,Delivery Note Detail\x01Quantity,Delivery Note Detail\x01Amount*',
-		'creation': '2010-12-14 10:33:09',
-		'criteria_name': 'Dispatch Report',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Delivery Note Detail',
+		'creation': '2010-12-14 10:23:31',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Delivery Note\x01Saved':1,'Delivery Note\x01Submitted':1,'Delivery Note\x01Status':'Submitted','Delivery Note\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-11-05 20:34:19',
 		'modified_by': 'Administrator',
+		'owner': 'ashwini@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Delivery Note\x01ID,Delivery Note\x01Project Name,Delivery Note\x01Customer,Delivery Note\x01Customer Name,Delivery Note\x01Posting Date,Delivery Note Detail\x01Item Code,Delivery Note Detail\x01Item Name,Delivery Note Detail\x01Quantity,Delivery Note Detail\x01Amount*',
+		'criteria_name': 'Dispatch Report',
+		'doc_type': 'Delivery Note Detail',
+		'doctype': 'Search Criteria',
+		'filters': "{'Delivery Note\x01Saved':1,'Delivery Note\x01Submitted':1,'Delivery Note\x01Status':'Submitted','Delivery Note\x01Fiscal Year':''}",
 		'module': 'Projects',
-		'name': 'dispatch_report',
-		'owner': 'ashwini@webnotestech.com',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Delivery Note',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabDelivery Note`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, dispatch_report
+	{
+		'doctype': 'Search Criteria',
+		'name': 'dispatch_report'
 	}
 ]
\ No newline at end of file
diff --git a/projects/search_criteria/projectwise_delivered_qty_and_costs/projectwise_delivered_qty_and_costs.txt b/projects/search_criteria/projectwise_delivered_qty_and_costs/projectwise_delivered_qty_and_costs.txt
index 552b23c..a084040 100644
--- a/projects/search_criteria/projectwise_delivered_qty_and_costs/projectwise_delivered_qty_and_costs.txt
+++ b/projects/search_criteria/projectwise_delivered_qty_and_costs/projectwise_delivered_qty_and_costs.txt
@@ -1,37 +1,35 @@
+# Search Criteria, projectwise_delivered_qty_and_costs
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': 'IFNULL(`tabDelivery Note`.`project_name`,"")!=""',
-		'add_tab': None,
-		'columns': 'Delivery Note\x01ID,Delivery Note\x01Project Name,Delivery Note\x01Customer,Delivery Note\x01Customer Name,Delivery Note\x01% Billed,Delivery Note\x01% Installed,Delivery Note Detail\x01Item Code,Delivery Note Detail\x01Item Name,Delivery Note Detail\x01Quantity,Delivery Note Detail\x01Amount*',
-		'creation': '2010-12-14 10:33:09',
-		'criteria_name': 'Projectwise Delivered Qty and Costs',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Delivery Note Detail',
+		'creation': '2010-09-01 15:48:09',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Delivery Note\x01Saved':1,'Delivery Note\x01Submitted':1,'Delivery Note\x01Status':'Submitted','Delivery Note\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2010-11-05 20:33:28',
+		'modified': '2010-08-30 11:54:36',
 		'modified_by': 'Administrator',
+		'owner': 'harshada@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': 'IFNULL(`tabDelivery Note`.`project_name`,"")!=""',
+		'columns': 'Delivery Note\x01ID,Delivery Note\x01Project Name,Delivery Note\x01Customer,Delivery Note\x01Customer Name,Delivery Note Detail\x01Item Code,Delivery Note Detail\x01Item Name,Delivery Note Detail\x01Quantity,Delivery Note\x01Posting Date,Delivery Note\x01% Billed,Delivery Note Detail\x01Amount*',
+		'criteria_name': 'Projectwise Delivered Qty and Costs',
+		'doc_type': 'Delivery Note Detail',
+		'doctype': 'Search Criteria',
+		'filters': "{'Delivery Note\x01Submitted':1,'Delivery Note\x01Status':'Submitted','Delivery Note\x01Fiscal Year':''}",
 		'module': 'Projects',
-		'name': 'projectwise_delivered_qty_and_costs',
-		'owner': 'ashwini@webnotestech.com',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Delivery Note',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabDelivery Note`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, projectwise_delivered_qty_and_costs
+	{
+		'doctype': 'Search Criteria',
+		'name': 'projectwise_delivered_qty_and_costs'
 	}
 ]
\ No newline at end of file
diff --git a/projects/search_criteria/projectwise_pending_qty_and_costs/projectwise_pending_qty_and_costs.txt b/projects/search_criteria/projectwise_pending_qty_and_costs/projectwise_pending_qty_and_costs.txt
index 3e3108c..1c6821b 100644
--- a/projects/search_criteria/projectwise_pending_qty_and_costs/projectwise_pending_qty_and_costs.txt
+++ b/projects/search_criteria/projectwise_pending_qty_and_costs/projectwise_pending_qty_and_costs.txt
@@ -1,37 +1,36 @@
+# Search Criteria, projectwise_pending_qty_and_costs
 [
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-09-01 15:48:09',
+		'docstatus': 0,
+		'modified': '2010-08-30 14:21:20',
+		'modified_by': 'Administrator',
+		'owner': 'ashwini@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
 	{
 		'add_col': "SUM(`tabSales Order Detail`.`qty` - `tabSales Order Detail`.`delivered_qty`) AS 'Pending Qty'\nSUM((`tabSales Order Detail`.`qty` - `tabSales Order Detail`.`delivered_qty`)* `tabSales Order Detail`.basic_rate) AS 'Pending Amount'",
 		'add_cond': '`tabSales Order Detail`.`qty` > `tabSales Order Detail`.`delivered_qty`\nIFNULL(`tabSales Order`.`project_name`,"")!=""\n`tabSales Order`.order_type = \'Sales\'',
-		'add_tab': None,
 		'columns': 'Sales Order\x01ID,Sales Order\x01Project Name,Sales Order\x01Customer,Sales Order\x01Customer Name,Sales Order Detail\x01Item Code,Sales Order Detail\x01Item Name,Sales Order\x01%  Delivered,Sales Order\x01% Billed,Sales Order\x01Sales Order Date,Sales Order\x01Expected Delivery Date',
-		'creation': '2010-12-14 10:33:09',
 		'criteria_name': 'Projectwise Pending Qty and Costs',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
 		'doc_type': 'Sales Order Detail',
-		'docstatus': 0,
 		'doctype': 'Search Criteria',
 		'filters': "{'Sales Order\x01Submitted':1,'Sales Order\x01Status':'Submitted','Sales Order\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2010-08-30 14:21:20',
-		'modified_by': 'Administrator',
 		'module': 'Projects',
-		'name': 'projectwise_pending_qty_and_costs',
-		'owner': 'ashwini@webnotestech.com',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Sales Order',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': '',
 		'sort_by': '`tabSales Order`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, projectwise_pending_qty_and_costs
+	{
+		'doctype': 'Search Criteria',
+		'name': 'projectwise_pending_qty_and_costs'
 	}
 ]
\ No newline at end of file
diff --git a/projects/search_criteria/projectwise_purchase_details/projectwise_purchase_details.txt b/projects/search_criteria/projectwise_purchase_details/projectwise_purchase_details.txt
index de306a6..286ec98 100644
--- a/projects/search_criteria/projectwise_purchase_details/projectwise_purchase_details.txt
+++ b/projects/search_criteria/projectwise_purchase_details/projectwise_purchase_details.txt
@@ -1,37 +1,31 @@
+# Search Criteria, projectwise_purchase_details
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': '',
-		'creation': '2010-12-14 10:33:09',
-		'criteria_name': 'Projectwise Purchase Details',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Purchase Order',
+		'creation': '2010-12-14 10:23:31',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Purchase Order\x01Status':'','Purchase Order\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-11-12 09:23:17',
 		'modified_by': 'Administrator',
+		'owner': 'ashwini@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'criteria_name': 'Projectwise Purchase Details',
+		'doc_type': 'Purchase Order',
+		'doctype': 'Search Criteria',
+		'filters': "{'Purchase Order\x01Status':'','Purchase Order\x01Fiscal Year':''}",
 		'module': 'Projects',
-		'name': 'projectwise_purchase_details',
-		'owner': 'ashwini@webnotestech.com',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
-		'sort_by': '',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, projectwise_purchase_details
+	{
+		'doctype': 'Search Criteria',
+		'name': 'projectwise_purchase_details'
 	}
 ]
\ No newline at end of file
diff --git a/projects/search_criteria/projectwise_sales_details/projectwise_sales_details.txt b/projects/search_criteria/projectwise_sales_details/projectwise_sales_details.txt
index 59bea25..bb51f25 100644
--- a/projects/search_criteria/projectwise_sales_details/projectwise_sales_details.txt
+++ b/projects/search_criteria/projectwise_sales_details/projectwise_sales_details.txt
@@ -1,37 +1,31 @@
+# Search Criteria, projectwise_sales_details
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': '',
-		'creation': '2010-12-14 10:33:09',
-		'criteria_name': 'Projectwise Sales Details',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Sales Order',
+		'creation': '2010-12-14 10:23:31',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Sales Order\x01Saved':1,'Sales Order\x01Submitted':1,'Sales Order\x01Status':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-11-12 09:21:11',
 		'modified_by': 'Administrator',
+		'owner': 'harshada@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'criteria_name': 'Projectwise Sales Details',
+		'doc_type': 'Sales Order',
+		'doctype': 'Search Criteria',
+		'filters': "{'Sales Order\x01Saved':1,'Sales Order\x01Submitted':1,'Sales Order\x01Status':''}",
 		'module': 'Projects',
-		'name': 'projectwise_sales_details',
-		'owner': 'harshada@webnotestech.com',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
-		'sort_by': '',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, projectwise_sales_details
+	{
+		'doctype': 'Search Criteria',
+		'name': 'projectwise_sales_details'
 	}
 ]
\ No newline at end of file
diff --git a/projects/search_criteria/projectwise_sales_orders/projectwise_sales_orders.txt b/projects/search_criteria/projectwise_sales_orders/projectwise_sales_orders.txt
index 18b2bd2..9d172b6 100644
--- a/projects/search_criteria/projectwise_sales_orders/projectwise_sales_orders.txt
+++ b/projects/search_criteria/projectwise_sales_orders/projectwise_sales_orders.txt
@@ -1,37 +1,34 @@
+# Search Criteria, projectwise_sales_orders
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': "ifnull(`tabSales Order`.project_name ,'') != ''",
-		'add_tab': None,
-		'columns': 'Sales Order\x01ID,Sales Order\x01Status,Sales Order\x01Project Name,Sales Order\x01Customer,Sales Order\x01Sales Order Date,Sales Order\x01Expected Delivery Date,Sales Order\x01Quotation No,Sales Order\x01%  Delivered,Sales Order\x01% Billed,Sales Order\x01Grand Total*',
-		'creation': '2010-09-01 15:47:57',
-		'criteria_name': 'Projectwise Sales Orders',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Sales Order',
+		'creation': '2010-09-01 15:48:09',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Sales Order\x01Saved':1,'Sales Order\x01Submitted':1,'Sales Order\x01Status':'','Sales Order\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-08-30 14:21:59',
 		'modified_by': 'Administrator',
+		'owner': 'harshada@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': "ifnull(`tabSales Order`.project_name ,'') != ''",
+		'columns': 'Sales Order\x01ID,Sales Order\x01Status,Sales Order\x01Project Name,Sales Order\x01Customer,Sales Order\x01Sales Order Date,Sales Order\x01Expected Delivery Date,Sales Order\x01Quotation No,Sales Order\x01%  Delivered,Sales Order\x01% Billed,Sales Order\x01Grand Total*',
+		'criteria_name': 'Projectwise Sales Orders',
+		'doc_type': 'Sales Order',
+		'doctype': 'Search Criteria',
+		'filters': "{'Sales Order\x01Saved':1,'Sales Order\x01Submitted':1,'Sales Order\x01Status':'','Sales Order\x01Fiscal Year':''}",
 		'module': 'Projects',
-		'name': 'projectwise_sales_orders',
-		'owner': 'harshada@webnotestech.com',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabSales Order`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, projectwise_sales_orders
+	{
+		'doctype': 'Search Criteria',
+		'name': 'projectwise_sales_orders'
 	}
 ]
\ No newline at end of file
diff --git a/projects/search_criteria/timesheet_report/timesheet_report.txt b/projects/search_criteria/timesheet_report/timesheet_report.txt
index d289c41..77f9d33 100644
--- a/projects/search_criteria/timesheet_report/timesheet_report.txt
+++ b/projects/search_criteria/timesheet_report/timesheet_report.txt
@@ -1,37 +1,34 @@
+# Search Criteria, timesheet_report
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Timesheet\x01ID,Timesheet\x01Timesheet Date,Timesheet\x01Timesheet by,Timesheet Detail\x01Project Name,Timesheet Detail\x01Task Id,Timesheet Detail\x01Task Name,Timesheet Detail\x01Actual Start Time,Timesheet Detail\x01Actual End Time,Timesheet Detail\x01Total Hours (Actual)',
-		'creation': '2010-12-14 10:33:09',
-		'criteria_name': 'Timesheet Report',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Timesheet Detail',
+		'creation': '2010-12-14 10:23:31',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Timesheet\x01Saved':1,'Timesheet\x01Submitted':1}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-11-05 20:44:03',
 		'modified_by': 'Administrator',
+		'owner': 'ashwini@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Timesheet\x01ID,Timesheet\x01Timesheet Date,Timesheet\x01Timesheet by,Timesheet Detail\x01Project Name,Timesheet Detail\x01Task Id,Timesheet Detail\x01Task Name,Timesheet Detail\x01Actual Start Time,Timesheet Detail\x01Actual End Time,Timesheet Detail\x01Total Hours (Actual)',
+		'criteria_name': 'Timesheet Report',
+		'doc_type': 'Timesheet Detail',
+		'doctype': 'Search Criteria',
+		'filters': "{'Timesheet\x01Saved':1,'Timesheet\x01Submitted':1}",
 		'module': 'Projects',
-		'name': 'timesheet_report',
-		'owner': 'ashwini@webnotestech.com',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Timesheet',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabTimesheet`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, timesheet_report
+	{
+		'doctype': 'Search Criteria',
+		'name': 'timesheet_report'
 	}
 ]
\ No newline at end of file
diff --git a/selling/DocType Mapper/Delivery Note-Installation Note/Delivery Note-Installation Note.txt b/selling/DocType Mapper/Delivery Note-Installation Note/Delivery Note-Installation Note.txt
index 7f91614..a4afac7 100644
--- a/selling/DocType Mapper/Delivery Note-Installation Note/Delivery Note-Installation Note.txt
+++ b/selling/DocType Mapper/Delivery Note-Installation Note/Delivery Note-Installation Note.txt
@@ -1,476 +1,269 @@
+# DocType Mapper, Delivery Note-Installation Note
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': None,
-		'_user_tags': None,
 		'creation': '2010-08-08 17:09:34',
 		'docstatus': 0,
-		'doctype': u'DocType Mapper',
-		'from_doctype': 'Delivery Note',
-		'idx': None,
 		'modified': '2011-05-17 11:42:57',
 		'modified_by': 'Administrator',
-		'module': 'Mapper',
-		'name': 'Delivery Note-Installation Note',
-		'owner': 'Administrator',
-		'parent': None,
-		'parentfield': None,
-		'parenttype': None,
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'name': '__common__',
+		'parent': 'Delivery Note-Installation Note',
+		'parentfield': 'table_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'map': 'Yes',
+		'name': '__common__',
+		'parent': 'Delivery Note-Installation Note',
+		'parentfield': 'field_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all DocType Mapper
+	{
+		'doctype': 'DocType Mapper',
+		'from_doctype': 'Delivery Note',
+		'module': 'Selling',
+		'name': '__common__',
 		'ref_doc_submitted': 1,
 		'to_doctype': 'Installation Note'
 	},
+
+	# DocType Mapper, Delivery Note-Installation Note
+	{
+		'doctype': 'DocType Mapper',
+		'name': 'Delivery Note-Installation Note'
+	},
+
+	# Field Mapper Detail
 	{
 		'checking_operator': '=',
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'company',
 		'idx': 1,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00022',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Installation Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'company'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'fiscal_year',
 		'idx': 2,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00023',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Installation Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'fiscal_year'
 	},
+
+	# Field Mapper Detail
 	{
 		'checking_operator': '=',
-		'creation': '2010-09-01 15:48:10',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'customer',
 		'idx': 3,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00556',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Delivery Note-Installation Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'customer'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:24',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'customer_address',
 		'idx': 4,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': '000003477',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Installation Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'customer_address'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'customer_address',
-		'idx': 4,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2010-08-08 17:09:34',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00025',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Installation Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'address'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_person',
 		'idx': 5,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00026',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Installation Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_person'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'customer_name',
 		'idx': 6,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00024',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Installation Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'customer_name'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:24',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'address_display',
 		'idx': 7,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': '000003478',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Installation Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'address_display'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:24',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_display',
 		'idx': 8,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': '000003479',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Installation Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_display'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:24',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_mobile',
 		'idx': 9,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': '000003480',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Installation Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_mobile'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:24',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_email',
 		'idx': 10,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': '000003481',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Installation Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_email'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'territory',
 		'idx': 11,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00027',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Installation Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'territory'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:24',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'customer_group',
 		'idx': 12,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': '000003482',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Installation Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'customer_group'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'name',
 		'idx': 13,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00028',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Installation Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'delivery_note_no'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'name',
 		'idx': 14,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00029',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Installation Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'prevdoc_detail_docname'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'parent',
 		'idx': 15,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00030',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Installation Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'prevdoc_docname'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'parenttype',
 		'idx': 16,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00031',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Installation Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'prevdoc_doctype'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_code',
 		'idx': 17,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00032',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Installation Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_code'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'description',
 		'idx': 18,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00033',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Installation Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'description'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval: flt(obj.qty) - flt(obj.installed_qty)',
 		'idx': 19,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00034',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Installation Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'qty'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'serial_no',
 		'idx': 20,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00035',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Installation Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'serial_no'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-09 09:44:02',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'posting_date',
 		'idx': 21,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00551',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Delivery Note-Installation Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'prevdoc_date'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
 		'from_field': 'delivery_note_details',
 		'from_table': 'Delivery Note Detail',
 		'idx': 1,
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000005',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Installation Note',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
-		'reference_key': None,
 		'to_field': 'installed_item_details',
 		'to_table': 'Installed Item Details',
 		'validation_logic': 'qty > ifnull(installed_qty,0) and docstatus = 1'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
-		'from_field': None,
 		'from_table': 'Delivery Note',
 		'idx': 2,
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000006',
-		'owner': 'Administrator',
-		'parent': 'Delivery Note-Installation Note',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
-		'reference_key': None,
-		'to_field': None,
 		'to_table': 'Installation Note',
 		'validation_logic': 'docstatus = 1'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2010-08-09 09:44:02',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
-		'from_field': None,
 		'from_table': 'Delivery Note',
 		'idx': 3,
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000058',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Delivery Note-Installation Note',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'reference_doctype_key': 'prevdoc_doctype',
 		'reference_key': 'prevdoc_docname',
 		'to_field': 'installed_item_details',
diff --git a/selling/DocType Mapper/Enquiry-Quotation/Enquiry-Quotation.txt b/selling/DocType Mapper/Enquiry-Quotation/Enquiry-Quotation.txt
index b04d533..78f5a56 100644
--- a/selling/DocType Mapper/Enquiry-Quotation/Enquiry-Quotation.txt
+++ b/selling/DocType Mapper/Enquiry-Quotation/Enquiry-Quotation.txt
@@ -1,621 +1,293 @@
+# DocType Mapper, Enquiry-Quotation
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': None,
-		'_user_tags': None,
 		'creation': '2010-08-08 17:09:34',
 		'docstatus': 0,
-		'doctype': u'DocType Mapper',
-		'from_doctype': 'Enquiry',
-		'idx': None,
 		'modified': '2011-05-10 16:04:40',
 		'modified_by': 'Administrator',
-		'module': 'Mapper',
-		'name': 'Enquiry-Quotation',
-		'owner': 'Administrator',
-		'parent': None,
-		'parentfield': None,
-		'parenttype': None,
-		'ref_doc_submitted': 1,
-		'to_doctype': 'Quotation'
+		'owner': 'Administrator'
 	},
+
+	# These values are common for all Table Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'contact_no',
-		'idx': 1,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2010-08-08 17:09:34',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00080',
-		'owner': 'Administrator',
-		'parent': 'Enquiry-Quotation',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'contact_no'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'item_code',
-		'idx': 1,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00081',
-		'owner': 'Administrator',
-		'parent': 'Enquiry-Quotation',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'item_code'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'item_name',
-		'idx': 2,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00082',
-		'owner': 'Administrator',
-		'parent': 'Enquiry-Quotation',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'item_name'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'qty',
-		'idx': 3,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00084',
-		'owner': 'Administrator',
-		'parent': 'Enquiry-Quotation',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'qty'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'subject',
-		'idx': 4,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2010-08-08 17:09:34',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00083',
-		'owner': 'Administrator',
-		'parent': 'Enquiry-Quotation',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'enq_det'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'uom',
-		'idx': 4,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00085',
-		'owner': 'Administrator',
-		'parent': 'Enquiry-Quotation',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'stock_uom'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'source',
-		'idx': 5,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00086',
-		'owner': 'Administrator',
-		'parent': 'Enquiry-Quotation',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'source'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'campaign',
-		'idx': 6,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00087',
-		'owner': 'Administrator',
-		'parent': 'Enquiry-Quotation',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'campaign'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'name',
-		'idx': 7,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00088',
-		'owner': 'dhanalekshmi@webnotestech.com',
-		'parent': 'Enquiry-Quotation',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'enq_no'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-09-01 15:48:10',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'customer',
-		'idx': 8,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00560',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Enquiry-Quotation',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'customer'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:25',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'customer_address',
-		'idx': 9,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': '000003489',
-		'owner': 'Administrator',
-		'parent': 'Enquiry-Quotation',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'customer_address'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'customer_name',
-		'idx': 10,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2010-08-08 17:09:34',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00089',
-		'owner': 'dhanalekshmi@webnotestech.com',
-		'parent': 'Enquiry-Quotation',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'customer_name'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'contact_person',
-		'idx': 10,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00092',
-		'owner': 'dhanalekshmi@webnotestech.com',
-		'parent': 'Enquiry-Quotation',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'contact_person'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:25',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'address_display',
-		'idx': 11,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': '000003490',
-		'owner': 'dhanalekshmi@webnotestech.com',
-		'parent': 'Enquiry-Quotation',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'address_display'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-09-01 15:48:10',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'customer_name',
-		'idx': 11,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2010-09-01 15:48:10',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00561',
-		'owner': 'dhanalekshmi@webnotestech.com',
-		'parent': 'Enquiry-Quotation',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'customer_name'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:25',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'contact_display',
-		'idx': 12,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': '000003491',
-		'owner': 'Administrator',
-		'parent': 'Enquiry-Quotation',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'contact_display'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'address',
-		'idx': 12,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2010-08-08 17:09:34',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00091',
-		'owner': 'dhanalekshmi@webnotestech.com',
-		'parent': 'Enquiry-Quotation',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'customer_address'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:25',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'contact_mobile',
-		'idx': 13,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': '000003492',
-		'owner': 'Administrator',
-		'parent': 'Enquiry-Quotation',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'contact_mobile'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:25',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'contact_email',
-		'idx': 14,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': '000003493',
-		'owner': 'Administrator',
-		'parent': 'Enquiry-Quotation',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'contact_email'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'email_id',
-		'idx': 14,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2010-08-08 17:09:34',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00093',
-		'owner': 'dhanalekshmi@webnotestech.com',
-		'parent': 'Enquiry-Quotation',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'email_id'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'territory',
-		'idx': 15,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00094',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Enquiry-Quotation',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'territory'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'customer_group',
-		'idx': 16,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00090',
-		'owner': 'dhanalekshmi@webnotestech.com',
-		'parent': 'Enquiry-Quotation',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'customer_group'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'description',
-		'idx': 17,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00095',
-		'owner': 'dhanalekshmi@webnotestech.com',
-		'parent': 'Enquiry-Quotation',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'description'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'item_group',
-		'idx': 18,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00096',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Enquiry-Quotation',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'item_group'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'brand',
-		'idx': 19,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00097',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Enquiry-Quotation',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'brand'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'parent',
-		'idx': 20,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00098',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Enquiry-Quotation',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'prevdoc_docname'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'parenttype',
-		'idx': 21,
-		'map': 'Yes',
-		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00099',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Enquiry-Quotation',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'prevdoc_doctype'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'lead',
-		'idx': 22,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00100',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Enquiry-Quotation',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'lead'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'lead_name',
-		'idx': 23,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00101',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Enquiry-Quotation',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'lead_name'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'enquiry_from',
-		'idx': 24,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00102',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Enquiry-Quotation',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'quotation_to'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'enquiry_type',
-		'idx': 25,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00103',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Enquiry-Quotation',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'order_type'
-	},
-	{
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
-		'from_field': None,
-		'from_table': 'Enquiry',
-		'idx': 1,
-		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000011',
-		'owner': 'Administrator',
+		'name': '__common__',
 		'parent': 'Enquiry-Quotation',
 		'parentfield': 'table_mapper_details',
 		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
-		'reference_key': None,
-		'to_field': None,
-		'to_table': 'Quotation',
 		'validation_logic': 'docstatus=1'
 	},
+
+	# These values are common for all Field Mapper Detail
 	{
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
+		'doctype': 'Field Mapper Detail',
+		'map': 'Yes',
+		'name': '__common__',
+		'parent': 'Enquiry-Quotation',
+		'parentfield': 'field_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all DocType Mapper
+	{
+		'doctype': 'DocType Mapper',
+		'from_doctype': 'Enquiry',
+		'module': 'Selling',
+		'name': '__common__',
+		'ref_doc_submitted': 1,
+		'to_doctype': 'Quotation'
+	},
+
+	# DocType Mapper, Enquiry-Quotation
+	{
+		'doctype': 'DocType Mapper',
+		'name': 'Enquiry-Quotation'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'item_code',
+		'idx': 1,
+		'match_id': 1,
+		'to_field': 'item_code'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'item_name',
+		'idx': 2,
+		'match_id': 1,
+		'to_field': 'item_name'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'qty',
+		'idx': 3,
+		'match_id': 1,
+		'to_field': 'qty'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'uom',
+		'idx': 4,
+		'match_id': 1,
+		'to_field': 'stock_uom'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'source',
+		'idx': 5,
+		'match_id': 0,
+		'to_field': 'source'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'campaign',
+		'idx': 6,
+		'match_id': 0,
+		'to_field': 'campaign'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'name',
+		'idx': 7,
+		'match_id': 0,
+		'to_field': 'enq_no'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'customer',
+		'idx': 8,
+		'match_id': 0,
+		'to_field': 'customer'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'customer_address',
+		'idx': 9,
+		'match_id': 0,
+		'to_field': 'customer_address'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'contact_person',
+		'idx': 10,
+		'match_id': 0,
+		'to_field': 'contact_person'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'address_display',
+		'idx': 11,
+		'match_id': 0,
+		'to_field': 'address_display'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'contact_display',
+		'idx': 12,
+		'match_id': 0,
+		'to_field': 'contact_display'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'contact_mobile',
+		'idx': 13,
+		'match_id': 0,
+		'to_field': 'contact_mobile'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'contact_email',
+		'idx': 14,
+		'match_id': 0,
+		'to_field': 'contact_email'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'territory',
+		'idx': 15,
+		'match_id': 0,
+		'to_field': 'territory'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'customer_group',
+		'idx': 16,
+		'match_id': 0,
+		'to_field': 'customer_group'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'description',
+		'idx': 17,
+		'match_id': 1,
+		'to_field': 'description'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'item_group',
+		'idx': 18,
+		'match_id': 1,
+		'to_field': 'item_group'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'brand',
+		'idx': 19,
+		'match_id': 1,
+		'to_field': 'brand'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'parent',
+		'idx': 20,
+		'match_id': 1,
+		'to_field': 'prevdoc_docname'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'parenttype',
+		'idx': 21,
+		'match_id': 1,
+		'to_field': 'prevdoc_doctype'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'lead',
+		'idx': 22,
+		'match_id': 0,
+		'to_field': 'lead'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'lead_name',
+		'idx': 23,
+		'match_id': 0,
+		'to_field': 'lead_name'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'enquiry_from',
+		'idx': 24,
+		'match_id': 0,
+		'to_field': 'quotation_to'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'enquiry_type',
+		'idx': 25,
+		'match_id': 0,
+		'to_field': 'order_type'
+	},
+
+	# Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'from_table': 'Enquiry',
+		'idx': 1,
+		'match_id': 0,
+		'to_table': 'Quotation'
+	},
+
+	# Table Mapper Detail
+	{
 		'doctype': 'Table Mapper Detail',
 		'from_field': 'enq_details',
 		'from_table': 'Enquiry Detail',
 		'idx': 2,
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000012',
-		'owner': 'Administrator',
-		'parent': 'Enquiry-Quotation',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
-		'reference_key': None,
 		'to_field': 'quotation_details',
-		'to_table': 'Quotation Detail',
-		'validation_logic': 'docstatus=1'
+		'to_table': 'Quotation Detail'
 	}
 ]
\ No newline at end of file
diff --git a/selling/DocType Mapper/Lead-Customer/Lead-Customer.txt b/selling/DocType Mapper/Lead-Customer/Lead-Customer.txt
index 6b1b14b..d91672a 100644
--- a/selling/DocType Mapper/Lead-Customer/Lead-Customer.txt
+++ b/selling/DocType Mapper/Lead-Customer/Lead-Customer.txt
@@ -1 +1,161 @@
-[{'modified_by': 'ashwini@webnotestech.com', 'name': 'Lead-Customer', 'parent': None, 'to_doctype': 'Customer', 'creation': '2009-11-26 13:15:20', 'modified': '2010-10-14 13:39:44', 'module': 'Mapper', 'doctype': 'DocType Mapper', 'idx': None, 'parenttype': None, 'ref_doc_submitted': None, 'owner': 'Administrator', 'docstatus': 0, 'from_doctype': 'Lead', 'parentfield': None}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00604', 'parent': 'Lead-Customer', 'to_field': 'lead_name', 'creation': '2009-11-26 13:15:20', 'modified': '2010-10-14 13:39:44', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 1, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'name', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00605', 'parent': 'Lead-Customer', 'to_field': 'customer_name', 'creation': '2009-11-26 13:26:04', 'modified': '2010-10-14 13:39:44', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 2, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'company_name', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00606', 'parent': 'Lead-Customer', 'to_field': 'address_line1', 'creation': '2009-11-26 13:28:14', 'modified': '2010-10-14 13:39:44', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 3, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'address_line1', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00607', 'parent': 'Lead-Customer', 'to_field': 'address_line2', 'creation': '2009-11-26 13:28:14', 'modified': '2010-10-14 13:39:44', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 4, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'address_line2', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00608', 'parent': 'Lead-Customer', 'to_field': 'city', 'creation': '2009-11-26 13:28:50', 'modified': '2010-10-14 13:39:44', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 5, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'city', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00609', 'parent': 'Lead-Customer', 'to_field': 'country', 'creation': '2009-11-26 13:28:50', 'modified': '2010-10-14 13:39:44', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 6, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'country', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00610', 'parent': 'Lead-Customer', 'to_field': 'state', 'creation': '2009-11-26 13:29:50', 'modified': '2010-10-14 13:39:44', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 7, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'state', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00611', 'parent': 'Lead-Customer', 'to_field': 'pincode', 'creation': '2009-11-26 13:29:50', 'modified': '2010-10-14 13:39:44', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 8, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'pincode', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00612', 'parent': 'Lead-Customer', 'to_field': 'company', 'creation': '2009-11-26 13:30:21', 'modified': '2010-10-14 13:39:44', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 9, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'company', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00621', 'parent': 'Lead-Customer', 'to_field': 'territory', 'creation': '2009-11-30 12:02:58', 'modified': '2010-10-14 13:39:44', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 10, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'territory', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00845', 'parent': 'Lead-Customer', 'to_field': 'phone_1', 'creation': '2010-08-04 12:32:05', 'modified': '2010-10-14 13:39:44', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 11, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'ashwini@webnotestech.com', 'docstatus': 0, 'from_field': 'contact_no', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00975', 'parent': 'Lead-Customer', 'to_field': 'fax_1', 'creation': '2010-10-14 13:37:20', 'modified': '2010-10-14 13:39:44', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 12, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'ashwini@webnotestech.com', 'docstatus': 0, 'from_field': 'fax', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00976', 'parent': 'Lead-Customer', 'to_field': 'website', 'creation': '2010-10-14 13:37:20', 'modified': '2010-10-14 13:39:44', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 13, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'ashwini@webnotestech.com', 'docstatus': 0, 'from_field': 'website', 'parentfield': 'field_mapper_details'}, {'reference_key': '', 'modified_by': 'ashwini@webnotestech.com', 'name': 'TMD/0000061', 'parent': 'Lead-Customer', 'is_reference_table': None, 'to_field': None, 'creation': '2009-11-26 13:15:20', 'reference_doctype_key': '', 'modified': '2010-10-14 13:39:44', 'doctype': 'Table Mapper Detail', 'match_id': 0, 'idx': 1, 'parenttype': 'DocType Mapper', 'from_table': 'Lead', 'owner': 'Administrator', 'docstatus': 0, 'to_table': 'Customer', 'from_field': None, 'validation_logic': 'name is not null', 'parentfield': 'table_mapper_details'}]
\ No newline at end of file
+# DocType Mapper, Lead-Customer
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:34',
+		'docstatus': 0,
+		'modified': '2010-10-14 13:39:44',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'from_table': 'Lead',
+		'idx': 1,
+		'match_id': 0,
+		'name': '__common__',
+		'parent': 'Lead-Customer',
+		'parentfield': 'table_mapper_details',
+		'parenttype': 'DocType Mapper',
+		'to_table': 'Customer',
+		'validation_logic': 'name is not null'
+	},
+
+	# These values are common for all Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'map': 'Yes',
+		'match_id': 0,
+		'name': '__common__',
+		'parent': 'Lead-Customer',
+		'parentfield': 'field_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all DocType Mapper
+	{
+		'doctype': 'DocType Mapper',
+		'from_doctype': 'Lead',
+		'module': 'Selling',
+		'name': '__common__',
+		'to_doctype': 'Customer'
+	},
+
+	# DocType Mapper, Lead-Customer
+	{
+		'doctype': 'DocType Mapper',
+		'name': 'Lead-Customer'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'name',
+		'idx': 1,
+		'to_field': 'lead_name'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'company_name',
+		'idx': 2,
+		'to_field': 'customer_name'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'address_line1',
+		'idx': 3,
+		'to_field': 'address_line1'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'address_line2',
+		'idx': 4,
+		'to_field': 'address_line2'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'city',
+		'idx': 5,
+		'to_field': 'city'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'country',
+		'idx': 6,
+		'to_field': 'country'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'state',
+		'idx': 7,
+		'to_field': 'state'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'pincode',
+		'idx': 8,
+		'to_field': 'pincode'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'company',
+		'idx': 9,
+		'to_field': 'company'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'territory',
+		'idx': 10,
+		'to_field': 'territory'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'contact_no',
+		'idx': 11,
+		'to_field': 'phone_1'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'fax',
+		'idx': 12,
+		'to_field': 'fax_1'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'website',
+		'idx': 13,
+		'to_field': 'website'
+	},
+
+	# Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail'
+	}
+]
\ No newline at end of file
diff --git a/selling/DocType Mapper/Lead-Enquiry/Lead-Enquiry.txt b/selling/DocType Mapper/Lead-Enquiry/Lead-Enquiry.txt
index 9079494..716674d 100644
--- a/selling/DocType Mapper/Lead-Enquiry/Lead-Enquiry.txt
+++ b/selling/DocType Mapper/Lead-Enquiry/Lead-Enquiry.txt
@@ -1 +1,161 @@
-[{'modified_by': 'harshada@webnotestech.com', 'name': 'Lead-Enquiry', 'parent': None, 'to_doctype': 'Enquiry', 'creation': '2009-11-27 10:47:07', 'modified': '2010-08-05 20:21:54', 'module': 'Mapper', 'doctype': 'DocType Mapper', 'idx': None, 'parenttype': None, 'ref_doc_submitted': None, 'owner': 'Administrator', 'docstatus': 0, 'from_doctype': 'Lead', 'parentfield': None}, {'map': 'Yes', 'modified_by': 'harshada@webnotestech.com', 'name': 'FMD/00613', 'parent': 'Lead-Enquiry', 'to_field': 'source', 'creation': '2009-11-27 10:48:10', 'modified': '2010-08-05 20:21:54', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 1, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'source', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'harshada@webnotestech.com', 'name': 'FMD/00614', 'parent': 'Lead-Enquiry', 'to_field': 'campaign', 'creation': '2009-11-27 10:48:10', 'modified': '2010-08-05 20:21:54', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 2, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'campaign_name', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'harshada@webnotestech.com', 'name': 'FMD/00655', 'parent': 'Lead-Enquiry', 'to_field': 'contact_by', 'creation': '2009-12-29 11:23:15', 'modified': '2010-08-05 20:21:54', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 3, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'dhanalekshmi@webnotestech.com', 'docstatus': 0, 'from_field': 'contact_by', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'harshada@webnotestech.com', 'name': 'FMD/00656', 'parent': 'Lead-Enquiry', 'to_field': 'last_contact_date', 'creation': '2009-12-29 11:23:15', 'modified': '2010-08-05 20:21:54', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 4, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'dhanalekshmi@webnotestech.com', 'docstatus': 0, 'from_field': 'last_contact_date', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'harshada@webnotestech.com', 'name': 'FMD/00657', 'parent': 'Lead-Enquiry', 'to_field': 'contact_date_ref', 'creation': '2009-12-29 11:23:15', 'modified': '2010-08-05 20:21:54', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 5, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'dhanalekshmi@webnotestech.com', 'docstatus': 0, 'from_field': 'contact_date_ref', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'harshada@webnotestech.com', 'name': 'FMD/00658', 'parent': 'Lead-Enquiry', 'to_field': 'contact_date', 'creation': '2009-12-29 11:23:15', 'modified': '2010-08-05 20:21:54', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 6, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'dhanalekshmi@webnotestech.com', 'docstatus': 0, 'from_field': 'contact_date', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'harshada@webnotestech.com', 'name': 'FMD/00850', 'parent': 'Lead-Enquiry', 'to_field': 'enquiry_from', 'creation': '2010-08-05 19:57:36', 'modified': '2010-08-05 20:21:54', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 7, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'from_field': 'doctype', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'harshada@webnotestech.com', 'name': 'FMD/00851', 'parent': 'Lead-Enquiry', 'to_field': 'lead_name', 'creation': '2010-08-05 19:57:36', 'modified': '2010-08-05 20:21:54', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 8, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'from_field': 'lead_name', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'harshada@webnotestech.com', 'name': 'FMD/00852', 'parent': 'Lead-Enquiry', 'to_field': 'lead', 'creation': '2010-08-05 19:57:36', 'modified': '2010-08-05 20:21:54', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 9, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'from_field': 'name', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'harshada@webnotestech.com', 'name': 'FMD/00853', 'parent': 'Lead-Enquiry', 'to_field': 'address', 'creation': '2010-08-05 19:57:36', 'modified': '2010-08-05 20:21:54', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 10, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'from_field': 'address', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'harshada@webnotestech.com', 'name': 'FMD/00854', 'parent': 'Lead-Enquiry', 'to_field': 'contact_no', 'creation': '2010-08-05 19:57:36', 'modified': '2010-08-05 20:21:54', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 11, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'from_field': 'contact_no', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'harshada@webnotestech.com', 'name': 'FMD/00855', 'parent': 'Lead-Enquiry', 'to_field': 'email_id', 'creation': '2010-08-05 19:57:36', 'modified': '2010-08-05 20:21:54', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 12, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'from_field': 'email_id', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'harshada@webnotestech.com', 'name': 'FMD/00856', 'parent': 'Lead-Enquiry', 'to_field': 'territory', 'creation': '2010-08-05 20:21:54', 'modified': '2010-08-05 20:21:54', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 13, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'from_field': 'territory', 'parentfield': 'field_mapper_details'}, {'reference_key': '', 'modified_by': 'harshada@webnotestech.com', 'name': 'TMD/0000062', 'parent': 'Lead-Enquiry', 'is_reference_table': None, 'to_field': None, 'creation': '2009-11-27 10:48:10', 'reference_doctype_key': '', 'modified': '2010-08-05 20:21:54', 'doctype': 'Table Mapper Detail', 'match_id': 0, 'idx': 1, 'parenttype': 'DocType Mapper', 'from_table': 'Lead', 'owner': 'Administrator', 'docstatus': 0, 'to_table': 'Enquiry', 'from_field': None, 'validation_logic': 'name is not null', 'parentfield': 'table_mapper_details'}]
\ No newline at end of file
+# DocType Mapper, Lead-Enquiry
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:34',
+		'docstatus': 0,
+		'modified': '2010-08-05 20:21:54',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'from_table': 'Lead',
+		'idx': 1,
+		'match_id': 0,
+		'name': '__common__',
+		'parent': 'Lead-Enquiry',
+		'parentfield': 'table_mapper_details',
+		'parenttype': 'DocType Mapper',
+		'to_table': 'Enquiry',
+		'validation_logic': 'name is not null'
+	},
+
+	# These values are common for all Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'map': 'Yes',
+		'match_id': 0,
+		'name': '__common__',
+		'parent': 'Lead-Enquiry',
+		'parentfield': 'field_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all DocType Mapper
+	{
+		'doctype': 'DocType Mapper',
+		'from_doctype': 'Lead',
+		'module': 'Selling',
+		'name': '__common__',
+		'to_doctype': 'Enquiry'
+	},
+
+	# DocType Mapper, Lead-Enquiry
+	{
+		'doctype': 'DocType Mapper',
+		'name': 'Lead-Enquiry'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'source',
+		'idx': 1,
+		'to_field': 'source'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'campaign_name',
+		'idx': 2,
+		'to_field': 'campaign'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'contact_by',
+		'idx': 3,
+		'to_field': 'contact_by'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'last_contact_date',
+		'idx': 4,
+		'to_field': 'last_contact_date'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'contact_date_ref',
+		'idx': 5,
+		'to_field': 'contact_date_ref'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'contact_date',
+		'idx': 6,
+		'to_field': 'contact_date'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'doctype',
+		'idx': 7,
+		'to_field': 'enquiry_from'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'lead_name',
+		'idx': 8,
+		'to_field': 'lead_name'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'name',
+		'idx': 9,
+		'to_field': 'lead'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'address',
+		'idx': 10,
+		'to_field': 'address'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'contact_no',
+		'idx': 11,
+		'to_field': 'contact_no'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'email_id',
+		'idx': 12,
+		'to_field': 'email_id'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'territory',
+		'idx': 13,
+		'to_field': 'territory'
+	},
+
+	# Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail'
+	}
+]
\ No newline at end of file
diff --git a/selling/DocType Mapper/Project-Sales Order/Project-Sales Order.txt b/selling/DocType Mapper/Project-Sales Order/Project-Sales Order.txt
index f28cb70..1f54abd 100644
--- a/selling/DocType Mapper/Project-Sales Order/Project-Sales Order.txt
+++ b/selling/DocType Mapper/Project-Sales Order/Project-Sales Order.txt
@@ -1 +1,122 @@
-[{'modified_by': 'ashwini@webnotestech.com', 'name': 'Project-Sales Order', 'parent': None, 'to_doctype': 'Sales Order', 'creation': '2010-08-18 14:41:39', 'modified': '2010-09-01 14:23:28', 'module': 'Mapper', 'doctype': 'DocType Mapper', 'idx': None, 'parenttype': None, 'ref_doc_submitted': None, 'owner': 'ashwini@webnotestech.com', 'docstatus': 0, 'from_doctype': 'Project', 'parentfield': None}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00892', 'parent': 'Project-Sales Order', 'to_field': 'customer', 'creation': '2010-08-26 13:29:10', 'modified': '2010-09-01 14:23:28', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 1, 'parenttype': 'DocType Mapper', 'checking_operator': '=', 'check_reference_value': None, 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'from_field': 'customer', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00864', 'parent': 'Project-Sales Order', 'to_field': 'customer_name', 'creation': '2010-08-18 14:41:39', 'modified': '2010-09-01 14:23:28', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 2, 'parenttype': 'DocType Mapper', 'checking_operator': '', 'check_reference_value': None, 'owner': 'ashwini@webnotestech.com', 'docstatus': 0, 'from_field': 'customer_name', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00865', 'parent': 'Project-Sales Order', 'to_field': 'customer_address', 'creation': '2010-08-18 14:41:39', 'modified': '2010-09-01 14:23:28', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 3, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'ashwini@webnotestech.com', 'docstatus': 0, 'from_field': 'customer_address', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00866', 'parent': 'Project-Sales Order', 'to_field': 'contact_person', 'creation': '2010-08-18 14:41:39', 'modified': '2010-09-01 14:23:28', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 4, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'ashwini@webnotestech.com', 'docstatus': 0, 'from_field': 'contact_person', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00867', 'parent': 'Project-Sales Order', 'to_field': 'contact_no', 'creation': '2010-08-18 14:41:39', 'modified': '2010-09-01 14:23:28', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 5, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'ashwini@webnotestech.com', 'docstatus': 0, 'from_field': 'contact_no', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00868', 'parent': 'Project-Sales Order', 'to_field': 'email_id', 'creation': '2010-08-18 14:41:39', 'modified': '2010-09-01 14:23:28', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 6, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'ashwini@webnotestech.com', 'docstatus': 0, 'from_field': 'email_id', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00885', 'parent': 'Project-Sales Order', 'to_field': 'customer_group', 'creation': '2010-08-19 14:15:00', 'modified': '2010-09-01 14:23:28', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 7, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'from_field': 'customer_group', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00886', 'parent': 'Project-Sales Order', 'to_field': 'territory', 'creation': '2010-08-19 14:15:00', 'modified': '2010-09-01 14:23:28', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 8, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'from_field': 'territory', 'parentfield': 'field_mapper_details'}, {'reference_key': '', 'modified_by': 'ashwini@webnotestech.com', 'name': 'TMD/0000086', 'parent': 'Project-Sales Order', 'is_reference_table': None, 'to_field': None, 'creation': '2010-08-18 14:41:39', 'reference_doctype_key': '', 'modified': '2010-09-01 14:23:28', 'doctype': 'Table Mapper Detail', 'match_id': 0, 'idx': 1, 'parenttype': 'DocType Mapper', 'from_table': 'Project', 'owner': 'ashwini@webnotestech.com', 'docstatus': 0, 'to_table': 'Sales Order', 'from_field': None, 'validation_logic': 'name is not null', 'parentfield': 'table_mapper_details'}]
\ No newline at end of file
+# DocType Mapper, Project-Sales Order
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-09-01 15:48:10',
+		'docstatus': 0,
+		'modified': '2010-09-01 14:23:28',
+		'modified_by': 'Administrator',
+		'owner': 'ashwini@webnotestech.com'
+	},
+
+	# These values are common for all Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'from_table': 'Project',
+		'idx': 1,
+		'match_id': 0,
+		'name': '__common__',
+		'parent': 'Project-Sales Order',
+		'parentfield': 'table_mapper_details',
+		'parenttype': 'DocType Mapper',
+		'to_table': 'Sales Order',
+		'validation_logic': 'name is not null'
+	},
+
+	# These values are common for all Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'map': 'Yes',
+		'match_id': 0,
+		'name': '__common__',
+		'parent': 'Project-Sales Order',
+		'parentfield': 'field_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all DocType Mapper
+	{
+		'doctype': 'DocType Mapper',
+		'from_doctype': 'Project',
+		'module': 'Selling',
+		'name': '__common__',
+		'to_doctype': 'Sales Order'
+	},
+
+	# DocType Mapper, Project-Sales Order
+	{
+		'doctype': 'DocType Mapper',
+		'name': 'Project-Sales Order'
+	},
+
+	# Field Mapper Detail
+	{
+		'checking_operator': '=',
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'customer',
+		'idx': 1,
+		'to_field': 'customer'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'customer_name',
+		'idx': 2,
+		'to_field': 'customer_name'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'customer_address',
+		'idx': 3,
+		'to_field': 'customer_address'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'contact_person',
+		'idx': 4,
+		'to_field': 'contact_person'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'contact_no',
+		'idx': 5,
+		'to_field': 'contact_no'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'email_id',
+		'idx': 6,
+		'to_field': 'email_id'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'customer_group',
+		'idx': 7,
+		'to_field': 'customer_group'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'territory',
+		'idx': 8,
+		'to_field': 'territory'
+	},
+
+	# Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail'
+	}
+]
\ No newline at end of file
diff --git a/selling/DocType Mapper/Quotation-Sales Order/Quotation-Sales Order.txt b/selling/DocType Mapper/Quotation-Sales Order/Quotation-Sales Order.txt
index 7601da0..d05553d 100644
--- a/selling/DocType Mapper/Quotation-Sales Order/Quotation-Sales Order.txt
+++ b/selling/DocType Mapper/Quotation-Sales Order/Quotation-Sales Order.txt
@@ -1,1256 +1,706 @@
+# DocType Mapper, Quotation-Sales Order
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': None,
-		'_user_tags': None,
 		'creation': '2010-08-08 17:09:35',
 		'docstatus': 0,
-		'doctype': u'DocType Mapper',
-		'from_doctype': 'Quotation',
-		'idx': None,
 		'modified': '2011-05-17 12:55:58',
 		'modified_by': 'Administrator',
-		'module': 'Mapper',
-		'name': 'Quotation-Sales Order',
-		'owner': 'Administrator',
-		'parent': None,
-		'parentfield': None,
-		'parenttype': None,
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'name': '__common__',
+		'parent': 'Quotation-Sales Order',
+		'parentfield': 'table_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'name': '__common__',
+		'parent': 'Quotation-Sales Order',
+		'parentfield': 'field_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all DocType Mapper
+	{
+		'doctype': 'DocType Mapper',
+		'from_doctype': 'Quotation',
+		'module': 'Selling',
+		'name': '__common__',
 		'ref_doc_submitted': 1,
 		'to_doctype': 'Sales Order'
 	},
+
+	# DocType Mapper, Quotation-Sales Order
+	{
+		'doctype': 'DocType Mapper',
+		'name': 'Quotation-Sales Order'
+	},
+
+	# Field Mapper Detail
 	{
 		'checking_operator': '>=',
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'transaction_date',
 		'idx': 1,
 		'map': 'No',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00261',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'transaction_date'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'order_type',
 		'idx': 2,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00262',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'order_type'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'name',
 		'idx': 3,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00263',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'quotation_no'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'transaction_date',
 		'idx': 4,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00264',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'quotation_date'
 	},
+
+	# Field Mapper Detail
 	{
 		'checking_operator': '=',
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'company',
 		'idx': 5,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00265',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'company'
 	},
+
+	# Field Mapper Detail
 	{
 		'checking_operator': '=',
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'fiscal_year',
 		'idx': 6,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00266',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'fiscal_year'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'price_list_name',
 		'idx': 7,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00267',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'price_list_name'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'conversion_rate',
 		'idx': 8,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00268',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'conversion_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'currency',
 		'idx': 9,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00269',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'currency'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-09-01 15:48:10',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'customer',
 		'idx': 10,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00590',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'customer'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'customer_name',
 		'idx': 11,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00271',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'customer_name'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'customer_address',
 		'idx': 12,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00270',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'customer_address'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'contact_person',
-		'idx': 13,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00272',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'contact_person'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'contact_no',
-		'idx': 13,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2010-08-08 17:09:35',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00273',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'contact_no'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:26',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'address_display',
 		'idx': 14,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': '000003511',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'address_display'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'email_id',
-		'idx': 14,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2010-08-08 17:09:35',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00274',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'email_id'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:26',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_display',
 		'idx': 15,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': '000003512',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_display'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:26',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_mobile',
 		'idx': 16,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': '000003513',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_mobile'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:26',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_email',
 		'idx': 17,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': '000003514',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_email'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'territory',
 		'idx': 18,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00319',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'territory'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'customer_group',
 		'idx': 19,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00276',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'customer_group'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'charge',
 		'idx': 20,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00275',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'charge'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'parent',
 		'idx': 21,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00277',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'prevdoc_docname'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'adj_rate',
 		'idx': 22,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00278',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'adj_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'basic_rate',
 		'idx': 23,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00279',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'basic_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'amount',
 		'idx': 24,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00280',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'amount'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'stock_uom',
 		'idx': 25,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00281',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'stock_uom'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'ref_rate',
 		'idx': 26,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00282',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'ref_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'base_ref_rate',
 		'idx': 27,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00283',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'base_ref_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'description',
 		'idx': 28,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00284',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'description'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'qty',
 		'idx': 29,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00285',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'qty'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_code',
 		'idx': 30,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00286',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_code'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_name',
 		'idx': 31,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00287',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_name'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'brand',
 		'idx': 32,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00288',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'brand'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_group',
 		'idx': 33,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00289',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_group'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'export_rate',
 		'idx': 34,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00290',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'export_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'export_amount',
 		'idx': 35,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00291',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'export_amount'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_tax_rate',
 		'idx': 36,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00292',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_tax_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'net_total',
 		'idx': 37,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00293',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'net_total'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'other_charges_total',
 		'idx': 38,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00294',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'other_charges_total'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'grand_total',
 		'idx': 39,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00295',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'grand_total'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'rounded_total',
 		'idx': 40,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00296',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'rounded_total'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'in_words',
 		'idx': 41,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00297',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'in_words'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'grand_total_export',
 		'idx': 42,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00298',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'grand_total_export'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'rounded_total_export',
 		'idx': 43,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00299',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'rounded_total_export'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'in_words_export',
 		'idx': 44,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00300',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'in_words_export'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'charge_type',
 		'idx': 45,
 		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00301',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'charge_type'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'row_id',
 		'idx': 46,
 		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00302',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'row_id'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_wise_tax_detail',
 		'idx': 47,
 		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00303',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_wise_tax_detail'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'description',
 		'idx': 48,
 		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00304',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'description'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'account_head',
 		'idx': 49,
 		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00305',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'account_head'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'rate',
 		'idx': 50,
 		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00306',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'customer_mobile_no',
-		'idx': 50,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2010-08-08 17:09:35',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00310',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'customer_mobile_no'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'tax_amount',
 		'idx': 51,
 		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00307',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'tax_amount'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'total',
 		'idx': 52,
 		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00308',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'total'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'idx',
 		'idx': 53,
 		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00309',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'idx'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'sales_person',
 		'idx': 54,
 		'map': 'Yes',
 		'match_id': 3,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00311',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'sales_person'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'allocated_percentage',
 		'idx': 55,
 		'map': 'Yes',
 		'match_id': 3,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00312',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'allocated_percentage'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'allocated_amount',
 		'idx': 56,
 		'map': 'Yes',
 		'match_id': 3,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00313',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'allocated_amount'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'tc_name',
-		'idx': 57,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00314',
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'tc_name'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_person',
 		'idx': 57,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2010-08-08 17:09:35',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00317',
-		'owner': 'dhanalekshmi@webnotestech.com',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_person'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'tc_name',
+		'idx': 57,
+		'map': 'Yes',
+		'match_id': 0,
+		'to_field': 'tc_name'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'contact_person',
+		'idx': 57,
+		'map': 'Yes',
+		'match_id': 0,
+		'to_field': 'contact_person'
+	},
+
+	# Field Mapper Detail
+	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'source',
 		'idx': 58,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00315',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'source'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'campaign',
 		'idx': 59,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00316',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'campaign'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'terms',
 		'idx': 60,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00318',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'terms'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
 		'from_field': 'sales_team',
 		'from_table': 'Sales Team',
 		'idx': 1,
 		'match_id': 3,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000031',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
-		'reference_key': None,
 		'to_field': 'sales_team',
 		'to_table': 'Sales Team',
 		'validation_logic': 'name is not null'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
 		'from_field': 'other_charges',
 		'from_table': 'RV Tax Detail',
 		'idx': 2,
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000032',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
-		'reference_key': None,
 		'to_field': 'other_charges',
 		'to_table': 'RV Tax Detail',
 		'validation_logic': 'name is not null'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
 		'from_field': 'quotation_details',
 		'from_table': 'Quotation Detail',
 		'idx': 3,
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000033',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'reference_doctype_key': 'prevdoc_doctype',
-		'reference_key': None,
 		'to_field': 'sales_order_details',
 		'to_table': 'Sales Order Detail',
 		'validation_logic': 'name is not null'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
-		'from_field': None,
 		'from_table': 'Quotation',
 		'idx': 4,
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000034',
-		'owner': 'Administrator',
-		'parent': 'Quotation-Sales Order',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
 		'reference_key': 'prevdoc_docname',
-		'to_field': None,
 		'to_table': 'Sales Order',
 		'validation_logic': 'docstatus = 1'
 	}
diff --git a/selling/Role/Customer/Customer.txt b/selling/Role/Customer/Customer.txt
index 39d0d82..3f7e9d2 100644
--- a/selling/Role/Customer/Customer.txt
+++ b/selling/Role/Customer/Customer.txt
@@ -1 +1,26 @@
-[{'modified_by': 'Administrator', 'name': 'Customer', 'parent': None, 'creation': '2009-06-26 14:42:33', 'modified': '2009-06-26 14:42:33', 'module': 'Roles', 'doctype': 'Role', 'idx': None, 'parenttype': None, 'role_name': 'Customer', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': None}]
\ No newline at end of file
+# Role, Customer
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:51',
+		'docstatus': 0,
+		'modified': '2009-06-26 14:42:33',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Role
+	{
+		'doctype': 'Role',
+		'module': 'Selling',
+		'name': '__common__',
+		'role_name': 'Customer'
+	},
+
+	# Role, Customer
+	{
+		'doctype': 'Role',
+		'name': 'Customer'
+	}
+]
\ No newline at end of file
diff --git a/selling/Role/Partner/Partner.txt b/selling/Role/Partner/Partner.txt
index 037d9f7..339929c 100644
--- a/selling/Role/Partner/Partner.txt
+++ b/selling/Role/Partner/Partner.txt
@@ -1 +1,26 @@
-[{'modified_by': 'yogesh@webnotestech.com', 'name': 'Partner', 'parent': None, 'creation': '2009-07-13 11:29:39', 'modified': '2009-07-13 11:29:39', 'module': 'Roles', 'doctype': 'Role', 'idx': None, 'parenttype': None, 'role_name': 'Partner', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': None}]
\ No newline at end of file
+# Role, Partner
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:51',
+		'docstatus': 0,
+		'modified': '2009-07-13 11:29:39',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Role
+	{
+		'doctype': 'Role',
+		'module': 'Selling',
+		'name': '__common__',
+		'role_name': 'Partner'
+	},
+
+	# Role, Partner
+	{
+		'doctype': 'Role',
+		'name': 'Partner'
+	}
+]
\ No newline at end of file
diff --git a/selling/Role/Sales Manager/Sales Manager.txt b/selling/Role/Sales Manager/Sales Manager.txt
index 5136e7c..5d975fc 100644
--- a/selling/Role/Sales Manager/Sales Manager.txt
+++ b/selling/Role/Sales Manager/Sales Manager.txt
@@ -1 +1,26 @@
-[{'modified_by': 'Administrator', 'name': 'Sales Manager', 'parent': None, 'creation': '2010-04-08 12:07:36', 'modified': '2010-04-08 12:07:36', 'module': 'Roles', 'doctype': 'Role', 'idx': None, 'parenttype': None, 'role_name': 'Sales Manager', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': None}]
\ No newline at end of file
+# Role, Sales Manager
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:51',
+		'docstatus': 0,
+		'modified': '2010-04-08 12:07:36',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Role
+	{
+		'doctype': 'Role',
+		'module': 'Selling',
+		'name': '__common__',
+		'role_name': 'Sales Manager'
+	},
+
+	# Role, Sales Manager
+	{
+		'doctype': 'Role',
+		'name': 'Sales Manager'
+	}
+]
\ No newline at end of file
diff --git a/selling/Role/Sales Master Manager/Sales Master Manager.txt b/selling/Role/Sales Master Manager/Sales Master Manager.txt
index e973100..1140f99 100644
--- a/selling/Role/Sales Master Manager/Sales Master Manager.txt
+++ b/selling/Role/Sales Master Manager/Sales Master Manager.txt
@@ -1 +1,26 @@
-[{'modified_by': 'Administrator', 'name': 'Sales Master Manager', 'parent': None, 'creation': '2010-04-08 13:50:11', 'modified': '2010-04-08 13:50:11', 'module': 'Roles', 'doctype': 'Role', 'idx': None, 'parenttype': None, 'role_name': 'Sales Master Manager', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': None}]
\ No newline at end of file
+# Role, Sales Master Manager
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:51',
+		'docstatus': 0,
+		'modified': '2010-04-08 13:50:11',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Role
+	{
+		'doctype': 'Role',
+		'module': 'Selling',
+		'name': '__common__',
+		'role_name': 'Sales Master Manager'
+	},
+
+	# Role, Sales Master Manager
+	{
+		'doctype': 'Role',
+		'name': 'Sales Master Manager'
+	}
+]
\ No newline at end of file
diff --git a/selling/Role/Sales User/Sales User.txt b/selling/Role/Sales User/Sales User.txt
index ce9f91c..97229b8 100644
--- a/selling/Role/Sales User/Sales User.txt
+++ b/selling/Role/Sales User/Sales User.txt
@@ -1 +1,26 @@
-[{'modified_by': 'Administrator', 'name': 'Sales User', 'parent': None, 'creation': '2010-04-08 12:07:44', 'modified': '2010-04-08 12:07:44', 'module': 'Roles', 'doctype': 'Role', 'idx': None, 'parenttype': None, 'role_name': 'Sales User', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': None}]
\ No newline at end of file
+# Role, Sales User
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:51',
+		'docstatus': 0,
+		'modified': '2010-04-08 12:07:44',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Role
+	{
+		'doctype': 'Role',
+		'module': 'Selling',
+		'name': '__common__',
+		'role_name': 'Sales User'
+	},
+
+	# Role, Sales User
+	{
+		'doctype': 'Role',
+		'name': 'Sales User'
+	}
+]
\ No newline at end of file
diff --git a/selling/search_criteria/delivered_items_to_be_install/delivered_items_to_be_install.txt b/selling/search_criteria/delivered_items_to_be_install/delivered_items_to_be_install.txt
index 13dd74b..fb44274 100644
--- a/selling/search_criteria/delivered_items_to_be_install/delivered_items_to_be_install.txt
+++ b/selling/search_criteria/delivered_items_to_be_install/delivered_items_to_be_install.txt
@@ -1,37 +1,37 @@
+# Search Criteria, delivered_items_to_be_install
 [
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2011-03-30 11:03:20',
+		'docstatus': 0,
+		'modified': '2011-03-29 14:08:46',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
 	{
 		'add_col': "(`tabDelivery Note Detail`.`qty`- ifnull(`tabDelivery Note Detail`.`installed_qty`, 0)) AS 'Pending to Install'",
 		'add_cond': '`tabDelivery Note Detail`.`qty` > ifnull(`tabDelivery Note Detail`.`installed_qty`, 0)',
-		'add_tab': None,
 		'columns': 'Delivery Note\x01ID,Delivery Note\x01Status,Delivery Note\x01Customer,Delivery Note\x01Customer Name,Delivery Note\x01Contact Person,Delivery Note\x01Voucher Date,Delivery Note Detail\x01Item Code,Delivery Note Detail\x01Item Name,Delivery Note Detail\x01Quantity,Delivery Note Detail\x01Installed Qty,Delivery Note\x01% Installed',
-		'creation': '2011-05-09 11:04:19',
 		'criteria_name': 'Delivered Items to be Install',
-		'custom_query': '',
 		'description': 'Delivered Items to be Install',
-		'dis_filters': None,
-		'disabled': None,
 		'doc_type': 'Delivery Note Detail',
-		'docstatus': 0,
 		'doctype': 'Search Criteria',
 		'filters': "{'Delivery Note\x01Saved':1,'Delivery Note\x01Submitted':1,'Delivery Note\x01Status':'','Delivery Note\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2011-03-29 14:08:46',
-		'modified_by': 'Administrator',
-		'module': 'CRM',
-		'name': 'delivered_items_to_be_install',
-		'owner': 'Administrator',
+		'module': 'Selling',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Delivery Note',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabDelivery Note`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, delivered_items_to_be_install
+	{
+		'doctype': 'Search Criteria',
+		'name': 'delivered_items_to_be_install'
 	}
 ]
\ No newline at end of file
diff --git a/selling/search_criteria/delivery_note_itemwise_pending_to_bill/delivery_note_itemwise_pending_to_bill.txt b/selling/search_criteria/delivery_note_itemwise_pending_to_bill/delivery_note_itemwise_pending_to_bill.txt
index 732281c..5351e4e 100644
--- a/selling/search_criteria/delivery_note_itemwise_pending_to_bill/delivery_note_itemwise_pending_to_bill.txt
+++ b/selling/search_criteria/delivery_note_itemwise_pending_to_bill/delivery_note_itemwise_pending_to_bill.txt
@@ -1,37 +1,37 @@
+# Search Criteria, delivery_note_itemwise_pending_to_bill
 [
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:31',
+		'docstatus': 0,
+		'modified': '2010-04-06 17:22:13',
+		'modified_by': 'Administrator',
+		'owner': 'jai@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
 	{
 		'add_col': "SUM(`tabDelivery Note Detail`.`qty` - `tabDelivery Note Detail`.`billed_qty`) AS 'Pending Qty'\nSUM((`tabDelivery Note Detail`.`qty` - `tabDelivery Note Detail`.`billed_qty`) * `tabDelivery Note Detail`.`basic_rate`) AS 'Pending Amount'",
 		'add_cond': "`tabDelivery Note`.status != 'Stopped'\nCASE WHEN `tabDelivery Note`.`per_billed` IS NULL OR `tabDelivery Note`.per_billed = '' THEN 0 < 100 ELSE `tabDelivery Note`.per_billed <100 END",
-		'add_tab': None,
 		'columns': 'Delivery Note\x01ID,Delivery Note\x01Owner,Delivery Note\x01Status,Delivery Note\x01Customer Name,Delivery Note\x01Voucher Date,Delivery Note\x01% Billed,Delivery Note\x01Posting Date,Delivery Note\x01Company Name,Delivery Note\x01Fiscal Year,Delivery Note Detail\x01Item Code,Delivery Note Detail\x01Against Document No,Delivery Note Detail\x01Document Type,Delivery Note Detail\x01Against Document Detail No',
-		'creation': '2010-08-08 17:09:31',
 		'criteria_name': 'Delivery Note Itemwise Pending To Bill',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
 		'doc_type': 'Delivery Note Detail',
-		'docstatus': 0,
 		'doctype': 'Search Criteria',
 		'filters': "{'Delivery Note\x01Saved':1,'Delivery Note\x01Submitted':1,'Delivery Note\x01Status':'','Delivery Note\x01Company Name':'','Delivery Note\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
 		'group_by': '`tabDelivery Note Detail`.item_code, `tabDelivery Note`.`name`',
-		'idx': None,
-		'modified': '2010-04-06 17:22:13',
-		'modified_by': 'Administrator',
-		'module': 'CRM',
-		'name': 'delivery_note_itemwise_pending_to_bill',
-		'owner': 'jai@webnotestech.com',
+		'module': 'Selling',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Delivery Note',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabDelivery Note`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, delivery_note_itemwise_pending_to_bill
+	{
+		'doctype': 'Search Criteria',
+		'name': 'delivery_note_itemwise_pending_to_bill'
 	}
 ]
\ No newline at end of file
diff --git a/selling/search_criteria/follow_up_report/follow_up_report.txt b/selling/search_criteria/follow_up_report/follow_up_report.txt
index 0da414b..64271ac 100644
--- a/selling/search_criteria/follow_up_report/follow_up_report.txt
+++ b/selling/search_criteria/follow_up_report/follow_up_report.txt
@@ -1,37 +1,34 @@
+# Search Criteria, follow-up_report
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Lead\x01ID,Follow up\x01Date,Follow up\x01Notes,Follow up\x01Follow up type',
-		'creation': '2010-08-13 11:09:21',
-		'criteria_name': 'Follow-up Report',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Follow up',
+		'creation': '2010-09-01 15:48:09',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Lead\x01Status':'','Lead\x01Source':'','Lead\x01Lead Type':'','Lead\x01Rating':'','Lead\x01Market Segment':'','Lead\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-08-12 16:33:19',
 		'modified_by': 'Administrator',
-		'module': 'CRM',
-		'name': 'follow-up_report',
-		'owner': 'ashwini@webnotestech.com',
+		'owner': 'ashwini@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Lead\x01ID,Follow up\x01Date,Follow up\x01Notes,Follow up\x01Follow up type',
+		'criteria_name': 'Follow-up Report',
+		'doc_type': 'Follow up',
+		'doctype': 'Search Criteria',
+		'filters': "{'Lead\x01Status':'','Lead\x01Source':'','Lead\x01Lead Type':'','Lead\x01Rating':'','Lead\x01Market Segment':'','Lead\x01Fiscal Year':''}",
+		'module': 'Selling',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Lead',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabLead`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, follow-up_report
+	{
+		'doctype': 'Search Criteria',
+		'name': 'follow-up_report'
 	}
 ]
\ No newline at end of file
diff --git a/selling/search_criteria/gross_profit/gross_profit.txt b/selling/search_criteria/gross_profit/gross_profit.txt
index 9e3857c..7675319 100644
--- a/selling/search_criteria/gross_profit/gross_profit.txt
+++ b/selling/search_criteria/gross_profit/gross_profit.txt
@@ -1,37 +1,35 @@
+# Search Criteria, gross_profit
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Delivery Note\x01ID,Delivery Note\x01Posting Date,Delivery Note\x01Posting Time,Delivery Note Detail\x01Item Code,Delivery Note Detail\x01Item Name,Delivery Note Detail\x01Description,Delivery Note\x01Project Name,Delivery Note Detail\x01Quantity,Delivery Note Detail\x01Rate*,Delivery Note Detail\x01Amount*',
-		'creation': '2010-12-14 10:33:09',
-		'criteria_name': 'Gross Profit',
-		'custom_query': '',
-		'description': 'Invoice wise',
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Delivery Note Detail',
+		'creation': '2010-12-14 10:23:21',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Delivery Note\x01Submitted':1,'Delivery Note\x01Status':'','Delivery Note\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-11-10 12:39:03',
 		'modified_by': 'Administrator',
-		'module': 'CRM',
-		'name': 'gross_profit',
-		'owner': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Delivery Note\x01ID,Delivery Note\x01Posting Date,Delivery Note\x01Posting Time,Delivery Note Detail\x01Item Code,Delivery Note Detail\x01Item Name,Delivery Note Detail\x01Description,Delivery Note\x01Project Name,Delivery Note Detail\x01Quantity,Delivery Note Detail\x01Rate*,Delivery Note Detail\x01Amount*',
+		'criteria_name': 'Gross Profit',
+		'description': 'Invoice wise',
+		'doc_type': 'Delivery Note Detail',
+		'doctype': 'Search Criteria',
+		'filters': "{'Delivery Note\x01Submitted':1,'Delivery Note\x01Status':'','Delivery Note\x01Fiscal Year':''}",
+		'module': 'Selling',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Delivery Note',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabDelivery Note`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, gross_profit
+	{
+		'doctype': 'Search Criteria',
+		'name': 'gross_profit'
 	}
 ]
\ No newline at end of file
diff --git a/selling/search_criteria/itemwise_delivery_details/itemwise_delivery_details.txt b/selling/search_criteria/itemwise_delivery_details/itemwise_delivery_details.txt
index 6a6cac9..fbba495 100644
--- a/selling/search_criteria/itemwise_delivery_details/itemwise_delivery_details.txt
+++ b/selling/search_criteria/itemwise_delivery_details/itemwise_delivery_details.txt
@@ -1,37 +1,34 @@
+# Search Criteria, itemwise_delivery_details
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Delivery Note\x01ID,Delivery Note Detail\x01Item Code,Delivery Note Detail\x01Item Name,Delivery Note Detail\x01Quantity,Delivery Note Detail\x01Rate*,Delivery Note Detail\x01Amount*,Delivery Note Detail\x01Billed Qty,Delivery Note\x01Company',
-		'creation': '2010-11-10 15:04:42',
-		'criteria_name': 'Itemwise Delivery Details',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Delivery Note Detail',
+		'creation': '2010-11-10 15:04:43',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Delivery Note\x01Submitted':1,'Delivery Note\x01Status':'','Delivery Note\x01From Voucher Date\x01lower':'','Delivery Note\x01To Voucher Date\x01upper':'','Delivery Note\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-10-26 09:10:53',
 		'modified_by': 'Administrator',
-		'module': 'CRM',
-		'name': 'itemwise_delivery_details',
-		'owner': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Delivery Note\x01ID,Delivery Note Detail\x01Item Code,Delivery Note Detail\x01Item Name,Delivery Note Detail\x01Quantity,Delivery Note Detail\x01Rate*,Delivery Note Detail\x01Amount*,Delivery Note Detail\x01Billed Qty,Delivery Note\x01Company',
+		'criteria_name': 'Itemwise Delivery Details',
+		'doc_type': 'Delivery Note Detail',
+		'doctype': 'Search Criteria',
+		'filters': "{'Delivery Note\x01Submitted':1,'Delivery Note\x01Status':'','Delivery Note\x01From Voucher Date\x01lower':'','Delivery Note\x01To Voucher Date\x01upper':'','Delivery Note\x01Fiscal Year':''}",
+		'module': 'Selling',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Delivery Note',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabDelivery Note`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, itemwise_delivery_details
+	{
+		'doctype': 'Search Criteria',
+		'name': 'itemwise_delivery_details'
 	}
 ]
\ No newline at end of file
diff --git a/selling/search_criteria/itemwise_sales_details/itemwise_sales_details.txt b/selling/search_criteria/itemwise_sales_details/itemwise_sales_details.txt
index 00a5341..d224693 100644
--- a/selling/search_criteria/itemwise_sales_details/itemwise_sales_details.txt
+++ b/selling/search_criteria/itemwise_sales_details/itemwise_sales_details.txt
@@ -1,37 +1,34 @@
+# Search Criteria, itemwise_sales_details
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Sales Order\x01ID,Sales Order\x01Customer,Sales Order Detail\x01Item Code,Sales Order Detail\x01Item Name,Sales Order Detail\x01Quantity,Sales Order Detail\x01Basic Rate*,Sales Order Detail\x01Amount*,Sales Order Detail\x01Delivered Qty,Sales Order Detail\x01Billed Qty,Sales Order\x01Company',
-		'creation': '2010-09-01 15:47:57',
-		'criteria_name': 'Itemwise Sales Details',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Sales Order Detail',
+		'creation': '2010-09-01 15:48:09',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Sales Order\x01Submitted':1,'Sales Order\x01Status':'','Sales Order\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': '',
-		'idx': None,
 		'modified': '2010-08-30 12:22:47',
 		'modified_by': 'Administrator',
-		'module': 'CRM',
-		'name': 'itemwise_sales_details',
-		'owner': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Sales Order\x01ID,Sales Order\x01Customer,Sales Order Detail\x01Item Code,Sales Order Detail\x01Item Name,Sales Order Detail\x01Quantity,Sales Order Detail\x01Basic Rate*,Sales Order Detail\x01Amount*,Sales Order Detail\x01Delivered Qty,Sales Order Detail\x01Billed Qty,Sales Order\x01Company',
+		'criteria_name': 'Itemwise Sales Details',
+		'doc_type': 'Sales Order Detail',
+		'doctype': 'Search Criteria',
+		'filters': "{'Sales Order\x01Submitted':1,'Sales Order\x01Status':'','Sales Order\x01Fiscal Year':''}",
+		'module': 'Selling',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Sales Order',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabSales Order`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, itemwise_sales_details
+	{
+		'doctype': 'Search Criteria',
+		'name': 'itemwise_sales_details'
 	}
 ]
\ No newline at end of file
diff --git a/selling/search_criteria/monthly_despatched_trend/monthly_despatched_trend.txt b/selling/search_criteria/monthly_despatched_trend/monthly_despatched_trend.txt
index 99504e9..51733dc 100644
--- a/selling/search_criteria/monthly_despatched_trend/monthly_despatched_trend.txt
+++ b/selling/search_criteria/monthly_despatched_trend/monthly_despatched_trend.txt
@@ -1,37 +1,38 @@
+# Search Criteria, monthly_despatched_trend
 [
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:31',
+		'docstatus': 0,
+		'modified': '2010-06-07 15:19:13',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
 	{
 		'add_col': "month(`tabDelivery Note`.posting_date) AS 'Sales Month'\nsum(`tabDelivery Note`.net_total) AS 'Total Despatched'",
 		'add_cond': '`tabDelivery Note`.net_total > 10',
-		'add_tab': None,
-		'columns': '',
-		'creation': '2010-08-08 17:09:31',
 		'criteria_name': 'Monthly Despatched Trend',
-		'custom_query': '',
 		'description': 'Monthly Despatched Trend',
-		'dis_filters': None,
-		'disabled': None,
 		'doc_type': 'Delivery Note',
-		'docstatus': 0,
 		'doctype': 'Search Criteria',
 		'filters': "{'Delivery Note\x01Submitted':1,'Delivery Note\x01Status':'','Delivery Note\x01Chargeable':'Yes','Delivery Note\x01Department':'','Delivery Note\x01Type':'','Delivery Note\x01Company Name':'Janak Healthcare Pvt Ltd','Delivery Note\x01Fiscal Year':'2009-2010'}",
 		'graph_series': 'Despatched Month',
 		'graph_values': 'Total Despatched',
 		'group_by': 'month(`tabDelivery Note`.Posting_date)',
-		'idx': None,
-		'modified': '2010-06-07 15:19:13',
-		'modified_by': 'Administrator',
-		'module': 'CRM',
-		'name': 'monthly_despatched_trend',
-		'owner': 'Administrator',
+		'module': 'Selling',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`Sales Month`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, monthly_despatched_trend
+	{
+		'doctype': 'Search Criteria',
+		'name': 'monthly_despatched_trend'
 	}
 ]
\ No newline at end of file
diff --git a/selling/search_criteria/periodic_sales_summary/periodic_sales_summary.txt b/selling/search_criteria/periodic_sales_summary/periodic_sales_summary.txt
index d3099d5..4672949 100644
--- a/selling/search_criteria/periodic_sales_summary/periodic_sales_summary.txt
+++ b/selling/search_criteria/periodic_sales_summary/periodic_sales_summary.txt
@@ -1,37 +1,37 @@
+# Search Criteria, periodic_sales_summary
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': '',
-		'add_tab': None,
-		'columns': 'Sales Order Detail\x01Item Code,Sales Order Detail\x01Quantity,Sales Order Detail\x01Delivered Qty,Sales Order Detail\x01Billed Qty',
 		'creation': '2010-08-08 17:09:31',
+		'docstatus': 0,
+		'modified': '2010-06-03 13:09:00',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Sales Order Detail\x01Item Code,Sales Order Detail\x01Quantity,Sales Order Detail\x01Delivered Qty,Sales Order Detail\x01Billed Qty',
 		'criteria_name': 'Periodic Sales Summary',
-		'custom_query': '',
-		'description': None,
 		'dis_filters': 'fiscal_year',
 		'disabled': 1,
 		'doc_type': 'Sales Order Detail',
-		'docstatus': 0,
 		'doctype': 'Search Criteria',
 		'filters': "{'Sales Order\x01Submitted':1,'Sales Order\x01Company Name':'','Sales Order\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
 		'group_by': '`tabSales Order Detail`.`item_code`',
-		'idx': None,
-		'modified': '2010-06-03 13:09:00',
-		'modified_by': 'Administrator',
-		'module': 'CRM',
-		'name': 'periodic_sales_summary',
-		'owner': 'Administrator',
+		'module': 'Selling',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Sales Order',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': '',
 		'sort_by': '`tabSales Order Detail`.`item_code`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, periodic_sales_summary
+	{
+		'doctype': 'Search Criteria',
+		'name': 'periodic_sales_summary'
 	}
 ]
\ No newline at end of file
diff --git a/selling/search_criteria/sales_agentwise_commission/sales_agentwise_commission.txt b/selling/search_criteria/sales_agentwise_commission/sales_agentwise_commission.txt
index 27a0dbe..047a175 100644
--- a/selling/search_criteria/sales_agentwise_commission/sales_agentwise_commission.txt
+++ b/selling/search_criteria/sales_agentwise_commission/sales_agentwise_commission.txt
@@ -1,37 +1,37 @@
+# Search Criteria, sales_agentwise_commission
 [
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-26 11:52:28',
+		'docstatus': 0,
+		'modified': '2010-08-26 11:48:17',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
 	{
 		'add_col': "SUM(`tabSales Order`.`total_commission`) AS 'Total Commission'\nSUM(`tabSales Order`.`net_total`) AS 'Net Total'\n((SUM(`tabSales Order`.`total_commission`) / SUM(`tabSales Order`.`net_total`)) * 100) AS 'Average Commission Rate'",
 		'add_cond': '`tabSales Order`.`net_total` > 0',
-		'add_tab': None,
 		'columns': 'Sales Order\x01Business Associate',
-		'creation': '2010-08-26 11:52:27',
 		'criteria_name': 'Sales Agentwise Commission',
-		'custom_query': '',
 		'description': 'Sales Agentwise Commission',
-		'dis_filters': None,
 		'disabled': 1,
 		'doc_type': 'Sales Order',
-		'docstatus': 0,
 		'doctype': 'Search Criteria',
 		'filters': "{'Sales Order\x01Submitted':1}",
-		'graph_series': '',
-		'graph_values': '',
 		'group_by': '`tabSales Order`.`sales_partner`',
-		'idx': None,
-		'modified': '2010-08-26 11:48:17',
-		'modified_by': 'Administrator',
-		'module': 'CRM',
-		'name': 'sales_agentwise_commission',
-		'owner': 'Administrator',
+		'module': 'Selling',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
-		'sort_by': '',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, sales_agentwise_commission
+	{
+		'doctype': 'Search Criteria',
+		'name': 'sales_agentwise_commission'
 	}
 ]
\ No newline at end of file
diff --git a/selling/search_criteria/sales_orderwise_booking_&_delivery_summary/sales_orderwise_booking_&_delivery_summary.txt b/selling/search_criteria/sales_orderwise_booking_&_delivery_summary/sales_orderwise_booking_&_delivery_summary.txt
index cce0f0a..0ef2f07 100644
--- a/selling/search_criteria/sales_orderwise_booking_&_delivery_summary/sales_orderwise_booking_&_delivery_summary.txt
+++ b/selling/search_criteria/sales_orderwise_booking_&_delivery_summary/sales_orderwise_booking_&_delivery_summary.txt
@@ -1,37 +1,37 @@
+# Search Criteria, sales_orderwise_booking_&_delivery_summary
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': "SUM(CASE WHEN `tabSales Order`.`status` = 'Stopped' THEN (`tabSales Order Detail`.`delivered_qty` * `tabSales Order Detail`.`basic_rate`) ELSE (`tabSales Order Detail`.`qty` * `tabSales Order Detail`.`basic_rate`) END) AS 'Booking Total'\nSUM(`tabSales Order Detail`.`delivered_qty` * `tabSales Order Detail`.`basic_rate`) AS 'Delivered Amount'",
-		'add_cond': '',
-		'add_tab': None,
-		'columns': 'Sales Order\x01ID,Sales Order\x01Status,Sales Order\x01% Billed,Sales Order\x01Sales Order Date,Sales Order\x01Customer,Sales Order\x01Customer Name,Sales Order\x01Territory',
-		'creation': '2010-09-01 15:47:57',
-		'criteria_name': 'Sales Orderwise Booking & Delivery Summary',
-		'custom_query': '',
-		'description': 'Sales Orderwise Booking & Delivery Summary',
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Sales Order Detail',
+		'creation': '2010-09-01 15:48:09',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Sales Order\x01Submitted':1,'Sales Order\x01Status':'','Sales Order\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': '`tabSales Order`.`name`',
-		'idx': None,
 		'modified': '2010-08-30 12:48:21',
 		'modified_by': 'Administrator',
-		'module': 'CRM',
-		'name': 'sales_orderwise_booking_&_delivery_summary',
-		'owner': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_col': "SUM(CASE WHEN `tabSales Order`.`status` = 'Stopped' THEN (`tabSales Order Detail`.`delivered_qty` * `tabSales Order Detail`.`basic_rate`) ELSE (`tabSales Order Detail`.`qty` * `tabSales Order Detail`.`basic_rate`) END) AS 'Booking Total'\nSUM(`tabSales Order Detail`.`delivered_qty` * `tabSales Order Detail`.`basic_rate`) AS 'Delivered Amount'",
+		'columns': 'Sales Order\x01ID,Sales Order\x01Status,Sales Order\x01% Billed,Sales Order\x01Sales Order Date,Sales Order\x01Customer,Sales Order\x01Customer Name,Sales Order\x01Territory',
+		'criteria_name': 'Sales Orderwise Booking & Delivery Summary',
+		'description': 'Sales Orderwise Booking & Delivery Summary',
+		'doc_type': 'Sales Order Detail',
+		'doctype': 'Search Criteria',
+		'filters': "{'Sales Order\x01Submitted':1,'Sales Order\x01Status':'','Sales Order\x01Fiscal Year':''}",
+		'group_by': '`tabSales Order`.`name`',
+		'module': 'Selling',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Sales Order',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabSales Order`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, sales_orderwise_booking_&_delivery_summary
+	{
+		'doctype': 'Search Criteria',
+		'name': 'sales_orderwise_booking_&_delivery_summary'
 	}
 ]
\ No newline at end of file
diff --git a/selling/search_criteria/sales_orderwise_pending_amount_to_bill/sales_orderwise_pending_amount_to_bill.txt b/selling/search_criteria/sales_orderwise_pending_amount_to_bill/sales_orderwise_pending_amount_to_bill.txt
index 290df07..e46e10d 100644
--- a/selling/search_criteria/sales_orderwise_pending_amount_to_bill/sales_orderwise_pending_amount_to_bill.txt
+++ b/selling/search_criteria/sales_orderwise_pending_amount_to_bill/sales_orderwise_pending_amount_to_bill.txt
@@ -1,37 +1,38 @@
+# Search Criteria, sales_orderwise_pending_amount_to_bill
 [
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2011-03-30 11:03:20',
+		'docstatus': 0,
+		'modified': '2011-03-29 14:06:13',
+		'modified_by': 'Administrator',
+		'owner': 'dhanalekshmi@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
 	{
 		'add_col': 'SUM((`tabSales Order Detail`.`qty` - ifnull(`tabSales Order Detail`.`billed_qty`, 0)) * `tabSales Order Detail`.`basic_rate`) AS "Pending Amount"',
 		'add_cond': '`tabSales Order`.status != "Stopped"\n`tabSales Order`.order_type!="Maintenance"',
-		'add_tab': None,
 		'columns': 'Sales Order\x01ID,Sales Order\x01Customer,Sales Order\x01Customer Address,Sales Order\x01Status,Sales Order\x01%  Delivered,Sales Order\x01% Billed,Sales Order\x01Company Name,Sales Order\x01Sales Order Date,Sales Order\x01Net Total,Sales Order\x01Zone,Sales Order\x01Territory,Sales Order\x01Email Id',
-		'creation': '2011-05-09 11:04:19',
 		'criteria_name': 'Sales Orderwise Pending Amount To Bill',
-		'custom_query': '',
 		'description': 'Sales Orderwise Pending Amount To Bill',
-		'dis_filters': None,
-		'disabled': None,
 		'doc_type': 'Sales Order Detail',
-		'docstatus': 0,
 		'doctype': 'Search Criteria',
 		'filters': "{'Sales Order\x01Saved':1,'Sales Order\x01Submitted':1,'Sales Order\x01Company Name':'','Sales Order\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
 		'group_by': '`tabSales Order`.`name`',
-		'idx': None,
-		'modified': '2011-03-29 14:06:13',
-		'modified_by': 'Administrator',
-		'module': 'CRM',
-		'name': 'sales_orderwise_pending_amount_to_bill',
-		'owner': 'dhanalekshmi@webnotestech.com',
+		'module': 'Selling',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Sales Order',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabSales Order`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, sales_orderwise_pending_amount_to_bill
+	{
+		'doctype': 'Search Criteria',
+		'name': 'sales_orderwise_pending_amount_to_bill'
 	}
 ]
\ No newline at end of file
diff --git a/selling/search_criteria/sales_orderwise_pending_qty_to_deliver/sales_orderwise_pending_qty_to_deliver.txt b/selling/search_criteria/sales_orderwise_pending_qty_to_deliver/sales_orderwise_pending_qty_to_deliver.txt
index 31d8a21..74fc106 100644
--- a/selling/search_criteria/sales_orderwise_pending_qty_to_deliver/sales_orderwise_pending_qty_to_deliver.txt
+++ b/selling/search_criteria/sales_orderwise_pending_qty_to_deliver/sales_orderwise_pending_qty_to_deliver.txt
@@ -1,37 +1,38 @@
+# Search Criteria, sales_orderwise_pending_qty_to_deliver
 [
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2011-03-30 11:03:20',
+		'docstatus': 0,
+		'modified': '2011-03-29 14:02:58',
+		'modified_by': 'Administrator',
+		'owner': 'dhanalekshmi@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
 	{
 		'add_col': 'SUM(`tabSales Order Detail`.`qty` - ifnull(`tabSales Order Detail`.`delivered_qty`, 0)) AS "Pending Qty"',
 		'add_cond': '`tabSales Order`.status != "Stopped"\n`tabSales Order Detail`.`qty` > ifnull(`tabSales Order Detail`.`delivered_qty`, 0)',
-		'add_tab': None,
 		'columns': 'Sales Order\x01ID,Sales Order\x01Customer,Sales Order\x01Customer Name,Sales Order\x01Customer Address,Sales Order\x01Status,Sales Order\x01%  Delivered,Sales Order\x01% Billed,Sales Order\x01Sales Order Date,Sales Order\x01Territory,Sales Order\x01Email Id',
-		'creation': '2011-05-09 11:04:19',
 		'criteria_name': 'Sales Orderwise Pending Qty To Deliver',
-		'custom_query': '',
 		'description': 'Sales Orderwise Pending Qty To Deliver',
-		'dis_filters': None,
-		'disabled': None,
 		'doc_type': 'Sales Order Detail',
-		'docstatus': 0,
 		'doctype': 'Search Criteria',
 		'filters': "{'Sales Order\x01Saved':1,'Sales Order\x01Submitted':1,'Sales Order\x01Status':'','Sales Order\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
 		'group_by': '`tabSales Order`.`name`',
-		'idx': None,
-		'modified': '2011-03-29 14:02:58',
-		'modified_by': 'Administrator',
-		'module': 'CRM',
-		'name': 'sales_orderwise_pending_qty_to_deliver',
-		'owner': 'dhanalekshmi@webnotestech.com',
+		'module': 'Selling',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Sales Order',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': '',
-		'server_script': None,
 		'sort_by': '`tabSales Order`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, sales_orderwise_pending_qty_to_deliver
+	{
+		'doctype': 'Search Criteria',
+		'name': 'sales_orderwise_pending_qty_to_deliver'
 	}
 ]
\ No newline at end of file
diff --git a/selling/search_criteria/sales_persons_target_variance_item_group_wise/sales_persons_target_variance_item_group_wise.txt b/selling/search_criteria/sales_persons_target_variance_item_group_wise/sales_persons_target_variance_item_group_wise.txt
index 07ba395..ec2b338 100644
--- a/selling/search_criteria/sales_persons_target_variance_item_group_wise/sales_persons_target_variance_item_group_wise.txt
+++ b/selling/search_criteria/sales_persons_target_variance_item_group_wise/sales_persons_target_variance_item_group_wise.txt
@@ -1,37 +1,33 @@
+# Search Criteria, sales_persons_target_variance_item_group_wise
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': '',
-		'creation': '2010-12-14 10:33:09',
-		'criteria_name': 'Sales Persons Target Variance (Item Group wise)',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Target Detail',
+		'creation': '2010-10-12 15:19:31',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Sales Person\x01Country':'','Sales Person\x01State':'','Target Detail\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-09-25 17:22:58',
 		'modified_by': 'Administrator',
-		'module': 'CRM',
-		'name': 'sales_persons_target_variance_item_group_wise',
-		'owner': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'criteria_name': 'Sales Persons Target Variance (Item Group wise)',
+		'doc_type': 'Target Detail',
+		'doctype': 'Search Criteria',
+		'filters': "{'Sales Person\x01Country':'','Sales Person\x01State':'','Target Detail\x01Fiscal Year':''}",
+		'module': 'Selling',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Sales Person',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabTarget Detail`.`target_amount`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, sales_persons_target_variance_item_group_wise
+	{
+		'doctype': 'Search Criteria',
+		'name': 'sales_persons_target_variance_item_group_wise'
 	}
 ]
\ No newline at end of file
diff --git a/selling/search_criteria/sales_personwise_transaction_summary/sales_personwise_transaction_summary.txt b/selling/search_criteria/sales_personwise_transaction_summary/sales_personwise_transaction_summary.txt
index 1013bc4..2e53d6f 100755
--- a/selling/search_criteria/sales_personwise_transaction_summary/sales_personwise_transaction_summary.txt
+++ b/selling/search_criteria/sales_personwise_transaction_summary/sales_personwise_transaction_summary.txt
@@ -1,37 +1,33 @@
+# Search Criteria, sales_personwise_transaction_summary
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Sales Person\x01ID',
-		'creation': '2011-06-07 16:58:27',
-		'criteria_name': 'Sales Personwise Transaction Summary',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Sales Person',
+		'creation': '2011-06-08 11:00:34',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Sales Person\x01Saved':1,'Sales Person\x01Submitted':1,'Sales Person\x01Country':'','Sales Person\x01State':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2011-02-24 17:35:32',
 		'modified_by': 'Administrator',
-		'module': 'CRM',
-		'name': 'sales_personwise_transaction_summary',
-		'owner': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Sales Person\x01ID',
+		'criteria_name': 'Sales Personwise Transaction Summary',
+		'doc_type': 'Sales Person',
+		'doctype': 'Search Criteria',
+		'filters': "{'Sales Person\x01Saved':1,'Sales Person\x01Submitted':1,'Sales Person\x01Country':'','Sales Person\x01State':''}",
+		'module': 'Selling',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabSales Person`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, sales_personwise_transaction_summary
+	{
+		'doctype': 'Search Criteria',
+		'name': 'sales_personwise_transaction_summary'
 	}
 ]
\ No newline at end of file
diff --git a/selling/search_criteria/target_variance_report/target_variance_report.txt b/selling/search_criteria/target_variance_report/target_variance_report.txt
index 5264f63..7ffe1f3 100644
--- a/selling/search_criteria/target_variance_report/target_variance_report.txt
+++ b/selling/search_criteria/target_variance_report/target_variance_report.txt
@@ -1,37 +1,34 @@
+# Search Criteria, target_variance_report
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Sales Person\x01ID,Sales Person\x01Owner,Sales Person\x01Sales Person,Sales Person\x01Country,Sales Person\x01State,Target Detail\x01Item Group,Target Detail\x01Fiscal Year,Target Detail\x01Target  Amount',
 		'creation': '2010-08-08 17:09:32',
-		'criteria_name': 'Target Variance Report',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': 0,
-		'doc_type': 'Target Detail',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Sales Person\x01Saved':1,'Sales Person\x01Submitted':1,'Sales Person\x01Country':'','Sales Person\x01State':'','Target Detail\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-06-23 12:27:37',
 		'modified_by': 'Administrator',
-		'module': 'CRM',
-		'name': 'target_variance_report',
-		'owner': 'harshada@webnotestech.com',
+		'owner': 'harshada@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Sales Person\x01ID,Sales Person\x01Owner,Sales Person\x01Sales Person,Sales Person\x01Country,Sales Person\x01State,Target Detail\x01Item Group,Target Detail\x01Fiscal Year,Target Detail\x01Target  Amount',
+		'criteria_name': 'Target Variance Report',
+		'disabled': 0,
+		'doc_type': 'Target Detail',
+		'doctype': 'Search Criteria',
+		'filters': "{'Sales Person\x01Saved':1,'Sales Person\x01Submitted':1,'Sales Person\x01Country':'','Sales Person\x01State':'','Target Detail\x01Fiscal Year':''}",
+		'module': 'Selling',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Sales Person',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
-		'sort_by': '',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, target_variance_report
+	{
+		'doctype': 'Search Criteria',
+		'name': 'target_variance_report'
 	}
 ]
\ No newline at end of file
diff --git a/selling/search_criteria/territories_target_variance_item_group_wise/territories_target_variance_item_group_wise.txt b/selling/search_criteria/territories_target_variance_item_group_wise/territories_target_variance_item_group_wise.txt
index 497bc13..827230a 100644
--- a/selling/search_criteria/territories_target_variance_item_group_wise/territories_target_variance_item_group_wise.txt
+++ b/selling/search_criteria/territories_target_variance_item_group_wise/territories_target_variance_item_group_wise.txt
@@ -1,37 +1,33 @@
+# Search Criteria, territories_target_variance_item_group_wise
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': '',
-		'creation': '2010-12-14 10:33:09',
-		'criteria_name': 'Territories Target Variance (Item Group wise)',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Target Detail',
+		'creation': '2010-12-14 10:23:21',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Sales Person\x01Country':'','Sales Person\x01State':'','Target Detail\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-11-25 13:18:22',
 		'modified_by': 'Administrator',
-		'module': 'CRM',
-		'name': 'territories_target_variance_item_group_wise',
-		'owner': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'criteria_name': 'Territories Target Variance (Item Group wise)',
+		'doc_type': 'Target Detail',
+		'doctype': 'Search Criteria',
+		'filters': "{'Sales Person\x01Country':'','Sales Person\x01State':'','Target Detail\x01Fiscal Year':''}",
+		'module': 'Selling',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Sales Person',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabTarget Detail`.`target_amount`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, territories_target_variance_item_group_wise
+	{
+		'doctype': 'Search Criteria',
+		'name': 'territories_target_variance_item_group_wise'
 	}
 ]
\ No newline at end of file
diff --git a/selling/search_criteria/territory_sales___variance_report/territory_sales___variance_report.txt b/selling/search_criteria/territory_sales___variance_report/territory_sales___variance_report.txt
index 3268c52..9344df2 100644
--- a/selling/search_criteria/territory_sales___variance_report/territory_sales___variance_report.txt
+++ b/selling/search_criteria/territory_sales___variance_report/territory_sales___variance_report.txt
@@ -1,37 +1,33 @@
+# Search Criteria, territory_sales_-_variance_report
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Territory\x01ID',
 		'creation': '2010-08-08 17:09:31',
-		'criteria_name': 'Territory Sales - Variance Report',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Territory',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Territory\x01State':'','Territory\x01Based On':'Sales Order','Territory\x01Fiscal Year':'2009-2010','Territory\x01Company':'Alpha Company','Territory\x01Period':'Quarterly'}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': '',
-		'idx': None,
 		'modified': '2010-03-30 16:48:42',
 		'modified_by': 'Administrator',
-		'module': 'CRM',
-		'name': 'territory_sales_-_variance_report',
-		'owner': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Territory\x01ID',
+		'criteria_name': 'Territory Sales - Variance Report',
+		'doc_type': 'Territory',
+		'doctype': 'Search Criteria',
+		'filters': "{'Territory\x01State':'','Territory\x01Based On':'Sales Order','Territory\x01Fiscal Year':'2009-2010','Territory\x01Company':'Alpha Company','Territory\x01Period':'Quarterly'}",
+		'module': 'Selling',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': 'ID',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, territory_sales_-_variance_report
+	{
+		'doctype': 'Search Criteria',
+		'name': 'territory_sales_-_variance_report'
 	}
 ]
\ No newline at end of file
diff --git a/selling/search_criteria/total_target_variance_report/total_target_variance_report.txt b/selling/search_criteria/total_target_variance_report/total_target_variance_report.txt
index 27ea80c..6d679c3 100644
--- a/selling/search_criteria/total_target_variance_report/total_target_variance_report.txt
+++ b/selling/search_criteria/total_target_variance_report/total_target_variance_report.txt
@@ -1,37 +1,34 @@
+# Search Criteria, total_target_variance_report
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Sales Person\x01ID,Sales Person\x01Owner,Sales Person\x01Sales Person,Sales Person\x01Country,Sales Person\x01State,Sales Person\x01lft,Sales Person\x01rgt,Target Detail\x01Item Group,Target Detail\x01Fiscal Year,Target Detail\x01Target  Amount',
-		'creation': '2010-12-14 10:33:08',
-		'criteria_name': 'Total Target Variance Report',
-		'custom_query': None,
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Target Detail',
+		'creation': '2010-12-14 10:23:21',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Sales Person\x01Saved':1,'Sales Person\x01Submitted':1,'Sales Person\x01Country':'','Sales Person\x01State':'','Target Detail\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-11-30 15:15:34',
 		'modified_by': 'Administrator',
-		'module': 'CRM',
-		'name': 'total_target_variance_report',
-		'owner': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Sales Person\x01ID,Sales Person\x01Owner,Sales Person\x01Sales Person,Sales Person\x01Country,Sales Person\x01State,Sales Person\x01lft,Sales Person\x01rgt,Target Detail\x01Item Group,Target Detail\x01Fiscal Year,Target Detail\x01Target  Amount',
+		'criteria_name': 'Total Target Variance Report',
+		'doc_type': 'Target Detail',
+		'doctype': 'Search Criteria',
+		'filters': "{'Sales Person\x01Saved':1,'Sales Person\x01Submitted':1,'Sales Person\x01Country':'','Sales Person\x01State':'','Target Detail\x01Fiscal Year':''}",
+		'module': 'Selling',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Sales Person',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabSales Person`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, total_target_variance_report
+	{
+		'doctype': 'Search Criteria',
+		'name': 'total_target_variance_report'
 	}
 ]
\ No newline at end of file
diff --git a/selling/search_criteria/variance_report/variance_report.txt b/selling/search_criteria/variance_report/variance_report.txt
index 5ca7ea6..9e3cbb3 100644
--- a/selling/search_criteria/variance_report/variance_report.txt
+++ b/selling/search_criteria/variance_report/variance_report.txt
@@ -1,37 +1,33 @@
+# Search Criteria, variance_report
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': '',
 		'creation': '2010-08-08 17:09:31',
-		'criteria_name': 'Variance Report',
-		'custom_query': None,
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Target Detail',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Territory\x01State':'','Target Detail\x01Fiscal Year':'2009-2010','Target Detail\x01Based On':'Territory','Target Detail\x01Company':'Alpha Company','Target Detail\x01Period':'Quarterly','Target Detail\x01Under':'Sales Order'}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-05-05 11:13:12',
 		'modified_by': 'Administrator',
-		'module': 'CRM',
-		'name': 'variance_report',
-		'owner': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'criteria_name': 'Variance Report',
+		'doc_type': 'Target Detail',
+		'doctype': 'Search Criteria',
+		'filters': "{'Territory\x01State':'','Target Detail\x01Fiscal Year':'2009-2010','Target Detail\x01Based On':'Territory','Target Detail\x01Company':'Alpha Company','Target Detail\x01Period':'Quarterly','Target Detail\x01Under':'Sales Order'}",
+		'module': 'Selling',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Territory',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': 'ID',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, variance_report
+	{
+		'doctype': 'Search Criteria',
+		'name': 'variance_report'
 	}
 ]
\ No newline at end of file
diff --git a/setup/Role/System Manager/System Manager.txt b/setup/Role/System Manager/System Manager.txt
index 37c4fb5..0918bc4 100644
--- a/setup/Role/System Manager/System Manager.txt
+++ b/setup/Role/System Manager/System Manager.txt
@@ -1 +1,26 @@
-[{'modified_by': 'Administrator', 'name': 'System Manager', 'parent': None, 'creation': '2009-03-12 13:53:20', 'modified': '2009-07-07 17:00:24', 'module': 'Roles', 'doctype': 'Role', 'idx': None, 'parenttype': None, 'role_name': 'System Manager', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': None}]
\ No newline at end of file
+# Role, System Manager
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:51',
+		'docstatus': 0,
+		'modified': '2009-07-07 17:00:24',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Role
+	{
+		'doctype': 'Role',
+		'module': 'Setup',
+		'name': '__common__',
+		'role_name': 'System Manager'
+	},
+
+	# Role, System Manager
+	{
+		'doctype': 'Role',
+		'name': 'System Manager'
+	}
+]
\ No newline at end of file
diff --git a/stock/DocType Mapper/Project-Delivery Note/Project-Delivery Note.txt b/stock/DocType Mapper/Project-Delivery Note/Project-Delivery Note.txt
index 410a120..ef9f0fc 100644
--- a/stock/DocType Mapper/Project-Delivery Note/Project-Delivery Note.txt
+++ b/stock/DocType Mapper/Project-Delivery Note/Project-Delivery Note.txt
@@ -1 +1,122 @@
-[{'modified_by': 'ashwini@webnotestech.com', 'name': 'Project-Delivery Note', 'parent': None, 'to_doctype': 'Delivery Note', 'creation': '2010-08-18 18:07:55', 'modified': '2010-09-01 14:25:08', 'module': 'Mapper', 'doctype': 'DocType Mapper', 'idx': None, 'parenttype': None, 'ref_doc_submitted': None, 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'from_doctype': 'Project', 'parentfield': None}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00894', 'parent': 'Project-Delivery Note', 'to_field': 'customer', 'creation': '2010-08-26 13:31:56', 'modified': '2010-09-01 14:25:08', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 1, 'parenttype': 'DocType Mapper', 'checking_operator': '=', 'check_reference_value': None, 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'from_field': 'customer', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00875', 'parent': 'Project-Delivery Note', 'to_field': 'customer_name', 'creation': '2010-08-18 18:07:55', 'modified': '2010-09-01 14:25:08', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 2, 'parenttype': 'DocType Mapper', 'checking_operator': '', 'check_reference_value': None, 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'from_field': 'customer_name', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00876', 'parent': 'Project-Delivery Note', 'to_field': 'customer_address', 'creation': '2010-08-18 18:07:55', 'modified': '2010-09-01 14:25:08', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 3, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'from_field': 'customer_address', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00877', 'parent': 'Project-Delivery Note', 'to_field': 'contact_person', 'creation': '2010-08-18 18:07:55', 'modified': '2010-09-01 14:25:08', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 4, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'from_field': 'contact_person', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00878', 'parent': 'Project-Delivery Note', 'to_field': 'contact_no', 'creation': '2010-08-18 18:07:55', 'modified': '2010-09-01 14:25:08', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 5, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'from_field': 'contact_no', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00879', 'parent': 'Project-Delivery Note', 'to_field': 'email_id', 'creation': '2010-08-18 18:07:55', 'modified': '2010-09-01 14:25:08', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 6, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'from_field': 'email_id', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00883', 'parent': 'Project-Delivery Note', 'to_field': 'territory', 'creation': '2010-08-19 14:14:32', 'modified': '2010-09-01 14:25:08', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 7, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'from_field': 'territory', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'ashwini@webnotestech.com', 'name': 'FMD/00884', 'parent': 'Project-Delivery Note', 'to_field': 'customer_group', 'creation': '2010-08-19 14:14:32', 'modified': '2010-09-01 14:25:08', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 8, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'check_reference_value': None, 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'from_field': 'customer_group', 'parentfield': 'field_mapper_details'}, {'reference_key': '', 'modified_by': 'ashwini@webnotestech.com', 'name': 'TMD/0000087', 'parent': 'Project-Delivery Note', 'is_reference_table': None, 'to_field': None, 'creation': '2010-08-18 18:07:55', 'reference_doctype_key': '', 'modified': '2010-09-01 14:25:08', 'doctype': 'Table Mapper Detail', 'match_id': 0, 'idx': 1, 'parenttype': 'DocType Mapper', 'from_table': 'Project', 'owner': 'harshada@webnotestech.com', 'docstatus': 0, 'to_table': 'Delivery Note', 'from_field': None, 'validation_logic': 'name is not null', 'parentfield': 'table_mapper_details'}]
\ No newline at end of file
+# DocType Mapper, Project-Delivery Note
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-09-01 15:48:10',
+		'docstatus': 0,
+		'modified': '2010-09-01 14:25:08',
+		'modified_by': 'Administrator',
+		'owner': 'harshada@webnotestech.com'
+	},
+
+	# These values are common for all Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'from_table': 'Project',
+		'idx': 1,
+		'match_id': 0,
+		'name': '__common__',
+		'parent': 'Project-Delivery Note',
+		'parentfield': 'table_mapper_details',
+		'parenttype': 'DocType Mapper',
+		'to_table': 'Delivery Note',
+		'validation_logic': 'name is not null'
+	},
+
+	# These values are common for all Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'map': 'Yes',
+		'match_id': 0,
+		'name': '__common__',
+		'parent': 'Project-Delivery Note',
+		'parentfield': 'field_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all DocType Mapper
+	{
+		'doctype': 'DocType Mapper',
+		'from_doctype': 'Project',
+		'module': 'Stock',
+		'name': '__common__',
+		'to_doctype': 'Delivery Note'
+	},
+
+	# DocType Mapper, Project-Delivery Note
+	{
+		'doctype': 'DocType Mapper',
+		'name': 'Project-Delivery Note'
+	},
+
+	# Field Mapper Detail
+	{
+		'checking_operator': '=',
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'customer',
+		'idx': 1,
+		'to_field': 'customer'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'customer_name',
+		'idx': 2,
+		'to_field': 'customer_name'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'customer_address',
+		'idx': 3,
+		'to_field': 'customer_address'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'contact_person',
+		'idx': 4,
+		'to_field': 'contact_person'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'contact_no',
+		'idx': 5,
+		'to_field': 'contact_no'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'email_id',
+		'idx': 6,
+		'to_field': 'email_id'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'territory',
+		'idx': 7,
+		'to_field': 'territory'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'customer_group',
+		'idx': 8,
+		'to_field': 'customer_group'
+	},
+
+	# Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail'
+	}
+]
\ No newline at end of file
diff --git a/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt b/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt
index 1d51ac1..ff00655 100644
--- a/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt
+++ b/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt
@@ -1,874 +1,482 @@
+# DocType Mapper, Purchase Order-Purchase Receipt
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': None,
-		'_user_tags': None,
 		'creation': '2010-08-08 17:09:35',
 		'docstatus': 0,
-		'doctype': u'DocType Mapper',
-		'from_doctype': 'Purchase Order',
-		'idx': None,
 		'modified': '2011-05-13 12:42:57',
 		'modified_by': 'Administrator',
-		'module': 'Mapper',
-		'name': 'Purchase Order-Purchase Receipt',
-		'owner': 'Administrator',
-		'parent': None,
-		'parentfield': None,
-		'parenttype': None,
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'name': '__common__',
+		'parent': 'Purchase Order-Purchase Receipt',
+		'parentfield': 'table_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'map': 'Yes',
+		'name': '__common__',
+		'parent': 'Purchase Order-Purchase Receipt',
+		'parentfield': 'field_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all DocType Mapper
+	{
+		'doctype': 'DocType Mapper',
+		'from_doctype': 'Purchase Order',
+		'module': 'Stock',
+		'name': '__common__',
 		'ref_doc_submitted': 1,
 		'to_doctype': 'Purchase Receipt'
 	},
+
+	# DocType Mapper, Purchase Order-Purchase Receipt
+	{
+		'doctype': 'DocType Mapper',
+		'name': 'Purchase Order-Purchase Receipt'
+	},
+
+	# Field Mapper Detail
 	{
 		'checking_operator': '=',
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'supplier',
 		'idx': 1,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00197',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'supplier'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'supplier_address',
 		'idx': 2,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00198',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'supplier_address'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-09-01 15:48:10',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'supplier_name',
 		'idx': 4,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00586',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'supplier_name'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:25',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'address_display',
 		'idx': 5,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': '000003501',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'address_display'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:25',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_display',
 		'idx': 6,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': '000003502',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_display'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:25',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_mobile',
 		'idx': 7,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': '000003503',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_mobile'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:25',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_email',
 		'idx': 8,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': '000003504',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_email'
 	},
+
+	# Field Mapper Detail
 	{
 		'checking_operator': '=',
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'company',
 		'idx': 9,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00199',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'company'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'fiscal_year',
 		'idx': 10,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00200',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'fiscal_year'
 	},
+
+	# Field Mapper Detail
 	{
 		'checking_operator': '=',
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'currency',
 		'idx': 11,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00201',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'currency'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'warehouse',
 		'idx': 12,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00202',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'warehouse'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-09 09:44:02',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'terms',
 		'idx': 13,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00553',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'terms'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'conversion_factor',
 		'idx': 14,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00203',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'conversion_factor'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'stock_uom',
 		'idx': 15,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00204',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'stock_uom'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'name',
 		'idx': 16,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00205',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'prevdoc_detail_docname'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'parent',
 		'idx': 17,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00206',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'prevdoc_docname'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'parenttype',
 		'idx': 18,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00207',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'prevdoc_doctype'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'uom',
 		'idx': 19,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00208',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'uom'
 	},
+
+	# Field Mapper Detail
 	{
 		'checking_operator': '=',
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_code',
 		'idx': 20,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00209',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_code'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'brand',
 		'idx': 21,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00210',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'brand'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_name',
 		'idx': 22,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00211',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_name'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval:(flt(obj.qty) - flt(obj.received_qty)) ',
 		'idx': 23,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00212',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'received_qty'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval:(flt(obj.qty) - flt(obj.received_qty)) ',
 		'idx': 24,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00213',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'qty'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval:(flt(obj.qty) - flt(obj.received_qty)) * flt(obj.conversion_factor)',
 		'idx': 25,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00214',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'stock_qty'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'purchase_rate',
 		'idx': 26,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00215',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'purchase_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'description',
 		'idx': 27,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00216',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'description'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_group',
 		'idx': 28,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00217',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_group'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'import_rate',
 		'idx': 29,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:25',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00218',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'import_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval:(flt(obj.qty) - flt(obj.received_qty)) * flt(obj.import_rate)',
 		'idx': 30,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00219',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'import_amount'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'schedule_date',
 		'idx': 31,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00220',
-		'owner': 'jitesh',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'schedule_date'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval:(flt(obj.qty) - flt(obj.received_qty)) * flt(obj.purchase_rate)',
 		'idx': 32,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00221',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'amount'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-03-23 15:14:10',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_tax_rate',
 		'idx': 33,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': '000001919',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_tax_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'conversion_rate',
 		'idx': 34,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00222',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'conversion_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'category',
 		'idx': 35,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00223',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'category'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'add_deduct_tax',
 		'idx': 36,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00224',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'add_deduct_tax'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'charge_type',
 		'idx': 37,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00225',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'charge_type'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'row_id',
 		'idx': 38,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00226',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'row_id'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_wise_tax_detail',
 		'idx': 39,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00227',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_wise_tax_detail'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_person',
 		'idx': 39,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00232',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_person'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'description',
 		'idx': 40,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00228',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'description'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'account_head',
 		'idx': 41,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00229',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'account_head'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'cost_center',
 		'idx': 42,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00230',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'cost_center'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'rate',
 		'idx': 43,
-		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00231',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-09-01 15:48:10',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'project_name',
 		'idx': 44,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00587',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'project_name'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
 		'from_field': 'po_details',
 		'from_table': 'PO Detail',
 		'idx': 1,
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000025',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'reference_doctype_key': 'prevdoc_doctype',
 		'reference_key': 'prevdoc_detail_docname',
 		'to_field': 'purchase_receipt_details',
 		'to_table': 'Purchase Receipt Detail',
 		'validation_logic': 'docstatus=1 and qty > ifnull(received_qty,0)'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
-		'from_field': None,
 		'from_table': 'Purchase Order',
 		'idx': 2,
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000026',
-		'owner': 'Administrator',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
 		'reference_key': 'prevdoc_docname',
-		'to_field': None,
 		'to_table': 'Purchase Receipt',
 		'validation_logic': 'docstatus = 1'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
 		'from_field': 'purchase_tax_details',
 		'from_table': 'Purchase Tax Detail',
 		'idx': 3,
 		'match_id': 2,
-		'modified': '2011-05-20 15:54:26',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000027',
-		'owner': 'wasim@webnotestech.com',
-		'parent': 'Purchase Order-Purchase Receipt',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
-		'reference_key': None,
 		'to_field': 'purchase_tax_details',
 		'to_table': 'Purchase Tax Detail',
 		'validation_logic': 'docstatus = 1'
diff --git a/stock/DocType Mapper/Receivable Voucher-Delivery Note/Receivable Voucher-Delivery Note.txt b/stock/DocType Mapper/Receivable Voucher-Delivery Note/Receivable Voucher-Delivery Note.txt
index 3b4e8ba..f05a93b 100755
--- a/stock/DocType Mapper/Receivable Voucher-Delivery Note/Receivable Voucher-Delivery Note.txt
+++ b/stock/DocType Mapper/Receivable Voucher-Delivery Note/Receivable Voucher-Delivery Note.txt
@@ -1 +1,525 @@
-[{'modified_by': 'Administrator', 'name': 'Receivable Voucher-Delivery Note', 'parent': None, 'to_doctype': 'Delivery Note', 'creation': '2010-12-14 16:40:41', 'modified': '2010-12-14 20:43:41', 'module': 'Mapper', 'doctype': 'DocType Mapper', 'idx': None, 'parenttype': None, 'ref_doc_submitted': 1, 'owner': 'Administrator', 'docstatus': 0, 'from_doctype': 'Receivable Voucher', 'parentfield': None}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00521', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'currency', 'creation': '2010-12-14 16:40:41', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 1, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'currency', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00522', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'company', 'creation': '2010-12-14 16:40:41', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 2, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'company', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00523', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'fiscal_year', 'creation': '2010-12-14 16:40:41', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 3, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'fiscal_year', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00524', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'customer', 'creation': '2010-12-14 16:40:41', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 4, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'customer', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00525', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'customer_name', 'creation': '2010-12-14 16:40:41', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 5, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'customer_name', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00526', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'price_list_name', 'creation': '2010-12-14 16:40:41', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 6, 'parenttype': 'DocType Mapper', 'checking_operator': '', 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'price_list_name', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00527', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'conversion_rate', 'creation': '2010-12-14 16:40:41', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 7, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'conversion_rate', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00528', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'charge', 'creation': '2010-12-14 16:40:41', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 8, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'charge', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00529', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'terms', 'creation': '2010-12-14 16:40:41', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 9, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'terms', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00530', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'item_code', 'creation': '2010-12-14 16:40:41', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 10, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'item_code', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00531', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'item_name', 'creation': '2010-12-14 16:40:41', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 11, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'item_name', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00532', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'brand', 'creation': '2010-12-14 16:40:41', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 12, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'brand', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00533', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'description', 'creation': '2010-12-14 16:40:41', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 13, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'description', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00534', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'item_group', 'creation': '2010-12-14 16:40:41', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 14, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'item_group', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00535', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'qty', 'creation': '2010-12-14 16:40:41', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 15, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'eval: flt(obj.qty) - flt(obj.delivered_qty)', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00536', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'base_ref_rate', 'creation': '2010-12-14 16:40:41', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 16, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'base_ref_rate', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00537', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'ref_rate', 'creation': '2010-12-14 16:40:41', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 17, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'ref_rate', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00538', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'basic_rate', 'creation': '2010-12-14 16:40:41', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 18, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'basic_rate', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00539', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'export_rate', 'creation': '2010-12-14 16:40:41', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 19, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'export_rate', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00540', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'prevdoc_docname', 'creation': '2010-12-14 16:40:41', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 20, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'parent', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00541', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'prevdoc_doctype', 'creation': '2010-12-14 16:40:41', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 21, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'parenttype', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00542', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'prevdoc_detail_docname', 'creation': '2010-12-14 16:40:41', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 22, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'name', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00543', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'export_rate', 'creation': '2010-12-14 16:40:41', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 23, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'export_rate', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00544', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'amount', 'creation': '2010-12-14 16:40:41', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 24, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'eval: (flt(obj.qty) - flt(obj.delivered_qty)) * flt(obj.basic_rate)', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00545', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'export_amount', 'creation': '2010-12-14 16:40:41', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 25, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'eval: (flt(obj.qty) - flt(obj.delivered_qty)) * flt(obj.export_rate)', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00546', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'adj_rate', 'creation': '2010-12-14 16:40:42', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 26, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'adj_rate', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00547', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'item_tax_rate', 'creation': '2010-12-14 16:40:42', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 27, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'item_tax_rate', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00548', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'warehouse', 'creation': '2010-12-14 16:40:42', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 1, 'idx': 28, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'warehouse', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00549', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'charge_type', 'creation': '2010-12-14 16:40:42', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 2, 'idx': 29, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'charge_type', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00550', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'row_id', 'creation': '2010-12-14 16:40:42', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 2, 'idx': 30, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'row_id', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00551', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'item_wise_tax_detail', 'creation': '2010-12-14 16:40:42', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 2, 'idx': 31, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'item_wise_tax_detail', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00552', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'description', 'creation': '2010-12-14 16:40:42', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 2, 'idx': 32, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'description', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00553', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'account_head', 'creation': '2010-12-14 16:40:42', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 2, 'idx': 33, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'account_head', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00554', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'rate', 'creation': '2010-12-14 16:40:42', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 2, 'idx': 34, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'rate', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00555', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'tax_amount', 'creation': '2010-12-14 16:40:42', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 2, 'idx': 35, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'tax_amount', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00556', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'total', 'creation': '2010-12-14 16:40:42', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 2, 'idx': 36, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'total', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00557', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'sales_person', 'creation': '2010-12-14 16:40:42', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 3, 'idx': 37, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'sales_person', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00558', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'allocated_percentage', 'creation': '2010-12-14 16:40:42', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 3, 'idx': 38, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'allocated_percentage', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00559', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'allocated_amount', 'creation': '2010-12-14 16:40:42', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 3, 'idx': 39, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'allocated_amount', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00560', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'source', 'creation': '2010-12-14 16:40:42', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 40, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'source', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00561', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'campaign', 'creation': '2010-12-14 16:40:42', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 41, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'campaign', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00562', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'sales_partner', 'creation': '2010-12-14 16:40:42', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 42, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'sales_partner', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00563', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'customer_address', 'creation': '2010-12-14 16:40:42', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 43, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'customer_address', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00564', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'delivery_address', 'creation': '2010-12-14 16:40:42', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 44, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'customer_address', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00565', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'net_total', 'creation': '2010-12-14 16:40:42', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 45, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'net_total', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00566', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'grand_total', 'creation': '2010-12-14 16:40:42', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 46, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'grand_total', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00567', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'territory', 'creation': '2010-12-14 16:40:42', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 47, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'territory', 'parentfield': 'field_mapper_details'}, {'map': 'Yes', 'modified_by': 'Administrator', 'name': 'FMD/00568', 'parent': 'Receivable Voucher-Delivery Note', 'to_field': 'project_name', 'creation': '2010-12-14 16:40:42', 'modified': '2010-12-14 20:43:41', 'doctype': 'Field Mapper Detail', 'match_id': 0, 'idx': 48, 'parenttype': 'DocType Mapper', 'checking_operator': None, 'owner': 'Administrator', 'docstatus': 0, 'from_field': 'project_name', 'parentfield': 'field_mapper_details'}, {'reference_key': '', 'modified_by': 'Administrator', 'name': 'TMD/0000056', 'parent': 'Receivable Voucher-Delivery Note', 'reference_doctype_key': '', 'to_field': None, 'creation': '2010-12-14 16:40:42', 'modified': '2010-12-14 20:43:41', 'doctype': 'Table Mapper Detail', 'match_id': 0, 'idx': 1, 'parenttype': 'DocType Mapper', 'from_table': 'Receivable Voucher', 'owner': 'Administrator', 'docstatus': 0, 'to_table': 'Delivery Note', 'from_field': '', 'validation_logic': 'docstatus=1', 'parentfield': 'table_mapper_details'}, {'reference_key': '', 'modified_by': 'Administrator', 'name': 'TMD/0000057', 'parent': 'Receivable Voucher-Delivery Note', 'reference_doctype_key': '', 'to_field': 'delivery_note_details', 'creation': '2010-12-14 16:40:42', 'modified': '2010-12-14 20:43:41', 'doctype': 'Table Mapper Detail', 'match_id': 1, 'idx': 2, 'parenttype': 'DocType Mapper', 'from_table': 'RV Detail', 'owner': 'Administrator', 'docstatus': 0, 'to_table': 'Delivery Note Detail', 'from_field': 'entries', 'validation_logic': 'docstatus = 1', 'parentfield': 'table_mapper_details'}, {'reference_key': '', 'modified_by': 'Administrator', 'name': 'TMD/0000058', 'parent': 'Receivable Voucher-Delivery Note', 'reference_doctype_key': '', 'to_field': 'other_charges', 'creation': '2010-12-14 16:40:42', 'modified': '2010-12-14 20:43:41', 'doctype': 'Table Mapper Detail', 'match_id': 2, 'idx': 3, 'parenttype': 'DocType Mapper', 'from_table': 'RV Tax Detail', 'owner': 'Administrator', 'docstatus': 0, 'to_table': 'RV Tax Detail', 'from_field': 'other_charges', 'validation_logic': 'name is not null', 'parentfield': 'table_mapper_details'}, {'reference_key': '', 'modified_by': 'Administrator', 'name': 'TMD/0000059', 'parent': 'Receivable Voucher-Delivery Note', 'reference_doctype_key': '', 'to_field': 'sales_team', 'creation': '2010-12-14 16:40:42', 'modified': '2010-12-14 20:43:41', 'doctype': 'Table Mapper Detail', 'match_id': 3, 'idx': 4, 'parenttype': 'DocType Mapper', 'from_table': 'Sales Team', 'owner': 'Administrator', 'docstatus': 0, 'to_table': 'Sales Team', 'from_field': 'sales_team', 'validation_logic': 'name is not null', 'parentfield': 'table_mapper_details'}]
\ No newline at end of file
+# DocType Mapper, Receivable Voucher-Delivery Note
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-12-15 08:39:22',
+		'docstatus': 0,
+		'modified': '2010-12-14 20:43:41',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'name': '__common__',
+		'parent': 'Receivable Voucher-Delivery Note',
+		'parentfield': 'table_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'map': 'Yes',
+		'name': '__common__',
+		'parent': 'Receivable Voucher-Delivery Note',
+		'parentfield': 'field_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all DocType Mapper
+	{
+		'doctype': 'DocType Mapper',
+		'from_doctype': 'Receivable Voucher',
+		'module': 'Stock',
+		'name': '__common__',
+		'ref_doc_submitted': 1,
+		'to_doctype': 'Delivery Note'
+	},
+
+	# DocType Mapper, Receivable Voucher-Delivery Note
+	{
+		'doctype': 'DocType Mapper',
+		'name': 'Receivable Voucher-Delivery Note'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'currency',
+		'idx': 1,
+		'match_id': 0,
+		'to_field': 'currency'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'company',
+		'idx': 2,
+		'match_id': 0,
+		'to_field': 'company'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'fiscal_year',
+		'idx': 3,
+		'match_id': 0,
+		'to_field': 'fiscal_year'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'customer',
+		'idx': 4,
+		'match_id': 0,
+		'to_field': 'customer'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'customer_name',
+		'idx': 5,
+		'match_id': 0,
+		'to_field': 'customer_name'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'price_list_name',
+		'idx': 6,
+		'match_id': 0,
+		'to_field': 'price_list_name'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'conversion_rate',
+		'idx': 7,
+		'match_id': 0,
+		'to_field': 'conversion_rate'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'charge',
+		'idx': 8,
+		'match_id': 0,
+		'to_field': 'charge'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'terms',
+		'idx': 9,
+		'match_id': 0,
+		'to_field': 'terms'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'item_code',
+		'idx': 10,
+		'match_id': 1,
+		'to_field': 'item_code'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'item_name',
+		'idx': 11,
+		'match_id': 1,
+		'to_field': 'item_name'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'brand',
+		'idx': 12,
+		'match_id': 1,
+		'to_field': 'brand'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'description',
+		'idx': 13,
+		'match_id': 1,
+		'to_field': 'description'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'item_group',
+		'idx': 14,
+		'match_id': 1,
+		'to_field': 'item_group'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'eval: flt(obj.qty) - flt(obj.delivered_qty)',
+		'idx': 15,
+		'match_id': 1,
+		'to_field': 'qty'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'base_ref_rate',
+		'idx': 16,
+		'match_id': 1,
+		'to_field': 'base_ref_rate'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'ref_rate',
+		'idx': 17,
+		'match_id': 1,
+		'to_field': 'ref_rate'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'basic_rate',
+		'idx': 18,
+		'match_id': 1,
+		'to_field': 'basic_rate'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'export_rate',
+		'idx': 19,
+		'match_id': 1,
+		'to_field': 'export_rate'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'parent',
+		'idx': 20,
+		'match_id': 1,
+		'to_field': 'prevdoc_docname'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'parenttype',
+		'idx': 21,
+		'match_id': 1,
+		'to_field': 'prevdoc_doctype'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'name',
+		'idx': 22,
+		'match_id': 1,
+		'to_field': 'prevdoc_detail_docname'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'export_rate',
+		'idx': 23,
+		'match_id': 1,
+		'to_field': 'export_rate'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'eval: (flt(obj.qty) - flt(obj.delivered_qty)) * flt(obj.basic_rate)',
+		'idx': 24,
+		'match_id': 1,
+		'to_field': 'amount'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'eval: (flt(obj.qty) - flt(obj.delivered_qty)) * flt(obj.export_rate)',
+		'idx': 25,
+		'match_id': 1,
+		'to_field': 'export_amount'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'adj_rate',
+		'idx': 26,
+		'match_id': 1,
+		'to_field': 'adj_rate'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'item_tax_rate',
+		'idx': 27,
+		'match_id': 1,
+		'to_field': 'item_tax_rate'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'warehouse',
+		'idx': 28,
+		'match_id': 1,
+		'to_field': 'warehouse'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'charge_type',
+		'idx': 29,
+		'match_id': 2,
+		'to_field': 'charge_type'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'row_id',
+		'idx': 30,
+		'match_id': 2,
+		'to_field': 'row_id'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'item_wise_tax_detail',
+		'idx': 31,
+		'match_id': 2,
+		'to_field': 'item_wise_tax_detail'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'description',
+		'idx': 32,
+		'match_id': 2,
+		'to_field': 'description'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'account_head',
+		'idx': 33,
+		'match_id': 2,
+		'to_field': 'account_head'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'rate',
+		'idx': 34,
+		'match_id': 2,
+		'to_field': 'rate'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'tax_amount',
+		'idx': 35,
+		'match_id': 2,
+		'to_field': 'tax_amount'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'total',
+		'idx': 36,
+		'match_id': 2,
+		'to_field': 'total'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'sales_person',
+		'idx': 37,
+		'match_id': 3,
+		'to_field': 'sales_person'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'allocated_percentage',
+		'idx': 38,
+		'match_id': 3,
+		'to_field': 'allocated_percentage'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'allocated_amount',
+		'idx': 39,
+		'match_id': 3,
+		'to_field': 'allocated_amount'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'source',
+		'idx': 40,
+		'match_id': 0,
+		'to_field': 'source'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'campaign',
+		'idx': 41,
+		'match_id': 0,
+		'to_field': 'campaign'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'sales_partner',
+		'idx': 42,
+		'match_id': 0,
+		'to_field': 'sales_partner'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'customer_address',
+		'idx': 43,
+		'match_id': 0,
+		'to_field': 'customer_address'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'customer_address',
+		'idx': 44,
+		'match_id': 0,
+		'to_field': 'delivery_address'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'net_total',
+		'idx': 45,
+		'match_id': 0,
+		'to_field': 'net_total'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'grand_total',
+		'idx': 46,
+		'match_id': 0,
+		'to_field': 'grand_total'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'territory',
+		'idx': 47,
+		'match_id': 0,
+		'to_field': 'territory'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'project_name',
+		'idx': 48,
+		'match_id': 0,
+		'to_field': 'project_name'
+	},
+
+	# Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'from_table': 'Receivable Voucher',
+		'idx': 1,
+		'match_id': 0,
+		'to_table': 'Delivery Note',
+		'validation_logic': 'docstatus=1'
+	},
+
+	# Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'from_field': 'entries',
+		'from_table': 'RV Detail',
+		'idx': 2,
+		'match_id': 1,
+		'to_field': 'delivery_note_details',
+		'to_table': 'Delivery Note Detail',
+		'validation_logic': 'docstatus = 1'
+	},
+
+	# Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'from_field': 'other_charges',
+		'from_table': 'RV Tax Detail',
+		'idx': 3,
+		'match_id': 2,
+		'to_field': 'other_charges',
+		'to_table': 'RV Tax Detail',
+		'validation_logic': 'name is not null'
+	},
+
+	# Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'from_field': 'sales_team',
+		'from_table': 'Sales Team',
+		'idx': 4,
+		'match_id': 3,
+		'to_field': 'sales_team',
+		'to_table': 'Sales Team',
+		'validation_logic': 'name is not null'
+	}
+]
\ No newline at end of file
diff --git a/stock/DocType Mapper/Sales Order-Delivery Note/Sales Order-Delivery Note.txt b/stock/DocType Mapper/Sales Order-Delivery Note/Sales Order-Delivery Note.txt
index ef4cf6c..dad93dd 100644
--- a/stock/DocType Mapper/Sales Order-Delivery Note/Sales Order-Delivery Note.txt
+++ b/stock/DocType Mapper/Sales Order-Delivery Note/Sales Order-Delivery Note.txt
@@ -1,1472 +1,780 @@
+# DocType Mapper, Sales Order-Delivery Note
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': None,
-		'_user_tags': None,
 		'creation': '2010-08-08 17:09:35',
 		'docstatus': 0,
-		'doctype': u'DocType Mapper',
-		'from_doctype': 'Sales Order',
-		'idx': None,
 		'modified': '2011-05-16 11:48:19',
 		'modified_by': 'Administrator',
-		'module': 'Mapper',
-		'name': 'Sales Order-Delivery Note',
-		'owner': 'Administrator',
-		'parent': None,
-		'parentfield': None,
-		'parenttype': None,
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'name': '__common__',
+		'parent': 'Sales Order-Delivery Note',
+		'parentfield': 'table_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'name': '__common__',
+		'parent': 'Sales Order-Delivery Note',
+		'parentfield': 'field_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all DocType Mapper
+	{
+		'doctype': 'DocType Mapper',
+		'from_doctype': 'Sales Order',
+		'module': 'Stock',
+		'name': '__common__',
 		'ref_doc_submitted': 1,
 		'to_doctype': 'Delivery Note'
 	},
+
+	# DocType Mapper, Sales Order-Delivery Note
+	{
+		'doctype': 'DocType Mapper',
+		'name': 'Sales Order-Delivery Note'
+	},
+
+	# Field Mapper Detail
 	{
 		'checking_operator': '>=',
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'transaction_date',
 		'idx': 1,
 		'map': 'No',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00320',
-		'owner': 'nabin@webnotestech.com',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'transaction_date'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'price_list_name',
 		'idx': 2,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00321',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'price_list_name'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'name',
 		'idx': 3,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00322',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'sales_order_no'
 	},
+
+	# Field Mapper Detail
 	{
 		'checking_operator': '=',
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'company',
 		'idx': 4,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00323',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'company'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'fiscal_year',
 		'idx': 5,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00324',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'fiscal_year'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'po_date',
 		'idx': 6,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00325',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'po_date'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'po_no',
 		'idx': 7,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00326',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'po_no'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'sales_partner',
 		'idx': 8,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00327',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'sales_partner'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'commission_rate',
 		'idx': 9,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00328',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'commission_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'total_commission',
 		'idx': 10,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00329',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'total_commission'
 	},
+
+	# Field Mapper Detail
 	{
 		'checking_operator': '=',
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'currency',
 		'idx': 11,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00331',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'currency'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'conversion_rate',
 		'idx': 12,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00332',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'conversion_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 12:58:43',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'shipping_address_name',
 		'idx': 14,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': '000003464',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'customer_address'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'customer_address',
-		'idx': 15,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2010-08-08 17:09:35',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00334',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'delivery_address'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_person',
 		'idx': 15,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00336',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_person'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'customer_name',
 		'idx': 16,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00333',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'customer_name'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'customer_address',
-		'idx': 16,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2010-08-08 17:09:35',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00335',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'customer_address'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2011-05-20 12:58:43',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'shipping_address',
 		'idx': 17,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': '000003465',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'address_display'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 12:58:43',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_display',
 		'idx': 18,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': '000003466',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_display'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'contact_no',
-		'idx': 18,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2010-08-08 17:09:35',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00337',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'contact_no'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2011-05-20 12:58:43',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_mobile',
 		'idx': 19,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': '000003467',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_mobile'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'email_id',
-		'idx': 19,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2010-08-08 17:09:35',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00338',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'email_id'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2011-05-20 12:58:43',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_email',
 		'idx': 20,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': '000003468',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_email'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-03-24 14:08:13',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'ship_det_no',
-		'idx': 21,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-03-24 14:08:13',
-		'modified_by': 'rahul@webnotestech.com',
-		'name': '000002010',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'ship_det_no'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2011-03-24 14:08:13',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'ship_to',
-		'idx': 22,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-03-24 14:08:13',
-		'modified_by': 'rahul@webnotestech.com',
-		'name': '000002011',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'ship_to'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'customer_group',
 		'idx': 22,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00340',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'customer_group'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-03-24 14:08:13',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'shipping_address',
-		'idx': 23,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2011-03-24 14:08:13',
-		'modified_by': 'rahul@webnotestech.com',
-		'name': '000002012',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'shipping_address'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'charge',
 		'idx': 23,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00339',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'charge'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'parent',
 		'idx': 24,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00341',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'prevdoc_docname'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'parenttype',
 		'idx': 25,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00342',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'prevdoc_doctype'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'name',
 		'idx': 26,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00343',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'prevdoc_detail_docname'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'export_rate',
 		'idx': 27,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00344',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'export_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval: (flt(obj.qty) - flt(obj.delivered_qty)) * flt(obj.export_rate)',
 		'idx': 28,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00345',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'export_amount'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_code',
 		'idx': 29,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00346',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_code'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_name',
 		'idx': 30,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00347',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_name'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'description',
 		'idx': 31,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00348',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'description'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_group',
 		'idx': 32,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00349',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_group'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'stock_uom',
 		'idx': 33,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00350',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'stock_uom'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'base_ref_rate',
 		'idx': 34,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00351',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'base_ref_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'ref_rate',
 		'idx': 35,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00352',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'ref_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'adj_rate',
 		'idx': 36,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00353',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'adj_rate'
 	},
+
+	# Field Mapper Detail
 	{
 		'checking_operator': '=',
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'basic_rate',
 		'idx': 37,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00354',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'basic_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval: flt(obj.qty) - flt(obj.delivered_qty)',
 		'idx': 38,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00355',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'qty'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval: (flt(obj.qty) - flt(obj.delivered_qty)) * flt(obj.basic_rate)',
 		'idx': 39,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00356',
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'amount'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'reserved_warehouse',
 		'idx': 40,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00357',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'warehouse'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_tax_rate',
 		'idx': 41,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00358',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_tax_rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'charge_type',
 		'idx': 42,
 		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00359',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'charge_type'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'row_id',
 		'idx': 43,
 		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00360',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'row_id'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_wise_tax_detail',
 		'idx': 44,
 		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00361',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_wise_tax_detail'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'description',
 		'idx': 45,
 		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00362',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'description'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'account_head',
 		'idx': 46,
 		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00363',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'account_head'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'rate',
 		'idx': 47,
 		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00364',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'rate'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'tax_amount',
 		'idx': 48,
 		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00365',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'tax_amount'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'total',
 		'idx': 49,
 		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00366',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'total'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'idx',
 		'idx': 50,
 		'map': 'Yes',
 		'match_id': 2,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00367',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'idx'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'net_total',
 		'idx': 51,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00368',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'net_total'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'other_charges_total',
 		'idx': 52,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00369',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'other_charges_total'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'grand_total',
 		'idx': 53,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00370',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'grand_total'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'rounded_total',
 		'idx': 54,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00371',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'rounded_total'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'in_words',
 		'idx': 55,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00372',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'in_words'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'grand_total_export',
 		'idx': 56,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00373',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'grand_total_export'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'rounded_total_export',
 		'idx': 57,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00374',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'rounded_total_export'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'customer_mobile_no',
-		'idx': 57,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2010-08-08 17:09:35',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00376',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'customer_mobile_no'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'in_words_export',
 		'idx': 58,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00375',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'in_words_export'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 12:58:43',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'allocated_amount',
 		'idx': 59,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': '000003469',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'customer_mobile_no'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'allocated_amount',
 		'idx': 60,
 		'map': 'Yes',
 		'match_id': 3,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00377',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'allocated_amount'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'allocated_percentage',
 		'idx': 60,
 		'map': 'Yes',
 		'match_id': 3,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00378',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'allocated_percentage'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'sales_person',
 		'idx': 61,
 		'map': 'Yes',
 		'match_id': 3,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00379',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'sales_person'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'source',
 		'idx': 62,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00380',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'source'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'campaign',
 		'idx': 63,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00381',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'campaign'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'brand',
 		'idx': 64,
 		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00382',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'brand'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'terms',
 		'idx': 65,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00384',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'terms'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'territory',
 		'idx': 66,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00383',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'territory'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'tc_name',
 		'idx': 66,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00385',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'tc_name'
 	},
+
+	# Field Mapper Detail
 	{
 		'checking_operator': '=',
-		'creation': '2010-09-09 12:52:00',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'project_name',
 		'idx': 67,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00592',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'project_name'
 	},
+
+	# Field Mapper Detail
 	{
 		'checking_operator': '=',
-		'creation': '2010-09-09 12:52:00',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'customer',
 		'idx': 70,
 		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00593',
-		'owner': 'saumil@webnotestech.com',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'customer'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
 		'from_field': 'sales_team',
 		'from_table': 'Sales Team',
 		'idx': 1,
 		'match_id': 3,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000035',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
-		'reference_key': None,
 		'to_field': 'sales_team',
 		'to_table': 'Sales Team',
 		'validation_logic': 'name is not null'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
 		'from_field': 'other_charges',
 		'from_table': 'RV Tax Detail',
 		'idx': 2,
 		'match_id': 2,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000036',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
-		'reference_key': None,
 		'to_field': 'other_charges',
 		'to_table': 'RV Tax Detail',
 		'validation_logic': 'name is not null'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
 		'from_field': 'sales_order_details',
 		'from_table': 'Sales Order Detail',
 		'idx': 3,
 		'match_id': 1,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000037',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'reference_doctype_key': 'prevdoc_doctype',
 		'reference_key': 'prevdoc_detail_docname',
 		'to_field': 'delivery_note_details',
 		'to_table': 'Delivery Note Detail',
 		'validation_logic': 'qty > ifnull(delivered_qty,0) and docstatus = 1'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
-		'from_field': None,
 		'from_table': 'Sales Order',
 		'idx': 4,
 		'match_id': 0,
-		'modified': '2011-05-20 12:58:43',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000038',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Delivery Note',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
 		'reference_key': 'prevdoc_docname',
-		'to_field': None,
 		'to_table': 'Delivery Note',
 		'validation_logic': 'docstatus = 1'
 	}
diff --git a/stock/Print Format/Purchase Receipt Format/Purchase Receipt Format.txt b/stock/Print Format/Purchase Receipt Format/Purchase Receipt Format.txt
index 3314962..fc7bc0e 100644
--- a/stock/Print Format/Purchase Receipt Format/Purchase Receipt Format.txt
+++ b/stock/Print Format/Purchase Receipt Format/Purchase Receipt Format.txt
@@ -1 +1,27 @@
-[{'modified_by': 'Administrator', 'name': 'Purchase Receipt Format', 'parent': None, 'creation': '2009-03-12 12:10:22', 'modified': '2009-09-07 11:03:11', 'module': 'Material Management', 'doctype': 'Print Format', 'idx': None, 'parenttype': None, 'html': '<html>\n<head>\n<!--Other charges function-->\n<script>\n    var make_row = function(title,val,bold){\n    var bstart = \'<b>\'; var bend = \'</b>\';\n    return \'<tr><td style="width:50%">\'+(bold?bstart:\'\')+title+(bold?bend:\'\')+\'</td>\'\n              +\'<td style="width:20%;text-align:right">\'+doc.currency+\'</td>\'\n              +\'<td style="width:30%;text-align:right">\'+(val?val:\'0.00\')+\'</td>\'\n              +\'</tr>\'\n  }\n\n  function get_other_charges(){\n    var out =\'\';\n    out += \'<div><table class="noborder" style="width:100%">\';\n    out += make_row(\'Total Amount\',fmt_money(convert_rate(doc.total_amount)),1)\n          +make_row(\'Grand Total\',fmt_money(convert_rate(doc.grand_total)),1);\n    out += \'</table></div>\';\n    return out;\n  }\n\n  function get_buying_costs(){\n    var out =\'\';\n    if(doc.buying_cost_transport || doc.buying_cost_taxes || doc.buying_cost_other){\n      out += \'<div><table class="noborder" style="width:100%">\'\n            + \'<tr><td style="width:100%"><b>\'+\'Buying Cost Details\'+\'</b></td></tr>\';\n      if(doc.buying_cost_transport){ out += make_row(\'Transport Cost\',fmt_money(convert_rate(doc.buying_cost_transport)),0)}\n      if(doc.buying_cost_taxes){ out += make_row(\'Taxes\',fmt_money(convert_rate(doc.buying_cost_taxes)),0)}\n      if(doc.buying_cost_other){ out += make_row(\'Other Cost\',fmt_money(convert_rate(doc.buying_cost_other)),0)}\n      out += \'</table></div>\';\n    }\n    return out;\n  }\n\n  function get_letter_head(){\n    var cp = locals[\'Control Panel\'][\'Control Panel\'];\n  \tif(cp.letter_head) {return cp.letter_head; }\n  }\n  \n  function convert_rate(val){\n    var new_val = flt(val)/flt(doc.conversion_rate);\n    return new_val;\n  }\n  \n    function get_transport_details(){\n    var out = \'\';\n    if(doc.transporter_name || doc.lr_no || doc.lr_date){\n     out += \'<div><table class="noborder" style="width:40%">\'\n            +\'<tr><td style="width:80%"><b>\' + \'Transporter Details\'+\'</b></td><td style="width:20%"></td></tr>\'\n\n     if(doc.transporter_name){ out += \'<tr><td style="width:40%">\' + \'Transporter Name\'+\'</td><td style="width:60%">\'+doc.transporter_name+\'</td></tr>\'}\n     if(doc.lr_no){ out += \'<tr><td style="width:40%">\' + \'LR No\'+\'</td><td style="width:60%">\'+doc.lr_no+\'</td></tr>\'}\n     if(doc.lr_date){ out += \'<tr><td style="width:40%">\' + \'LR Date\'+\'</td><td style="width:60%">\'+doc.lr_date+\'</td></tr>\'}\n     out += \'</table></div>\'\n    }\n    return out;\n  }\n\n</script>\n</head>\n<body>\n<div style="border:1px solid black;padding:15px">\n<!--header-->\n<div><script>get_letter_head()</script></div>\n<div style="border-bottom: 1px solid; padding-bottom: 5px;">\n <div><br><b>Purchase Receipt: <script>doc.name</script></b></div>\n <div>Date: <script>date.str_to_user(doc.transaction_date)</script></div>\n</div>\n\n<div style="padding-top:15px">\n<div><script>doc.supplier</script></div>\n<div><br><script>replace_newlines(doc.supplier_address)</script></div>\n</div>\n\n<div>\n<br>\n    <script>\n    var t = print_table(\'Purchase Receipt\', doc.name, \'purchase_receipt_details\', \'Purchase Receipt Detail\', [\'SR\', \'item_code\',\'description\',\'received_qty\',\'qty\',\'rejected_qty\',\'po_rate\',\'amount\',\'billed_qty\'], [\'Sr\', \'Item Code\', \'Description\',\'Received Quantity\',\'Accepted Qty\',\'Rejected Qty\',\'Rate\',\'Amount\',\'Billed Qty\'], [\'4%\',\'12%\', \'24%\', \'10%\',\'10%\',\'10%\',\'10%\',\'10%\',\'10%\'])\n    if(t.appendChild) {\n      // single\n      out = t.innerHTML;\n    } \n    else {//multiple\n      out = \'\'\n      for(var i=0;i<t.length;i++) {\n        if(i!=t.length-1){\n          out += \'<div style:"padding-top:5px;"></div>\' + t[i].innerHTML +\'<div style="page-break-after:always"></div>\';\n        }\n        else out += \'<div style:"padding-top:5px;"></div>\' + t[i].innerHTML;\n      }\n    }\n    out;\n    </script>\n\n</div>\n\n<!--Other charges table-->\n<div>\n<table style="width:100%">\n  <tr><td style="width:40%"><script>get_buying_costs()</script></td>\n  <td style="width:20%"></td><td style="width:40%"><script>get_other_charges()</script></td></tr>\n</table>\n</div>\n<div><script>get_transport_details()</script></div>\n<div><br>Payment Terms</div>\n<div><br><script>replace_newlines(doc.payment_terms)</script></div>\n<div><br>For NCSCI</div>\n<div><br><br>(Authorised Signatory)</div>\n</div></body>\n</html>', 'owner': 'Administrator', 'docstatus': 0, 'standard': 'Yes', 'parentfield': None}]
\ No newline at end of file
+# Print Format, Purchase Receipt Format
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:09:34',
+		'docstatus': 0,
+		'modified': '2009-09-07 11:03:11',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Print Format
+	{
+		'doctype': 'Print Format',
+		'html': '<html>\n<head>\n<!--Other charges function-->\n<script>\n    var make_row = function(title,val,bold){\n    var bstart = \'<b>\'; var bend = \'</b>\';\n    return \'<tr><td style="width:50%">\'+(bold?bstart:\'\')+title+(bold?bend:\'\')+\'</td>\'\n              +\'<td style="width:20%;text-align:right">\'+doc.currency+\'</td>\'\n              +\'<td style="width:30%;text-align:right">\'+(val?val:\'0.00\')+\'</td>\'\n              +\'</tr>\'\n  }\n\n  function get_other_charges(){\n    var out =\'\';\n    out += \'<div><table class="noborder" style="width:100%">\';\n    out += make_row(\'Total Amount\',fmt_money(convert_rate(doc.total_amount)),1)\n          +make_row(\'Grand Total\',fmt_money(convert_rate(doc.grand_total)),1);\n    out += \'</table></div>\';\n    return out;\n  }\n\n  function get_buying_costs(){\n    var out =\'\';\n    if(doc.buying_cost_transport || doc.buying_cost_taxes || doc.buying_cost_other){\n      out += \'<div><table class="noborder" style="width:100%">\'\n            + \'<tr><td style="width:100%"><b>\'+\'Buying Cost Details\'+\'</b></td></tr>\';\n      if(doc.buying_cost_transport){ out += make_row(\'Transport Cost\',fmt_money(convert_rate(doc.buying_cost_transport)),0)}\n      if(doc.buying_cost_taxes){ out += make_row(\'Taxes\',fmt_money(convert_rate(doc.buying_cost_taxes)),0)}\n      if(doc.buying_cost_other){ out += make_row(\'Other Cost\',fmt_money(convert_rate(doc.buying_cost_other)),0)}\n      out += \'</table></div>\';\n    }\n    return out;\n  }\n\n  function get_letter_head(){\n    var cp = locals[\'Control Panel\'][\'Control Panel\'];\n  \tif(cp.letter_head) {return cp.letter_head; }\n  }\n  \n  function convert_rate(val){\n    var new_val = flt(val)/flt(doc.conversion_rate);\n    return new_val;\n  }\n  \n    function get_transport_details(){\n    var out = \'\';\n    if(doc.transporter_name || doc.lr_no || doc.lr_date){\n     out += \'<div><table class="noborder" style="width:40%">\'\n            +\'<tr><td style="width:80%"><b>\' + \'Transporter Details\'+\'</b></td><td style="width:20%"></td></tr>\'\n\n     if(doc.transporter_name){ out += \'<tr><td style="width:40%">\' + \'Transporter Name\'+\'</td><td style="width:60%">\'+doc.transporter_name+\'</td></tr>\'}\n     if(doc.lr_no){ out += \'<tr><td style="width:40%">\' + \'LR No\'+\'</td><td style="width:60%">\'+doc.lr_no+\'</td></tr>\'}\n     if(doc.lr_date){ out += \'<tr><td style="width:40%">\' + \'LR Date\'+\'</td><td style="width:60%">\'+doc.lr_date+\'</td></tr>\'}\n     out += \'</table></div>\'\n    }\n    return out;\n  }\n\n</script>\n</head>\n<body>\n<div style="border:1px solid black;padding:15px">\n<!--header-->\n<div><script>get_letter_head()</script></div>\n<div style="border-bottom: 1px solid; padding-bottom: 5px;">\n <div><br><b>Purchase Receipt: <script>doc.name</script></b></div>\n <div>Date: <script>date.str_to_user(doc.transaction_date)</script></div>\n</div>\n\n<div style="padding-top:15px">\n<div><script>doc.supplier</script></div>\n<div><br><script>replace_newlines(doc.address_display)</script></div>\n</div>\n\n<div>\n<br>\n    <script>\n    var t = print_table(\'Purchase Receipt\', doc.name, \'purchase_receipt_details\', \'Purchase Receipt Detail\', [\'SR\', \'item_code\',\'description\',\'received_qty\',\'qty\',\'rejected_qty\',\'po_rate\',\'amount\',\'billed_qty\'], [\'Sr\', \'Item Code\', \'Description\',\'Received Quantity\',\'Accepted Qty\',\'Rejected Qty\',\'Rate\',\'Amount\',\'Billed Qty\'], [\'4%\',\'12%\', \'24%\', \'10%\',\'10%\',\'10%\',\'10%\',\'10%\',\'10%\'])\n    if(t.appendChild) {\n      // single\n      out = t.innerHTML;\n    } \n    else {//multiple\n      out = \'\'\n      for(var i=0;i<t.length;i++) {\n        if(i!=t.length-1){\n          out += \'<div style:"padding-top:5px;"></div>\' + t[i].innerHTML +\'<div style="page-break-after:always"></div>\';\n        }\n        else out += \'<div style:"padding-top:5px;"></div>\' + t[i].innerHTML;\n      }\n    }\n    out;\n    </script>\n\n</div>\n\n<!--Other charges table-->\n<div>\n<table style="width:100%">\n  <tr><td style="width:40%"><script>get_buying_costs()</script></td>\n  <td style="width:20%"></td><td style="width:40%"><script>get_other_charges()</script></td></tr>\n</table>\n</div>\n<div><script>get_transport_details()</script></div>\n<div><br>Payment Terms</div>\n<div><br><script>replace_newlines(doc.payment_terms)</script></div>\n<div><br>For NCSCI</div>\n<div><br><br>(Authorised Signatory)</div>\n</div></body>\n</html>',
+		'module': 'Stock',
+		'name': '__common__',
+		'standard': 'Yes'
+	},
+
+	# Print Format, Purchase Receipt Format
+	{
+		'doctype': 'Print Format',
+		'name': 'Purchase Receipt Format'
+	}
+]
\ No newline at end of file
diff --git a/stock/Role/Material Manager/Material Manager.txt b/stock/Role/Material Manager/Material Manager.txt
index 9e3ba18..1d6369b 100644
--- a/stock/Role/Material Manager/Material Manager.txt
+++ b/stock/Role/Material Manager/Material Manager.txt
@@ -1 +1,26 @@
-[{'modified_by': 'Administrator', 'name': 'Material Manager', 'parent': None, 'creation': '2009-03-12 12:09:44', 'modified': '2009-03-19 14:56:51', 'module': 'Roles', 'doctype': 'Role', 'idx': None, 'parenttype': None, 'role_name': 'Material Manager', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': None}]
\ No newline at end of file
+# Role, Material Manager
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:51',
+		'docstatus': 0,
+		'modified': '2009-03-19 14:56:51',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Role
+	{
+		'doctype': 'Role',
+		'module': 'Stock',
+		'name': '__common__',
+		'role_name': 'Material Manager'
+	},
+
+	# Role, Material Manager
+	{
+		'doctype': 'Role',
+		'name': 'Material Manager'
+	}
+]
\ No newline at end of file
diff --git a/stock/Role/Material Master Manager/Material Master Manager.txt b/stock/Role/Material Master Manager/Material Master Manager.txt
index 5f4666d..10fac2c 100644
--- a/stock/Role/Material Master Manager/Material Master Manager.txt
+++ b/stock/Role/Material Master Manager/Material Master Manager.txt
@@ -1 +1,26 @@
-[{'modified_by': 'Administrator', 'name': 'Material Master Manager', 'parent': None, 'creation': '2010-04-08 13:49:58', 'modified': '2010-04-08 13:49:58', 'module': 'Roles', 'doctype': 'Role', 'idx': None, 'parenttype': None, 'role_name': 'Material Master Manager', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': None}]
\ No newline at end of file
+# Role, Material Master Manager
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:51',
+		'docstatus': 0,
+		'modified': '2010-04-08 13:49:58',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Role
+	{
+		'doctype': 'Role',
+		'module': 'Stock',
+		'name': '__common__',
+		'role_name': 'Material Master Manager'
+	},
+
+	# Role, Material Master Manager
+	{
+		'doctype': 'Role',
+		'name': 'Material Master Manager'
+	}
+]
\ No newline at end of file
diff --git a/stock/Role/Material User/Material User.txt b/stock/Role/Material User/Material User.txt
index 320e280..1436ccb 100644
--- a/stock/Role/Material User/Material User.txt
+++ b/stock/Role/Material User/Material User.txt
@@ -1 +1,26 @@
-[{'modified_by': 'Administrator', 'name': 'Material User', 'parent': None, 'creation': '2010-04-08 12:08:13', 'modified': '2010-04-08 12:08:13', 'module': 'Roles', 'doctype': 'Role', 'idx': None, 'parenttype': None, 'role_name': 'Material User', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': None}]
\ No newline at end of file
+# Role, Material User
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:51',
+		'docstatus': 0,
+		'modified': '2010-04-08 12:08:13',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Role
+	{
+		'doctype': 'Role',
+		'module': 'Stock',
+		'name': '__common__',
+		'role_name': 'Material User'
+	},
+
+	# Role, Material User
+	{
+		'doctype': 'Role',
+		'name': 'Material User'
+	}
+]
\ No newline at end of file
diff --git a/stock/Role/Quality Manager/Quality Manager.txt b/stock/Role/Quality Manager/Quality Manager.txt
index aacf400..226e9aa 100644
--- a/stock/Role/Quality Manager/Quality Manager.txt
+++ b/stock/Role/Quality Manager/Quality Manager.txt
@@ -1 +1,26 @@
-[{'modified_by': 'Administrator', 'name': 'Quality Manager', 'parent': None, 'creation': '2010-05-04 13:12:27', 'modified': '2010-05-04 13:12:27', 'module': 'Roles', 'doctype': 'Role', 'idx': None, 'parenttype': None, 'role_name': 'Quality Manager', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': None}]
\ No newline at end of file
+# Role, Quality Manager
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:51',
+		'docstatus': 0,
+		'modified': '2010-05-04 13:12:27',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Role
+	{
+		'doctype': 'Role',
+		'module': 'Stock',
+		'name': '__common__',
+		'role_name': 'Quality Manager'
+	},
+
+	# Role, Quality Manager
+	{
+		'doctype': 'Role',
+		'name': 'Quality Manager'
+	}
+]
\ No newline at end of file
diff --git a/stock/doctype/landed_cost_detail/landed_cost_detail.txt b/stock/doctype/landed_cost_detail/landed_cost_detail.txt
index 16fadba..78efae5 100644
--- a/stock/doctype/landed_cost_detail/landed_cost_detail.txt
+++ b/stock/doctype/landed_cost_detail/landed_cost_detail.txt
@@ -15,7 +15,7 @@
 		'colour': 'White:FFF',
 		'doctype': 'DocType',
 		'istable': 1,
-		'module': 'stock',
+		'module': 'Stock',
 		'name': '__common__',
 		'section_style': 'Simple',
 		'server_code_error': ' ',
diff --git a/stock/doctype/lc_pr_detail/lc_pr_detail.txt b/stock/doctype/lc_pr_detail/lc_pr_detail.txt
index 555f88e..706af56 100644
--- a/stock/doctype/lc_pr_detail/lc_pr_detail.txt
+++ b/stock/doctype/lc_pr_detail/lc_pr_detail.txt
@@ -15,7 +15,7 @@
 		'colour': 'White:FFF',
 		'doctype': 'DocType',
 		'istable': 1,
-		'module': 'stock',
+		'module': 'Stock',
 		'name': '__common__',
 		'section_style': 'Simple',
 		'server_code_error': ' ',
diff --git a/stock/search_criteria/itemwise_price_list/itemwise_price_list.txt b/stock/search_criteria/itemwise_price_list/itemwise_price_list.txt
index 6c6a2e7..0e029cb 100644
--- a/stock/search_criteria/itemwise_price_list/itemwise_price_list.txt
+++ b/stock/search_criteria/itemwise_price_list/itemwise_price_list.txt
@@ -1,37 +1,34 @@
+# Search Criteria, itemwise_price_list
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Item\x01Item Name,Item\x01Item Group,Ref Rate Detail\x01Price List Name,Ref Rate Detail\x01Ref Rate,Ref Rate Detail\x01Currency',
-		'creation': '2010-08-20 12:20:55',
-		'criteria_name': 'Itemwise Price List',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Ref Rate Detail',
+		'creation': '2010-08-20 12:20:56',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Item\x01Saved':1,'Ref Rate Detail\x01Price List Name':'','Ref Rate Detail\x01Currency':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-08-20 12:15:17',
 		'modified_by': 'Administrator',
-		'module': 'Material Management',
-		'name': 'itemwise_price_list',
-		'owner': 'harshada@webnotestech.com',
+		'owner': 'harshada@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Item\x01Item Name,Item\x01Item Group,Ref Rate Detail\x01Price List Name,Ref Rate Detail\x01Ref Rate,Ref Rate Detail\x01Currency',
+		'criteria_name': 'Itemwise Price List',
+		'doc_type': 'Ref Rate Detail',
+		'doctype': 'Search Criteria',
+		'filters': "{'Item\x01Saved':1,'Ref Rate Detail\x01Price List Name':'','Ref Rate Detail\x01Currency':''}",
+		'module': 'Stock',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Item',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabItem`.`item_name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, itemwise_price_list
+	{
+		'doctype': 'Search Criteria',
+		'name': 'itemwise_price_list'
 	}
 ]
\ No newline at end of file
diff --git a/stock/search_criteria/shortage_to_indent/shortage_to_indent.txt b/stock/search_criteria/shortage_to_indent/shortage_to_indent.txt
index 2ac52a1..4b3e396 100644
--- a/stock/search_criteria/shortage_to_indent/shortage_to_indent.txt
+++ b/stock/search_criteria/shortage_to_indent/shortage_to_indent.txt
@@ -1,37 +1,33 @@
+# Search Criteria, shortage_to_indent
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Item\x01ID,Item\x01Item Name,Item\x01Description,Item\x01Lead Time Days',
-		'creation': '2011-05-25 12:44:22',
-		'criteria_name': 'Shortage To Indent',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Item',
+		'creation': '2011-05-18 11:48:54',
 		'docstatus': 0,
+		'modified': '2011-05-18 11:52:59',
+		'modified_by': 'Administrator',
+		'owner': 'wasim@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Item\x01ID,Item\x01Item Name,Item\x01Description,Item\x01Lead Time Days',
+		'criteria_name': 'Shortage To Indent',
+		'doc_type': 'Item',
 		'doctype': 'Search Criteria',
 		'filters': "{'Item\x01Saved':1}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2011-05-18 11:52:59',
-		'modified_by': 'Guest',
-		'module': 'Material Management',
-		'name': 'shortage_to_indent',
-		'owner': 'wasim@webnotestech.com',
+		'module': 'Stock',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabItem`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, shortage_to_indent
+	{
+		'doctype': 'Search Criteria',
+		'name': 'shortage_to_indent'
 	}
 ]
\ No newline at end of file
diff --git a/stock/search_criteria/stock_aging_report/stock_aging_report.txt b/stock/search_criteria/stock_aging_report/stock_aging_report.txt
index ab5ab76..bbc8b5c 100644
--- a/stock/search_criteria/stock_aging_report/stock_aging_report.txt
+++ b/stock/search_criteria/stock_aging_report/stock_aging_report.txt
@@ -1,37 +1,34 @@
+# Search Criteria, stock_aging_report
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': '',
-		'add_cond': "`tabSerial No`.status = 'In Store'",
-		'add_tab': None,
-		'columns': 'Serial No\x01ID,Serial No\x01Item Code,Serial No\x01Description,Serial No\x01Item Group,Serial No\x01Purchase Date',
-		'creation': '2010-09-01 15:47:57',
-		'criteria_name': 'Stock Aging Report',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Serial No',
+		'creation': '2010-09-01 15:48:09',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Serial No\x01Saved':1,'Serial No\x01Submitted':1,'Serial No\x01Status':'In Store','Serial No\x01Maintenance Status':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-08-16 13:42:24',
 		'modified_by': 'Administrator',
-		'module': 'Material Management',
-		'name': 'stock_aging_report',
-		'owner': 'ashwini@webnotestech.com',
+		'owner': 'ashwini@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': "`tabSerial No`.status = 'In Store'",
+		'columns': 'Serial No\x01ID,Serial No\x01Item Code,Serial No\x01Description,Serial No\x01Item Group,Serial No\x01Purchase Date',
+		'criteria_name': 'Stock Aging Report',
+		'doc_type': 'Serial No',
+		'doctype': 'Search Criteria',
+		'filters': "{'Serial No\x01Saved':1,'Serial No\x01Submitted':1,'Serial No\x01Status':'In Store','Serial No\x01Maintenance Status':''}",
+		'module': 'Stock',
+		'name': '__common__',
 		'page_len': 1000,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabSerial No`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, stock_aging_report
+	{
+		'doctype': 'Search Criteria',
+		'name': 'stock_aging_report'
 	}
 ]
\ No newline at end of file
diff --git a/stock/search_criteria/stock_ledger/stock_ledger.txt b/stock/search_criteria/stock_ledger/stock_ledger.txt
index 8185138..34dd521 100644
--- a/stock/search_criteria/stock_ledger/stock_ledger.txt
+++ b/stock/search_criteria/stock_ledger/stock_ledger.txt
@@ -1,37 +1,33 @@
+# Search Criteria, stock_ledger
 [
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-10-14 08:43:05',
+		'docstatus': 0,
+		'modified': '2010-10-14 08:31:40',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
 	{
 		'add_col': '`tabItem`.`item_name`\n`tabItem`.`description`',
 		'add_cond': '`tabItem`.`name` = `tabStock Ledger Entry`.`item_code`',
 		'add_tab': '`tabItem`',
 		'columns': 'Stock Ledger Entry\x01Item Code,Stock Ledger Entry\x01Warehouse,Stock Ledger Entry\x01Posting Date,Stock Ledger Entry\x01Voucher Detail No,Stock Ledger Entry\x01Actual Quantity,Stock Ledger Entry\x01Bin Actual Qty After Transaction',
-		'creation': '2010-10-14 08:43:04',
 		'criteria_name': 'Stock Ledger',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
 		'doc_type': 'Stock Ledger Entry',
-		'docstatus': 0,
 		'doctype': 'Search Criteria',
 		'filters': "{'Stock Ledger Entry\x01Is Cancelled':'','Stock Ledger Entry\x01Is Stock Entry':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2010-10-14 08:31:40',
-		'modified_by': 'Administrator',
-		'module': 'Material Management',
-		'name': 'stock_ledger',
-		'owner': 'Administrator',
-		'page_len': None,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
-		'sort_by': None,
-		'sort_order': None,
+		'module': 'Stock',
+		'name': '__common__',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, stock_ledger
+	{
+		'doctype': 'Search Criteria',
+		'name': 'stock_ledger'
 	}
 ]
\ No newline at end of file
diff --git a/stock/search_criteria/stock_level/stock_level.txt b/stock/search_criteria/stock_level/stock_level.txt
index 7c87ec0..252cdff 100644
--- a/stock/search_criteria/stock_level/stock_level.txt
+++ b/stock/search_criteria/stock_level/stock_level.txt
@@ -1,37 +1,36 @@
+# Search Criteria, stock_level
 [
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-12-14 10:23:23',
+		'docstatus': 0,
+		'modified': '2010-10-20 16:51:11',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
 	{
 		'add_col': '`tabItem`.`item_name`\n`tabItem`.`description`',
 		'add_cond': '`tabItem`.name = `tabBin`.item_code',
 		'add_tab': '`tabItem`',
 		'columns': 'Bin\x01Warehouse,Bin\x01Item Code,Bin\x01UOM,Bin\x01Reserved Quantity,Bin\x01Actual Quantity,Bin\x01Ordered Quantity,Bin\x01Planned Qty,Bin\x01Projected Qty,Bin\x01Indented Quantity,Bin\x01Valuation Rate,Bin\x01Stock Value',
-		'creation': '2010-12-14 10:33:08',
 		'criteria_name': 'Stock Level',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
 		'doc_type': 'Bin',
-		'docstatus': 0,
 		'doctype': 'Search Criteria',
 		'filters': '{}',
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2010-10-20 16:51:11',
-		'modified_by': 'Administrator',
-		'module': 'Material Management',
-		'name': 'stock_level',
-		'owner': 'Administrator',
+		'module': 'Stock',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabBin`.`warehouse`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, stock_level
+	{
+		'doctype': 'Search Criteria',
+		'name': 'stock_level'
 	}
 ]
\ No newline at end of file
diff --git a/stock/search_criteria/stock_report/stock_report.txt b/stock/search_criteria/stock_report/stock_report.txt
index 323214d..df73fba 100644
--- a/stock/search_criteria/stock_report/stock_report.txt
+++ b/stock/search_criteria/stock_report/stock_report.txt
@@ -1,37 +1,33 @@
+# Search Criteria, stock_report
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Stock Ledger Entry\x01ID',
-		'creation': '2010-11-02 15:37:36',
-		'criteria_name': 'Stock Report',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Stock Ledger Entry',
+		'creation': '2010-11-02 15:37:37',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Stock Ledger Entry\x01Is Cancelled':'','Stock Ledger Entry\x01Is Stock Entry':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-11-02 15:35:12',
 		'modified_by': 'Administrator',
-		'module': 'Material Management',
-		'name': 'stock_report',
-		'owner': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Stock Ledger Entry\x01ID',
+		'criteria_name': 'Stock Report',
+		'doc_type': 'Stock Ledger Entry',
+		'doctype': 'Search Criteria',
+		'filters': "{'Stock Ledger Entry\x01Is Cancelled':'','Stock Ledger Entry\x01Is Stock Entry':''}",
+		'module': 'Stock',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabStock Ledger Entry`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, stock_report
+	{
+		'doctype': 'Search Criteria',
+		'name': 'stock_report'
 	}
 ]
\ No newline at end of file
diff --git a/support/DocType Mapper/Customer Issue-Maintenance Visit/Customer Issue-Maintenance Visit.txt b/support/DocType Mapper/Customer Issue-Maintenance Visit/Customer Issue-Maintenance Visit.txt
index 3beb0f5..5d2e6a1 100644
--- a/support/DocType Mapper/Customer Issue-Maintenance Visit/Customer Issue-Maintenance Visit.txt
+++ b/support/DocType Mapper/Customer Issue-Maintenance Visit/Customer Issue-Maintenance Visit.txt
@@ -1,405 +1,232 @@
+# DocType Mapper, Customer Issue-Maintenance Visit
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': None,
-		'_user_tags': None,
 		'creation': '2010-08-08 17:09:34',
 		'docstatus': 0,
-		'doctype': u'DocType Mapper',
-		'from_doctype': 'Customer Issue',
-		'idx': None,
 		'modified': '2011-05-18 13:37:43',
 		'modified_by': 'Administrator',
-		'module': 'Mapper',
-		'name': 'Customer Issue-Maintenance Visit',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': None,
-		'parentfield': None,
-		'parenttype': None,
+		'owner': 'ashwini@webnotestech.com'
+	},
+
+	# These values are common for all Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'from_table': 'Customer Issue',
+		'name': '__common__',
+		'parent': 'Customer Issue-Maintenance Visit',
+		'parentfield': 'table_mapper_details',
+		'parenttype': 'DocType Mapper',
+		'reference_key': 'prevdoc_docname',
+		'validation_logic': 'docstatus=1'
+	},
+
+	# These values are common for all Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'map': 'Yes',
+		'name': '__common__',
+		'parent': 'Customer Issue-Maintenance Visit',
+		'parentfield': 'field_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all DocType Mapper
+	{
+		'doctype': 'DocType Mapper',
+		'from_doctype': 'Customer Issue',
+		'module': 'Support',
+		'name': '__common__',
 		'ref_doc_submitted': 1,
 		'to_doctype': 'Maintenance Visit'
 	},
+
+	# DocType Mapper, Customer Issue-Maintenance Visit
+	{
+		'doctype': 'DocType Mapper',
+		'name': 'Customer Issue-Maintenance Visit'
+	},
+
+	# Field Mapper Detail
 	{
 		'checking_operator': '=',
-		'creation': '2010-09-01 15:48:10',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'customer',
 		'idx': 1,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00555',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Customer Issue-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'customer'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:24',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'customer_address',
 		'idx': 2,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': '000003470',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Customer Issue-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'customer_address'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'customer_address',
-		'idx': 2,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2010-08-08 17:09:34',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00012',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Customer Issue-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'address'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:24',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_person',
 		'idx': 3,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': '000003471',
-		'owner': 'Administrator',
-		'parent': 'Customer Issue-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_person'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'customer_name',
 		'idx': 4,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00011',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Customer Issue-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'customer_name'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:24',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'address_display',
 		'idx': 5,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': '000003472',
-		'owner': 'Administrator',
-		'parent': 'Customer Issue-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'address_display'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:24',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_display',
 		'idx': 6,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': '000003473',
-		'owner': 'Administrator',
-		'parent': 'Customer Issue-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_display'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:24',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_mobile',
 		'idx': 7,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': '000003474',
-		'owner': 'Administrator',
-		'parent': 'Customer Issue-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_mobile'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:24',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_email',
 		'idx': 8,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': '000003475',
-		'owner': 'Administrator',
-		'parent': 'Customer Issue-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_email'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'territory',
 		'idx': 9,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00013',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Customer Issue-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'territory'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:24',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'customer_group',
 		'idx': 10,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': '000003476',
-		'owner': 'Administrator',
-		'parent': 'Customer Issue-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'customer_group'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'company',
 		'idx': 11,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00014',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Customer Issue-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'company'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'fiscal_year',
 		'idx': 12,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00015',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Customer Issue-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'fiscal_year'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'name',
 		'idx': 13,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00016',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Customer Issue-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'customer_issue_no'
 	},
+
+	# Field Mapper Detail
 	{
 		'checking_operator': '=',
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'complaint',
 		'idx': 14,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00017',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Customer Issue-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'description'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_code',
 		'idx': 15,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00018',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Customer Issue-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_code'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_name',
 		'idx': 16,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00019',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Customer Issue-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_name'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'doctype',
 		'idx': 17,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00020',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Customer Issue-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'prevdoc_doctype'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'name',
 		'idx': 18,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00021',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Customer Issue-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'prevdoc_docname'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
-		'from_field': None,
-		'from_table': 'Customer Issue',
 		'idx': 1,
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000003',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Customer Issue-Maintenance Visit',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'reference_doctype_key': 'prevdoc_doctype',
-		'reference_key': 'prevdoc_docname',
 		'to_field': 'maintenance_visit_details',
-		'to_table': 'Maintenance Visit Detail',
-		'validation_logic': 'docstatus=1'
+		'to_table': 'Maintenance Visit Detail'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2010-08-08 17:09:34',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
-		'from_field': None,
-		'from_table': 'Customer Issue',
 		'idx': 2,
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:24',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000004',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Customer Issue-Maintenance Visit',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
-		'reference_key': 'prevdoc_docname',
-		'to_field': None,
-		'to_table': 'Maintenance Visit',
-		'validation_logic': 'docstatus=1'
+		'to_table': 'Maintenance Visit'
 	}
 ]
\ No newline at end of file
diff --git a/support/DocType Mapper/Sales Order-Maintenance Schedule/Sales Order-Maintenance Schedule.txt b/support/DocType Mapper/Sales Order-Maintenance Schedule/Sales Order-Maintenance Schedule.txt
index bb6c771..9cc6c58 100644
--- a/support/DocType Mapper/Sales Order-Maintenance Schedule/Sales Order-Maintenance Schedule.txt
+++ b/support/DocType Mapper/Sales Order-Maintenance Schedule/Sales Order-Maintenance Schedule.txt
@@ -1,368 +1,214 @@
+# DocType Mapper, Sales Order-Maintenance Schedule
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': None,
-		'_user_tags': None,
 		'creation': '2010-08-08 17:09:35',
 		'docstatus': 0,
-		'doctype': u'DocType Mapper',
-		'from_doctype': 'Sales Order',
-		'idx': None,
 		'modified': '2011-05-18 11:05:26',
 		'modified_by': 'Administrator',
-		'module': 'Mapper',
-		'name': 'Sales Order-Maintenance Schedule',
-		'owner': 'Administrator',
-		'parent': None,
-		'parentfield': None,
-		'parenttype': None,
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'name': '__common__',
+		'parent': 'Sales Order-Maintenance Schedule',
+		'parentfield': 'table_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'map': 'Yes',
+		'name': '__common__',
+		'parent': 'Sales Order-Maintenance Schedule',
+		'parentfield': 'field_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all DocType Mapper
+	{
+		'doctype': 'DocType Mapper',
+		'from_doctype': 'Sales Order',
+		'module': 'Support',
+		'name': '__common__',
 		'ref_doc_submitted': 1,
 		'to_doctype': 'Maintenance Schedule'
 	},
+
+	# DocType Mapper, Sales Order-Maintenance Schedule
+	{
+		'doctype': 'DocType Mapper',
+		'name': 'Sales Order-Maintenance Schedule'
+	},
+
+	# Field Mapper Detail
 	{
 		'checking_operator': '=',
-		'creation': '2010-09-15 14:15:40',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'customer',
 		'idx': 1,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00594',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Sales Order-Maintenance Schedule',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'customer'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:27',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'customer_address',
 		'idx': 2,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': '000003515',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Maintenance Schedule',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'customer_address'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'customer_address',
-		'idx': 2,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2010-08-08 17:09:36',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00398',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Maintenance Schedule',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'address'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_person',
 		'idx': 3,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00399',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Maintenance Schedule',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_person'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:35',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'customer_name',
 		'idx': 4,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00397',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Maintenance Schedule',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'customer_name'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:27',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'address_display',
 		'idx': 5,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': '000003516',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Maintenance Schedule',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'address_display'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:27',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_display',
 		'idx': 6,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': '000003517',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Maintenance Schedule',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_display'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:27',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_mobile',
 		'idx': 7,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': '000003518',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Maintenance Schedule',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_mobile'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:27',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_email',
 		'idx': 8,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': '000003519',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Maintenance Schedule',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_email'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'territory',
 		'idx': 9,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00400',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Sales Order-Maintenance Schedule',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'territory'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:27',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'customer_group',
 		'idx': 10,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': '000003520',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Maintenance Schedule',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'customer_group'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'company',
 		'idx': 11,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00401',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Sales Order-Maintenance Schedule',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'company'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'name',
 		'idx': 12,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00402',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Maintenance Schedule',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'sales_order_no'
 	},
+
+	# Field Mapper Detail
 	{
 		'checking_operator': '=',
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_code',
 		'idx': 13,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00403',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Maintenance Schedule',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_code'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_name',
 		'idx': 14,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00404',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Sales Order-Maintenance Schedule',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_name'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'description',
 		'idx': 15,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00405',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Maintenance Schedule',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'description'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'parent',
 		'idx': 16,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00406',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Sales Order-Maintenance Schedule',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'prevdoc_docname'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
 		'from_field': 'sales_order_details',
 		'from_table': 'Sales Order Detail',
 		'idx': 1,
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000041',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Maintenance Schedule',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
-		'reference_key': None,
 		'to_field': 'item_maintenance_detail',
 		'to_table': 'Item Maintenance Detail',
 		'validation_logic': 'docstatus =1'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
-		'from_field': None,
 		'from_table': 'Sales Order',
 		'idx': 2,
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000042',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Maintenance Schedule',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
-		'reference_key': None,
-		'to_field': None,
 		'to_table': 'Maintenance Schedule',
 		'validation_logic': 'docstatus=1'
 	}
diff --git a/support/DocType Mapper/Sales Order-Maintenance Visit/Sales Order-Maintenance Visit.txt b/support/DocType Mapper/Sales Order-Maintenance Visit/Sales Order-Maintenance Visit.txt
index 4196cb8..32de61a 100644
--- a/support/DocType Mapper/Sales Order-Maintenance Visit/Sales Order-Maintenance Visit.txt
+++ b/support/DocType Mapper/Sales Order-Maintenance Visit/Sales Order-Maintenance Visit.txt
@@ -1,405 +1,231 @@
+# DocType Mapper, Sales Order-Maintenance Visit
 [
+
+	# These values are common in all dictionaries
 	{
-		'_last_update': None,
-		'_user_tags': None,
 		'creation': '2010-08-08 17:09:36',
 		'docstatus': 0,
-		'doctype': u'DocType Mapper',
-		'from_doctype': 'Sales Order',
-		'idx': None,
 		'modified': '2011-05-18 13:35:55',
 		'modified_by': 'Administrator',
-		'module': 'Mapper',
-		'name': 'Sales Order-Maintenance Visit',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': None,
-		'parentfield': None,
-		'parenttype': None,
+		'owner': 'ashwini@webnotestech.com'
+	},
+
+	# These values are common for all Table Mapper Detail
+	{
+		'doctype': 'Table Mapper Detail',
+		'name': '__common__',
+		'parent': 'Sales Order-Maintenance Visit',
+		'parentfield': 'table_mapper_details',
+		'parenttype': 'DocType Mapper',
+		'validation_logic': 'docstatus=1'
+	},
+
+	# These values are common for all Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'map': 'Yes',
+		'name': '__common__',
+		'parent': 'Sales Order-Maintenance Visit',
+		'parentfield': 'field_mapper_details',
+		'parenttype': 'DocType Mapper'
+	},
+
+	# These values are common for all DocType Mapper
+	{
+		'doctype': 'DocType Mapper',
+		'from_doctype': 'Sales Order',
+		'module': 'Support',
+		'name': '__common__',
 		'ref_doc_submitted': 1,
 		'to_doctype': 'Maintenance Visit'
 	},
+
+	# DocType Mapper, Sales Order-Maintenance Visit
+	{
+		'doctype': 'DocType Mapper',
+		'name': 'Sales Order-Maintenance Visit'
+	},
+
+	# Field Mapper Detail
 	{
 		'checking_operator': '=',
-		'creation': '2011-05-20 15:54:27',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'customer',
 		'idx': 1,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': '000003521',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'customer'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:27',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'customer_address',
 		'idx': 2,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': '000003522',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Sales Order-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'customer_address'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'customer_address',
-		'idx': 2,
-		'map': 'Yes',
-		'match_id': 0,
-		'modified': '2010-08-08 17:09:36',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00408',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Sales Order-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'to_field': 'address'
-	},
-	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_person',
 		'idx': 3,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00409',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Sales Order-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_person'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'customer_name',
 		'idx': 4,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00407',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Sales Order-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'customer_name'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:27',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'address_display',
 		'idx': 5,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': '000003523',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'address_display'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:27',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_display',
 		'idx': 6,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': '000003524',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_display'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:27',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_mobile',
 		'idx': 7,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': '000003525',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_mobile'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:27',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'contact_email',
 		'idx': 8,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': '000003526',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'contact_email'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'territory',
 		'idx': 9,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00410',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Sales Order-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'territory'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2011-05-20 15:54:27',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'customer_group',
 		'idx': 10,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': '000003527',
-		'owner': 'Administrator',
-		'parent': 'Sales Order-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'customer_group'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'company',
 		'idx': 11,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00411',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Sales Order-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'company'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'fiscal_year',
 		'idx': 12,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00412',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Sales Order-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'fiscal_year'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'name',
 		'idx': 13,
-		'map': 'Yes',
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00413',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Sales Order-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'sales_order_no'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_code',
 		'idx': 14,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00414',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Sales Order-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_code'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'item_name',
 		'idx': 15,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00415',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Sales Order-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'item_name'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'description',
 		'idx': 16,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00416',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Sales Order-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'description'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'parent',
 		'idx': 17,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00417',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Sales Order-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'prevdoc_docname'
 	},
+
+	# Field Mapper Detail
 	{
-		'checking_operator': None,
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'parenttype',
 		'idx': 18,
-		'map': 'Yes',
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'FMD/00418',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Sales Order-Maintenance Visit',
-		'parentfield': 'field_mapper_details',
-		'parenttype': 'DocType Mapper',
 		'to_field': 'prevdoc_doctype'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
 		'from_field': 'sales_order_details',
 		'from_table': 'Sales Order Detail',
 		'idx': 1,
 		'match_id': 1,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000043',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Sales Order-Maintenance Visit',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
-		'reference_key': None,
 		'to_field': 'maintenance_visit_details',
-		'to_table': 'Maintenance Visit Detail',
-		'validation_logic': 'docstatus=1'
+		'to_table': 'Maintenance Visit Detail'
 	},
+
+	# Table Mapper Detail
 	{
-		'creation': '2010-08-08 17:09:36',
-		'docstatus': 0,
 		'doctype': 'Table Mapper Detail',
-		'from_field': None,
 		'from_table': 'Sales Order',
 		'idx': 2,
 		'match_id': 0,
-		'modified': '2011-05-20 15:54:27',
-		'modified_by': 'Administrator',
-		'name': 'TMD/0000044',
-		'owner': 'ashwini@webnotestech.com',
-		'parent': 'Sales Order-Maintenance Visit',
-		'parentfield': 'table_mapper_details',
-		'parenttype': 'DocType Mapper',
-		'reference_doctype_key': None,
-		'reference_key': None,
-		'to_field': None,
-		'to_table': 'Maintenance Visit',
-		'validation_logic': 'docstatus=1'
+		'to_table': 'Maintenance Visit'
 	}
 ]
\ No newline at end of file
diff --git a/support/Role/Maintenance Manager/Maintenance Manager.txt b/support/Role/Maintenance Manager/Maintenance Manager.txt
index 4047171..291a52c 100644
--- a/support/Role/Maintenance Manager/Maintenance Manager.txt
+++ b/support/Role/Maintenance Manager/Maintenance Manager.txt
@@ -1 +1,26 @@
-[{'modified_by': 'ashwini@webnotestech.com', 'name': 'Maintenance Manager', 'parent': None, 'creation': '2010-07-22 15:19:33', 'modified': '2010-07-22 15:19:33', 'module': 'Roles', 'doctype': 'Role', 'idx': None, 'parenttype': None, 'role_name': 'Maintenance Manager', 'owner': 'ashwini@webnotestech.com', 'docstatus': 0, 'parentfield': None}]
\ No newline at end of file
+# Role, Maintenance Manager
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:51',
+		'docstatus': 0,
+		'modified': '2010-07-22 15:19:33',
+		'modified_by': 'Administrator',
+		'owner': 'ashwini@webnotestech.com'
+	},
+
+	# These values are common for all Role
+	{
+		'doctype': 'Role',
+		'module': 'Support',
+		'name': '__common__',
+		'role_name': 'Maintenance Manager'
+	},
+
+	# Role, Maintenance Manager
+	{
+		'doctype': 'Role',
+		'name': 'Maintenance Manager'
+	}
+]
\ No newline at end of file
diff --git a/support/Role/Maintenance User/Maintenance User.txt b/support/Role/Maintenance User/Maintenance User.txt
index 6f7a5ab..c0a9e4e 100644
--- a/support/Role/Maintenance User/Maintenance User.txt
+++ b/support/Role/Maintenance User/Maintenance User.txt
@@ -1 +1,26 @@
-[{'modified_by': 'ashwini@webnotestech.com', 'name': 'Maintenance User', 'parent': None, 'creation': '2010-07-22 15:19:19', 'modified': '2010-07-22 15:19:19', 'module': 'Roles', 'doctype': 'Role', 'idx': None, 'parenttype': None, 'role_name': 'Maintenance User', 'owner': 'ashwini@webnotestech.com', 'docstatus': 0, 'parentfield': None}]
\ No newline at end of file
+# Role, Maintenance User
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:51',
+		'docstatus': 0,
+		'modified': '2010-07-22 15:19:19',
+		'modified_by': 'Administrator',
+		'owner': 'ashwini@webnotestech.com'
+	},
+
+	# These values are common for all Role
+	{
+		'doctype': 'Role',
+		'module': 'Support',
+		'name': '__common__',
+		'role_name': 'Maintenance User'
+	},
+
+	# Role, Maintenance User
+	{
+		'doctype': 'Role',
+		'name': 'Maintenance User'
+	}
+]
\ No newline at end of file
diff --git a/support/Role/Support Manager/Support Manager.txt b/support/Role/Support Manager/Support Manager.txt
index c0b0b4e..409280f 100644
--- a/support/Role/Support Manager/Support Manager.txt
+++ b/support/Role/Support Manager/Support Manager.txt
@@ -1 +1,26 @@
-[{'modified_by': 'Administrator', 'name': 'Support Manager', 'parent': None, 'creation': '2010-12-28 15:17:40', 'modified': '2010-12-28 15:17:40', 'module': 'Roles', 'doctype': 'Role', 'idx': None, 'parenttype': None, 'role_name': 'Support Manager', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': None}]
\ No newline at end of file
+# Role, Support Manager
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-12-28 17:02:39',
+		'docstatus': 0,
+		'modified': '2010-12-28 15:17:40',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Role
+	{
+		'doctype': 'Role',
+		'module': 'Support',
+		'name': '__common__',
+		'role_name': 'Support Manager'
+	},
+
+	# Role, Support Manager
+	{
+		'doctype': 'Role',
+		'name': 'Support Manager'
+	}
+]
\ No newline at end of file
diff --git a/support/Role/Support Team/Support Team.txt b/support/Role/Support Team/Support Team.txt
index 259b30a..f5bcca6 100644
--- a/support/Role/Support Team/Support Team.txt
+++ b/support/Role/Support Team/Support Team.txt
@@ -1 +1,26 @@
-[{'modified_by': 'Administrator', 'name': 'Support Team', 'parent': None, 'creation': '2010-12-28 15:19:11', 'modified': '2010-12-28 15:19:11', 'module': 'Roles', 'doctype': 'Role', 'idx': None, 'parenttype': None, 'role_name': 'Support Team', 'owner': 'Administrator', 'docstatus': 0, 'parentfield': None}]
\ No newline at end of file
+# Role, Support Team
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-12-28 17:02:39',
+		'docstatus': 0,
+		'modified': '2010-12-28 15:19:11',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Role
+	{
+		'doctype': 'Role',
+		'module': 'Support',
+		'name': '__common__',
+		'role_name': 'Support Team'
+	},
+
+	# Role, Support Team
+	{
+		'doctype': 'Role',
+		'name': 'Support Team'
+	}
+]
\ No newline at end of file
diff --git a/support/search_criteria/amc_summary/amc_summary.txt b/support/search_criteria/amc_summary/amc_summary.txt
index f93d32a..008efb4 100644
--- a/support/search_criteria/amc_summary/amc_summary.txt
+++ b/support/search_criteria/amc_summary/amc_summary.txt
@@ -1,37 +1,35 @@
+# Search Criteria, amc_summary
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': "`tabSerial No`.`territory` is not null\n`tabSerial No`.`territory` != ''\n`tabSerial No`.`status` not in ('In Store', 'Scrapped')",
-		'add_tab': None,
-		'columns': 'Serial No\x01Territory',
 		'creation': '2010-08-08 17:09:32',
-		'criteria_name': 'AMC Summary',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Serial No',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Serial No\x01Saved':1,'Serial No\x01Status':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': '`tabSerial No`.`cost_center`',
-		'idx': None,
 		'modified': '2010-07-15 16:00:11',
 		'modified_by': 'Administrator',
-		'module': 'Maintenance',
-		'name': 'amc_summary',
-		'owner': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'add_cond': "`tabSerial No`.`territory` is not null\n`tabSerial No`.`territory` != ''\n`tabSerial No`.`status` not in ('In Store', 'Scrapped')",
+		'columns': 'Serial No\x01Territory',
+		'criteria_name': 'AMC Summary',
+		'doc_type': 'Serial No',
+		'doctype': 'Search Criteria',
+		'filters': "{'Serial No\x01Saved':1,'Serial No\x01Status':''}",
+		'group_by': '`tabSerial No`.`cost_center`',
+		'module': 'Support',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabSerial No`.`cost_center`',
 		'sort_order': 'ASC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, amc_summary
+	{
+		'doctype': 'Search Criteria',
+		'name': 'amc_summary'
 	}
 ]
\ No newline at end of file
diff --git a/support/search_criteria/customer_issues/customer_issues.txt b/support/search_criteria/customer_issues/customer_issues.txt
index b56e1fb..652d1fb 100644
--- a/support/search_criteria/customer_issues/customer_issues.txt
+++ b/support/search_criteria/customer_issues/customer_issues.txt
@@ -1,37 +1,33 @@
+# Search Criteria, customer_issues
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Customer Issue\x01ID,Customer Issue\x01Status,Customer Issue\x01Complaint Date,Customer Issue\x01Complaint,Customer Issue\x01Item Code,Customer Issue\x01Item Name,Customer Issue\x01Allocated To,Customer Issue\x01Allocated On,Customer Issue\x01Resolved By,Customer Issue\x01Resolution Date,Customer Issue\x01Customer Name,Customer Issue\x01Fiscal Year',
-		'creation': '2010-09-01 15:47:57',
-		'criteria_name': 'Customer Issues',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Customer Issue',
+		'creation': '2010-09-01 15:48:09',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Customer Issue\x01Saved':1,'Customer Issue\x01Submitted':1,'Customer Issue\x01Status':'','Customer Issue\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-08-30 13:21:32',
 		'modified_by': 'Administrator',
-		'module': 'Maintenance',
-		'name': 'customer_issues',
-		'owner': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Customer Issue\x01ID,Customer Issue\x01Status,Customer Issue\x01Complaint Date,Customer Issue\x01Complaint,Customer Issue\x01Item Code,Customer Issue\x01Item Name,Customer Issue\x01Allocated To,Customer Issue\x01Allocated On,Customer Issue\x01Resolved By,Customer Issue\x01Resolution Date,Customer Issue\x01Customer Name,Customer Issue\x01Fiscal Year',
+		'criteria_name': 'Customer Issues',
+		'doc_type': 'Customer Issue',
+		'doctype': 'Search Criteria',
+		'filters': "{'Customer Issue\x01Saved':1,'Customer Issue\x01Submitted':1,'Customer Issue\x01Status':'','Customer Issue\x01Fiscal Year':''}",
+		'module': 'Support',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabCustomer Issue`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, customer_issues
+	{
+		'doctype': 'Search Criteria',
+		'name': 'customer_issues'
 	}
 ]
\ No newline at end of file
diff --git a/support/search_criteria/maintenance_orderwise_pending_amount_to_bill/maintenance_orderwise_pending_amount_to_bill.txt b/support/search_criteria/maintenance_orderwise_pending_amount_to_bill/maintenance_orderwise_pending_amount_to_bill.txt
index 9271d03..d0c3578 100644
--- a/support/search_criteria/maintenance_orderwise_pending_amount_to_bill/maintenance_orderwise_pending_amount_to_bill.txt
+++ b/support/search_criteria/maintenance_orderwise_pending_amount_to_bill/maintenance_orderwise_pending_amount_to_bill.txt
@@ -1,37 +1,36 @@
+# Search Criteria, maintenance_orderwise_pending_amount_to_bill
 [
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-09-01 15:48:09',
+		'docstatus': 0,
+		'modified': '2010-08-30 13:40:44',
+		'modified_by': 'Administrator',
+		'owner': 'ashwini@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
 	{
 		'add_col': "SUM((`tabSales Order Detail`.`qty` - `tabSales Order Detail`.`billed_qty`) * `tabSales Order Detail`.`basic_rate`) AS 'Pending Amount'",
 		'add_cond': "`tabSales Order`.status != 'Stopped'\n`tabSales Order`.order_type='Maintenance'",
-		'add_tab': None,
 		'columns': 'Sales Order\x01ID,Sales Order\x01Customer,Sales Order\x01Customer Name,Sales Order\x01Customer Address,Sales Order\x01Status,Sales Order\x01% Billed,Sales Order\x01Sales Order Date',
-		'creation': '2010-09-01 15:47:57',
 		'criteria_name': 'Maintenance Orderwise Pending Amount To Bill',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
 		'doc_type': 'Sales Order Detail',
-		'docstatus': 0,
 		'doctype': 'Search Criteria',
 		'filters': "{'Sales Order\x01Saved':1,'Sales Order\x01Submitted':1,'Sales Order\x01Status':'','Sales Order\x01Fiscal Year':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
-		'modified': '2010-08-30 13:40:44',
-		'modified_by': 'Administrator',
-		'module': 'Maintenance',
-		'name': 'maintenance_orderwise_pending_amount_to_bill',
-		'owner': 'ashwini@webnotestech.com',
+		'module': 'Support',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Sales Order',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabSales Order`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, maintenance_orderwise_pending_amount_to_bill
+	{
+		'doctype': 'Search Criteria',
+		'name': 'maintenance_orderwise_pending_amount_to_bill'
 	}
 ]
\ No newline at end of file
diff --git a/support/search_criteria/maintenance_schedule_details/maintenance_schedule_details.txt b/support/search_criteria/maintenance_schedule_details/maintenance_schedule_details.txt
index ab60552..b1ae15f 100644
--- a/support/search_criteria/maintenance_schedule_details/maintenance_schedule_details.txt
+++ b/support/search_criteria/maintenance_schedule_details/maintenance_schedule_details.txt
@@ -1,37 +1,34 @@
+# Search Criteria, maintenance_schedule_details
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Maintenance Schedule Detail\x01Item Code,Maintenance Schedule Detail\x01Item Name,Maintenance Schedule Detail\x01Serial No,Maintenance Schedule Detail\x01Incharge Name,Maintenance Schedule Detail\x01Scheduled Date,Maintenance Schedule\x01Customer Name,Maintenance Schedule\x01Address,Maintenance Schedule\x01Sales Order No',
-		'creation': '2010-09-01 15:47:57',
-		'criteria_name': 'Maintenance Schedule Details',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Maintenance Schedule Detail',
+		'creation': '2010-09-01 15:48:09',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Maintenance Schedule\x01Submitted':1,'Maintenance Schedule\x01Status':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-08-30 13:18:23',
 		'modified_by': 'Administrator',
-		'module': 'Maintenance',
-		'name': 'maintenance_schedule_details',
-		'owner': 'nabin@webnotestech.com',
+		'owner': 'nabin@webnotestech.com'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Maintenance Schedule Detail\x01Item Code,Maintenance Schedule Detail\x01Item Name,Maintenance Schedule Detail\x01Serial No,Maintenance Schedule Detail\x01Incharge Name,Maintenance Schedule Detail\x01Scheduled Date,Maintenance Schedule\x01Customer Name,Maintenance Schedule\x01Address,Maintenance Schedule\x01Sales Order No',
+		'criteria_name': 'Maintenance Schedule Details',
+		'doc_type': 'Maintenance Schedule Detail',
+		'doctype': 'Search Criteria',
+		'filters': "{'Maintenance Schedule\x01Submitted':1,'Maintenance Schedule\x01Status':''}",
+		'module': 'Support',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
 		'parent_doc_type': 'Maintenance Schedule',
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabMaintenance Schedule Detail`.`item_code`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, maintenance_schedule_details
+	{
+		'doctype': 'Search Criteria',
+		'name': 'maintenance_schedule_details'
 	}
 ]
\ No newline at end of file
diff --git a/support/search_criteria/warranty_amc_expiry_details/warranty_amc_expiry_details.txt b/support/search_criteria/warranty_amc_expiry_details/warranty_amc_expiry_details.txt
index 7d41d62..89b5797 100644
--- a/support/search_criteria/warranty_amc_expiry_details/warranty_amc_expiry_details.txt
+++ b/support/search_criteria/warranty_amc_expiry_details/warranty_amc_expiry_details.txt
@@ -1,37 +1,33 @@
+# Search Criteria, warranty-amc_expiry_details
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': 'Serial No\x01ID,Serial No\x01Item Code,Serial No\x01Description,Serial No\x01Status,Serial No\x01Item Group,Serial No\x01Purchase Receipt No,Serial No\x01Delivery Note No,Serial No\x01Customer,Serial No\x01Customer Name,Serial No\x01AMC Expiry Date,Serial No\x01Warranty Expiry Date',
-		'creation': '2010-09-01 15:47:57',
-		'criteria_name': 'Warranty/AMC Expiry Details',
-		'custom_query': '',
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Serial No',
+		'creation': '2010-09-01 15:48:09',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Serial No\x01Saved':1,'Serial No\x01Status':'','Serial No\x01Maintenance Status':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-08-30 13:32:21',
 		'modified_by': 'Administrator',
-		'module': 'Maintenance',
-		'name': 'warranty-amc_expiry_details',
-		'owner': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'columns': 'Serial No\x01ID,Serial No\x01Item Code,Serial No\x01Description,Serial No\x01Status,Serial No\x01Item Group,Serial No\x01Purchase Receipt No,Serial No\x01Delivery Note No,Serial No\x01Customer,Serial No\x01Customer Name,Serial No\x01AMC Expiry Date,Serial No\x01Warranty Expiry Date',
+		'criteria_name': 'Warranty/AMC Expiry Details',
+		'doc_type': 'Serial No',
+		'doctype': 'Search Criteria',
+		'filters': "{'Serial No\x01Saved':1,'Serial No\x01Status':'','Serial No\x01Maintenance Status':''}",
+		'module': 'Support',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': '`tabSerial No`.`name`',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, warranty-amc_expiry_details
+	{
+		'doctype': 'Search Criteria',
+		'name': 'warranty-amc_expiry_details'
 	}
 ]
\ No newline at end of file
diff --git a/support/search_criteria/warranty_amc_summary/warranty_amc_summary.txt b/support/search_criteria/warranty_amc_summary/warranty_amc_summary.txt
index efd2e3a..02aa84c 100644
--- a/support/search_criteria/warranty_amc_summary/warranty_amc_summary.txt
+++ b/support/search_criteria/warranty_amc_summary/warranty_amc_summary.txt
@@ -1,37 +1,32 @@
+# Search Criteria, warranty-amc_summary
 [
+
+	# These values are common in all dictionaries
 	{
-		'add_col': None,
-		'add_cond': None,
-		'add_tab': None,
-		'columns': '',
-		'creation': '2010-12-14 17:56:43',
-		'criteria_name': 'Warranty/AMC Summary',
-		'custom_query': None,
-		'description': None,
-		'dis_filters': None,
-		'disabled': None,
-		'doc_type': 'Serial No',
+		'creation': '2010-10-12 15:19:31',
 		'docstatus': 0,
-		'doctype': 'Search Criteria',
-		'filters': "{'Serial No\x01Saved':1,'Serial No\x01Status':''}",
-		'graph_series': None,
-		'graph_values': None,
-		'group_by': None,
-		'idx': None,
 		'modified': '2010-09-25 12:14:49',
 		'modified_by': 'Administrator',
-		'module': 'Maintenance',
-		'name': 'warranty-amc_summary',
-		'owner': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Search Criteria
+	{
+		'criteria_name': 'Warranty/AMC Summary',
+		'doc_type': 'Serial No',
+		'doctype': 'Search Criteria',
+		'filters': "{'Serial No\x01Saved':1,'Serial No\x01Status':''}",
+		'module': 'Support',
+		'name': '__common__',
 		'page_len': 50,
-		'parent': None,
-		'parent_doc_type': None,
-		'parentfield': None,
-		'parenttype': None,
-		'report_script': None,
-		'server_script': None,
 		'sort_by': 'name',
 		'sort_order': 'DESC',
 		'standard': 'Yes'
+	},
+
+	# Search Criteria, warranty-amc_summary
+	{
+		'doctype': 'Search Criteria',
+		'name': 'warranty-amc_summary'
 	}
 ]
\ No newline at end of file