diff --git a/erpnext/accounts/DocType Mapper/Delivery Note-Receivable Voucher/Delivery Note-Receivable Voucher.txt b/erpnext/accounts/DocType Mapper/Delivery Note-Receivable Voucher/Delivery Note-Receivable Voucher.txt
index 981e64a..ee94be8 100644
--- a/erpnext/accounts/DocType Mapper/Delivery Note-Receivable Voucher/Delivery Note-Receivable Voucher.txt
+++ b/erpnext/accounts/DocType Mapper/Delivery Note-Receivable Voucher/Delivery Note-Receivable Voucher.txt
@@ -5,7 +5,7 @@
 	{
 		'creation': '2010-08-08 17:09:34',
 		'docstatus': 0,
-		'modified': '2011-08-09 11:14:09',
+		'modified': '2011-09-13 13:23:44',
 		'modified_by': 'Administrator',
 		'owner': 'Administrator'
 	},
@@ -22,8 +22,6 @@
 	# These values are common for all Field Mapper Detail
 	{
 		'doctype': 'Field Mapper Detail',
-		'map': 'Yes',
-		'match_id': 1,
 		'name': '__common__',
 		'parent': 'Delivery Note-Receivable Voucher',
 		'parentfield': 'field_mapper_details',
@@ -32,7 +30,7 @@
 
 	# These values are common for all DocType Mapper
 	{
-		'doctype': 'DocType Mapper',
+		'doctype': u'DocType Mapper',
 		'from_doctype': 'Delivery Note',
 		'module': 'Accounts',
 		'name': '__common__',
@@ -42,7 +40,7 @@
 
 	# DocType Mapper, Delivery Note-Receivable Voucher
 	{
-		'doctype': 'DocType Mapper',
+		'doctype': u'DocType Mapper',
 		'name': 'Delivery Note-Receivable Voucher'
 	},
 
@@ -50,6 +48,8 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval: (flt(obj.amount) - flt(obj.billed_amt)) / flt(obj.basic_rate)',
+		'map': 'Yes',
+		'match_id': 1,
 		'to_field': 'qty'
 	},
 
@@ -57,6 +57,8 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'parent',
+		'map': 'Yes',
+		'match_id': 1,
 		'to_field': 'delivery_note'
 	},
 
@@ -64,6 +66,8 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'name',
+		'map': 'Yes',
+		'match_id': 1,
 		'to_field': 'dn_detail'
 	},
 
@@ -71,6 +75,8 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'prevdoc_docname',
+		'map': 'Yes',
+		'match_id': 1,
 		'to_field': 'sales_order'
 	},
 
@@ -78,6 +84,8 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'prevdoc_detail_docname',
+		'map': 'Yes',
+		'match_id': 1,
 		'to_field': 'so_detail'
 	},
 
@@ -85,6 +93,8 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval: flt(obj.amount) - flt(obj.billed_amt)',
+		'map': 'Yes',
+		'match_id': 1,
 		'to_field': 'amount'
 	},
 
@@ -92,9 +102,29 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval: (flt(obj.amount) - flt(obj.billed_amt)) * flt(obj.export_rate)/flt(obj.basic_rate)',
+		'map': 'Yes',
+		'match_id': 1,
 		'to_field': 'export_amount'
 	},
 
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'naming_series',
+		'map': 'No',
+		'match_id': 0,
+		'to_field': 'naming_series'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'incentives',
+		'map': 'No',
+		'match_id': 3,
+		'to_field': 'incentives'
+	},
+
 	# Table Mapper Detail
 	{
 		'doctype': 'Table Mapper Detail',
diff --git a/erpnext/accounts/DocType Mapper/Purchase Order-Payable Voucher/Purchase Order-Payable Voucher.txt b/erpnext/accounts/DocType Mapper/Purchase Order-Payable Voucher/Purchase Order-Payable Voucher.txt
index aa4e787..17b6363 100644
--- a/erpnext/accounts/DocType Mapper/Purchase Order-Payable Voucher/Purchase Order-Payable Voucher.txt
+++ b/erpnext/accounts/DocType Mapper/Purchase Order-Payable Voucher/Purchase Order-Payable Voucher.txt
@@ -5,8 +5,8 @@
 	{
 		'creation': '2010-08-08 17:09:35',
 		'docstatus': 0,
-		'modified': '2011-05-13 11:26:20',
-		'modified_by': 'umair@iwebnotes.com',
+		'modified': '2011-09-07 12:10:30',
+		'modified_by': 'Administrator',
 		'owner': 'Administrator'
 	},
 
@@ -22,8 +22,6 @@
 	# These values are common for all Field Mapper Detail
 	{
 		'doctype': 'Field Mapper Detail',
-		'map': 'Yes',
-		'match_id': 1,
 		'name': '__common__',
 		'parent': 'Purchase Order-Payable Voucher',
 		'parentfield': 'field_mapper_details',
@@ -32,7 +30,7 @@
 
 	# These values are common for all DocType Mapper
 	{
-		'doctype': 'DocType Mapper',
+		'doctype': u'DocType Mapper',
 		'from_doctype': 'Purchase Order',
 		'module': 'Accounts',
 		'name': '__common__',
@@ -42,7 +40,7 @@
 
 	# DocType Mapper, Purchase Order-Payable Voucher
 	{
-		'doctype': 'DocType Mapper',
+		'doctype': u'DocType Mapper',
 		'name': 'Purchase Order-Payable Voucher'
 	},
 
@@ -50,6 +48,8 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval: flt(obj.qty) - flt(obj.billed_qty)',
+		'map': 'Yes',
+		'match_id': 1,
 		'to_field': 'qty'
 	},
 
@@ -57,6 +57,8 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'purchase_rate',
+		'map': 'Yes',
+		'match_id': 1,
 		'to_field': 'rate'
 	},
 
@@ -64,6 +66,8 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.purchase_rate)',
+		'map': 'Yes',
+		'match_id': 1,
 		'to_field': 'amount'
 	},
 
@@ -71,6 +75,8 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.import_rate)',
+		'map': 'Yes',
+		'match_id': 1,
 		'to_field': 'import_amount'
 	},
 
@@ -78,6 +84,8 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'parent',
+		'map': 'Yes',
+		'match_id': 1,
 		'to_field': 'purchase_order'
 	},
 
