all txt files updated due to module renaming/merging
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