@@ -85,9 +93,20 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'name',
+		'map': 'Yes',
+		'match_id': 1,
 		'to_field': 'po_detail'
 	},
 
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'naming_series',
+		'map': 'No',
+		'match_id': 0,
+		'to_field': 'naming_series'
+	},
+
 	# Table Mapper Detail
 	{
 		'doctype': 'Table Mapper Detail',
diff --git a/erpnext/accounts/DocType Mapper/Purchase Receipt-Payable Voucher/Purchase Receipt-Payable Voucher.txt b/erpnext/accounts/DocType Mapper/Purchase Receipt-Payable Voucher/Purchase Receipt-Payable Voucher.txt
index d363acb..d755954 100644
--- a/erpnext/accounts/DocType Mapper/Purchase Receipt-Payable Voucher/Purchase Receipt-Payable Voucher.txt
+++ b/erpnext/accounts/DocType Mapper/Purchase Receipt-Payable Voucher/Purchase Receipt-Payable Voucher.txt
@@ -5,8 +5,8 @@
 	{
 		'creation': '2010-08-08 17:09:35',
 		'docstatus': 0,
-		'modified': '2011-05-13 12:18:34',
-		'modified_by': 'umair@iwebnotes.com',
+		'modified': '2011-09-07 12:09:55',
+		'modified_by': 'Administrator',
 		'owner': 'Administrator'
 	},
 
@@ -22,8 +22,6 @@
 	# These values are common for all Field Mapper Detail
 	{
 		'doctype': 'Field Mapper Detail',
-		'map': 'Yes',
-		'match_id': 1,
 		'name': '__common__',
 		'parent': 'Purchase Receipt-Payable Voucher',
 		'parentfield': 'field_mapper_details',
@@ -32,7 +30,7 @@
 
 	# These values are common for all DocType Mapper
 	{
-		'doctype': 'DocType Mapper',
+		'doctype': u'DocType Mapper',
 		'from_doctype': 'Purchase Receipt',
 		'module': 'Accounts',
 		'name': '__common__',
@@ -42,7 +40,7 @@
 
 	# DocType Mapper, Purchase Receipt-Payable Voucher
 	{
-		'doctype': 'DocType Mapper',
+		'doctype': u'DocType Mapper',
 		'name': 'Purchase Receipt-Payable Voucher'
 	},
 
@@ -50,6 +48,8 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval: flt(obj.qty) - flt(obj.billed_qty)',
+		'map': 'Yes',
+		'match_id': 1,
 		'to_field': 'qty'
 	},
 
@@ -57,6 +57,8 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'purchase_rate',
+		'map': 'Yes',
+		'match_id': 1,
 		'to_field': 'rate'
 	},
 
@@ -64,6 +66,8 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.purchase_rate)',
+		'map': 'Yes',
+		'match_id': 1,
 		'to_field': 'amount'
 	},
 
@@ -71,6 +75,8 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.import_rate)',
+		'map': 'Yes',
+		'match_id': 1,
 		'to_field': 'import_amount'
 	},
 
@@ -78,6 +84,8 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'parent',
+		'map': 'Yes',
+		'match_id': 1,
 		'to_field': 'purchase_receipt'
 	},
 
@@ -85,6 +93,8 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'prevdoc_docname',
+		'map': 'Yes',
+		'match_id': 1,
 		'to_field': 'purchase_order'
 	},
 
@@ -92,6 +102,8 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'name',
+		'map': 'Yes',
+		'match_id': 1,
 		'to_field': 'pr_detail'
 	},
 
@@ -99,9 +111,20 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'prevdoc_detail_docname',
+		'map': 'Yes',
+		'match_id': 1,
 		'to_field': 'po_detail'
 	},
 
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'naming_series',
+		'map': 'No',
+		'match_id': 0,
+		'to_field': 'naming_series'
+	},
+
 	# Table Mapper Detail
 	{
 		'doctype': 'Table Mapper Detail',
diff --git a/erpnext/accounts/DocType Mapper/Sales Order-Receivable Voucher/Sales Order-Receivable Voucher.txt b/erpnext/accounts/DocType Mapper/Sales Order-Receivable Voucher/Sales Order-Receivable Voucher.txt
index 78431f5..97b1cb2 100644
--- a/erpnext/accounts/DocType Mapper/Sales Order-Receivable Voucher/Sales Order-Receivable Voucher.txt
+++ b/erpnext/accounts/DocType Mapper/Sales Order-Receivable Voucher/Sales Order-Receivable Voucher.txt
@@ -5,7 +5,7 @@
 	{
 		'creation': '2010-08-08 17:09:36',
 		'docstatus': 0,
-		'modified': '2011-08-31 16:53:11',
+		'modified': '2011-09-13 13:23:04',
 		'modified_by': 'Administrator',
 		'owner': 'Administrator'
 	},
@@ -22,7 +22,6 @@
 	# 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',
@@ -50,6 +49,7 @@
 		'checking_operator': '=',
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'customer',
+		'map': 'Yes',
 		'match_id': 0,
 		'to_field': 'customer'
 	},
@@ -58,6 +58,7 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval: (flt(obj.amount) - flt(obj.billed_amt))/flt(obj.basic_rate)',
+		'map': 'Yes',
 		'match_id': 1,
 		'to_field': 'qty'
 	},
@@ -66,6 +67,7 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'parent',
+		'map': 'Yes',
 		'match_id': 1,
 		'to_field': 'sales_order'
 	},
@@ -74,6 +76,7 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'name',
+		'map': 'Yes',
 		'match_id': 1,
 		'to_field': 'so_detail'
 	},
@@ -82,6 +85,7 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval:flt(obj.amount) - flt(obj.billed_amt)',
+		'map': 'Yes',
 		'match_id': 1,
 		'to_field': 'amount'
 	},
@@ -90,6 +94,7 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval: (flt(obj.amount) - flt(obj.billed_amt))* flt(obj.export_rate)/flt(obj.basic_rate)',
+		'map': 'Yes',
 		'match_id': 1,
 		'to_field': 'export_amount'
 	},
@@ -99,6 +104,7 @@
 		'checking_operator': '=',
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'project_name',
+		'map': 'Yes',
 		'match_id': 0,
 		'to_field': 'project_name'
 	},
@@ -107,10 +113,29 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'reserved_warehouse',
+		'map': 'Yes',
 		'match_id': 1,
 		'to_field': 'warehouse'
 	},
 
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'naming_series',
+		'map': 'No',
+		'match_id': 0,
+		'to_field': 'naming_series'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'incentives',
+		'map': 'No',
+		'match_id': 3,
+		'to_field': 'incentives'
+	},
+
 	# Table Mapper Detail
 	{
 		'doctype': 'Table Mapper Detail',
diff --git a/erpnext/accounts/Module Def/Accounts/Accounts.txt b/erpnext/accounts/Module Def/Accounts/Accounts.txt
index 512b460..50a7ac9 100644
--- a/erpnext/accounts/Module Def/Accounts/Accounts.txt
+++ b/erpnext/accounts/Module Def/Accounts/Accounts.txt
@@ -3,9 +3,9 @@
 
 	# These values are common in all dictionaries
 	{
-		'creation': '2010-09-25 10:50:34',
+		'creation': '2010-09-25 10:50:37',
 		'docstatus': 0,
-		'modified': '2011-07-28 12:01:10',
+		'modified': '2011-09-12 13:22:15',
 		'modified_by': 'Administrator',
 		'owner': 'Administrator'
 	},
@@ -31,7 +31,7 @@
 	# These values are common for all Module Def
 	{
 		'disabled': 'No',
-		'doctype': 'Module Def',
+		'doctype': u'Module Def',
 		'doctype_list': 'GL Mapper, Journal Voucher\nGL Mapper, Payable Voucher\nGL Mapper, Receivable Voucher\nDocType Label, Receivable Voucher\nDocType Label, Payable Voucher',
 		'file_list': 'finance.gif,FileData/00210',
 		'is_hidden': 'No',
@@ -40,13 +40,13 @@
 		'module_icon': 'Accounts.gif',
 		'module_label': 'Accounts',
 		'module_name': 'Accounts',
-		'module_seq': 3,
+		'module_seq': 5,
 		'name': '__common__'
 	},
 
 	# Module Def, Accounts
 	{
-		'doctype': 'Module Def',
+		'doctype': u'Module Def',
 		'name': 'Accounts'
 	},
 
@@ -57,8 +57,7 @@
 		'display_name': 'Chart of Accounts',
 		'doc_name': 'Accounts Browser',
 		'doc_type': 'Pages',
-		'doctype': 'Module Def Item',
-		'idx': 1
+		'doctype': 'Module Def Item'
 	},
 
 	# Module Def Item
@@ -68,8 +67,7 @@
 		'display_name': 'Chart of Cost Centers',
 		'doc_name': 'Accounts Browser',
 		'doc_type': 'Pages',
-		'doctype': 'Module Def Item',
-		'idx': 2
+		'doctype': 'Module Def Item'
 	},
 
 	# Module Def Item
@@ -79,8 +77,7 @@
 		'doc_name': 'Journal Voucher',
 		'doc_type': 'Forms',
 		'doctype': 'Module Def Item',
-		'fields': 'voucher_type\nvoucher_date\nfiscal_year\ntotal_debit\ntotal_credit',
-		'idx': 3
+		'fields': 'voucher_type\nvoucher_date\nfiscal_year\ntotal_debit\ntotal_credit'
 	},
 
 	# Module Def Item
@@ -90,8 +87,7 @@
 		'doc_name': 'Receivable Voucher',
 		'doc_type': 'Forms',
 		'doctype': 'Module Def Item',
-		'fields': 'voucher_date\ndue_date\ndebit_to\ngrand_total\noutstanding_amount',
-		'idx': 4
+		'fields': 'voucher_date\ndue_date\ndebit_to\ngrand_total\noutstanding_amount'
 	},
 
 	# Module Def Item
@@ -101,8 +97,7 @@
 		'doc_name': 'Payable Voucher',
 		'doc_type': 'Forms',
 		'doctype': 'Module Def Item',
-		'fields': 'voucher_date\ncredit_to\nbill_no\ngrand_total\noutstanding_amount',
-		'idx': 5
+		'fields': 'voucher_date\ncredit_to\nbill_no\ngrand_total\noutstanding_amount'
 	},
 
 	# Module Def Item
@@ -111,8 +106,7 @@
 		'display_name': 'Lease Agreement',
 		'doc_name': 'Lease Agreement',
 		'doc_type': 'Forms',
-		'doctype': 'Module Def Item',
-		'idx': 6
+		'doctype': 'Module Def Item'
 	},
 
 	# Module Def Item
@@ -122,8 +116,7 @@
 		'doc_name': 'Financial Statements',
 		'doc_type': 'Pages',
 		'doctype': 'Module Def Item',
-		'icon': 'table.gif',
-		'idx': 7
+		'icon': 'table.gif'
 	},
 
 	# Module Def Item
@@ -132,8 +125,7 @@
 		'display_name': 'Bank Reconciliation',
 		'doc_name': 'Bank Reconciliation',
 		'doc_type': 'Single DocType',
-		'doctype': 'Module Def Item',
-		'idx': 8
+		'doctype': 'Module Def Item'
 	},
 
 	# Module Def Item
@@ -141,8 +133,7 @@
 		'display_name': 'TDS Payment',
 		'doc_name': 'TDS Payment',
 		'doc_type': 'Setup Forms',
-		'doctype': 'Module Def Item',
-		'idx': 9
+		'doctype': 'Module Def Item'
 	},
 
 	# Module Def Item
@@ -150,8 +141,7 @@
 		'display_name': 'TDS Return Acknowledgement',
 		'doc_name': 'TDS Return Acknowledgement',
 		'doc_type': 'Setup Forms',
-		'doctype': 'Module Def Item',
-		'idx': 10
+		'doctype': 'Module Def Item'
 	},
 
 	# Module Def Item
@@ -159,8 +149,7 @@
 		'display_name': 'Form 16A',
 		'doc_name': 'Form 16A',
 		'doc_type': 'Setup Forms',
-		'doctype': 'Module Def Item',
-		'idx': 11
+		'doctype': 'Module Def Item'
 	},
 
 	# Module Def Item
@@ -169,8 +158,7 @@
 		'display_name': 'Period Closing Voucher',
 		'doc_name': 'Period Closing Voucher',
 		'doc_type': 'Setup Forms',
-		'doctype': 'Module Def Item',
-		'idx': 12
+		'doctype': 'Module Def Item'
 	},
 
 	# Module Def Item
@@ -179,8 +167,7 @@
 		'display_name': 'Ledger Balance Export',
 		'doc_name': 'Ledger Balance Export',
 		'doc_type': 'Single DocType',
-		'doctype': 'Module Def Item',
-		'idx': 13
+		'doctype': 'Module Def Item'
 	},
 
 	# Module Def Item
@@ -188,8 +175,7 @@
 		'display_name': 'General Ledger',
 		'doc_name': 'GL Entry',
 		'doc_type': 'Reports',
-		'doctype': 'Module Def Item',
-		'idx': 14
+		'doctype': 'Module Def Item'
 	},
 
 	# Module Def Item
@@ -197,8 +183,7 @@
 		'display_name': 'Accounts Receivable',
 		'doc_name': 'GL Entry',
 		'doc_type': 'Reports',
-		'doctype': 'Module Def Item',
-		'idx': 15
+		'doctype': 'Module Def Item'
 	},
 
 	# Module Def Item
@@ -206,8 +191,7 @@
 		'display_name': 'Accounts Payable',
 		'doc_name': 'GL Entry',
 		'doc_type': 'Reports',
-		'doctype': 'Module Def Item',
-		'idx': 16
+		'doctype': 'Module Def Item'
 	},
 
 	# Module Def Item
@@ -215,8 +199,7 @@
 		'display_name': 'Bank Reconciliation Statement',
 		'doc_name': 'Journal Voucher Detail',
 		'doc_type': 'Reports',
-		'doctype': 'Module Def Item',
-		'idx': 17
+		'doctype': 'Module Def Item'
 	},
 
 	# Module Def Item
@@ -224,8 +207,7 @@
 		'display_name': 'Trial Balance',
 		'doc_name': 'Account',
 		'doc_type': 'Reports',
-		'doctype': 'Module Def Item',
-		'idx': 18
+		'doctype': 'Module Def Item'
 	},
 
 	# Module Def Item
@@ -233,8 +215,7 @@
 		'display_name': 'Sales Register',
 		'doc_name': 'Receivable Voucher',
 		'doc_type': 'Reports',
-		'doctype': 'Module Def Item',
-		'idx': 19
+		'doctype': 'Module Def Item'
 	},
 
 	# Module Def Item
@@ -242,8 +223,7 @@
 		'display_name': 'Purchase Register',
 		'doc_name': 'Payable Voucher',
 		'doc_type': 'Reports',
-		'doctype': 'Module Def Item',
-		'idx': 20
+		'doctype': 'Module Def Item'
 	},
 
 	# Module Def Item
@@ -251,8 +231,7 @@
 		'display_name': 'Bank Clearance report',
 		'doc_name': 'Journal Voucher Detail',
 		'doc_type': 'Reports',
-		'doctype': 'Module Def Item',
-		'idx': 21
+		'doctype': 'Module Def Item'
 	},
 
 	# Module Def Item
@@ -260,8 +239,7 @@
 		'display_name': 'Monthly Ledger Summary Report',
 		'doc_name': 'GL Entry',
 		'doc_type': 'Reports',
-		'doctype': 'Module Def Item',
-		'idx': 22
+		'doctype': 'Module Def Item'
 	},
 
 	# Module Def Item
@@ -269,8 +247,7 @@
 		'display_name': 'Collection Report',
 		'doc_name': 'Journal Voucher Detail',
 		'doc_type': 'Reports',
-		'doctype': 'Module Def Item',
-		'idx': 23
+		'doctype': 'Module Def Item'
 	},
 
 	# Module Def Item
@@ -278,8 +255,7 @@
 		'display_name': 'Total amout collection for a period - Customerwise',
 		'doc_name': 'Account',
 		'doc_type': 'Reports',
-		'doctype': 'Module Def Item',
-		'idx': 24
+		'doctype': 'Module Def Item'
 	},
 
 	# Module Def Item
@@ -287,8 +263,7 @@
 		'display_name': 'Payment Report',
 		'doc_name': 'Journal Voucher Detail',
 		'doc_type': 'Reports',
-		'doctype': 'Module Def Item',
-		'idx': 25
+		'doctype': 'Module Def Item'
 	},
 
 	# Module Def Item
@@ -296,8 +271,7 @@
 		'display_name': 'Itemwise Sales Register',
 		'doc_name': 'RV Detail',
 		'doc_type': 'Reports',
-		'doctype': 'Module Def Item',
-		'idx': 26
+		'doctype': 'Module Def Item'
 	},
 
 	# Module Def Item
@@ -305,8 +279,7 @@
 		'display_name': 'Itemwise Purchase Register',
 		'doc_name': 'PV Detail',
 		'doc_type': 'Reports',
-		'doctype': 'Module Def Item',
-		'idx': 27
+		'doctype': 'Module Def Item'
 	},
 
 	# Module Def Item
@@ -314,8 +287,7 @@
 		'display_name': 'Cost Center wise Expense',
 		'doc_name': 'GL Entry',
 		'doc_type': 'Reports',
-		'doctype': 'Module Def Item',
-		'idx': 28
+		'doctype': 'Module Def Item'
 	},
 
 	# Module Def Item
@@ -323,8 +295,7 @@
 		'display_name': 'TDS Return',
 		'doc_name': 'TDS Payment Detail',
 		'doc_type': 'Reports',
-		'doctype': 'Module Def Item',
-		'idx': 29
+		'doctype': 'Module Def Item'
 	},
 
 	# Module Def Item
@@ -332,8 +303,7 @@
 		'display_name': 'Budget Variance Report',
 		'doc_name': 'Budget Detail',
 		'doc_type': 'Reports',
-		'doctype': 'Module Def Item',
-		'idx': 30
+		'doctype': 'Module Def Item'
 	},
 
 	# Module Def Item
@@ -341,8 +311,7 @@
 		'display_name': 'Payment Receipt Report',
 		'doc_name': 'GL Entry',
 		'doc_type': 'Reports',
-		'doctype': 'Module Def Item',
-		'idx': 31
+		'doctype': 'Module Def Item'
 	},
 
 	# Module Def Item
@@ -351,8 +320,7 @@
 		'display_name': 'Business Associate Commission Report',
 		'doc_name': 'Receivable Voucher',
 		'doc_type': 'Reports',
-		'doctype': 'Module Def Item',
-		'idx': 32
+		'doctype': 'Module Def Item'
 	},
 
 	# Module Def Item
@@ -360,8 +328,7 @@
 		'display_name': 'Lease Agreement List',
 		'doc_name': 'GL Entry',
 		'doc_type': 'Reports',
-		'doctype': 'Module Def Item',
-		'idx': 33
+		'doctype': 'Module Def Item'
 	},
 
 	# Module Def Item
@@ -369,8 +336,7 @@
 		'display_name': 'Lease Monthly Future Installment Inflows',
 		'doc_name': 'GL Entry',
 		'doc_type': 'Reports',
-		'doctype': 'Module Def Item',
-		'idx': 34
+		'doctype': 'Module Def Item'
 	},
 
 	# Module Def Item
@@ -378,8 +344,7 @@
 		'display_name': 'Lease Overdue Age Wise',
 		'doc_name': 'GL Entry',
 		'doc_type': 'Reports',
-		'doctype': 'Module Def Item',
-		'idx': 35
+		'doctype': 'Module Def Item'
 	},
 
 	# Module Def Item
@@ -387,8 +352,7 @@
 		'display_name': 'Lease Overdue List',
 		'doc_name': 'GL Entry',
 		'doc_type': 'Reports',
-		'doctype': 'Module Def Item',
-		'idx': 36
+		'doctype': 'Module Def Item'
 	},
 
 	# Module Def Item
@@ -396,17 +360,7 @@
 		'display_name': 'Lease Receipts Client Wise',
 		'doc_name': 'GL Entry',
 		'doc_type': 'Reports',
-		'doctype': 'Module Def Item',
-		'idx': 37
-	},
-
-	# Module Def Item
-	{
-		'display_name': 'Lease Receipt Summary Month Wise',
-		'doc_name': 'GL Entry',
-		'doc_type': 'Reports',
-		'doctype': 'Module Def Item',
-		'idx': 38
+		'doctype': 'Module Def Item'
 	},
 
 	# Module Def Item
@@ -414,28 +368,26 @@
 		'display_name': 'Lease Yearly Future Installment Inflows',
 		'doc_name': 'GL Entry',
 		'doc_type': 'Reports',
-		'doctype': 'Module Def Item',
-		'idx': 39
+		'doctype': 'Module Def Item'
+	},
+
+	# Module Def Item
+	{
+		'display_name': 'Voucher wise tax details',
+		'doc_name': 'RV Tax Detail',
+		'doc_type': 'Reports',
+		'doctype': 'Module Def Item'
 	},
 
 	# Module Def Role
 	{
 		'doctype': 'Module Def Role',
-		'idx': 1,
 		'role': 'Accounts Manager'
 	},
 
 	# Module Def Role
 	{
 		'doctype': 'Module Def Role',
-		'idx': 2,
 		'role': 'Accounts User'
-	},
-
-	# Module Def Role
-	{
-		'doctype': 'Module Def Role',
-		'idx': 3,
-		'role': 'Administrator'
 	}
 ]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.py b/erpnext/accounts/doctype/fiscal_year/fiscal_year.py
index 6b2dfde..48d7d91 100644
--- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.py
+++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.py
@@ -133,8 +133,8 @@
 
 			# build dict
 			p = {
-				'debit': flt(entry[2])
-				,'credit':flt(entry[3])
+				'debit': entry[4]=='No' and flt(entry[2]) or 0
+				,'credit': entry[4]=='No' and flt(entry[3]) or 0
 				,'opening': entry[4]=='Yes' and diff or 0
 				
 				# end date conditino only if it is not opening
diff --git a/erpnext/accounts/doctype/payable_voucher/payable_voucher.js b/erpnext/accounts/doctype/payable_voucher/payable_voucher.js
index 4a566d3..e3b986d 100644
--- a/erpnext/accounts/doctype/payable_voucher/payable_voucher.js
+++ b/erpnext/accounts/doctype/payable_voucher/payable_voucher.js
@@ -20,12 +20,15 @@
   }  
   
   if(doc.__islocal){
-    if(doc.supplier) {cur_frm.cscript.supplier(doc,dt,dn)}
-    hide_field(['supplier_address','contact_person','supplier_name','address_display','contact_display','contact_mobile','contact_email']);
+    hide_field(['supplier_address', 'contact_person', 'supplier_name', 'address_display', 'contact_display', 'contact_mobile', 'contact_email']);
   }
-  
+}
 
-  if(doc.supplier) unhide_field(['supplier_address','contact_person','supplier_name','address_display','contact_display','contact_mobile','contact_email']);  
+
+//Onload post render
+//------------------------
+cur_frm.cscript.onload_post_render = function(doc, dt, dn) {
+  if(doc.__islocal && doc.supplier) cur_frm.cscript.supplier(doc,dt,dn);
 }
 
 // Refresh
diff --git a/erpnext/accounts/search_criteria/accounts_payable/accounts_payable.py b/erpnext/accounts/search_criteria/accounts_payable/accounts_payable.py
index 8c07b68..44daddc 100644
--- a/erpnext/accounts/search_criteria/accounts_payable/accounts_payable.py
+++ b/erpnext/accounts/search_criteria/accounts_payable/accounts_payable.py
@@ -90,9 +90,13 @@
 	# supplier type
 	r.append(supp_type_dict.get(r[col_idx['Account']], ''))	
 	
+	if r[col_idx['Voucher Type']] == 'Payable Voucher':
+		r += pv_dict.get(r[col_idx['Voucher No']], ['', '', ''])
+	else:
+		r += ['', '', '']
+	
 	# if entry against Payable Voucher
 	if r[col_idx['Against Voucher']] and r[col_idx['Voucher Type']] == 'Payable Voucher':
-		r += pv_dict.get(r[col_idx['Voucher No']], ['', '', ''])
 		cond = " and ifnull(against_voucher, '') = '%s'" % r[col_idx['Against Voucher']]
 
 	# if entry against JV & and not adjusted within period
diff --git a/erpnext/home/doctype/company_control/company_control.py b/erpnext/home/doctype/company_control/company_control.py
index c789a57..9c055a7 100644
--- a/erpnext/home/doctype/company_control/company_control.py
+++ b/erpnext/home/doctype/company_control/company_control.py
@@ -53,6 +53,15 @@
 			pr.role = r
 			pr.parentfield = 'userroles'
 			pr.save(1)
+		
+		# Update Membership Type at Gateway
+		if cint(webnotes.conn.get_value('Control Panel', None, 'sync_with_gateway')):
+			if 'System Manager' in role_list : membership_type = 'Administrator'
+			else : membership_type = 'Member'
+
+			import server_tools.gateway_utils
+			server_tools.gateway_utils.update_membership_type(cstr(arg['usr']), membership_type)
+
 		sql("delete from __SessionCache where user=%s", cstr(arg['usr']))
 
 	# Save profile
diff --git a/erpnext/home/page/my_company/my_company.js b/erpnext/home/page/my_company/my_company.js
index 9da7e9b..40bf155 100644
--- a/erpnext/home/page/my_company/my_company.js
+++ b/erpnext/home/page/my_company/my_company.js
@@ -322,7 +322,7 @@
 	
 	// show securty settings
 	this.set_security = function() {
-		var d = new wn.widgets.Dialog({
+		var sd = new wn.widgets.Dialog({
 			title: 'Set User Security',
 			width: 500,
 			fields: [
@@ -362,30 +362,72 @@
 				}
 			]
 		});
-		d.onshow = function() {
-			d.set_values({
+
+		me.sec_dialog = sd
+
+		sd.onshow = function() {
+			me.sec_dialog.set_values({
 				restrict_ip: me.profile.restrict_ip || '',
 				login_before: me.profile.login_before || '',
 				login_after: me.profile.login_after || '',
 				new_password: ''
-			})
-		}
-		d.fields_dict.update.input.onclick = function() {
+			});
+		};
+		sd.fields_dict.update.input.onclick = function() {
 			var btn = this;
 			this.set_working();
-			var args = d.get_values();
+			var args = me.sec_dialog.get_values();
 			args.user = me.profile.name;
-			$c_page('home', 'my_company', 'update_security', JSON.stringify(args), function(r,rt) {
-				if(r.exc) {
-					msgprint(r.exc);
+
+			if (args.new_password) {
+				var pass_d = new wn.widgets.Dialog({
+					title: 'Your Password',
+					width: 300,
+					fields: [
+						{
+							label: 'Please Enter Your Password',
+							description: "Your password is required to update the concerned user's password",
+							fieldtype: 'Password',
+							fieldname: 'sys_admin_pwd',
+							reqd: 1		
+						},
+
+						{
+							label: 'Continue',
+							fieldtype: 'Button',
+							fieldname: 'continue'
+						}
+					]
+				});
+
+				pass_d.fields_dict.continue.input.onclick = function() {
+					btn.pwd_dialog.hide();					
+					args.sys_admin_pwd = btn.pwd_dialog.get_values().sys_admin_pwd;					
+					btn.set_working();					
+					me.update_security(args);
 					btn.done_working();
-					return;
 				}
-				$.extend(me.profile, d.get_values());
-				d.hide();
-			});
-		}
-		d.show();
+
+				pass_d.show();
+				btn.pwd_dialog = pass_d;
+				btn.done_working();
+			} else {
+				btn.done_working();
+				me.update_security(args);
+			}			
+		};
+		sd.show();		
+	}
+
+	this.update_security = function(args) {
+		$c_page('home', 'my_company', 'update_security', JSON.stringify(args), function(r,rt) {
+			if(r.exc) {
+				msgprint(r.exc);				
+				return;
+			}
+			me.sec_dialog.hide();
+			$.extend(me.profile, me.sec_dialog.get_values());
+		});
 	}
 	
 	// delete user
diff --git a/erpnext/home/page/my_company/my_company.py b/erpnext/home/page/my_company/my_company.py
index 5d5ed80..3ff1482 100644
--- a/erpnext/home/page/my_company/my_company.py
+++ b/erpnext/home/page/my_company/my_company.py
@@ -140,8 +140,7 @@
 	if 'new_password' in args:
 		if cint(webnotes.conn.get_value('Control Panel',None,'sync_with_gateway')):
 			import server_tools.gateway_utils
-			webnotes.msgprint(server_tools.gateway_utils.change_password('', args['new_password'])['message'])
+			webnotes.msgprint(server_tools.gateway_utils.change_password('', args['new_password'], args['user'], args['sys_admin_pwd'])['message'])
 		else:
 			webnotes.conn.sql("update tabProfile set password=password(%s) where name=%s", (args['new_password'], args['user']))
-
-	webnotes.msgprint('Settings Updated')
\ No newline at end of file
+	else: webnotes.msgprint('Settings Updated')
\ No newline at end of file
diff --git a/erpnext/patches/patch.py b/erpnext/patches/patch.py
index 384a994..a98143d 100644
--- a/erpnext/patches/patch.py
+++ b/erpnext/patches/patch.py
@@ -1,7 +1,7 @@
 # REMEMBER to update this
 # ========================
 
-last_patch = 358
+last_patch = 363
 
 #-------------------------------------------
 
@@ -291,8 +291,18 @@
 			ch.format = 'Delivery Note Packing List Wise'
 			ch.save(1)
 	elif patch_no == 353:
-		reload_doc('hr', 'doctype', 'salary_manager')
+		reload_doc('core', 'doctype', 'doctype')
+		sql("update `tabDocType` set default_print_format = 'Standard' where name = 'Delivery Note'")
 	elif patch_no == 354:
+		reload_doc('stock', 'doctype', 'delivery_note')
+		reload_doc('stock', 'doctype', 'delivery_note_detail')
+	elif patch_no == 355:
+		sql("update `tabDocField` set print_hide =1 where fieldname in ('pack_no', 'pack_gross_wt', 'weight_uom', 'pack_nett_wt') and parent = 'Delivery Note Detail'")
+	elif patch_no == 356:
+		sql("update `tabDocField` set print_hide =1 where fieldname = 'print_packing_slip' and parent = 'Delivery Note'")
+	elif patch_no == 357:
+		reload_doc('hr', 'doctype', 'salary_manager')
+	elif patch_no == 358:
 		reload_doc('setup', 'doctype','features_setup')
 		reload_doc('stock','doctype','item')
 		sql("update tabDocField set label='Produced Qty',description='Updated after finished goods are transferred to FG Warehouse through Stock Entry' where parent='Production Order' and fieldname='produced_qty'")
@@ -302,14 +312,19 @@
 		for d in rs:
 			m.fields[d[0]] = 1
 		m.save()
-	elif patch_no == 355:
+	elif patch_no == 359:
 		reload_doc('hr', 'doctype', 'salary_slip')
 		delete_doc('DocType', 'Salary Control Panel')
-	elif patch_no == 356:
-		reload_doc('core', 'doctype', 'doctype')
-		sql("update `tabDocType` set default_print_format = 'Standard' where name = 'Delivery Note'")
-	elif patch_no == 357:
+	elif patch_no == 360:
 		sql("delete from `tabDocField` where (fieldname in ('client_string', 'server_code_error', 'server_code_compiled', 'server_code', 'server_code_core', 'client_script', 'client_script_core', 'dt_template', 'change_log') or label = 'Template') and parent = 'DocType'")
-	elif patch_no == 358:
-		reload_doc('stock', 'doctype', 'delivery_note')
-		reload_doc('stock', 'doctype', 'delivery_note_detail')
+	elif patch_no == 361:
+		sql("update `tabModule Def Item` set doc_name = 'GL Entry' where display_name in ('Lease Agreement List', 'Lease Monthly Future Installment Inflows', 'Lease Overdue Age Wise', 'Lease Overdue List', 'Lease Receipts Client Wise', 'Lease Receipt Summary Month Wise', 'Lease Yearly Future Installment Inflows') and parent = 'Accounts'")
+	elif patch_no == 362:
+		sql("update `tabDocField` set no_copy = 1 where fieldname in ('amended_from', 'amendment_date', 'file_list', 'naming_series', 'status')")
+	elif patch_no == 363:
+		reload_doc('accounts', 'search_criteria', 'voucher_wise_tax_details')
+		reload_doc('accounts', 'Module Def', 'Accounts')
+		mappers = sql("select name, module from `tabDocType Mapper`")
+		for d in mappers:
+			if d[0] and d[1]:
+				reload_doc(d[1].lower(), 'DocType Mapper', d[0])
diff --git a/erpnext/selling/DocType Mapper/Enquiry-Quotation/Enquiry-Quotation.txt b/erpnext/selling/DocType Mapper/Enquiry-Quotation/Enquiry-Quotation.txt
index 4db092d..807a057 100644
--- a/erpnext/selling/DocType Mapper/Enquiry-Quotation/Enquiry-Quotation.txt
+++ b/erpnext/selling/DocType Mapper/Enquiry-Quotation/Enquiry-Quotation.txt
@@ -5,8 +5,8 @@
 	{
 		'creation': '2010-08-08 17:09:34',
 		'docstatus': 0,
-		'modified': '2011-05-10 16:04:40',
-		'modified_by': 'umair@iwebnotes.com',
+		'modified': '2011-09-07 12:12:30',
+		'modified_by': 'Administrator',
 		'owner': 'Administrator'
 	},
 
@@ -23,7 +23,6 @@
 	# These values are common for all Field Mapper Detail
 	{
 		'doctype': 'Field Mapper Detail',
-		'map': 'Yes',
 		'name': '__common__',
 		'parent': 'Enquiry-Quotation',
 		'parentfield': 'field_mapper_details',
@@ -32,7 +31,7 @@
 
 	# These values are common for all DocType Mapper
 	{
-		'doctype': 'DocType Mapper',
+		'doctype': u'DocType Mapper',
 		'from_doctype': 'Enquiry',
 		'module': 'Selling',
 		'name': '__common__',
@@ -42,7 +41,7 @@
 
 	# DocType Mapper, Enquiry-Quotation
 	{
-		'doctype': 'DocType Mapper',
+		'doctype': u'DocType Mapper',
 		'name': 'Enquiry-Quotation'
 	},
 
@@ -50,6 +49,7 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'uom',
+		'map': 'Yes',
 		'match_id': 1,
 		'to_field': 'stock_uom'
 	},
@@ -58,6 +58,7 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'name',
+		'map': 'Yes',
 		'match_id': 0,
 		'to_field': 'enq_no'
 	},
@@ -66,6 +67,7 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'parent',
+		'map': 'Yes',
 		'match_id': 1,
 		'to_field': 'prevdoc_docname'
 	},
@@ -74,6 +76,7 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'parenttype',
+		'map': 'Yes',
 		'match_id': 1,
 		'to_field': 'prevdoc_doctype'
 	},
@@ -82,6 +85,7 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'enquiry_from',
+		'map': 'Yes',
 		'match_id': 0,
 		'to_field': 'quotation_to'
 	},
@@ -90,10 +94,38 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'enquiry_type',
+		'map': 'Yes',
 		'match_id': 0,
 		'to_field': 'order_type'
 	},
 
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'transaction_date',
+		'map': 'No',
+		'match_id': 0,
+		'to_field': 'transaction_date'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'status',
+		'map': 'No',
+		'match_id': 0,
+		'to_field': 'status'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'naming_series',
+		'map': 'No',
+		'match_id': 0,
+		'to_field': 'naming_series'
+	},
+
 	# Table Mapper Detail
 	{
 		'doctype': 'Table Mapper Detail',
diff --git a/erpnext/selling/DocType Mapper/Lead-Customer/Lead-Customer.txt b/erpnext/selling/DocType Mapper/Lead-Customer/Lead-Customer.txt
index 2b7a15a..19a9f8a 100644
--- a/erpnext/selling/DocType Mapper/Lead-Customer/Lead-Customer.txt
+++ b/erpnext/selling/DocType Mapper/Lead-Customer/Lead-Customer.txt
@@ -5,7 +5,7 @@
 	{
 		'creation': '2010-08-08 17:09:34',
 		'docstatus': 0,
-		'modified': '2010-10-14 13:39:44',
+		'modified': '2011-09-07 12:11:39',
 		'modified_by': 'Administrator',
 		'owner': 'Administrator'
 	},
@@ -36,7 +36,7 @@
 
 	# These values are common for all DocType Mapper
 	{
-		'doctype': 'DocType Mapper',
+		'doctype': u'DocType Mapper',
 		'from_doctype': 'Lead',
 		'module': 'Selling',
 		'name': '__common__',
@@ -45,7 +45,7 @@
 
 	# DocType Mapper, Lead-Customer
 	{
-		'doctype': 'DocType Mapper',
+		'doctype': u'DocType Mapper',
 		'name': 'Lead-Customer'
 	},
 
@@ -63,20 +63,6 @@
 		'to_field': 'customer_name'
 	},
 
-	# Field Mapper Detail
-	{
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'contact_no',
-		'to_field': 'phone_1'
-	},
-
-	# Field Mapper Detail
-	{
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'fax',
-		'to_field': 'fax_1'
-	},
-
 	# Table Mapper Detail
 	{
 		'doctype': 'Table Mapper Detail'
diff --git a/erpnext/selling/DocType Mapper/Lead-Enquiry/Lead-Enquiry.txt b/erpnext/selling/DocType Mapper/Lead-Enquiry/Lead-Enquiry.txt
index 4b32723..742215b 100644
--- a/erpnext/selling/DocType Mapper/Lead-Enquiry/Lead-Enquiry.txt
+++ b/erpnext/selling/DocType Mapper/Lead-Enquiry/Lead-Enquiry.txt
@@ -5,7 +5,7 @@
 	{
 		'creation': '2010-08-08 17:09:34',
 		'docstatus': 0,
-		'modified': '2010-08-05 20:21:54',
+		'modified': '2011-09-07 12:11:00',
 		'modified_by': 'Administrator',
 		'owner': 'Administrator'
 	},
@@ -26,7 +26,6 @@
 	# These values are common for all Field Mapper Detail
 	{
 		'doctype': 'Field Mapper Detail',
-		'map': 'Yes',
 		'match_id': 0,
 		'name': '__common__',
 		'parent': 'Lead-Enquiry',
@@ -36,7 +35,7 @@
 
 	# These values are common for all DocType Mapper
 	{
-		'doctype': 'DocType Mapper',
+		'doctype': u'DocType Mapper',
 		'from_doctype': 'Lead',
 		'module': 'Selling',
 		'name': '__common__',
@@ -45,7 +44,7 @@
 
 	# DocType Mapper, Lead-Enquiry
 	{
-		'doctype': 'DocType Mapper',
+		'doctype': u'DocType Mapper',
 		'name': 'Lead-Enquiry'
 	},
 
@@ -53,6 +52,7 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'campaign_name',
+		'map': 'Yes',
 		'to_field': 'campaign'
 	},
 
@@ -60,6 +60,7 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'doctype',
+		'map': 'Yes',
 		'to_field': 'enquiry_from'
 	},
 
@@ -67,9 +68,18 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'name',
+		'map': 'Yes',
 		'to_field': 'lead'
 	},
 
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'status',
+		'map': 'No',
+		'to_field': 'status'
+	},
+
 	# Table Mapper Detail
 	{
 		'doctype': 'Table Mapper Detail'
diff --git a/erpnext/selling/DocType Mapper/Quotation-Sales Order/Quotation-Sales Order.txt b/erpnext/selling/DocType Mapper/Quotation-Sales Order/Quotation-Sales Order.txt
index 4d493a6..5a529dd 100644
--- a/erpnext/selling/DocType Mapper/Quotation-Sales Order/Quotation-Sales Order.txt
+++ b/erpnext/selling/DocType Mapper/Quotation-Sales Order/Quotation-Sales Order.txt
@@ -5,7 +5,7 @@
 	{
 		'creation': '2010-08-08 17:09:35',
 		'docstatus': 0,
-		'modified': '2011-08-25 18:25:02',
+		'modified': '2011-09-07 12:08:48',
 		'modified_by': 'Administrator',
 		'owner': 'Administrator'
 	},
@@ -30,7 +30,7 @@
 
 	# These values are common for all DocType Mapper
 	{
-		'doctype': 'DocType Mapper',
+		'doctype': u'DocType Mapper',
 		'from_doctype': 'Quotation',
 		'module': 'Selling',
 		'name': '__common__',
@@ -40,7 +40,7 @@
 
 	# DocType Mapper, Quotation-Sales Order
 	{
-		'doctype': 'DocType Mapper',
+		'doctype': u'DocType Mapper',
 		'name': 'Quotation-Sales Order'
 	},
 
@@ -110,6 +110,15 @@
 		'to_field': 'naming_series'
 	},
 
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'status',
+		'map': 'No',
+		'match_id': 0,
+		'to_field': 'status'
+	},
+
 	# Table Mapper Detail
 	{
 		'doctype': 'Table Mapper Detail',
diff --git a/erpnext/selling/doctype/quotation/quotation.js b/erpnext/selling/doctype/quotation/quotation.js
index b3dcde6..0732e45 100644
--- a/erpnext/selling/doctype/quotation/quotation.js
+++ b/erpnext/selling/doctype/quotation/quotation.js
@@ -312,10 +312,11 @@
 //================ Last Quoted Price and Last Sold Price suggestion ======================
 cur_frm.fields_dict['quotation_details'].grid.get_field('item_code').get_query= function(doc, cdt, cdn) {
   var d = locals[cdt][cdn];
+  var cond = (doc.order_type == 'Maintenance')? " and tabItem.is_service_item = 'Yes'" : " and tabItem.is_sales_item = 'Yes'"
   if(doc.customer)
     return repl("SELECT i.name,i.item_code,concat('Last quoted at - ',cast(quote_rate as char)) as quote_rate,concat('Last sold at - ',cast(sales_rate as char)) as sales_rate FROM\
 		(\
-			select item_code,name from tabItem where tabItem.%(key)s like '%s'\
+			select item_code,name from tabItem where tabItem.%(key)s like '%s' %(cond)s\
 		)i\
 		left join\
 		(\
@@ -336,7 +337,7 @@
 			(\
 				select rd.item_code,max(voucher_date) as voucher_date from `tabRV Detail` rd, `tabReceivable Voucher` r where r.name=rd.parent and r.docstatus=1 and customer='%(cust)s' group by rd.item_code\
 			)m where r.item_code=m.item_code and r.voucher_date=m.voucher_date\
-		)s on i.item_code=s.item_code ORDER BY item_code LIMIT 50",{cust:doc.customer});
+		)s on i.item_code=s.item_code ORDER BY item_code LIMIT 50",{cust:doc.customer, cond:cond});
   else
-    return "SELECT name, item_code FROM tabItem WHERE `tabItem`.%(key)s LIKE '%s' ORDER BY tabItem.item_code DESC LIMIT 50";
-}
\ No newline at end of file
+    return repl("SELECT name, item_code FROM tabItem WHERE `tabItem`.%(key)s LIKE '%s' %(cond)s ORDER BY tabItem.item_code DESC LIMIT 50", {cond:cond});
+}
diff --git a/erpnext/setup/doctype/manage_account/manage_account.py b/erpnext/setup/doctype/manage_account/manage_account.py
index a0ed2fa..651794f 100644
--- a/erpnext/setup/doctype/manage_account/manage_account.py
+++ b/erpnext/setup/doctype/manage_account/manage_account.py
@@ -29,7 +29,7 @@
     set_default(defkey, defvalue)
 
     if defkey == 'fiscal_year':
-      ysd = sql("select year_start_date from `tabFiscal Year` where name=%s", defvalue)
+      ysd = sql("select year_start_date from `tabFiscal Year` where name=%s", cstr(defvalue))
       ysd = ysd and ysd[0][0] or ''
       if ysd:
         set_default('year_start_date', ysd.strftime('%Y-%m-%d'))
diff --git a/erpnext/setup/doctype/sales_browser_control/sales_browser_control.py b/erpnext/setup/doctype/sales_browser_control/sales_browser_control.py
index d4c4a13..e9f8242 100644
--- a/erpnext/setup/doctype/sales_browser_control/sales_browser_control.py
+++ b/erpnext/setup/doctype/sales_browser_control/sales_browser_control.py
@@ -131,7 +131,7 @@
 
     r = eval(args)
     
-    if r['lft'] == 0:
+    if r['lft'] == 0 and r['action'] != 'Create':
       n = sql("select lft,rgt from `tab%s` where name = '%s'"%(r['node_title'],r['nm']))
       r['lft'] = n[0][0]
       r['rgt'] = n[0][1]
@@ -212,4 +212,4 @@
     if res:
       msgprint("'%s' record is already exist."%(r['nm']))
       return 'true'
-    return 'false'      
\ No newline at end of file
+    return 'false'      
diff --git a/erpnext/stock/DocType Mapper/Receivable Voucher-Delivery Note/Receivable Voucher-Delivery Note.txt b/erpnext/stock/DocType Mapper/Receivable Voucher-Delivery Note/Receivable Voucher-Delivery Note.txt
index 6688f2b..3fd88db 100755
--- a/erpnext/stock/DocType Mapper/Receivable Voucher-Delivery Note/Receivable Voucher-Delivery Note.txt
+++ b/erpnext/stock/DocType Mapper/Receivable Voucher-Delivery Note/Receivable Voucher-Delivery Note.txt
@@ -5,7 +5,7 @@
 	{
 		'creation': '2010-12-15 08:39:22',
 		'docstatus': 0,
-		'modified': '2010-12-14 20:43:41',
+		'modified': '2011-09-07 12:08:19',
 		'modified_by': 'Administrator',
 		'owner': 'Administrator'
 	},
@@ -22,7 +22,6 @@
 	# These values are common for all Field Mapper Detail
 	{
 		'doctype': 'Field Mapper Detail',
-		'map': 'Yes',
 		'name': '__common__',
 		'parent': 'Receivable Voucher-Delivery Note',
 		'parentfield': 'field_mapper_details',
@@ -31,7 +30,7 @@
 
 	# These values are common for all DocType Mapper
 	{
-		'doctype': 'DocType Mapper',
+		'doctype': u'DocType Mapper',
 		'from_doctype': 'Receivable Voucher',
 		'module': 'Stock',
 		'name': '__common__',
@@ -41,7 +40,7 @@
 
 	# DocType Mapper, Receivable Voucher-Delivery Note
 	{
-		'doctype': 'DocType Mapper',
+		'doctype': u'DocType Mapper',
 		'name': 'Receivable Voucher-Delivery Note'
 	},
 
@@ -49,6 +48,7 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval: flt(obj.qty) - flt(obj.delivered_qty)',
+		'map': 'Yes',
 		'match_id': 1,
 		'to_field': 'qty'
 	},
@@ -57,6 +57,7 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'parent',
+		'map': 'Yes',
 		'match_id': 1,
 		'to_field': 'prevdoc_docname'
 	},
@@ -65,6 +66,7 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'parenttype',
+		'map': 'Yes',
 		'match_id': 1,
 		'to_field': 'prevdoc_doctype'
 	},
@@ -73,6 +75,7 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'name',
+		'map': 'Yes',
 		'match_id': 1,
 		'to_field': 'prevdoc_detail_docname'
 	},
@@ -81,6 +84,7 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval: (flt(obj.qty) - flt(obj.delivered_qty)) * flt(obj.basic_rate)',
+		'map': 'Yes',
 		'match_id': 1,
 		'to_field': 'amount'
 	},
@@ -89,6 +93,7 @@
 	{
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'eval: (flt(obj.qty) - flt(obj.delivered_qty)) * flt(obj.export_rate)',
+		'map': 'Yes',
 		'match_id': 1,
 		'to_field': 'export_amount'
 	},
@@ -96,9 +101,10 @@
 	# Field Mapper Detail
 	{
 		'doctype': 'Field Mapper Detail',
-		'from_field': 'customer_address',
+		'from_field': 'naming_series',
+		'map': 'No',
 		'match_id': 0,
-		'to_field': 'delivery_address'
+		'to_field': 'naming_series'
 	},
 
 	# Table Mapper Detail
diff --git a/erpnext/stock/DocType Mapper/Sales Order-Delivery Note/Sales Order-Delivery Note.txt b/erpnext/stock/DocType Mapper/Sales Order-Delivery Note/Sales Order-Delivery Note.txt
index f93fadf..9b08913 100644
--- a/erpnext/stock/DocType Mapper/Sales Order-Delivery Note/Sales Order-Delivery Note.txt
+++ b/erpnext/stock/DocType Mapper/Sales Order-Delivery Note/Sales Order-Delivery Note.txt
@@ -5,8 +5,8 @@
 	{
 		'creation': '2010-08-08 17:09:35',
 		'docstatus': 0,
-		'modified': '2011-05-16 11:48:19',
-		'modified_by': 'umair@iwebnotes.com',
+		'modified': '2011-09-13 13:23:26',
+		'modified_by': 'Administrator',
 		'owner': 'Administrator'
 	},
 
@@ -30,7 +30,7 @@
 
 	# These values are common for all DocType Mapper
 	{
-		'doctype': 'DocType Mapper',
+		'doctype': u'DocType Mapper',
 		'from_doctype': 'Sales Order',
 		'module': 'Stock',
 		'name': '__common__',
@@ -40,7 +40,7 @@
 
 	# DocType Mapper, Sales Order-Delivery Note
 	{
-		'doctype': 'DocType Mapper',
+		'doctype': u'DocType Mapper',
 		'name': 'Sales Order-Delivery Note'
 	},
 
@@ -176,15 +176,6 @@
 
 	# Field Mapper Detail
 	{
-		'doctype': 'Field Mapper Detail',
-		'from_field': 'allocated_amount',
-		'map': 'Yes',
-		'match_id': 0,
-		'to_field': 'customer_mobile_no'
-	},
-
-	# Field Mapper Detail
-	{
 		'checking_operator': '=',
 		'doctype': 'Field Mapper Detail',
 		'from_field': 'project_name',
@@ -203,6 +194,33 @@
 		'to_field': 'customer'
 	},
 
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'naming_series',
+		'map': 'No',
+		'match_id': 0,
+		'to_field': 'naming_series'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'status',
+		'map': 'No',
+		'match_id': 0,
+		'to_field': 'status'
+	},
+
+	# Field Mapper Detail
+	{
+		'doctype': 'Field Mapper Detail',
+		'from_field': 'incentives',
+		'map': 'No',
+		'match_id': 3,
+		'to_field': 'incentives'
+	},
+
 	# Table Mapper Detail
 	{
 		'doctype': 'Table Mapper Detail',