diff --git a/accounts/doctype/account/account.txt b/accounts/doctype/account/account.txt
index aa3fd67..099e97d 100644
--- a/accounts/doctype/account/account.txt
+++ b/accounts/doctype/account/account.txt
@@ -29,7 +29,7 @@
 		'istable': None,
 		'max_attachments': None,
 		'menu_index': None,
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-06-23 17:11:38',
 		'modified_by': 'Administrator',
 		'module': 'Accounts',
 		'name': 'Account',
@@ -65,7 +65,7 @@
 		'execute': None,
 		'idx': 1,
 		'match': None,
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-02-19 13:20:49',
 		'modified_by': 'Administrator',
 		'name': 'PERM00042',
 		'owner': 'Administrator',
@@ -88,7 +88,7 @@
 		'execute': None,
 		'idx': 2,
 		'match': None,
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-02-19 13:20:49',
 		'modified_by': 'Administrator',
 		'name': 'PERM00043',
 		'owner': 'Administrator',
@@ -111,7 +111,7 @@
 		'execute': None,
 		'idx': 3,
 		'match': None,
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-02-19 13:20:49',
 		'modified_by': 'Administrator',
 		'name': 'PERM00044',
 		'owner': 'Administrator',
@@ -134,7 +134,7 @@
 		'execute': None,
 		'idx': 4,
 		'match': None,
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-02-19 13:20:49',
 		'modified_by': 'Administrator',
 		'name': 'PERM00045',
 		'owner': 'Administrator',
@@ -157,7 +157,7 @@
 		'execute': None,
 		'idx': 5,
 		'match': None,
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-02-19 13:20:49',
 		'modified_by': 'Administrator',
 		'name': 'PERM00046',
 		'owner': 'Administrator',
@@ -180,7 +180,7 @@
 		'execute': None,
 		'idx': 6,
 		'match': None,
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-02-19 13:20:49',
 		'modified_by': 'Administrator',
 		'name': 'PERM00047',
 		'owner': 'Administrator',
@@ -203,7 +203,7 @@
 		'execute': None,
 		'idx': 7,
 		'match': None,
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-02-19 13:20:49',
 		'modified_by': 'Administrator',
 		'name': 'PERM00048',
 		'owner': 'Administrator',
@@ -226,7 +226,7 @@
 		'execute': None,
 		'idx': 8,
 		'match': None,
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-02-19 13:20:49',
 		'modified_by': 'Administrator',
 		'name': 'PERM00049',
 		'owner': 'Administrator',
@@ -242,7 +242,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-03-21 11:13:07',
+		'creation': '2011-06-23 17:11:38',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -255,9 +255,9 @@
 		'idx': 1,
 		'in_filter': None,
 		'label': 'Properties',
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-06-23 17:11:38',
 		'modified_by': 'Administrator',
-		'name': '000013925',
+		'name': 'FL05605',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -278,7 +278,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-03-21 11:13:07',
+		'creation': '2011-06-23 17:11:38',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -291,9 +291,9 @@
 		'idx': 2,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-06-23 17:11:38',
 		'modified_by': 'Administrator',
-		'name': '000013926',
+		'name': 'FL05606',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -327,7 +327,7 @@
 		'idx': 3,
 		'in_filter': 1,
 		'label': 'Account Name',
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-06-23 17:11:38',
 		'modified_by': 'Administrator',
 		'name': 'FL00433',
 		'no_column': None,
@@ -363,7 +363,7 @@
 		'idx': 4,
 		'in_filter': None,
 		'label': 'Parent Account',
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-06-23 17:11:38',
 		'modified_by': 'Administrator',
 		'name': 'FL00434',
 		'no_column': None,
@@ -399,7 +399,7 @@
 		'idx': 5,
 		'in_filter': None,
 		'label': 'Level',
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-06-23 17:11:38',
 		'modified_by': 'Administrator',
 		'name': 'FL00435',
 		'no_column': None,
@@ -435,7 +435,7 @@
 		'idx': 6,
 		'in_filter': 1,
 		'label': 'Group or Ledger',
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-06-23 17:11:38',
 		'modified_by': 'Administrator',
 		'name': 'FL00436',
 		'no_column': None,
@@ -458,7 +458,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-03-21 11:13:07',
+		'creation': '2011-03-22 16:06:53',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -471,9 +471,9 @@
 		'idx': 7,
 		'in_filter': None,
 		'label': 'Convert to Group',
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-06-23 17:11:38',
 		'modified_by': 'Administrator',
-		'name': '000013923',
+		'name': '000001803',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -494,7 +494,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-03-21 11:13:07',
+		'creation': '2011-03-22 16:06:53',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -507,9 +507,9 @@
 		'idx': 8,
 		'in_filter': None,
 		'label': 'Convert to Ledger',
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-06-23 17:11:38',
 		'modified_by': 'Administrator',
-		'name': '000013924',
+		'name': '000001804',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -543,7 +543,7 @@
 		'idx': 9,
 		'in_filter': 1,
 		'label': 'Debit or Credit',
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-06-23 17:11:38',
 		'modified_by': 'Administrator',
 		'name': 'FL00441',
 		'no_column': None,
@@ -579,7 +579,7 @@
 		'idx': 10,
 		'in_filter': 1,
 		'label': 'Is PL Account',
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-06-23 17:11:38',
 		'modified_by': 'Administrator',
 		'name': 'FL00437',
 		'no_column': None,
@@ -615,7 +615,7 @@
 		'idx': 11,
 		'in_filter': 1,
 		'label': 'Account Type',
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-06-23 17:11:38',
 		'modified_by': 'Administrator',
 		'name': 'FL00439',
 		'no_column': None,
@@ -651,7 +651,7 @@
 		'idx': 12,
 		'in_filter': None,
 		'label': 'Rate',
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-06-23 17:11:38',
 		'modified_by': 'Administrator',
 		'name': 'FL00440',
 		'no_column': None,
@@ -674,7 +674,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-03-21 11:13:07',
+		'creation': '2011-06-23 17:11:38',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -687,9 +687,9 @@
 		'idx': 13,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-06-23 17:11:38',
 		'modified_by': 'Administrator',
-		'name': '000013927',
+		'name': 'FL05607',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -723,7 +723,7 @@
 		'idx': 14,
 		'in_filter': None,
 		'label': 'Freeze Account',
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-06-23 17:11:38',
 		'modified_by': 'Administrator',
 		'name': 'FL00438',
 		'no_column': None,
@@ -759,7 +759,7 @@
 		'idx': 15,
 		'in_filter': 1,
 		'label': 'Company',
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-06-23 17:11:38',
 		'modified_by': 'Administrator',
 		'name': 'FL00442',
 		'no_column': None,
@@ -790,12 +790,12 @@
 		'doctype': 'DocField',
 		'fieldname': 'credit_days',
 		'fieldtype': 'Int',
-		'hidden': 1,
+		'hidden': 0,
 		'icon': None,
 		'idx': 16,
 		'in_filter': None,
 		'label': 'Credit Days',
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-06-23 17:11:38',
 		'modified_by': 'Administrator',
 		'name': 'FL00443',
 		'no_column': None,
@@ -826,12 +826,12 @@
 		'doctype': 'DocField',
 		'fieldname': 'credit_limit',
 		'fieldtype': 'Currency',
-		'hidden': 1,
+		'hidden': 0,
 		'icon': None,
 		'idx': 17,
 		'in_filter': None,
 		'label': 'Credit Limit',
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-06-23 17:11:38',
 		'modified_by': 'Administrator',
 		'name': 'FL00444',
 		'no_column': None,
@@ -867,7 +867,7 @@
 		'idx': 18,
 		'in_filter': None,
 		'label': 'Master Type',
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-06-23 17:11:38',
 		'modified_by': 'Administrator',
 		'name': 'FL00453',
 		'no_column': None,
@@ -903,7 +903,7 @@
 		'idx': 19,
 		'in_filter': None,
 		'label': 'Master Name',
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-06-23 17:11:38',
 		'modified_by': 'Administrator',
 		'name': 'FL00454',
 		'no_column': None,
@@ -926,7 +926,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-03-21 11:13:07',
+		'creation': '2011-06-23 17:11:38',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -939,9 +939,9 @@
 		'idx': 20,
 		'in_filter': None,
 		'label': 'TDS',
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-06-23 17:11:38',
 		'modified_by': 'Administrator',
-		'name': '000013928',
+		'name': 'FL05608',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -975,7 +975,7 @@
 		'idx': 21,
 		'in_filter': None,
 		'label': 'PAN Number',
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-06-23 17:11:38',
 		'modified_by': 'Administrator',
 		'name': 'FL00451',
 		'no_column': None,
@@ -1011,7 +1011,7 @@
 		'idx': 22,
 		'in_filter': None,
 		'label': 'TDS Applicable',
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-06-23 17:11:38',
 		'modified_by': 'Administrator',
 		'name': 'FL00452',
 		'no_column': None,
@@ -1047,7 +1047,7 @@
 		'idx': 23,
 		'in_filter': None,
 		'label': 'TDS Details',
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-06-23 17:11:38',
 		'modified_by': 'Administrator',
 		'name': 'FL00456',
 		'no_column': None,
@@ -1083,7 +1083,7 @@
 		'idx': 24,
 		'in_filter': None,
 		'label': 'Old Parent',
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-06-23 17:11:38',
 		'modified_by': 'Administrator',
 		'name': 'FL00447',
 		'no_column': None,
@@ -1119,7 +1119,7 @@
 		'idx': 25,
 		'in_filter': 1,
 		'label': 'Lft',
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-06-23 17:11:38',
 		'modified_by': 'Administrator',
 		'name': 'FL00448',
 		'no_column': None,
@@ -1155,7 +1155,7 @@
 		'idx': 26,
 		'in_filter': 1,
 		'label': 'Rgt',
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-06-23 17:11:38',
 		'modified_by': 'Administrator',
 		'name': 'FL00449',
 		'no_column': None,
@@ -1191,7 +1191,7 @@
 		'idx': 27,
 		'in_filter': None,
 		'label': 'Trash Reason',
-		'modified': '2011-06-23 12:36:56',
+		'modified': '2011-06-23 17:11:38',
 		'modified_by': 'Administrator',
 		'name': 'FL00457',
 		'no_column': None,
diff --git a/crm/doctype/sales_common/sales_common.py b/crm/doctype/sales_common/sales_common.py
index f99853b..68afed4 100644
--- a/crm/doctype/sales_common/sales_common.py
+++ b/crm/doctype/sales_common/sales_common.py
@@ -707,7 +707,7 @@
 						set 
 							%(target_field)s = (select sum(qty) from `tab%(source_dt)s` where `%(join_field)s`="%(detail_id)s" and (docstatus=1 %(cond)s))
 						where
-							name="%(detail_id)s"
+							name="%(detail_id)s" 
 					""" % args)			
 		
 		# get unique transactions to update
@@ -716,33 +716,15 @@
 				args['name'] = name
 				
 				# update percent complete in the parent table
-				if args.get('source_dt')!='Installed Item Details':
-					sql("""
-						update 
-							`tab%(target_parent_dt)s` 
-						set 
-							%(target_parent_field)s = (
-								(select sum(amount) from `tab%(source_dt)s` where `%(percent_join_field)s`="%(name)s" and (docstatus=1 %(cond)s)) 
-								/ net_total
-								* 100
-							)
-							where
-								name="%(name)s"
-						""" % args)
-				else:
-					sql("""
-						update 
-							`tab%(target_parent_dt)s` 
-						set 
-							%(target_parent_field)s = (
-								(select sum(qty) from `tab%(source_dt)s` where `%(percent_join_field)s`="%(name)s" and (docstatus=1 %(cond)s)) 
-								/ (select sum(qty) from `tab%(target_dt)s` where parent="%(name)s" and docstatus=1) 
-								* 100
-							)
-							where
-								name="%(name)s"
-						""" % args)
-					
+				sql("""
+					update 
+						`tab%(target_parent_dt)s` 
+					set 
+						%(target_parent_field)s = 
+							(select sum(if(qty > ifnull(%(target_field)s, 0), %(target_field)s, qty))/sum(qty)*100 from `tab%(target_dt)s` where parent="%(name)s")
+						where
+							name="%(name)s"
+					""" % args)
 
 				# update field
 				if args['status_field']:
@@ -756,4 +738,3 @@
 						where
 							name="%(name)s"
 					""" % args)
-
diff --git a/crm/doctype/sales_order/sales_order.txt b/crm/doctype/sales_order/sales_order.txt
index f9d2aa4..f37853c 100644
--- a/crm/doctype/sales_order/sales_order.txt
+++ b/crm/doctype/sales_order/sales_order.txt
@@ -1,6 +1,6 @@
 [
 	{
-		'_last_update': '1306899441',
+		'_last_update': '1308741898',
 		'allow_attach': None,
 		'allow_copy': None,
 		'allow_email': None,
@@ -29,7 +29,7 @@
 		'istable': None,
 		'max_attachments': None,
 		'menu_index': None,
-		'modified': '2011-06-02 09:56:17',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'module': 'CRM',
 		'name': 'Sales Order',
@@ -53,7 +53,7 @@
 		'subject': 'From %(customer_name)s on %(transaction_date)s worth %(currency)s %(grand_total_export)s | %(per_delivered)s% delivered | %(per_billed)s% billed',
 		'tag_fields': 'delivery_status,billing_status',
 		'use_template': None,
-		'version': 592
+		'version': 593
 	},
 	{
 		'amend': 0,
@@ -65,7 +65,7 @@
 		'execute': None,
 		'idx': 1,
 		'match': None,
-		'modified': '2011-06-02 09:56:17',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'PERM00494',
 		'owner': 'Administrator',
@@ -88,7 +88,7 @@
 		'execute': None,
 		'idx': 2,
 		'match': None,
-		'modified': '2011-06-02 09:56:17',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'PERM00495',
 		'owner': 'Administrator',
@@ -111,7 +111,7 @@
 		'execute': None,
 		'idx': 3,
 		'match': None,
-		'modified': '2011-06-02 09:56:17',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'PERM00496',
 		'owner': 'Administrator',
@@ -134,7 +134,7 @@
 		'execute': None,
 		'idx': 4,
 		'match': None,
-		'modified': '2011-06-02 09:56:17',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'PERM00497',
 		'owner': 'Administrator',
@@ -157,7 +157,7 @@
 		'execute': None,
 		'idx': 5,
 		'match': 'customer_name',
-		'modified': '2011-06-02 09:56:17',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'PERM00498',
 		'owner': 'Administrator',
@@ -180,7 +180,7 @@
 		'execute': None,
 		'idx': 6,
 		'match': None,
-		'modified': '2011-06-02 09:56:17',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'PERM00499',
 		'owner': 'saumil@webnotestech.com',
@@ -203,7 +203,7 @@
 		'execute': None,
 		'idx': 7,
 		'match': None,
-		'modified': '2011-06-02 09:56:17',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'PERM00500',
 		'owner': 'ashwini@webnotestech.com',
@@ -226,7 +226,7 @@
 		'execute': None,
 		'idx': 8,
 		'match': None,
-		'modified': '2011-06-02 09:56:17',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'PERM00501',
 		'owner': 'ashwini@webnotestech.com',
@@ -249,7 +249,7 @@
 		'execute': None,
 		'idx': 9,
 		'match': None,
-		'modified': '2011-06-02 09:56:17',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'PERM00502',
 		'owner': 'ashwini@webnotestech.com',
@@ -272,7 +272,7 @@
 		'execute': None,
 		'idx': 10,
 		'match': None,
-		'modified': '2011-06-02 09:56:17',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'PERM00503',
 		'owner': 'ashwini@webnotestech.com',
@@ -288,7 +288,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-24 10:32:34',
+		'creation': '2011-06-03 12:34:34',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -301,9 +301,9 @@
 		'idx': 1,
 		'in_filter': None,
 		'label': 'Basic Info',
-		'modified': '2011-06-02 09:56:17',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
-		'name': 'FL05100',
+		'name': 'FL05546',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -324,7 +324,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:32:34',
+		'creation': '2011-06-03 12:34:34',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -337,9 +337,9 @@
 		'idx': 2,
 		'in_filter': 0,
 		'label': None,
-		'modified': '2011-06-02 09:56:17',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
-		'name': 'FL05101',
+		'name': 'FL05547',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -373,14 +373,14 @@
 		'idx': 3,
 		'in_filter': None,
 		'label': 'Series',
-		'modified': '2011-06-02 09:56:17',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03010',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'naming_series',
 		'oldfieldtype': 'Select',
-		'options': 'SO\nSO/10-11/\nSO/11-12/',
+		'options': 'SO\nSO/10-11/',
 		'owner': 'Administrator',
 		'parent': 'Sales Order',
 		'parentfield': 'fields',
@@ -396,7 +396,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-09-01 15:47:53',
+		'creation': '2010-09-01 15:48:02',
 		'default': None,
 		'depends_on': None,
 		'description': 'Select Customer',
@@ -409,9 +409,9 @@
 		'idx': 4,
 		'in_filter': 1,
 		'label': 'Customer',
-		'modified': '2011-06-02 09:56:17',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
-		'name': 'FL03778',
+		'name': 'FL03790',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'customer',
@@ -445,7 +445,7 @@
 		'idx': 5,
 		'in_filter': 1,
 		'label': 'Customer Address',
-		'modified': '2011-06-02 09:56:17',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03013',
 		'no_column': None,
@@ -481,7 +481,7 @@
 		'idx': 6,
 		'in_filter': 1,
 		'label': 'Contact Person',
-		'modified': '2011-06-02 09:56:17',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03014',
 		'no_column': None,
@@ -517,7 +517,7 @@
 		'idx': 7,
 		'in_filter': None,
 		'label': 'Name',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03012',
 		'no_column': None,
@@ -540,7 +540,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:32:33',
+		'creation': '2011-05-24 10:15:51',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -553,9 +553,9 @@
 		'idx': 8,
 		'in_filter': None,
 		'label': 'Address',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
-		'name': 'FL05089',
+		'name': 'FL05339',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -576,7 +576,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:32:33',
+		'creation': '2011-05-24 10:15:51',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -589,9 +589,9 @@
 		'idx': 9,
 		'in_filter': None,
 		'label': 'Contact',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
-		'name': 'FL05090',
+		'name': 'FL05340',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -612,7 +612,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:32:33',
+		'creation': '2011-05-24 10:15:51',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -625,9 +625,9 @@
 		'idx': 10,
 		'in_filter': None,
 		'label': 'Mobile No',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
-		'name': 'FL05091',
+		'name': 'FL05341',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -648,7 +648,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:32:33',
+		'creation': '2011-05-24 10:15:51',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -661,9 +661,9 @@
 		'idx': 11,
 		'in_filter': None,
 		'label': 'Contact Email',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
-		'name': 'FL05092',
+		'name': 'FL05342',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -697,7 +697,7 @@
 		'idx': 12,
 		'in_filter': 1,
 		'label': 'Territory',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03015',
 		'no_column': None,
@@ -733,7 +733,7 @@
 		'idx': 13,
 		'in_filter': 1,
 		'label': 'Customer Group',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03060',
 		'no_column': None,
@@ -769,7 +769,7 @@
 		'idx': 14,
 		'in_filter': None,
 		'label': 'P.O. No',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03016',
 		'no_column': None,
@@ -805,7 +805,7 @@
 		'idx': 15,
 		'in_filter': None,
 		'label': 'P.O. Date',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03017',
 		'no_column': None,
@@ -828,7 +828,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:32:34',
+		'creation': '2011-06-03 12:34:34',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -841,9 +841,9 @@
 		'idx': 16,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
-		'name': 'FL05102',
+		'name': 'FL05548',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -877,7 +877,7 @@
 		'idx': 17,
 		'in_filter': 1,
 		'label': 'Sales Order Date',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03019',
 		'no_column': None,
@@ -913,7 +913,7 @@
 		'idx': 18,
 		'in_filter': None,
 		'label': 'Order Type',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03009',
 		'no_column': None,
@@ -949,7 +949,7 @@
 		'idx': 19,
 		'in_filter': 1,
 		'label': 'Status',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03011',
 		'no_column': None,
@@ -985,7 +985,7 @@
 		'idx': 20,
 		'in_filter': 1,
 		'label': 'Expected Delivery Date',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03020',
 		'no_column': None,
@@ -1008,7 +1008,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-09-01 15:47:53',
+		'creation': '2010-09-01 15:48:02',
 		'default': None,
 		'depends_on': None,
 		'description': 'Track this Sales Order against any Project',
@@ -1021,9 +1021,9 @@
 		'idx': 21,
 		'in_filter': 1,
 		'label': 'Project Name',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
-		'name': 'FL03777',
+		'name': 'FL03789',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'project_name',
@@ -1057,7 +1057,7 @@
 		'idx': 22,
 		'in_filter': 1,
 		'label': '%  Delivered',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03021',
 		'no_column': None,
@@ -1093,7 +1093,7 @@
 		'idx': 23,
 		'in_filter': 1,
 		'label': '% Qty Billed',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03022',
 		'no_column': None,
@@ -1129,7 +1129,7 @@
 		'idx': 24,
 		'in_filter': None,
 		'label': 'Amended From',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03025',
 		'no_column': None,
@@ -1165,7 +1165,7 @@
 		'idx': 25,
 		'in_filter': None,
 		'label': 'Amendment Date',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03026',
 		'no_column': None,
@@ -1188,7 +1188,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:32:33',
+		'creation': '2011-05-24 10:15:51',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1201,9 +1201,9 @@
 		'idx': 26,
 		'in_filter': 1,
 		'label': 'Shipping Address Name',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
-		'name': 'FL05094',
+		'name': 'FL05344',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1224,7 +1224,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-03-24 17:00:43',
+		'creation': '2011-03-23 14:51:46',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1237,9 +1237,9 @@
 		'idx': 27,
 		'in_filter': 0,
 		'label': 'Shipping Address',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
-		'name': '000000170',
+		'name': '000001829',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1260,7 +1260,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-24 10:32:34',
+		'creation': '2011-06-03 12:34:34',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1273,9 +1273,9 @@
 		'idx': 28,
 		'in_filter': None,
 		'label': 'Items',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
-		'name': 'FL05103',
+		'name': 'FL05549',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1309,7 +1309,7 @@
 		'idx': 29,
 		'in_filter': 1,
 		'label': 'Quotation No',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03028',
 		'no_column': None,
@@ -1345,7 +1345,7 @@
 		'idx': 30,
 		'in_filter': None,
 		'label': 'Quotation Date',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03029',
 		'no_column': None,
@@ -1381,7 +1381,7 @@
 		'idx': 31,
 		'in_filter': None,
 		'label': 'Pull Quotation Details',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03030',
 		'no_column': None,
@@ -1417,7 +1417,7 @@
 		'idx': 32,
 		'in_filter': None,
 		'label': 'Price List',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03031',
 		'no_column': None,
@@ -1440,7 +1440,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:32:34',
+		'creation': '2011-06-03 12:34:34',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1453,9 +1453,9 @@
 		'idx': 33,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
-		'name': 'FL05104',
+		'name': 'FL05550',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1489,7 +1489,7 @@
 		'idx': 34,
 		'in_filter': None,
 		'label': 'Currency',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03023',
 		'no_column': None,
@@ -1525,7 +1525,7 @@
 		'idx': 35,
 		'in_filter': None,
 		'label': 'Conversion Rate',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03024',
 		'no_column': None,
@@ -1548,7 +1548,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:32:34',
+		'creation': '2011-06-03 12:34:34',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1561,9 +1561,9 @@
 		'idx': 36,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
-		'name': 'FL05105',
+		'name': 'FL05551',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1597,7 +1597,7 @@
 		'idx': 37,
 		'in_filter': None,
 		'label': 'Sales Order Details',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03032',
 		'no_column': None,
@@ -1633,7 +1633,7 @@
 		'idx': 38,
 		'in_filter': None,
 		'label': 'Clear Table',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03033',
 		'no_column': None,
@@ -1669,7 +1669,7 @@
 		'idx': 39,
 		'in_filter': None,
 		'label': 'Re-Calculate Values',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03035',
 		'no_column': None,
@@ -1705,7 +1705,7 @@
 		'idx': 40,
 		'in_filter': None,
 		'label': 'Net Total*',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03034',
 		'no_column': None,
@@ -1728,7 +1728,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-24 10:32:34',
+		'creation': '2011-06-03 12:34:34',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1741,9 +1741,9 @@
 		'idx': 41,
 		'in_filter': None,
 		'label': 'Note1',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
-		'name': 'FL05106',
+		'name': 'FL05552',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1764,7 +1764,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-24 10:32:34',
+		'creation': '2011-06-03 12:34:34',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1777,9 +1777,9 @@
 		'idx': 42,
 		'in_filter': None,
 		'label': 'Taxes',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
-		'name': 'FL05107',
+		'name': 'FL05553',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1813,7 +1813,7 @@
 		'idx': 43,
 		'in_filter': None,
 		'label': 'Select Charges Master',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03038',
 		'no_column': None,
@@ -1849,7 +1849,7 @@
 		'idx': 44,
 		'in_filter': None,
 		'label': 'Get Charges',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03039',
 		'no_column': None,
@@ -1885,7 +1885,7 @@
 		'idx': 45,
 		'in_filter': None,
 		'label': 'Other Charges',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03040',
 		'no_column': None,
@@ -1921,7 +1921,7 @@
 		'idx': 46,
 		'in_filter': None,
 		'label': 'Calculate Charges',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03041',
 		'no_column': None,
@@ -1957,7 +1957,7 @@
 		'idx': 47,
 		'in_filter': None,
 		'label': 'Charges Total*',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03042',
 		'no_column': None,
@@ -1993,7 +1993,7 @@
 		'idx': 48,
 		'in_filter': None,
 		'label': 'Grand Total*',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03043',
 		'no_column': None,
@@ -2016,7 +2016,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:32:34',
+		'creation': '2011-06-03 12:34:34',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2029,9 +2029,9 @@
 		'idx': 49,
 		'in_filter': None,
 		'label': 'OT Notes',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
-		'name': 'FL05108',
+		'name': 'FL05554',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2052,7 +2052,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:32:34',
+		'creation': '2011-06-03 12:34:34',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2065,9 +2065,9 @@
 		'idx': 50,
 		'in_filter': None,
 		'label': 'Other Charges Calculation',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
-		'name': 'FL05109',
+		'name': 'FL05555',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2088,7 +2088,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-24 10:32:34',
+		'creation': '2011-06-03 12:34:34',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2101,9 +2101,9 @@
 		'idx': 51,
 		'in_filter': None,
 		'label': 'Totals',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
-		'name': 'FL05110',
+		'name': 'FL05556',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2137,7 +2137,7 @@
 		'idx': 52,
 		'in_filter': None,
 		'label': 'Rounded Total',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03068',
 		'no_column': None,
@@ -2173,7 +2173,7 @@
 		'idx': 53,
 		'in_filter': None,
 		'label': 'In Words',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03069',
 		'no_column': None,
@@ -2196,7 +2196,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:32:34',
+		'creation': '2011-06-03 12:34:34',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2209,9 +2209,9 @@
 		'idx': 54,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
-		'name': 'FL05111',
+		'name': 'FL05557',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2245,7 +2245,7 @@
 		'idx': 55,
 		'in_filter': None,
 		'label': 'Grand Total (Export)',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03071',
 		'no_column': None,
@@ -2281,7 +2281,7 @@
 		'idx': 56,
 		'in_filter': None,
 		'label': 'Rounded Total (Export)',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03072',
 		'no_column': None,
@@ -2317,7 +2317,7 @@
 		'idx': 57,
 		'in_filter': None,
 		'label': 'In Words (Export)',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03073',
 		'no_column': None,
@@ -2340,7 +2340,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-24 10:32:34',
+		'creation': '2011-06-03 12:34:34',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2353,9 +2353,9 @@
 		'idx': 58,
 		'in_filter': None,
 		'label': 'Terms',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
-		'name': 'FL05112',
+		'name': 'FL05558',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2389,7 +2389,7 @@
 		'idx': 59,
 		'in_filter': None,
 		'label': 'Select Terms',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03047',
 		'no_column': None,
@@ -2425,7 +2425,7 @@
 		'idx': 60,
 		'in_filter': None,
 		'label': 'Get Terms',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03048',
 		'no_column': None,
@@ -2448,7 +2448,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:32:34',
+		'creation': '2011-06-03 12:34:34',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2461,9 +2461,9 @@
 		'idx': 61,
 		'in_filter': None,
 		'label': 'Terms HTML',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
-		'name': 'FL05113',
+		'name': 'FL05559',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2497,7 +2497,7 @@
 		'idx': 62,
 		'in_filter': None,
 		'label': 'Term Details',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03050',
 		'no_column': None,
@@ -2520,7 +2520,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-24 10:32:34',
+		'creation': '2011-06-03 12:34:34',
 		'default': None,
 		'depends_on': None,
 		'description': 'Filling in additional information about the Sales Order will help you analyze your data better.',
@@ -2533,9 +2533,9 @@
 		'idx': 63,
 		'in_filter': None,
 		'label': 'More Info',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
-		'name': 'FL05114',
+		'name': 'FL05560',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2556,7 +2556,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:32:34',
+		'creation': '2011-06-03 12:34:34',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2569,9 +2569,9 @@
 		'idx': 64,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
-		'name': 'FL05115',
+		'name': 'FL05561',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2592,7 +2592,7 @@
 	{
 		'allow_on_submit': 1,
 		'colour': None,
-		'creation': '2010-12-14 10:33:04',
+		'creation': '2010-12-14 10:23:21',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2605,9 +2605,9 @@
 		'idx': 65,
 		'in_filter': None,
 		'label': 'Letter Head',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
-		'name': 'FL04196',
+		'name': 'FL04241',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'letter_head',
@@ -2641,7 +2641,7 @@
 		'idx': 66,
 		'in_filter': 1,
 		'label': 'Company',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03053',
 		'no_column': None,
@@ -2677,7 +2677,7 @@
 		'idx': 67,
 		'in_filter': 1,
 		'label': 'Fiscal Year',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03054',
 		'no_column': None,
@@ -2713,7 +2713,7 @@
 		'idx': 68,
 		'in_filter': None,
 		'label': 'Select Print Heading',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03057',
 		'no_column': None,
@@ -2736,7 +2736,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:32:34',
+		'creation': '2011-06-03 12:34:34',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2749,9 +2749,9 @@
 		'idx': 69,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
-		'name': 'FL05116',
+		'name': 'FL05562',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2785,7 +2785,7 @@
 		'idx': 70,
 		'in_filter': None,
 		'label': 'Source',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03055',
 		'no_column': None,
@@ -2821,7 +2821,7 @@
 		'idx': 71,
 		'in_filter': None,
 		'label': 'Campaign',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03056',
 		'no_column': None,
@@ -2857,7 +2857,7 @@
 		'idx': 72,
 		'in_filter': None,
 		'label': 'Note',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03065',
 		'no_column': None,
@@ -2893,7 +2893,7 @@
 		'idx': 73,
 		'in_filter': None,
 		'label': 'Cancel Reason',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03063',
 		'no_column': 0,
@@ -2916,7 +2916,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-06-01 09:07:18',
+		'creation': '2011-06-03 12:34:33',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2929,14 +2929,14 @@
 		'idx': 74,
 		'in_filter': None,
 		'label': 'Delivery Status',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
-		'name': 'FL05197',
+		'name': 'FL05544',
 		'no_column': 0,
 		'no_copy': 1,
 		'oldfieldname': None,
 		'oldfieldtype': None,
-		'options': '\nBilled\nNot Billed\nPartly Billed\nClosed',
+		'options': 'Delivered\nNot Delivered\nPartly Delivered\nClosed\nNot Applicable',
 		'owner': 'Administrator',
 		'parent': 'Sales Order',
 		'parentfield': 'fields',
@@ -2952,7 +2952,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-06-01 09:07:18',
+		'creation': '2011-06-03 12:34:34',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2965,14 +2965,14 @@
 		'idx': 75,
 		'in_filter': None,
 		'label': 'Billing Status',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
-		'name': 'FL05196',
+		'name': 'FL05545',
 		'no_column': 0,
 		'no_copy': 1,
 		'oldfieldname': None,
 		'oldfieldtype': None,
-		'options': '\nDelivered\nNot Delivered\nPartly Delivered\nClosed\nNot Applicable',
+		'options': 'Billed\nNot Billed\nPartly Billed\nClosed',
 		'owner': 'Administrator',
 		'parent': 'Sales Order',
 		'parentfield': 'fields',
@@ -2988,7 +2988,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-24 10:32:34',
+		'creation': '2011-06-03 12:34:34',
 		'default': None,
 		'depends_on': None,
 		'description': 'Display all the individual items delivered with the main items',
@@ -3001,9 +3001,9 @@
 		'idx': 76,
 		'in_filter': None,
 		'label': 'Packing List',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
-		'name': 'FL05117',
+		'name': 'FL05563',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -3037,7 +3037,7 @@
 		'idx': 77,
 		'in_filter': None,
 		'label': 'Packing Details',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03075',
 		'no_column': None,
@@ -3060,7 +3060,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:32:34',
+		'creation': '2011-06-03 12:34:34',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -3073,9 +3073,9 @@
 		'idx': 78,
 		'in_filter': None,
 		'label': 'Sales Team',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
-		'name': 'FL05118',
+		'name': 'FL05564',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -3109,7 +3109,7 @@
 		'idx': 79,
 		'in_filter': 1,
 		'label': 'Sales Partner',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03077',
 		'no_column': None,
@@ -3145,7 +3145,7 @@
 		'idx': 80,
 		'in_filter': None,
 		'label': 'Commission Rate',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03078',
 		'no_column': None,
@@ -3181,7 +3181,7 @@
 		'idx': 81,
 		'in_filter': None,
 		'label': 'Total Commission',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03079',
 		'no_column': None,
@@ -3217,7 +3217,7 @@
 		'idx': 82,
 		'in_filter': None,
 		'label': 'Sales Team1',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03080',
 		'no_column': None,
@@ -3253,7 +3253,7 @@
 		'idx': 83,
 		'in_filter': None,
 		'label': 'Repair Sales Order',
-		'modified': '2011-06-02 09:56:18',
+		'modified': '2011-06-27 16:05:56',
 		'modified_by': 'Administrator',
 		'name': 'FL03093',
 		'no_column': None,
diff --git a/material_management/doctype/bin/bin.py b/material_management/doctype/bin/bin.py
index 7034264..1a1eb70 100644
--- a/material_management/doctype/bin/bin.py
+++ b/material_management/doctype/bin/bin.py
@@ -30,7 +30,7 @@
 		if not dt: dt = nowdate()
 		# update the stock values (for current quantities)
 		self.doc.actual_qty = flt(self.doc.actual_qty) + flt(actual_qty)
-		self.doc.ordered_qty = flt(self.doc.ordered_qty) + flt(ordered_qty)						
+		self.doc.ordered_qty = flt(self.doc.ordered_qty) + flt(ordered_qty)
 		self.doc.reserved_qty = flt(self.doc.reserved_qty) + flt(reserved_qty)
 		self.doc.indented_qty = flt(self.doc.indented_qty) + flt(indented_qty)
 		self.doc.planned_qty = flt(self.doc.planned_qty) + flt(planned_qty)
diff --git a/material_management/doctype/delivery_note/delivery_note.txt b/material_management/doctype/delivery_note/delivery_note.txt
index fc2fdd2..6b9c8c9 100644
--- a/material_management/doctype/delivery_note/delivery_note.txt
+++ b/material_management/doctype/delivery_note/delivery_note.txt
@@ -1,6 +1,6 @@
 [
 	{
-		'_last_update': '1306988762',
+		'_last_update': '1308741898',
 		'allow_attach': None,
 		'allow_copy': None,
 		'allow_email': None,
@@ -29,7 +29,7 @@
 		'istable': None,
 		'max_attachments': None,
 		'menu_index': None,
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'module': 'Material Management',
 		'name': 'Delivery Note',
@@ -53,7 +53,7 @@
 		'subject': 'To %(customer_name)s on %(transaction_date)s | %(per_billed)s% billed',
 		'tag_fields': 'billing_status',
 		'use_template': None,
-		'version': 443
+		'version': 444
 	},
 	{
 		'amend': 1,
@@ -65,7 +65,7 @@
 		'execute': None,
 		'idx': 1,
 		'match': None,
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'PERM00175',
 		'owner': 'Administrator',
@@ -88,7 +88,7 @@
 		'execute': None,
 		'idx': 2,
 		'match': None,
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'PERM00176',
 		'owner': 'Administrator',
@@ -111,7 +111,7 @@
 		'execute': None,
 		'idx': 3,
 		'match': None,
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'PERM00177',
 		'owner': 'Administrator',
@@ -134,7 +134,7 @@
 		'execute': None,
 		'idx': 4,
 		'match': None,
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'PERM00178',
 		'owner': 'Administrator',
@@ -157,7 +157,7 @@
 		'execute': None,
 		'idx': 5,
 		'match': None,
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'PERM00179',
 		'owner': 'Administrator',
@@ -180,7 +180,7 @@
 		'execute': None,
 		'idx': 6,
 		'match': None,
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'PERM00180',
 		'owner': 'Administrator',
@@ -203,7 +203,7 @@
 		'execute': None,
 		'idx': 7,
 		'match': None,
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'PERM00181',
 		'owner': 'Administrator',
@@ -226,7 +226,7 @@
 		'execute': None,
 		'idx': 8,
 		'match': None,
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'PERM00182',
 		'owner': 'Administrator',
@@ -249,7 +249,7 @@
 		'execute': None,
 		'idx': 9,
 		'match': 'customer_name',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'PERM00183',
 		'owner': 'Administrator',
@@ -272,7 +272,7 @@
 		'execute': None,
 		'idx': 10,
 		'match': None,
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'PERM00184',
 		'owner': 'nabin@webnotestech.com',
@@ -288,7 +288,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-24 10:31:48',
+		'creation': '2011-06-03 12:34:39',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -301,9 +301,9 @@
 		'idx': 1,
 		'in_filter': None,
 		'label': 'Basic Info',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
-		'name': 'FL04868',
+		'name': 'FL05576',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -324,7 +324,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:31:48',
+		'creation': '2011-06-03 12:34:39',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -337,9 +337,9 @@
 		'idx': 2,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
-		'name': 'FL04869',
+		'name': 'FL05577',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -373,7 +373,7 @@
 		'idx': 3,
 		'in_filter': None,
 		'label': 'Series',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00910',
 		'no_column': None,
@@ -396,7 +396,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-09-01 15:47:51',
+		'creation': '2010-09-01 15:48:01',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -409,9 +409,9 @@
 		'idx': 4,
 		'in_filter': 1,
 		'label': 'Customer',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
-		'name': 'FL03772',
+		'name': 'FL03784',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'customer',
@@ -445,7 +445,7 @@
 		'idx': 5,
 		'in_filter': 1,
 		'label': 'Shipping Address',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00913',
 		'no_column': None,
@@ -481,7 +481,7 @@
 		'idx': 6,
 		'in_filter': 1,
 		'label': 'Contact Person',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00915',
 		'no_column': None,
@@ -517,7 +517,7 @@
 		'idx': 7,
 		'in_filter': None,
 		'label': 'Customer Name',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00912',
 		'no_column': None,
@@ -540,7 +540,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:31:47',
+		'creation': '2011-05-24 10:14:59',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -553,9 +553,9 @@
 		'idx': 8,
 		'in_filter': None,
 		'label': 'Shipping Address',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
-		'name': 'FL04855',
+		'name': 'FL05105',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -576,7 +576,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:31:47',
+		'creation': '2011-05-24 10:14:59',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -589,9 +589,9 @@
 		'idx': 9,
 		'in_filter': None,
 		'label': 'Contact',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
-		'name': 'FL04856',
+		'name': 'FL05106',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -612,7 +612,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:31:47',
+		'creation': '2011-05-24 10:14:59',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -625,9 +625,9 @@
 		'idx': 10,
 		'in_filter': None,
 		'label': 'Mobile No',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
-		'name': 'FL04857',
+		'name': 'FL05107',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -648,7 +648,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:31:47',
+		'creation': '2011-05-24 10:14:59',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -661,9 +661,9 @@
 		'idx': 11,
 		'in_filter': None,
 		'label': 'Contact Email',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
-		'name': 'FL04858',
+		'name': 'FL05108',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -684,7 +684,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:31:49',
+		'creation': '2011-06-03 12:34:39',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -697,9 +697,9 @@
 		'idx': 12,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
-		'name': 'FL04870',
+		'name': 'FL05578',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -733,7 +733,7 @@
 		'idx': 13,
 		'in_filter': 1,
 		'label': 'Voucher Date',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00921',
 		'no_column': None,
@@ -769,7 +769,7 @@
 		'idx': 14,
 		'in_filter': 1,
 		'label': 'Status',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00911',
 		'no_column': None,
@@ -805,7 +805,7 @@
 		'idx': 15,
 		'in_filter': 1,
 		'label': '% Qty Billed',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00922',
 		'no_column': None,
@@ -841,7 +841,7 @@
 		'idx': 16,
 		'in_filter': 1,
 		'label': '% Installed',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00923',
 		'no_column': None,
@@ -877,7 +877,7 @@
 		'idx': 17,
 		'in_filter': None,
 		'label': 'Amended From',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00917',
 		'no_column': None,
@@ -913,7 +913,7 @@
 		'idx': 18,
 		'in_filter': None,
 		'label': 'Amendment Date',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00918',
 		'no_column': None,
@@ -949,7 +949,7 @@
 		'idx': 19,
 		'in_filter': 1,
 		'label': 'Territory',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00914',
 		'no_column': None,
@@ -985,7 +985,7 @@
 		'idx': 20,
 		'in_filter': 1,
 		'label': 'Customer Group',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00971',
 		'no_column': None,
@@ -1008,7 +1008,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:31:49',
+		'creation': '2011-06-03 12:34:39',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1021,9 +1021,9 @@
 		'idx': 21,
 		'in_filter': None,
 		'label': 'Transporter Info',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
-		'name': 'FL04871',
+		'name': 'FL05579',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1057,7 +1057,7 @@
 		'idx': 22,
 		'in_filter': None,
 		'label': 'Transporter Name',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00919',
 		'no_column': None,
@@ -1093,7 +1093,7 @@
 		'idx': 23,
 		'in_filter': None,
 		'label': 'LR No',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00926',
 		'no_column': None,
@@ -1129,7 +1129,7 @@
 		'idx': 24,
 		'in_filter': None,
 		'label': 'LR Date',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00927',
 		'no_column': None,
@@ -1152,7 +1152,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:31:49',
+		'creation': '2011-06-03 12:34:39',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1165,9 +1165,9 @@
 		'idx': 25,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
-		'name': 'FL04872',
+		'name': 'FL05580',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1201,7 +1201,7 @@
 		'idx': 26,
 		'in_filter': None,
 		'label': 'Challan No',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00928',
 		'no_column': None,
@@ -1237,7 +1237,7 @@
 		'idx': 27,
 		'in_filter': None,
 		'label': 'Challan Date',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00929',
 		'no_column': None,
@@ -1260,7 +1260,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-24 10:31:49',
+		'creation': '2011-06-03 12:34:39',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1273,9 +1273,9 @@
 		'idx': 28,
 		'in_filter': None,
 		'label': 'Items',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
-		'name': 'FL04873',
+		'name': 'FL05581',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1309,7 +1309,7 @@
 		'idx': 29,
 		'in_filter': None,
 		'label': 'Sales Order No',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00931',
 		'no_column': None,
@@ -1345,7 +1345,7 @@
 		'idx': 30,
 		'in_filter': None,
 		'label': 'Get Items',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00932',
 		'no_column': None,
@@ -1381,7 +1381,7 @@
 		'idx': 31,
 		'in_filter': None,
 		'label': 'Price List',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00933',
 		'no_column': None,
@@ -1404,7 +1404,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:31:49',
+		'creation': '2011-06-03 12:34:39',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1417,9 +1417,9 @@
 		'idx': 32,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
-		'name': 'FL04874',
+		'name': 'FL05582',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1453,7 +1453,7 @@
 		'idx': 33,
 		'in_filter': None,
 		'label': 'Currency',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00924',
 		'no_column': None,
@@ -1489,7 +1489,7 @@
 		'idx': 34,
 		'in_filter': None,
 		'label': 'Conversion Rate',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00925',
 		'no_column': None,
@@ -1512,7 +1512,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:31:49',
+		'creation': '2011-06-03 12:34:39',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1525,9 +1525,9 @@
 		'idx': 35,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
-		'name': 'FL04875',
+		'name': 'FL05583',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1561,7 +1561,7 @@
 		'idx': 36,
 		'in_filter': None,
 		'label': 'Delivery Note Details',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00934',
 		'no_column': None,
@@ -1597,7 +1597,7 @@
 		'idx': 37,
 		'in_filter': None,
 		'label': 'Net Total*',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00935',
 		'no_column': None,
@@ -1633,7 +1633,7 @@
 		'idx': 38,
 		'in_filter': None,
 		'label': 'Re-Calculate Values',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00936',
 		'no_column': None,
@@ -1656,7 +1656,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:31:49',
+		'creation': '2011-06-03 12:34:39',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1669,9 +1669,9 @@
 		'idx': 39,
 		'in_filter': None,
 		'label': 'Note',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
-		'name': 'FL04876',
+		'name': 'FL05584',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1692,7 +1692,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-24 10:31:49',
+		'creation': '2011-06-03 12:34:39',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1705,9 +1705,9 @@
 		'idx': 40,
 		'in_filter': None,
 		'label': 'Taxes',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
-		'name': 'FL04877',
+		'name': 'FL05585',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1741,7 +1741,7 @@
 		'idx': 41,
 		'in_filter': None,
 		'label': 'Charge',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00939',
 		'no_column': None,
@@ -1777,7 +1777,7 @@
 		'idx': 42,
 		'in_filter': None,
 		'label': 'Get Charges',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00940',
 		'no_column': None,
@@ -1813,7 +1813,7 @@
 		'idx': 43,
 		'in_filter': None,
 		'label': 'Other Charges',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00941',
 		'no_column': None,
@@ -1849,7 +1849,7 @@
 		'idx': 44,
 		'in_filter': None,
 		'label': 'Charges Total',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00945',
 		'no_column': None,
@@ -1885,7 +1885,7 @@
 		'idx': 45,
 		'in_filter': None,
 		'label': 'Calculate Charges',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00942',
 		'no_column': None,
@@ -1908,7 +1908,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:31:49',
+		'creation': '2011-06-03 12:34:39',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1921,9 +1921,9 @@
 		'idx': 46,
 		'in_filter': None,
 		'label': 'Other Charges Calculation',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
-		'name': 'FL04878',
+		'name': 'FL05586',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1944,7 +1944,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-24 10:31:49',
+		'creation': '2011-06-03 12:34:39',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1957,9 +1957,9 @@
 		'idx': 47,
 		'in_filter': None,
 		'label': 'Totals',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
-		'name': 'FL04879',
+		'name': 'FL05587',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1993,7 +1993,7 @@
 		'idx': 48,
 		'in_filter': None,
 		'label': 'Grand Total',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00946',
 		'no_column': None,
@@ -2029,7 +2029,7 @@
 		'idx': 49,
 		'in_filter': None,
 		'label': 'Rounded Total',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00947',
 		'no_column': None,
@@ -2065,7 +2065,7 @@
 		'idx': 50,
 		'in_filter': None,
 		'label': 'In Words',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00948',
 		'no_column': None,
@@ -2088,7 +2088,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:31:49',
+		'creation': '2011-06-03 12:34:39',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2101,9 +2101,9 @@
 		'idx': 51,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
-		'name': 'FL04880',
+		'name': 'FL05588',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2137,7 +2137,7 @@
 		'idx': 52,
 		'in_filter': None,
 		'label': 'Grand Total (Export)',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00950',
 		'no_column': None,
@@ -2173,7 +2173,7 @@
 		'idx': 53,
 		'in_filter': None,
 		'label': 'Rounded Total (Export)',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00951',
 		'no_column': None,
@@ -2209,7 +2209,7 @@
 		'idx': 54,
 		'in_filter': None,
 		'label': 'In Words (Export)',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00952',
 		'no_column': None,
@@ -2232,7 +2232,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:31:49',
+		'creation': '2011-06-03 12:34:39',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2245,9 +2245,9 @@
 		'idx': 55,
 		'in_filter': None,
 		'label': 'Terms',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
-		'name': 'FL04881',
+		'name': 'FL05589',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2281,7 +2281,7 @@
 		'idx': 56,
 		'in_filter': None,
 		'label': 'Select Terms',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00954',
 		'no_column': None,
@@ -2317,7 +2317,7 @@
 		'idx': 57,
 		'in_filter': None,
 		'label': 'Get Terms',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00955',
 		'no_column': None,
@@ -2340,7 +2340,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-24 10:31:49',
+		'creation': '2011-06-03 12:34:39',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2353,9 +2353,9 @@
 		'idx': 58,
 		'in_filter': None,
 		'label': 'Terms HTML',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
-		'name': 'FL04882',
+		'name': 'FL05590',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2389,7 +2389,7 @@
 		'idx': 59,
 		'in_filter': None,
 		'label': 'Term Details',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00957',
 		'no_column': None,
@@ -2412,7 +2412,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-24 10:31:49',
+		'creation': '2011-06-03 12:34:39',
 		'default': None,
 		'depends_on': None,
 		'description': 'Filling in Additional Information about the Delivery Note will help you analyze your data better.',
@@ -2425,9 +2425,9 @@
 		'idx': 60,
 		'in_filter': None,
 		'label': 'More Info',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
-		'name': 'FL04883',
+		'name': 'FL05591',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2461,7 +2461,7 @@
 		'idx': 61,
 		'in_filter': 1,
 		'label': 'Company',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00967',
 		'no_column': None,
@@ -2497,7 +2497,7 @@
 		'idx': 62,
 		'in_filter': 1,
 		'label': 'Fiscal Year',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00968',
 		'no_column': None,
@@ -2533,7 +2533,7 @@
 		'idx': 63,
 		'in_filter': 1,
 		'label': 'Posting Date',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00959',
 		'no_column': None,
@@ -2569,7 +2569,7 @@
 		'idx': 64,
 		'in_filter': 0,
 		'label': 'Posting Time',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00960',
 		'no_column': None,
@@ -2592,7 +2592,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-09-01 15:47:51',
+		'creation': '2010-09-01 15:48:01',
 		'default': None,
 		'depends_on': None,
 		'description': 'Track this Delivery Note against any Project',
@@ -2605,9 +2605,9 @@
 		'idx': 65,
 		'in_filter': 1,
 		'label': 'Project Name',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
-		'name': 'FL03771',
+		'name': 'FL03783',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'project_name',
@@ -2641,7 +2641,7 @@
 		'idx': 66,
 		'in_filter': None,
 		'label': 'To Warehouse',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00963',
 		'no_column': None,
@@ -2664,7 +2664,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:31:49',
+		'creation': '2011-06-03 12:34:39',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2677,9 +2677,9 @@
 		'idx': 67,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
-		'name': 'FL04884',
+		'name': 'FL05592',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2700,7 +2700,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-06-01 16:23:33',
+		'creation': '2011-06-03 12:34:38',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2713,9 +2713,9 @@
 		'idx': 68,
 		'in_filter': None,
 		'label': 'Billing Status',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
-		'name': 'FL05198',
+		'name': 'FL05572',
 		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': None,
@@ -2736,7 +2736,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-06-02 12:06:13',
+		'creation': '2011-06-03 12:34:38',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2749,9 +2749,9 @@
 		'idx': 69,
 		'in_filter': None,
 		'label': 'Installation Status',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
-		'name': 'FL05199',
+		'name': 'FL05573',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2772,7 +2772,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-04-21 10:53:23',
+		'creation': '2010-08-08 17:08:58',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2780,14 +2780,14 @@
 		'doctype': 'DocField',
 		'fieldname': 'po_no',
 		'fieldtype': 'Data',
-		'hidden': None,
+		'hidden': 1,
 		'icon': None,
 		'idx': 70,
 		'in_filter': None,
 		'label': 'P.O. No',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
-		'name': '000000635',
+		'name': 'FL00974',
 		'no_column': None,
 		'no_copy': 0,
 		'oldfieldname': 'po_no',
@@ -2798,7 +2798,7 @@
 		'parentfield': 'fields',
 		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': None,
+		'print_hide': 1,
 		'report_hide': None,
 		'reqd': None,
 		'search_index': None,
@@ -2808,7 +2808,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-04-21 10:53:23',
+		'creation': '2010-08-08 17:08:58',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2816,14 +2816,14 @@
 		'doctype': 'DocField',
 		'fieldname': 'po_date',
 		'fieldtype': 'Data',
-		'hidden': None,
+		'hidden': 1,
 		'icon': None,
 		'idx': 71,
 		'in_filter': None,
 		'label': 'P.O. Date',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
-		'name': '000000634',
+		'name': 'FL00975',
 		'no_column': None,
 		'no_copy': 0,
 		'oldfieldname': 'po_date',
@@ -2834,7 +2834,7 @@
 		'parentfield': 'fields',
 		'parenttype': 'DocType',
 		'permlevel': 1,
-		'print_hide': None,
+		'print_hide': 1,
 		'report_hide': None,
 		'reqd': None,
 		'search_index': None,
@@ -2844,7 +2844,7 @@
 	{
 		'allow_on_submit': 1,
 		'colour': None,
-		'creation': '2010-12-14 10:32:56',
+		'creation': '2010-12-14 10:23:21',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2857,9 +2857,9 @@
 		'idx': 72,
 		'in_filter': None,
 		'label': 'Letter Head',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
-		'name': 'FL04141',
+		'name': 'FL04234',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'letter_head',
@@ -2893,7 +2893,7 @@
 		'idx': 73,
 		'in_filter': None,
 		'label': 'Source',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00961',
 		'no_column': None,
@@ -2929,7 +2929,7 @@
 		'idx': 74,
 		'in_filter': None,
 		'label': 'Campaign',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00962',
 		'no_column': None,
@@ -2965,7 +2965,7 @@
 		'idx': 75,
 		'in_filter': None,
 		'label': 'Select Print Heading',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00969',
 		'no_column': None,
@@ -3001,7 +3001,7 @@
 		'idx': 76,
 		'in_filter': None,
 		'label': 'Print Without Amount',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00966',
 		'no_column': None,
@@ -3037,7 +3037,7 @@
 		'idx': 77,
 		'in_filter': None,
 		'label': 'Instructions',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00964',
 		'no_column': None,
@@ -3073,7 +3073,7 @@
 		'idx': 78,
 		'in_filter': None,
 		'label': 'Cancel Reason',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00976',
 		'no_column': None,
@@ -3109,7 +3109,7 @@
 		'idx': 79,
 		'in_filter': None,
 		'label': 'Excise Page Number',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00977',
 		'no_column': None,
@@ -3132,7 +3132,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-05-24 10:31:49',
+		'creation': '2011-06-03 12:34:39',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -3145,9 +3145,9 @@
 		'idx': 80,
 		'in_filter': None,
 		'label': 'Sales Team',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
-		'name': 'FL04885',
+		'name': 'FL05593',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -3168,7 +3168,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:31:49',
+		'creation': '2011-06-03 12:34:39',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -3181,9 +3181,9 @@
 		'idx': 81,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
-		'name': 'FL04886',
+		'name': 'FL05594',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -3217,7 +3217,7 @@
 		'idx': 82,
 		'in_filter': None,
 		'label': 'Sales Partner',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00981',
 		'no_column': None,
@@ -3253,7 +3253,7 @@
 		'idx': 83,
 		'in_filter': None,
 		'label': 'Commission Rate (%)',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00982',
 		'no_column': None,
@@ -3289,7 +3289,7 @@
 		'idx': 84,
 		'in_filter': None,
 		'label': 'Total Commission',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00983',
 		'no_column': None,
@@ -3312,7 +3312,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:31:49',
+		'creation': '2011-06-03 12:34:39',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -3325,9 +3325,9 @@
 		'idx': 85,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
-		'name': 'FL04887',
+		'name': 'FL05595',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -3361,7 +3361,7 @@
 		'idx': 86,
 		'in_filter': None,
 		'label': 'Sales Team1',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00984',
 		'no_column': None,
@@ -3384,7 +3384,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:31:49',
+		'creation': '2011-06-03 12:34:39',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -3397,9 +3397,9 @@
 		'idx': 87,
 		'in_filter': None,
 		'label': 'Supplier Details',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
-		'name': 'FL04888',
+		'name': 'FL05596',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -3433,7 +3433,7 @@
 		'idx': 88,
 		'in_filter': None,
 		'label': 'Supplier',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00986',
 		'no_column': None,
@@ -3469,7 +3469,7 @@
 		'idx': 89,
 		'in_filter': None,
 		'label': 'Supplier Address',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00987',
 		'no_column': None,
@@ -3505,7 +3505,7 @@
 		'idx': 90,
 		'in_filter': None,
 		'label': 'Purchase Receipt No',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00988',
 		'no_column': None,
@@ -3541,7 +3541,7 @@
 		'idx': 91,
 		'in_filter': None,
 		'label': 'Purchase Order',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00989',
 		'no_column': None,
@@ -3564,7 +3564,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-24 10:31:49',
+		'creation': '2011-06-03 12:34:39',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -3577,9 +3577,9 @@
 		'idx': 92,
 		'in_filter': None,
 		'label': 'Packing List',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
-		'name': 'FL04889',
+		'name': 'FL05597',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -3613,7 +3613,7 @@
 		'idx': 93,
 		'in_filter': None,
 		'label': 'Packing Details',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00991',
 		'no_column': None,
@@ -3649,7 +3649,7 @@
 		'idx': 94,
 		'in_filter': None,
 		'label': 'Repair Delivery Note',
-		'modified': '2011-06-02 12:06:13',
+		'modified': '2011-06-27 16:42:01',
 		'modified_by': 'Administrator',
 		'name': 'FL00995',
 		'no_column': None,
diff --git a/patches/delivery_billing_status_patch.py b/patches/delivery_billing_status_patch.py
new file mode 100644
index 0000000..2f95013
--- /dev/null
+++ b/patches/delivery_billing_status_patch.py
@@ -0,0 +1,43 @@
+import webnotes
+sql = webnotes.conn.sql
+
+# update SO
+#---------------
+def update_percent():
+	so = sql("select name from 	`tabSales Order` where docstatus = 1")
+	for d in so:
+		sql("""
+			update 
+				`tabSales Order` 
+			set 
+				per_delivered = (select sum(if(qty > ifnull(delivered_qty, 0), delivered_qty, qty))/sum(qty)*100 from `tabSales Order Detail` where parent='%s'), 
+				per_billed = (select sum(if(qty > ifnull(billed_qty, 0), billed_qty, qty))/sum(qty)*100 from `tabSales Order Detail` where parent='%s') 
+			where 
+				name='%s'""" % (d[0], d[0], d[0]))
+
+	# update DN	
+	# ---------
+	dn = sql("select name from 	`tabDelivery Note` where docstatus = 1")
+	for d in dn:
+		sql("""
+			update 
+				`tabDelivery Note` 
+			set 
+				per_billed = (select sum(if(qty > ifnull(billed_qty, 0), billed_qty, qty))/sum(qty)*100 from `tabDelivery Note Detail` where parent='%s') 
+			where 
+				name='%s'""" % (d[0], d[0]))
+	
+
+# update delivery/billing status 
+#-------------------------------
+def update_status():
+	sql("""update `tabSales Order` set delivery_status = if(ifnull(per_delivered,0) < 0.001, 'Not Delivered', 
+			if(per_delivered >= 99.99, 'Fully Delivered', 'Partly Delivered'))""")
+	sql("""update `tabSales Order` set billing_status = if(ifnull(per_billed,0) < 0.001, 'Not Billed', 
+			if(per_billed >= 99.99, 'Fully Billed', 'Partly Billed'))""")
+	sql("""update `tabDelivery Note` set billing_status = if(ifnull(per_billed,0) < 0.001, 'Not Billed', 
+			if(per_billed >= 99.99, 'Fully Billed', 'Partly Billed'))""")
+			
+def run_patch():
+	update_percent()
+	update_status()
diff --git a/patches/patch.py b/patches/patch.py
index e1ee318..43eca9f 100644
--- a/patches/patch.py
+++ b/patches/patch.py
@@ -1,6 +1,6 @@
 # REMEMBER to update this
 # ========================
-last_patch = 300
+last_patch = 301
 
 #-------------------------------------------
 
@@ -1195,3 +1195,6 @@
 	elif patch_no == 300:
 		sql("""DELETE FROM `tabSearch Criteria` WHERE name IN
 			   ('sales_register1', 'sales_register2', 'purchase_register1')""")
+	elif patch_no == 301:
+		from patches.delivery_billing_status_patch import run_patch
+		run_patch()
diff --git a/payroll/doctype/appraisal/appraisal.txt b/payroll/doctype/appraisal/appraisal.txt
index d5865bc..0410d8d 100644
--- a/payroll/doctype/appraisal/appraisal.txt
+++ b/payroll/doctype/appraisal/appraisal.txt
@@ -13,7 +13,7 @@
 		'client_script_core': None,
 		'client_string': None,
 		'colour': 'White:FFF',
-		'creation': '2010-09-01 15:47:54',
+		'creation': '2010-09-01 15:48:05',
 		'description': None,
 		'docstatus': 0,
 		'doctype': 'DocType',
@@ -29,7 +29,7 @@
 		'istable': None,
 		'max_attachments': None,
 		'menu_index': None,
-		'modified': '2011-06-24 18:47:36',
+		'modified': '2011-06-27 14:39:10',
 		'modified_by': 'Administrator',
 		'module': 'Payroll',
 		'name': 'Appraisal',
@@ -59,15 +59,15 @@
 		'amend': 1,
 		'cancel': 1,
 		'create': 1,
-		'creation': '2010-09-01 15:47:54',
+		'creation': '2010-09-01 15:48:05',
 		'docstatus': 0,
 		'doctype': 'DocPerm',
 		'execute': None,
 		'idx': 1,
 		'match': None,
-		'modified': '2011-06-24 18:47:36',
+		'modified': '2010-09-01 15:48:05',
 		'modified_by': 'Administrator',
-		'name': 'PERM00658',
+		'name': 'PERM00664',
 		'owner': 'ashwini@webnotestech.com',
 		'parent': 'Appraisal',
 		'parentfield': 'permissions',
@@ -82,15 +82,15 @@
 		'amend': None,
 		'cancel': None,
 		'create': None,
-		'creation': '2010-09-01 15:47:54',
+		'creation': '2010-09-01 15:48:05',
 		'docstatus': 0,
 		'doctype': 'DocPerm',
 		'execute': None,
 		'idx': 2,
 		'match': None,
-		'modified': '2011-06-24 18:47:36',
+		'modified': '2010-09-01 15:48:05',
 		'modified_by': 'Administrator',
-		'name': 'PERM00659',
+		'name': 'PERM00665',
 		'owner': 'ashwini@webnotestech.com',
 		'parent': 'Appraisal',
 		'parentfield': 'permissions',
@@ -105,15 +105,15 @@
 		'amend': 1,
 		'cancel': 1,
 		'create': 1,
-		'creation': '2010-09-01 15:47:54',
+		'creation': '2010-09-01 15:48:05',
 		'docstatus': 0,
 		'doctype': 'DocPerm',
 		'execute': None,
 		'idx': 3,
 		'match': None,
-		'modified': '2011-06-24 18:47:36',
+		'modified': '2010-09-01 15:48:05',
 		'modified_by': 'Administrator',
-		'name': 'PERM00660',
+		'name': 'PERM00666',
 		'owner': 'ashwini@webnotestech.com',
 		'parent': 'Appraisal',
 		'parentfield': 'permissions',
@@ -128,15 +128,15 @@
 		'amend': None,
 		'cancel': None,
 		'create': None,
-		'creation': '2010-09-01 15:47:54',
+		'creation': '2010-09-01 15:48:05',
 		'docstatus': 0,
 		'doctype': 'DocPerm',
 		'execute': None,
 		'idx': 4,
 		'match': None,
-		'modified': '2011-06-24 18:47:36',
+		'modified': '2010-09-01 15:48:05',
 		'modified_by': 'Administrator',
-		'name': 'PERM00661',
+		'name': 'PERM00667',
 		'owner': 'ashwini@webnotestech.com',
 		'parent': 'Appraisal',
 		'parentfield': 'permissions',
@@ -151,15 +151,15 @@
 		'amend': 1,
 		'cancel': 1,
 		'create': 1,
-		'creation': '2010-09-01 15:47:54',
+		'creation': '2010-09-01 15:48:05',
 		'docstatus': 0,
 		'doctype': 'DocPerm',
 		'execute': None,
 		'idx': 5,
 		'match': None,
-		'modified': '2011-06-24 18:47:36',
+		'modified': '2010-09-01 15:48:05',
 		'modified_by': 'Administrator',
-		'name': 'PERM00662',
+		'name': 'PERM00668',
 		'owner': 'ashwini@webnotestech.com',
 		'parent': 'Appraisal',
 		'parentfield': 'permissions',
@@ -174,15 +174,15 @@
 		'amend': 1,
 		'cancel': 1,
 		'create': 1,
-		'creation': '2010-09-01 15:47:54',
+		'creation': '2010-09-01 15:48:05',
 		'docstatus': 0,
 		'doctype': 'DocPerm',
 		'execute': None,
 		'idx': 6,
 		'match': None,
-		'modified': '2011-06-24 18:47:36',
+		'modified': '2010-09-01 15:48:05',
 		'modified_by': 'Administrator',
-		'name': 'PERM00663',
+		'name': 'PERM00669',
 		'owner': 'ashwini@webnotestech.com',
 		'parent': 'Appraisal',
 		'parentfield': 'permissions',
@@ -197,15 +197,15 @@
 		'amend': None,
 		'cancel': None,
 		'create': None,
-		'creation': '2010-09-01 15:47:54',
+		'creation': '2010-09-01 15:48:05',
 		'docstatus': 0,
 		'doctype': 'DocPerm',
 		'execute': None,
 		'idx': 7,
 		'match': None,
-		'modified': '2011-06-24 18:47:36',
+		'modified': '2010-09-01 15:48:05',
 		'modified_by': 'Administrator',
-		'name': 'PERM00664',
+		'name': 'PERM00670',
 		'owner': 'ashwini@webnotestech.com',
 		'parent': 'Appraisal',
 		'parentfield': 'permissions',
@@ -220,15 +220,15 @@
 		'amend': None,
 		'cancel': None,
 		'create': None,
-		'creation': '2010-09-01 15:47:54',
+		'creation': '2010-09-01 15:48:05',
 		'docstatus': 0,
 		'doctype': 'DocPerm',
 		'execute': None,
 		'idx': 8,
 		'match': None,
-		'modified': '2011-06-24 18:47:36',
+		'modified': '2010-09-01 15:48:05',
 		'modified_by': 'Administrator',
-		'name': 'PERM00665',
+		'name': 'PERM00671',
 		'owner': 'ashwini@webnotestech.com',
 		'parent': 'Appraisal',
 		'parentfield': 'permissions',
@@ -242,7 +242,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-09-01 15:47:54',
+		'creation': '2011-06-27 14:39:10',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -255,9 +255,9 @@
 		'idx': 1,
 		'in_filter': None,
 		'label': 'Employee Details',
-		'modified': '2011-06-24 18:47:36',
+		'modified': '2011-06-27 14:39:10',
 		'modified_by': 'Administrator',
-		'name': 'FL03790',
+		'name': 'FL05653',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -278,7 +278,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-09-01 15:47:54',
+		'creation': '2010-09-01 15:48:05',
 		'default': 'Draft',
 		'depends_on': None,
 		'description': None,
@@ -291,9 +291,9 @@
 		'idx': 2,
 		'in_filter': 1,
 		'label': 'Status',
-		'modified': '2011-06-24 18:47:36',
+		'modified': '2011-06-27 14:39:10',
 		'modified_by': 'Administrator',
-		'name': 'FL03791',
+		'name': 'FL03803',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'status',
@@ -314,7 +314,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-09-01 15:47:54',
+		'creation': '2010-09-01 15:48:05',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -327,9 +327,9 @@
 		'idx': 3,
 		'in_filter': 1,
 		'label': 'Employee',
-		'modified': '2011-06-24 18:47:36',
+		'modified': '2011-06-27 14:39:10',
 		'modified_by': 'Administrator',
-		'name': 'FL03792',
+		'name': 'FL03804',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'employee',
@@ -350,7 +350,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-09-01 15:47:54',
+		'creation': '2010-09-01 15:48:05',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -363,9 +363,9 @@
 		'idx': 4,
 		'in_filter': 1,
 		'label': 'Employee Name',
-		'modified': '2011-06-24 18:47:36',
+		'modified': '2011-06-27 14:39:10',
 		'modified_by': 'Administrator',
-		'name': 'FL03793',
+		'name': 'FL03805',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'employee_name',
@@ -386,7 +386,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-09-01 15:47:54',
+		'creation': '2010-09-01 15:48:05',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -399,9 +399,9 @@
 		'idx': 5,
 		'in_filter': 1,
 		'label': 'Fiscal Year',
-		'modified': '2011-06-24 18:47:36',
+		'modified': '2011-06-27 14:39:10',
 		'modified_by': 'Administrator',
-		'name': 'FL03794',
+		'name': 'FL03806',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'fiscal_year',
@@ -422,7 +422,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-09-01 15:47:54',
+		'creation': '2010-09-01 15:48:05',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -435,14 +435,14 @@
 		'idx': 6,
 		'in_filter': 1,
 		'label': 'Company',
-		'modified': '2011-06-24 18:47:36',
+		'modified': '2011-06-27 14:39:10',
 		'modified_by': 'Administrator',
-		'name': 'FL03795',
+		'name': 'FL03807',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'company',
 		'oldfieldtype': 'Link',
-		'options': 'Link:Company',
+		'options': 'Company',
 		'owner': 'ashwini@webnotestech.com',
 		'parent': 'Appraisal',
 		'parentfield': 'fields',
@@ -458,7 +458,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-09-01 15:47:54',
+		'creation': '2011-06-27 14:39:10',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -471,9 +471,9 @@
 		'idx': 7,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-24 18:47:36',
+		'modified': '2011-06-27 14:39:10',
 		'modified_by': 'Administrator',
-		'name': 'FL03796',
+		'name': 'FL05654',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -494,7 +494,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-09-01 15:47:54',
+		'creation': '2010-09-01 15:48:05',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -507,9 +507,9 @@
 		'idx': 8,
 		'in_filter': 1,
 		'label': 'Start Date',
-		'modified': '2011-06-24 18:47:36',
+		'modified': '2011-06-27 14:39:10',
 		'modified_by': 'Administrator',
-		'name': 'FL03797',
+		'name': 'FL03809',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'start_date',
@@ -530,7 +530,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-09-01 15:47:54',
+		'creation': '2010-09-01 15:48:05',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -543,9 +543,9 @@
 		'idx': 9,
 		'in_filter': 1,
 		'label': 'End Date',
-		'modified': '2011-06-24 18:47:36',
+		'modified': '2011-06-27 14:39:10',
 		'modified_by': 'Administrator',
-		'name': 'FL03798',
+		'name': 'FL03810',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'end_date',
@@ -566,7 +566,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-09-01 15:47:54',
+		'creation': '2010-09-01 15:48:05',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -579,9 +579,9 @@
 		'idx': 10,
 		'in_filter': 0,
 		'label': 'Approver',
-		'modified': '2011-06-24 18:47:36',
+		'modified': '2011-06-27 14:39:10',
 		'modified_by': 'Administrator',
-		'name': 'FL03799',
+		'name': 'FL03811',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'kra_approver',
@@ -602,7 +602,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-09-01 15:47:54',
+		'creation': '2010-09-01 15:48:05',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -615,9 +615,9 @@
 		'idx': 11,
 		'in_filter': None,
 		'label': 'Amended From',
-		'modified': '2011-06-24 18:47:36',
+		'modified': '2011-06-27 14:39:10',
 		'modified_by': 'Administrator',
-		'name': 'FL03800',
+		'name': 'FL03812',
 		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'amended_from',
@@ -638,7 +638,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-09-01 15:47:54',
+		'creation': '2010-09-01 15:48:05',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -651,9 +651,9 @@
 		'idx': 12,
 		'in_filter': None,
 		'label': 'Amendment Date',
-		'modified': '2011-06-24 18:47:36',
+		'modified': '2011-06-27 14:39:10',
 		'modified_by': 'Administrator',
-		'name': 'FL03801',
+		'name': 'FL03813',
 		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'amendment_date',
@@ -674,7 +674,7 @@
 	{
 		'allow_on_submit': 1,
 		'colour': 'White:FFF',
-		'creation': '2010-09-01 15:47:54',
+		'creation': '2010-09-01 15:48:05',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -687,9 +687,9 @@
 		'idx': 13,
 		'in_filter': None,
 		'label': 'Declare Completed',
-		'modified': '2011-06-24 18:47:36',
+		'modified': '2011-06-27 14:39:10',
 		'modified_by': 'Administrator',
-		'name': 'FL03802',
+		'name': 'FL03814',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -710,7 +710,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-09-01 15:47:54',
+		'creation': '2011-06-27 14:39:10',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -723,9 +723,9 @@
 		'idx': 14,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-24 18:47:36',
+		'modified': '2011-06-27 14:39:10',
 		'modified_by': 'Administrator',
-		'name': 'FL03803',
+		'name': 'FL05655',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -746,7 +746,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-09-01 15:47:54',
+		'creation': '2010-09-01 15:48:05',
 		'default': None,
 		'depends_on': None,
 		'description': 'Select template from which you want to fetch KRA',
@@ -759,9 +759,9 @@
 		'idx': 15,
 		'in_filter': None,
 		'label': 'KRA Template',
-		'modified': '2011-06-24 18:47:37',
+		'modified': '2011-06-27 14:39:10',
 		'modified_by': 'Administrator',
-		'name': 'FL03804',
+		'name': 'FL03816',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'kra_template',
@@ -782,7 +782,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-09-01 15:47:54',
+		'creation': '2010-09-01 15:48:05',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -795,9 +795,9 @@
 		'idx': 16,
 		'in_filter': None,
 		'label': 'Fetch Template',
-		'modified': '2011-06-24 18:47:37',
+		'modified': '2011-06-27 14:39:10',
 		'modified_by': 'Administrator',
-		'name': 'FL03805',
+		'name': 'FL03817',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -818,7 +818,7 @@
 	{
 		'allow_on_submit': 1,
 		'colour': 'White:FFF',
-		'creation': '2010-09-01 15:47:54',
+		'creation': '2010-09-01 15:48:05',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -831,9 +831,9 @@
 		'idx': 17,
 		'in_filter': None,
 		'label': 'Update',
-		'modified': '2011-06-24 18:47:37',
+		'modified': '2011-06-27 14:39:10',
 		'modified_by': 'Administrator',
-		'name': 'FL03806',
+		'name': 'FL03818',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -854,7 +854,7 @@
 	{
 		'allow_on_submit': 1,
 		'colour': 'White:FFF',
-		'creation': '2010-09-01 15:47:54',
+		'creation': '2010-09-01 15:48:05',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -867,9 +867,9 @@
 		'idx': 18,
 		'in_filter': None,
 		'label': 'Appraisal Details',
-		'modified': '2011-06-24 18:47:37',
+		'modified': '2011-06-27 14:39:10',
 		'modified_by': 'Administrator',
-		'name': 'FL03807',
+		'name': 'FL03819',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'appraisal_details',
@@ -890,7 +890,7 @@
 	{
 		'allow_on_submit': 1,
 		'colour': None,
-		'creation': '2010-09-01 15:47:54',
+		'creation': '2010-09-01 15:48:05',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -903,9 +903,9 @@
 		'idx': 19,
 		'in_filter': None,
 		'label': 'Calculate Total Score',
-		'modified': '2011-06-24 18:47:37',
+		'modified': '2011-06-27 14:39:10',
 		'modified_by': 'Administrator',
-		'name': 'FL03808',
+		'name': 'FL03820',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -926,7 +926,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-09-01 15:47:54',
+		'creation': '2010-09-01 15:48:05',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -939,9 +939,9 @@
 		'idx': 20,
 		'in_filter': None,
 		'label': 'Total Score',
-		'modified': '2011-06-24 18:47:37',
+		'modified': '2011-06-27 14:39:10',
 		'modified_by': 'Administrator',
-		'name': 'FL03809',
+		'name': 'FL03821',
 		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'total_score',
diff --git a/payroll/doctype/attendance/attendance.txt b/payroll/doctype/attendance/attendance.txt
index b3e2fef..6ce8995 100644
--- a/payroll/doctype/attendance/attendance.txt
+++ b/payroll/doctype/attendance/attendance.txt
@@ -13,7 +13,7 @@
 		'client_script_core': None,
 		'client_string': None,
 		'colour': 'White:FFF',
-		'creation': '2010-09-23 10:26:02',
+		'creation': '2010-09-23 10:26:03',
 		'description': None,
 		'docstatus': 0,
 		'doctype': 'DocType',
@@ -29,7 +29,7 @@
 		'istable': None,
 		'max_attachments': None,
 		'menu_index': None,
-		'modified': '2011-06-24 18:13:54',
+		'modified': '2011-06-27 14:39:08',
 		'modified_by': 'Administrator',
 		'module': 'Payroll',
 		'name': 'Attendance',
@@ -56,19 +56,19 @@
 		'version': 74
 	},
 	{
-		'amend': 0,
-		'cancel': 0,
+		'amend': None,
+		'cancel': 1,
 		'create': 1,
-		'creation': '2010-09-23 17:49:12',
+		'creation': '2010-09-23 17:47:09',
 		'docstatus': 0,
 		'doctype': 'DocPerm',
 		'execute': None,
-		'idx': 1,
+		'idx': None,
 		'match': None,
-		'modified': '2011-06-24 18:13:54',
-		'modified_by': 'Administrator',
-		'name': 'PERM00682',
-		'owner': 'Administrator',
+		'modified': '2010-09-23 17:47:09',
+		'modified_by': 'harshada@webnotestech.com',
+		'name': 'PERM00692',
+		'owner': 'harshada@webnotestech.com',
 		'parent': 'Attendance',
 		'parentfield': 'permissions',
 		'parenttype': 'DocType',
@@ -79,19 +79,19 @@
 		'write': 1
 	},
 	{
-		'amend': 0,
-		'cancel': 0,
+		'amend': None,
+		'cancel': 1,
 		'create': 1,
-		'creation': '2010-09-23 17:49:12',
+		'creation': '2010-09-23 17:47:09',
 		'docstatus': 0,
 		'doctype': 'DocPerm',
 		'execute': None,
-		'idx': 2,
+		'idx': None,
 		'match': None,
-		'modified': '2011-06-24 18:13:54',
-		'modified_by': 'Administrator',
-		'name': 'PERM00683',
-		'owner': 'Administrator',
+		'modified': '2010-09-23 17:47:09',
+		'modified_by': 'harshada@webnotestech.com',
+		'name': 'PERM00693',
+		'owner': 'harshada@webnotestech.com',
 		'parent': 'Attendance',
 		'parentfield': 'permissions',
 		'parenttype': 'DocType',
@@ -105,15 +105,15 @@
 		'amend': 0,
 		'cancel': 1,
 		'create': 1,
-		'creation': '2010-09-23 10:26:02',
+		'creation': '2010-09-23 10:26:03',
 		'docstatus': 0,
 		'doctype': 'DocPerm',
 		'execute': None,
-		'idx': 3,
+		'idx': 1,
 		'match': None,
-		'modified': '2011-06-24 18:13:54',
-		'modified_by': 'Administrator',
-		'name': 'PERM00681',
+		'modified': '2010-09-23 17:46:48',
+		'modified_by': 'harshada@webnotestech.com',
+		'name': 'PERM00687',
 		'owner': 'ashwini@webnotestech.com',
 		'parent': 'Attendance',
 		'parentfield': 'permissions',
@@ -127,7 +127,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-09-23 10:26:02',
+		'creation': '2011-06-27 14:39:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -140,9 +140,9 @@
 		'idx': 1,
 		'in_filter': None,
 		'label': 'Attendance Details',
-		'modified': '2011-06-24 18:13:54',
+		'modified': '2011-06-27 14:39:08',
 		'modified_by': 'Administrator',
-		'name': 'FL03903',
+		'name': 'FL05645',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -163,7 +163,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-09-23 10:26:02',
+		'creation': '2010-09-23 10:26:03',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -176,9 +176,9 @@
 		'idx': 2,
 		'in_filter': None,
 		'label': 'Naming Series',
-		'modified': '2011-06-24 18:13:54',
+		'modified': '2011-06-27 14:39:08',
 		'modified_by': 'Administrator',
-		'name': 'FL03904',
+		'name': 'FL03918',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'naming_series',
@@ -199,7 +199,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-09-23 10:26:02',
+		'creation': '2010-09-23 10:26:03',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -212,9 +212,9 @@
 		'idx': 3,
 		'in_filter': 1,
 		'label': 'Employee',
-		'modified': '2011-06-24 18:13:54',
+		'modified': '2011-06-27 14:39:08',
 		'modified_by': 'Administrator',
-		'name': 'FL03905',
+		'name': 'FL03919',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'employee',
@@ -235,7 +235,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-09-23 10:26:02',
+		'creation': '2010-09-23 10:26:03',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -248,9 +248,9 @@
 		'idx': 4,
 		'in_filter': None,
 		'label': 'Employee Name',
-		'modified': '2011-06-24 18:13:54',
+		'modified': '2011-06-27 14:39:08',
 		'modified_by': 'Administrator',
-		'name': 'FL03906',
+		'name': 'FL03920',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'employee_name',
@@ -271,7 +271,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-09-23 10:26:02',
+		'creation': '2010-09-23 10:26:03',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -284,9 +284,9 @@
 		'idx': 5,
 		'in_filter': 1,
 		'label': 'Status',
-		'modified': '2011-06-24 18:13:54',
+		'modified': '2011-06-27 14:39:08',
 		'modified_by': 'Administrator',
-		'name': 'FL03907',
+		'name': 'FL03921',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'status',
@@ -306,8 +306,44 @@
 	},
 	{
 		'allow_on_submit': None,
+		'colour': None,
+		'creation': '2010-10-27 16:07:27',
+		'default': None,
+		'depends_on': None,
+		'description': None,
+		'docstatus': 0,
+		'doctype': 'DocField',
+		'fieldname': 'shifts',
+		'fieldtype': 'Select',
+		'hidden': None,
+		'icon': None,
+		'idx': 6,
+		'in_filter': None,
+		'label': 'Shifts',
+		'modified': '2010-10-27 16:07:27',
+		'modified_by': 'sneha@webnotestech.com',
+		'name': 'FL04164',
+		'no_column': None,
+		'no_copy': None,
+		'oldfieldname': 'shifts',
+		'oldfieldtype': 'Select',
+		'options': '\nDay\nNight',
+		'owner': 'sneha@webnotestech.com',
+		'parent': 'Attendance',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'print_hide': None,
+		'report_hide': None,
+		'reqd': 0,
+		'search_index': None,
+		'trigger': None,
+		'width': None
+	},
+	{
+		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-09-23 10:26:02',
+		'creation': '2010-09-23 10:26:03',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -317,12 +353,12 @@
 		'fieldtype': 'Link',
 		'hidden': 1,
 		'icon': None,
-		'idx': 6,
+		'idx': 7,
 		'in_filter': None,
 		'label': 'Leave Type',
-		'modified': '2011-06-24 18:13:54',
+		'modified': '2011-06-27 14:39:08',
 		'modified_by': 'Administrator',
-		'name': 'FL03908',
+		'name': 'FL03922',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'leave_type',
@@ -343,7 +379,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-09-23 10:26:02',
+		'creation': '2011-06-27 14:39:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -353,12 +389,12 @@
 		'fieldtype': 'Column Break',
 		'hidden': None,
 		'icon': None,
-		'idx': 7,
+		'idx': 8,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-24 18:13:54',
+		'modified': '2011-06-27 14:39:08',
 		'modified_by': 'Administrator',
-		'name': 'FL03909',
+		'name': 'FL05646',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -379,7 +415,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-09-23 10:26:02',
+		'creation': '2010-09-23 10:26:03',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -389,12 +425,12 @@
 		'fieldtype': 'Date',
 		'hidden': None,
 		'icon': None,
-		'idx': 8,
+		'idx': 9,
 		'in_filter': 1,
 		'label': 'Attendance Date',
-		'modified': '2011-06-24 18:13:54',
+		'modified': '2011-06-27 14:39:08',
 		'modified_by': 'Administrator',
-		'name': 'FL03910',
+		'name': 'FL03924',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'att_date',
@@ -415,7 +451,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-09-23 10:26:02',
+		'creation': '2010-09-23 10:26:03',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -425,12 +461,12 @@
 		'fieldtype': 'Select',
 		'hidden': None,
 		'icon': None,
-		'idx': 9,
+		'idx': 10,
 		'in_filter': 1,
 		'label': 'Fiscal Year',
-		'modified': '2011-06-24 18:13:54',
+		'modified': '2011-06-27 14:39:08',
 		'modified_by': 'Administrator',
-		'name': 'FL03911',
+		'name': 'FL03925',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'fiscal_year',
@@ -451,7 +487,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-09-23 10:26:02',
+		'creation': '2010-09-23 10:26:03',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -461,17 +497,17 @@
 		'fieldtype': 'Select',
 		'hidden': None,
 		'icon': None,
-		'idx': 10,
+		'idx': 11,
 		'in_filter': 1,
 		'label': 'Company',
-		'modified': '2011-06-24 18:13:54',
+		'modified': '2011-06-27 14:39:08',
 		'modified_by': 'Administrator',
-		'name': 'FL03912',
+		'name': 'FL03926',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'company',
 		'oldfieldtype': 'Link',
-		'options': 'Link:Company',
+		'options': 'Company',
 		'owner': 'ashwini@webnotestech.com',
 		'parent': 'Attendance',
 		'parentfield': 'fields',
diff --git a/payroll/doctype/employee/employee.txt b/payroll/doctype/employee/employee.txt
index 43ec479..fbc2883 100644
--- a/payroll/doctype/employee/employee.txt
+++ b/payroll/doctype/employee/employee.txt
@@ -13,7 +13,7 @@
 		'client_script_core': None,
 		'client_string': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:59',
+		'creation': '2011-02-17 11:16:08',
 		'description': None,
 		'docstatus': 0,
 		'doctype': 'DocType',
@@ -29,7 +29,7 @@
 		'istable': None,
 		'max_attachments': None,
 		'menu_index': None,
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:04',
 		'modified_by': 'Administrator',
 		'module': 'Payroll',
 		'name': 'Employee',
@@ -56,64 +56,64 @@
 		'version': 443
 	},
 	{
-		'amend': 0,
+		'amend': None,
 		'cancel': 1,
 		'create': 1,
-		'creation': '2011-05-12 22:59:24',
+		'creation': '2011-02-17 11:16:08',
 		'docstatus': 0,
 		'doctype': 'DocPerm',
 		'execute': None,
 		'idx': 1,
 		'match': None,
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-02-23 15:05:17',
 		'modified_by': 'Administrator',
-		'name': '000011952',
-		'owner': 'sanjeeva@vencesystem.com',
+		'name': 'PERM00823',
+		'owner': 'Administrator',
 		'parent': 'Employee',
 		'parentfield': 'permissions',
 		'parenttype': 'DocType',
 		'permlevel': 0,
 		'read': 1,
 		'role': 'System Manager',
-		'submit': 0,
+		'submit': None,
 		'write': 1
 	},
 	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2011-05-12 23:27:02',
+		'amend': None,
+		'cancel': None,
+		'create': None,
+		'creation': '2011-02-17 11:16:08',
 		'docstatus': 0,
 		'doctype': 'DocPerm',
 		'execute': None,
 		'idx': 2,
-		'match': 'owner',
-		'modified': '2011-06-24 18:12:51',
+		'match': None,
+		'modified': '2011-02-23 15:05:17',
 		'modified_by': 'Administrator',
-		'name': '000011971',
-		'owner': 'sanjeeva@vencesystem.com',
+		'name': 'PERM00824',
+		'owner': 'Administrator',
 		'parent': 'Employee',
 		'parentfield': 'permissions',
 		'parenttype': 'DocType',
-		'permlevel': 0,
+		'permlevel': 1,
 		'read': 1,
-		'role': 'Employee',
-		'submit': 0,
-		'write': 0
+		'role': 'All',
+		'submit': None,
+		'write': None
 	},
 	{
-		'amend': 0,
-		'cancel': 0,
+		'amend': None,
+		'cancel': 1,
 		'create': 1,
-		'creation': '2010-08-08 17:08:59',
+		'creation': '2011-02-17 11:16:08',
 		'docstatus': 0,
 		'doctype': 'DocPerm',
 		'execute': None,
 		'idx': 3,
 		'match': None,
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-02-23 15:05:17',
 		'modified_by': 'Administrator',
-		'name': 'PERM00206',
+		'name': 'PERM00825',
 		'owner': 'harshada@webnotestech.com',
 		'parent': 'Employee',
 		'parentfield': 'permissions',
@@ -121,22 +121,22 @@
 		'permlevel': 0,
 		'read': 1,
 		'role': 'HR User',
-		'submit': 0,
+		'submit': None,
 		'write': 1
 	},
 	{
-		'amend': 0,
-		'cancel': 0,
+		'amend': None,
+		'cancel': 1,
 		'create': 1,
-		'creation': '2010-08-08 17:08:59',
+		'creation': '2011-02-17 11:16:08',
 		'docstatus': 0,
 		'doctype': 'DocPerm',
 		'execute': None,
 		'idx': 4,
 		'match': None,
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-02-23 15:05:17',
 		'modified_by': 'Administrator',
-		'name': 'PERM00207',
+		'name': 'PERM00826',
 		'owner': 'harshada@webnotestech.com',
 		'parent': 'Employee',
 		'parentfield': 'permissions',
@@ -144,22 +144,22 @@
 		'permlevel': 0,
 		'read': 1,
 		'role': 'HR Manager',
-		'submit': 0,
+		'submit': None,
 		'write': 1
 	},
 	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:08:59',
+		'amend': None,
+		'cancel': None,
+		'create': None,
+		'creation': '2011-02-17 11:16:08',
 		'docstatus': 0,
 		'doctype': 'DocPerm',
 		'execute': None,
 		'idx': 5,
 		'match': None,
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-02-23 15:05:17',
 		'modified_by': 'Administrator',
-		'name': 'PERM00208',
+		'name': 'PERM00827',
 		'owner': 'harshada@webnotestech.com',
 		'parent': 'Employee',
 		'parentfield': 'permissions',
@@ -167,22 +167,22 @@
 		'permlevel': 1,
 		'read': 1,
 		'role': 'HR User',
-		'submit': 0,
-		'write': 0
+		'submit': None,
+		'write': None
 	},
 	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-08-08 17:08:59',
+		'amend': None,
+		'cancel': None,
+		'create': None,
+		'creation': '2011-02-17 11:16:08',
 		'docstatus': 0,
 		'doctype': 'DocPerm',
 		'execute': None,
 		'idx': 6,
 		'match': None,
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-02-23 15:05:17',
 		'modified_by': 'Administrator',
-		'name': 'PERM00209',
+		'name': 'PERM00828',
 		'owner': 'harshada@webnotestech.com',
 		'parent': 'Employee',
 		'parentfield': 'permissions',
@@ -190,28 +190,28 @@
 		'permlevel': 1,
 		'read': 1,
 		'role': 'HR Manager',
-		'submit': 0,
-		'write': 0
+		'submit': None,
+		'write': None
 	},
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-06-27 14:39:04',
 		'default': None,
 		'depends_on': None,
 		'description': None,
 		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': 'section_break3',
+		'fieldname': None,
 		'fieldtype': 'Section Break',
 		'hidden': None,
 		'icon': None,
 		'idx': 1,
 		'in_filter': None,
 		'label': 'Basic Information',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:04',
 		'modified_by': 'Administrator',
-		'name': 'FL04533',
+		'name': 'FL05624',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -232,22 +232,22 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-06-27 14:39:04',
 		'default': None,
 		'depends_on': None,
 		'description': None,
 		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': 'column_break4',
+		'fieldname': None,
 		'fieldtype': 'Column Break',
 		'hidden': None,
 		'icon': None,
 		'idx': 2,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:04',
 		'modified_by': 'Administrator',
-		'name': 'FL04534',
+		'name': 'FL05625',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -268,7 +268,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:08',
 		'default': None,
 		'depends_on': None,
 		'description': 'To manage multiple series please go to Setup > Manage Series',
@@ -281,14 +281,14 @@
 		'idx': 3,
 		'in_filter': None,
 		'label': 'Naming Series',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:02',
 		'modified_by': 'Administrator',
-		'name': 'FL01099',
+		'name': 'FL04691',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'naming_series',
 		'oldfieldtype': 'Select',
-		'options': 'EMP/',
+		'options': 'WN-EMP\nEMP/',
 		'owner': 'harshada@webnotestech.com',
 		'parent': 'Employee',
 		'parentfield': 'fields',
@@ -304,7 +304,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -317,9 +317,9 @@
 		'idx': 4,
 		'in_filter': None,
 		'label': 'Salutation',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:02',
 		'modified_by': 'Administrator',
-		'name': 'FL01097',
+		'name': 'FL04689',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'salutation',
@@ -340,7 +340,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -353,9 +353,9 @@
 		'idx': 5,
 		'in_filter': None,
 		'label': 'Employee Name',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:02',
 		'modified_by': 'Administrator',
-		'name': 'FL01098',
+		'name': 'FL04690',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'employee_name',
@@ -376,7 +376,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -389,9 +389,9 @@
 		'idx': 6,
 		'in_filter': 1,
 		'label': 'Employee Number',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:02',
 		'modified_by': 'Administrator',
-		'name': 'FL01100',
+		'name': 'FL04692',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'employee_number',
@@ -412,7 +412,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -425,9 +425,9 @@
 		'idx': 7,
 		'in_filter': None,
 		'label': 'Date of Joining',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:02',
 		'modified_by': 'Administrator',
-		'name': 'FL01101',
+		'name': 'FL04693',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'date_of_joining',
@@ -448,7 +448,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -461,9 +461,9 @@
 		'idx': 8,
 		'in_filter': 1,
 		'label': 'Date of Birth',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:02',
 		'modified_by': 'Administrator',
-		'name': 'FL01103',
+		'name': 'FL04694',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'date_of_birth',
@@ -484,7 +484,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -497,9 +497,9 @@
 		'idx': 9,
 		'in_filter': 1,
 		'label': 'Gender',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:02',
 		'modified_by': 'Administrator',
-		'name': 'FL01102',
+		'name': 'FL04695',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'gender',
@@ -520,7 +520,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-06-24 17:52:11',
+		'creation': '2011-06-27 14:39:02',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -533,9 +533,9 @@
 		'idx': 10,
 		'in_filter': 1,
 		'label': 'Company',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:02',
 		'modified_by': 'Administrator',
-		'name': 'FL05403',
+		'name': 'FL05619',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -556,22 +556,22 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-06-27 14:39:04',
 		'default': None,
 		'depends_on': None,
 		'description': None,
 		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': 'column_break12',
+		'fieldname': None,
 		'fieldtype': 'Column Break',
 		'hidden': None,
 		'icon': None,
 		'idx': 11,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:04',
 		'modified_by': 'Administrator',
-		'name': 'FL04535',
+		'name': 'FL05626',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -592,7 +592,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:08',
 		'default': 'Active',
 		'depends_on': None,
 		'description': None,
@@ -605,9 +605,9 @@
 		'idx': 12,
 		'in_filter': 1,
 		'label': 'Status',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:02',
 		'modified_by': 'Administrator',
-		'name': 'FL01111',
+		'name': 'FL04697',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'status',
@@ -628,7 +628,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -641,9 +641,9 @@
 		'idx': 13,
 		'in_filter': 1,
 		'label': 'Employment Type',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL01106',
+		'name': 'FL04698',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'employment_type',
@@ -664,7 +664,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -677,9 +677,9 @@
 		'idx': 14,
 		'in_filter': 1,
 		'label': 'Scheduled Confirmation Date',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL01107',
+		'name': 'FL04699',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'scheduled_confirmation_date',
@@ -700,7 +700,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -713,9 +713,9 @@
 		'idx': 15,
 		'in_filter': None,
 		'label': 'Final Confirmation Date',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL01108',
+		'name': 'FL04700',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'final_confirmation_date',
@@ -736,7 +736,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -749,9 +749,9 @@
 		'idx': 16,
 		'in_filter': 1,
 		'label': 'Contract End Date',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL01109',
+		'name': 'FL04701',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'contract_end_date',
@@ -772,7 +772,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -785,9 +785,9 @@
 		'idx': 17,
 		'in_filter': None,
 		'label': 'Date Of Retirement',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL01110',
+		'name': 'FL04702',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'date_of_retirement',
@@ -808,7 +808,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:08',
 		'default': None,
 		'depends_on': None,
 		'description': 'Applicable Holiday List',
@@ -821,9 +821,9 @@
 		'idx': 18,
 		'in_filter': None,
 		'label': 'Holiday List',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL01112',
+		'name': 'FL04703',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'holiday_list',
@@ -844,22 +844,22 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-06-27 14:39:04',
 		'default': None,
 		'depends_on': None,
 		'description': None,
 		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': 'section_break20',
+		'fieldname': None,
 		'fieldtype': 'Section Break',
 		'hidden': None,
 		'icon': None,
 		'idx': 19,
 		'in_filter': None,
 		'label': 'Job Profile',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:04',
 		'modified_by': 'Administrator',
-		'name': 'FL04536',
+		'name': 'FL05627',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -880,22 +880,22 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-06-27 14:39:04',
 		'default': None,
 		'depends_on': None,
 		'description': None,
 		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': 'column_break21',
+		'fieldname': None,
 		'fieldtype': 'Column Break',
 		'hidden': None,
 		'icon': None,
 		'idx': 20,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:04',
 		'modified_by': 'Administrator',
-		'name': 'FL04537',
+		'name': 'FL05628',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -916,7 +916,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -929,9 +929,9 @@
 		'idx': 21,
 		'in_filter': 1,
 		'label': 'Branch',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL01114',
+		'name': 'FL04706',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'branch',
@@ -952,7 +952,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -965,9 +965,9 @@
 		'idx': 22,
 		'in_filter': 1,
 		'label': 'Department',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL01115',
+		'name': 'FL04707',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'department',
@@ -988,7 +988,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1001,9 +1001,9 @@
 		'idx': 23,
 		'in_filter': 1,
 		'label': 'Designation',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL01118',
+		'name': 'FL04708',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'designation',
@@ -1024,7 +1024,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1037,9 +1037,9 @@
 		'idx': 24,
 		'in_filter': 1,
 		'label': 'Grade',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL01119',
+		'name': 'FL04709',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'grade',
@@ -1060,7 +1060,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1073,9 +1073,9 @@
 		'idx': 25,
 		'in_filter': None,
 		'label': 'Reports to',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL01116',
+		'name': 'FL04710',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'reports_to',
@@ -1096,7 +1096,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:08',
 		'default': None,
 		'depends_on': None,
 		'description': 'Provide email id registered in company',
@@ -1109,9 +1109,9 @@
 		'idx': 26,
 		'in_filter': 1,
 		'label': 'Email (By company)',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL01120',
+		'name': 'FL04711',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'company_email',
@@ -1132,22 +1132,58 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-02-23 14:42:18',
 		'default': None,
 		'depends_on': None,
 		'description': None,
 		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': 'column_break28',
-		'fieldtype': 'Column Break',
+		'fieldname': 'is_sales_person',
+		'fieldtype': 'Check',
 		'hidden': None,
 		'icon': None,
 		'idx': 27,
 		'in_filter': None,
-		'label': 'Salary Information',
-		'modified': '2011-06-24 18:12:51',
+		'label': 'Is Sales Person',
+		'modified': '2011-02-23 15:05:17',
 		'modified_by': 'Administrator',
-		'name': 'FL04538',
+		'name': 'FL04883',
+		'no_column': None,
+		'no_copy': None,
+		'oldfieldname': None,
+		'oldfieldtype': None,
+		'options': None,
+		'owner': 'Administrator',
+		'parent': 'Employee',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'print_hide': None,
+		'report_hide': None,
+		'reqd': None,
+		'search_index': None,
+		'trigger': None,
+		'width': None
+	},
+	{
+		'allow_on_submit': None,
+		'colour': None,
+		'creation': '2011-06-27 14:39:04',
+		'default': None,
+		'depends_on': None,
+		'description': None,
+		'docstatus': 0,
+		'doctype': 'DocField',
+		'fieldname': None,
+		'fieldtype': 'Column Break',
+		'hidden': None,
+		'icon': None,
+		'idx': 28,
+		'in_filter': None,
+		'label': 'Salary Information',
+		'modified': '2011-06-27 14:39:04',
+		'modified_by': 'Administrator',
+		'name': 'FL05629',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1168,7 +1204,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1178,17 +1214,17 @@
 		'fieldtype': 'Select',
 		'hidden': None,
 		'icon': None,
-		'idx': 28,
+		'idx': 29,
 		'in_filter': None,
 		'label': 'Salary Mode',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL01122',
+		'name': 'FL04713',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'salary_mode',
 		'oldfieldtype': 'Select',
-		'options': '\nBank\nCash\nCheque',
+		'options': '\nBank\nCash \nCheque',
 		'owner': 'Administrator',
 		'parent': 'Employee',
 		'parentfield': 'fields',
@@ -1204,7 +1240,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:08',
 		'default': None,
 		'depends_on': "eval:doc.salary_mode == 'Bank'",
 		'description': None,
@@ -1214,12 +1250,12 @@
 		'fieldtype': 'Data',
 		'hidden': 0,
 		'icon': None,
-		'idx': 29,
+		'idx': 30,
 		'in_filter': 1,
 		'label': 'Bank Name',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL01123',
+		'name': 'FL04714',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'bank_name',
@@ -1240,7 +1276,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:08',
 		'default': None,
 		'depends_on': "eval:doc.salary_mode == 'Bank'",
 		'description': None,
@@ -1250,12 +1286,12 @@
 		'fieldtype': 'Data',
 		'hidden': 0,
 		'icon': None,
-		'idx': 30,
+		'idx': 31,
 		'in_filter': None,
 		'label': 'Bank A/C No.',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL01124',
+		'name': 'FL04715',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'bank_ac_no',
@@ -1276,7 +1312,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1286,12 +1322,12 @@
 		'fieldtype': 'Data',
 		'hidden': None,
 		'icon': None,
-		'idx': 31,
+		'idx': 32,
 		'in_filter': None,
 		'label': 'ESIC CARD No',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL01125',
+		'name': 'FL04716',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'esic_card_no',
@@ -1312,7 +1348,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1322,12 +1358,12 @@
 		'fieldtype': 'Data',
 		'hidden': None,
 		'icon': None,
-		'idx': 32,
+		'idx': 33,
 		'in_filter': None,
 		'label': 'PF Number',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL01126',
+		'name': 'FL04717',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'pf_number',
@@ -1348,7 +1384,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1358,12 +1394,12 @@
 		'fieldtype': 'Data',
 		'hidden': None,
 		'icon': None,
-		'idx': 33,
+		'idx': 34,
 		'in_filter': None,
 		'label': 'Gratuity LIC ID',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL01127',
+		'name': 'FL04718',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'gratuity_lic_id',
@@ -1384,22 +1420,22 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-06-27 14:39:04',
 		'default': None,
 		'depends_on': None,
 		'description': None,
 		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': 'section_break35',
+		'fieldname': None,
 		'fieldtype': 'Section Break',
 		'hidden': None,
 		'icon': None,
-		'idx': 34,
+		'idx': 35,
 		'in_filter': None,
 		'label': 'Contact Details',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:04',
 		'modified_by': 'Administrator',
-		'name': 'FL04539',
+		'name': 'FL05630',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1420,22 +1456,22 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-06-27 14:39:04',
 		'default': None,
 		'depends_on': None,
 		'description': None,
 		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': 'column_break36',
+		'fieldname': None,
 		'fieldtype': 'Column Break',
 		'hidden': None,
 		'icon': None,
-		'idx': 35,
+		'idx': 36,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:04',
 		'modified_by': 'Administrator',
-		'name': 'FL04540',
+		'name': 'FL05631',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1456,7 +1492,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-02-17 11:16:09',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1466,12 +1502,12 @@
 		'fieldtype': 'Data',
 		'hidden': None,
 		'icon': None,
-		'idx': 36,
+		'idx': 37,
 		'in_filter': None,
 		'label': 'Cell Number',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL04503',
+		'name': 'FL04721',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1492,7 +1528,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-02-17 11:16:09',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1502,12 +1538,12 @@
 		'fieldtype': 'Data',
 		'hidden': None,
 		'icon': None,
-		'idx': 37,
+		'idx': 38,
 		'in_filter': None,
 		'label': 'Personal Email',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL04504',
+		'name': 'FL04722',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1528,7 +1564,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:09',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1538,12 +1574,12 @@
 		'fieldtype': 'Int',
 		'hidden': None,
 		'icon': None,
-		'idx': 38,
+		'idx': 39,
 		'in_filter': None,
 		'label': 'Notice - Number of Days',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL01132',
+		'name': 'FL04755',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'notice_number_of_days',
@@ -1564,7 +1600,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-06-27 14:39:04',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1574,12 +1610,12 @@
 		'fieldtype': 'HTML',
 		'hidden': None,
 		'icon': None,
-		'idx': 39,
+		'idx': 40,
 		'in_filter': None,
 		'label': 'Emergency Contact Details',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:04',
 		'modified_by': 'Administrator',
-		'name': 'FL04541',
+		'name': 'FL05632',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1600,7 +1636,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-02-17 11:16:09',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1610,12 +1646,12 @@
 		'fieldtype': 'Data',
 		'hidden': None,
 		'icon': None,
-		'idx': 40,
+		'idx': 41,
 		'in_filter': None,
 		'label': 'Person To Be Contacted',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL04506',
+		'name': 'FL04724',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1636,7 +1672,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-02-17 11:16:09',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1646,12 +1682,12 @@
 		'fieldtype': 'Data',
 		'hidden': None,
 		'icon': None,
-		'idx': 41,
+		'idx': 42,
 		'in_filter': None,
 		'label': 'Relation',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL04507',
+		'name': 'FL04725',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1672,7 +1708,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-02-17 11:16:09',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1682,12 +1718,12 @@
 		'fieldtype': 'Data',
 		'hidden': None,
 		'icon': None,
-		'idx': 42,
+		'idx': 43,
 		'in_filter': None,
 		'label': 'Emergency Phone Number',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL04508',
+		'name': 'FL04726',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1708,22 +1744,22 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-06-27 14:39:04',
 		'default': None,
 		'depends_on': None,
 		'description': None,
 		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': 'column_break43',
+		'fieldname': None,
 		'fieldtype': 'Column Break',
 		'hidden': None,
 		'icon': None,
-		'idx': 43,
+		'idx': 44,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:04',
 		'modified_by': 'Administrator',
-		'name': 'FL04542',
+		'name': 'FL05633',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1744,7 +1780,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-02-17 11:16:09',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1754,12 +1790,12 @@
 		'fieldtype': 'Select',
 		'hidden': None,
 		'icon': None,
-		'idx': 44,
+		'idx': 45,
 		'in_filter': None,
 		'label': 'Permanent Accommodation Type',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL04509',
+		'name': 'FL04728',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1780,7 +1816,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-02-17 11:16:09',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1790,12 +1826,12 @@
 		'fieldtype': 'Small Text',
 		'hidden': None,
 		'icon': None,
-		'idx': 45,
+		'idx': 46,
 		'in_filter': None,
 		'label': 'Permanent Address',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL04510',
+		'name': 'FL04729',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1816,7 +1852,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-02-17 11:16:09',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1826,12 +1862,12 @@
 		'fieldtype': 'Select',
 		'hidden': None,
 		'icon': None,
-		'idx': 46,
+		'idx': 47,
 		'in_filter': None,
 		'label': 'Current Accommodation Type',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL04511',
+		'name': 'FL04730',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1852,7 +1888,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-02-17 11:16:09',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1862,48 +1898,12 @@
 		'fieldtype': 'Small Text',
 		'hidden': None,
 		'icon': None,
-		'idx': 47,
-		'in_filter': None,
-		'label': 'Current Address',
-		'modified': '2011-06-24 18:12:51',
-		'modified_by': 'Administrator',
-		'name': 'FL04512',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Employee',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-02-17 13:25:54',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'section_break48',
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 48,
 		'in_filter': None,
-		'label': 'Personal Details',
-		'modified': '2011-06-24 18:12:51',
+		'label': 'Current Address',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL04543',
+		'name': 'FL04731',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1924,22 +1924,58 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-06-27 14:39:04',
 		'default': None,
 		'depends_on': None,
 		'description': None,
 		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': 'column_break49',
-		'fieldtype': 'Column Break',
+		'fieldname': None,
+		'fieldtype': 'Section Break',
 		'hidden': None,
 		'icon': None,
 		'idx': 49,
 		'in_filter': None,
-		'label': None,
-		'modified': '2011-06-24 18:12:51',
+		'label': 'Personal Details',
+		'modified': '2011-06-27 14:39:04',
 		'modified_by': 'Administrator',
-		'name': 'FL04544',
+		'name': 'FL05634',
+		'no_column': None,
+		'no_copy': None,
+		'oldfieldname': None,
+		'oldfieldtype': None,
+		'options': None,
+		'owner': 'Administrator',
+		'parent': 'Employee',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'print_hide': None,
+		'report_hide': None,
+		'reqd': None,
+		'search_index': None,
+		'trigger': None,
+		'width': None
+	},
+	{
+		'allow_on_submit': None,
+		'colour': None,
+		'creation': '2011-06-27 14:39:04',
+		'default': None,
+		'depends_on': None,
+		'description': None,
+		'docstatus': 0,
+		'doctype': 'DocField',
+		'fieldname': None,
+		'fieldtype': 'Column Break',
+		'hidden': None,
+		'icon': None,
+		'idx': 50,
+		'in_filter': None,
+		'label': None,
+		'modified': '2011-06-27 14:39:04',
+		'modified_by': 'Administrator',
+		'name': 'FL05635',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1960,7 +1996,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-02-17 11:16:09',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1970,12 +2006,12 @@
 		'fieldtype': 'Data',
 		'hidden': None,
 		'icon': None,
-		'idx': 50,
+		'idx': 51,
 		'in_filter': None,
 		'label': 'PAN Number',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL04514',
+		'name': 'FL04734',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1996,7 +2032,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-02-17 11:16:09',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2006,12 +2042,12 @@
 		'fieldtype': 'Data',
 		'hidden': None,
 		'icon': None,
-		'idx': 51,
+		'idx': 52,
 		'in_filter': None,
 		'label': 'Passport Number',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL04515',
+		'name': 'FL04735',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2032,7 +2068,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-06-27 14:39:03',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2042,12 +2078,12 @@
 		'fieldtype': 'Button',
 		'hidden': 1,
 		'icon': None,
-		'idx': 52,
+		'idx': 53,
 		'in_filter': None,
 		'label': 'Employee Profile',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL01143',
+		'name': 'FL05621',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2068,7 +2104,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-02-17 11:16:09',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2078,12 +2114,12 @@
 		'fieldtype': 'Date',
 		'hidden': None,
 		'icon': None,
-		'idx': 53,
+		'idx': 54,
 		'in_filter': None,
 		'label': 'Date of Issue',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL04516',
+		'name': 'FL04736',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2104,7 +2140,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-02-17 11:16:09',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2114,12 +2150,12 @@
 		'fieldtype': 'Date',
 		'hidden': None,
 		'icon': None,
-		'idx': 54,
+		'idx': 55,
 		'in_filter': None,
 		'label': 'Valid Upto',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL04517',
+		'name': 'FL04737',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2140,7 +2176,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-06-27 14:39:03',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2150,12 +2186,12 @@
 		'fieldtype': 'Button',
 		'hidden': 1,
 		'icon': None,
-		'idx': 55,
+		'idx': 56,
 		'in_filter': None,
 		'label': 'Salary Structure',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL01145',
+		'name': 'FL05622',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2176,7 +2212,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-02-17 11:16:09',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2186,12 +2222,12 @@
 		'fieldtype': 'Data',
 		'hidden': None,
 		'icon': None,
-		'idx': 56,
+		'idx': 57,
 		'in_filter': None,
 		'label': 'Place of Issue',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL04518',
+		'name': 'FL04738',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2212,7 +2248,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-02-17 11:16:09',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2222,12 +2258,12 @@
 		'fieldtype': 'Select',
 		'hidden': None,
 		'icon': None,
-		'idx': 57,
+		'idx': 58,
 		'in_filter': None,
 		'label': 'Marital Status',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL04519',
+		'name': 'FL04739',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2248,7 +2284,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-02-17 11:16:09',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2258,12 +2294,12 @@
 		'fieldtype': 'Select',
 		'hidden': None,
 		'icon': None,
-		'idx': 58,
+		'idx': 59,
 		'in_filter': None,
 		'label': 'Blood Group',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL04520',
+		'name': 'FL04740',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2284,22 +2320,22 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-06-27 14:39:04',
 		'default': None,
 		'depends_on': None,
 		'description': None,
 		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': 'column_break57',
+		'fieldname': None,
 		'fieldtype': 'Column Break',
 		'hidden': None,
 		'icon': None,
-		'idx': 59,
+		'idx': 60,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:04',
 		'modified_by': 'Administrator',
-		'name': 'FL04545',
+		'name': 'FL05636',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2320,7 +2356,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-02-17 11:16:09',
 		'default': None,
 		'depends_on': None,
 		'description': 'Here you can maintain family details like name and occupation of parent, spouse and children',
@@ -2330,12 +2366,12 @@
 		'fieldtype': 'Small Text',
 		'hidden': None,
 		'icon': None,
-		'idx': 60,
+		'idx': 61,
 		'in_filter': None,
 		'label': 'Family Background',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL04521',
+		'name': 'FL04742',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2356,7 +2392,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-02-17 11:16:09',
 		'default': None,
 		'depends_on': None,
 		'description': 'Here you can maintain height, weight, allergies, medical concerns etc',
@@ -2366,12 +2402,12 @@
 		'fieldtype': 'Small Text',
 		'hidden': None,
 		'icon': None,
-		'idx': 61,
+		'idx': 62,
 		'in_filter': None,
 		'label': 'Health Details',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL04522',
+		'name': 'FL04743',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2392,22 +2428,22 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-06-27 14:39:04',
 		'default': None,
 		'depends_on': None,
 		'description': None,
 		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': 'section_break60',
+		'fieldname': None,
 		'fieldtype': 'Section Break',
 		'hidden': None,
 		'icon': None,
-		'idx': 62,
+		'idx': 63,
 		'in_filter': None,
 		'label': 'Educational Qualification',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:04',
 		'modified_by': 'Administrator',
-		'name': 'FL04546',
+		'name': 'FL05637',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2428,7 +2464,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-02-17 11:16:09',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2438,12 +2474,12 @@
 		'fieldtype': 'Table',
 		'hidden': None,
 		'icon': None,
-		'idx': 63,
+		'idx': 64,
 		'in_filter': None,
 		'label': 'Educational Qualification Details',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL04524',
+		'name': 'FL04745',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2464,22 +2500,22 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-06-27 14:39:04',
 		'default': None,
 		'depends_on': None,
 		'description': None,
 		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': 'section_break62',
+		'fieldname': None,
 		'fieldtype': 'Section Break',
 		'hidden': None,
 		'icon': None,
-		'idx': 64,
+		'idx': 65,
 		'in_filter': None,
 		'label': 'Career History',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:04',
 		'modified_by': 'Administrator',
-		'name': 'FL04547',
+		'name': 'FL05638',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2500,22 +2536,22 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-06-27 14:39:04',
 		'default': None,
 		'depends_on': None,
 		'description': None,
 		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': 'section_break63',
+		'fieldname': None,
 		'fieldtype': 'Section Break',
 		'hidden': None,
 		'icon': None,
-		'idx': 65,
+		'idx': 66,
 		'in_filter': None,
 		'label': 'Previous Work Experience',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:04',
 		'modified_by': 'Administrator',
-		'name': 'FL04548',
+		'name': 'FL05639',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2536,7 +2572,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-02-17 11:16:09',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2546,12 +2582,12 @@
 		'fieldtype': 'Table',
 		'hidden': None,
 		'icon': None,
-		'idx': 66,
+		'idx': 67,
 		'in_filter': None,
 		'label': 'Previous Experience Details',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL04527',
+		'name': 'FL04748',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2572,22 +2608,22 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-06-27 14:39:04',
 		'default': None,
 		'depends_on': None,
 		'description': None,
 		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': 'section_break65',
+		'fieldname': None,
 		'fieldtype': 'Section Break',
 		'hidden': None,
 		'icon': None,
-		'idx': 67,
+		'idx': 68,
 		'in_filter': None,
 		'label': 'History In Company',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:04',
 		'modified_by': 'Administrator',
-		'name': 'FL04549',
+		'name': 'FL05640',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2608,7 +2644,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-02-17 11:16:09',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2618,12 +2654,12 @@
 		'fieldtype': 'Table',
 		'hidden': None,
 		'icon': None,
-		'idx': 68,
+		'idx': 69,
 		'in_filter': None,
 		'label': 'Experience In Company Details',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL04529',
+		'name': 'FL04750',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2644,22 +2680,22 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-06-27 14:39:04',
 		'default': None,
 		'depends_on': None,
 		'description': None,
 		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': 'section_break67',
+		'fieldname': None,
 		'fieldtype': 'Section Break',
 		'hidden': None,
 		'icon': None,
-		'idx': 69,
+		'idx': 70,
 		'in_filter': None,
 		'label': 'Exit',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:04',
 		'modified_by': 'Administrator',
-		'name': 'FL04550',
+		'name': 'FL05641',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2680,22 +2716,22 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-06-27 14:39:04',
 		'default': None,
 		'depends_on': None,
 		'description': None,
 		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': 'column_break68',
+		'fieldname': None,
 		'fieldtype': 'Column Break',
 		'hidden': None,
 		'icon': None,
-		'idx': 70,
+		'idx': 71,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:04',
 		'modified_by': 'Administrator',
-		'name': 'FL04551',
+		'name': 'FL05642',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -2716,7 +2752,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:09',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2726,12 +2762,12 @@
 		'fieldtype': 'Date',
 		'hidden': None,
 		'icon': None,
-		'idx': 71,
+		'idx': 72,
 		'in_filter': None,
 		'label': 'Resignation Letter Date',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL01130',
+		'name': 'FL04753',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'resignation_letter_date',
@@ -2752,7 +2788,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:09',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2762,12 +2798,12 @@
 		'fieldtype': 'Date',
 		'hidden': None,
 		'icon': None,
-		'idx': 72,
+		'idx': 73,
 		'in_filter': 1,
 		'label': 'Relieving Date',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL01131',
+		'name': 'FL04754',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'relieving_date',
@@ -2788,7 +2824,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:09',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2798,12 +2834,12 @@
 		'fieldtype': 'Data',
 		'hidden': None,
 		'icon': None,
-		'idx': 73,
+		'idx': 74,
 		'in_filter': None,
 		'label': 'Reason for Leaving',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL01133',
+		'name': 'FL04756',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'reason_for_leaving',
@@ -2824,7 +2860,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:09',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2834,12 +2870,12 @@
 		'fieldtype': 'Select',
 		'hidden': None,
 		'icon': None,
-		'idx': 74,
+		'idx': 75,
 		'in_filter': None,
 		'label': 'Leave Encashed?',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL01134',
+		'name': 'FL04757',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'leave_encashed',
@@ -2860,7 +2896,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:09',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2870,12 +2906,12 @@
 		'fieldtype': 'Date',
 		'hidden': None,
 		'icon': None,
-		'idx': 75,
+		'idx': 76,
 		'in_filter': None,
 		'label': 'Encashment Date',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL01135',
+		'name': 'FL04758',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'encashment_date',
@@ -2896,22 +2932,22 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:54',
+		'creation': '2011-06-27 14:39:04',
 		'default': None,
 		'depends_on': None,
 		'description': None,
 		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': 'column_break75',
+		'fieldname': None,
 		'fieldtype': 'Column Break',
 		'hidden': None,
 		'icon': None,
-		'idx': 76,
+		'idx': 77,
 		'in_filter': None,
 		'label': 'Exit Interview Details',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:04',
 		'modified_by': 'Administrator',
-		'name': 'FL04552',
+		'name': 'FL05643',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'col_brk6',
@@ -2932,7 +2968,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:09',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2942,12 +2978,12 @@
 		'fieldtype': 'Date',
 		'hidden': None,
 		'icon': None,
-		'idx': 77,
+		'idx': 78,
 		'in_filter': None,
 		'label': 'Held On',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL01137',
+		'name': 'FL04760',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'held_on',
@@ -2968,7 +3004,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:09',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -2978,12 +3014,12 @@
 		'fieldtype': 'Select',
 		'hidden': None,
 		'icon': None,
-		'idx': 78,
+		'idx': 79,
 		'in_filter': None,
 		'label': 'Reason for Resignation',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL01138',
+		'name': 'FL04761',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'reason_for_resignation',
@@ -3004,7 +3040,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:09',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -3014,12 +3050,12 @@
 		'fieldtype': 'Data',
 		'hidden': None,
 		'icon': None,
-		'idx': 79,
+		'idx': 80,
 		'in_filter': None,
 		'label': 'New Workplace',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL01139',
+		'name': 'FL04762',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'new_workplace',
@@ -3040,7 +3076,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-08-08 17:09:00',
+		'creation': '2011-02-17 11:16:09',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -3050,12 +3086,12 @@
 		'fieldtype': 'Small Text',
 		'hidden': None,
 		'icon': None,
-		'idx': 80,
+		'idx': 81,
 		'in_filter': None,
 		'label': 'Feedback',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:03',
 		'modified_by': 'Administrator',
-		'name': 'FL01140',
+		'name': 'FL04763',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'feedback',
@@ -3076,7 +3112,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-06-24 15:15:06',
+		'creation': '2011-06-27 14:39:04',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -3086,12 +3122,12 @@
 		'fieldtype': 'Text',
 		'hidden': 1,
 		'icon': None,
-		'idx': 81,
+		'idx': 82,
 		'in_filter': None,
 		'label': 'File List',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:04',
 		'modified_by': 'Administrator',
-		'name': 'FL05402',
+		'name': 'FL05623',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -3112,7 +3148,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-08-08 17:08:59',
+		'creation': '2011-02-17 11:16:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -3122,12 +3158,12 @@
 		'fieldtype': 'Small Text',
 		'hidden': None,
 		'icon': None,
-		'idx': 82,
+		'idx': 83,
 		'in_filter': None,
 		'label': 'Trash Reason',
-		'modified': '2011-06-24 18:12:51',
+		'modified': '2011-06-27 14:39:04',
 		'modified_by': 'Administrator',
-		'name': 'FL01094',
+		'name': 'FL04685',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'trash_reason',
diff --git a/payroll/doctype/expense_voucher/expense_voucher.txt b/payroll/doctype/expense_voucher/expense_voucher.txt
index a706460..8f413b0 100644
--- a/payroll/doctype/expense_voucher/expense_voucher.txt
+++ b/payroll/doctype/expense_voucher/expense_voucher.txt
@@ -13,7 +13,7 @@
 		'client_script_core': None,
 		'client_string': None,
 		'colour': 'White:FFF',
-		'creation': '2010-09-03 16:45:05',
+		'creation': '2010-09-03 16:45:08',
 		'description': None,
 		'docstatus': 0,
 		'doctype': 'DocType',
@@ -29,7 +29,7 @@
 		'istable': None,
 		'max_attachments': None,
 		'menu_index': None,
-		'modified': '2011-06-24 18:24:25',
+		'modified': '2011-06-27 14:39:09',
 		'modified_by': 'Administrator',
 		'module': 'Payroll',
 		'name': 'Expense Voucher',
@@ -59,22 +59,22 @@
 		'amend': 1,
 		'cancel': 1,
 		'create': 1,
-		'creation': '2011-05-12 23:27:50',
+		'creation': '2011-03-01 10:14:12',
 		'docstatus': 0,
 		'doctype': 'DocPerm',
 		'execute': None,
-		'idx': 1,
+		'idx': None,
 		'match': 'owner',
-		'modified': '2011-06-24 18:24:25',
+		'modified': '2011-03-01 10:14:12',
 		'modified_by': 'Administrator',
-		'name': '000011972',
-		'owner': 'sanjeeva@vencesystem.com',
+		'name': 'PERM00831',
+		'owner': 'Administrator',
 		'parent': 'Expense Voucher',
 		'parentfield': 'permissions',
 		'parenttype': 'DocType',
 		'permlevel': 0,
 		'read': 1,
-		'role': 'Employee',
+		'role': None,
 		'submit': 1,
 		'write': 1
 	},
@@ -82,16 +82,16 @@
 		'amend': 1,
 		'cancel': 1,
 		'create': 1,
-		'creation': '2011-05-29 14:17:03',
+		'creation': '2011-03-01 10:14:12',
 		'docstatus': 0,
 		'doctype': 'DocPerm',
 		'execute': None,
-		'idx': 2,
+		'idx': None,
 		'match': None,
-		'modified': '2011-06-24 18:24:25',
+		'modified': '2011-03-01 10:14:12',
 		'modified_by': 'Administrator',
-		'name': 'PERM00841',
-		'owner': 'sanjeeva@vencesystem.com',
+		'name': 'PERM00832',
+		'owner': 'Administrator',
 		'parent': 'Expense Voucher',
 		'parentfield': 'permissions',
 		'parenttype': 'DocType',
@@ -105,190 +105,121 @@
 		'amend': 1,
 		'cancel': 1,
 		'create': 1,
-		'creation': '2011-05-29 14:17:03',
+		'creation': '2011-03-01 10:14:12',
+		'docstatus': 0,
+		'doctype': 'DocPerm',
+		'execute': None,
+		'idx': None,
+		'match': None,
+		'modified': '2011-03-01 10:14:12',
+		'modified_by': 'Administrator',
+		'name': 'PERM00833',
+		'owner': 'Administrator',
+		'parent': 'Expense Voucher',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'role': 'HR User',
+		'submit': 1,
+		'write': 1
+	},
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'creation': '2011-03-01 10:14:13',
+		'docstatus': 0,
+		'doctype': 'DocPerm',
+		'execute': None,
+		'idx': None,
+		'match': 'owner',
+		'modified': '2011-03-01 10:14:13',
+		'modified_by': 'Administrator',
+		'name': 'PERM00834',
+		'owner': 'Administrator',
+		'parent': 'Expense Voucher',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'role': None,
+		'submit': 1,
+		'write': 1
+	},
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'creation': '2011-03-01 10:14:13',
+		'docstatus': 0,
+		'doctype': 'DocPerm',
+		'execute': None,
+		'idx': None,
+		'match': None,
+		'modified': '2011-03-01 10:14:13',
+		'modified_by': 'Administrator',
+		'name': 'PERM00835',
+		'owner': 'Administrator',
+		'parent': 'Expense Voucher',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'role': 'HR Manager',
+		'submit': 1,
+		'write': 1
+	},
+	{
+		'amend': 1,
+		'cancel': 1,
+		'create': 1,
+		'creation': '2011-03-01 10:14:13',
+		'docstatus': 0,
+		'doctype': 'DocPerm',
+		'execute': None,
+		'idx': None,
+		'match': None,
+		'modified': '2011-03-01 10:14:13',
+		'modified_by': 'Administrator',
+		'name': 'PERM00836',
+		'owner': 'Administrator',
+		'parent': 'Expense Voucher',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'role': 'HR User',
+		'submit': 1,
+		'write': 1
+	},
+	{
+		'amend': None,
+		'cancel': None,
+		'create': None,
+		'creation': '2010-09-03 16:45:08',
 		'docstatus': 0,
 		'doctype': 'DocPerm',
 		'execute': None,
 		'idx': 3,
-		'match': 'owner',
-		'modified': '2011-06-24 18:24:25',
+		'match': '',
+		'modified': '2010-09-03 16:45:08',
 		'modified_by': 'Administrator',
-		'name': 'PERM00840',
-		'owner': 'sanjeeva@vencesystem.com',
+		'name': 'PERM00683',
+		'owner': 'harshada@webnotestech.com',
 		'parent': 'Expense Voucher',
 		'parentfield': 'permissions',
 		'parenttype': 'DocType',
-		'permlevel': 0,
+		'permlevel': 1,
 		'read': 1,
-		'role': 'Employee',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2011-05-29 14:16:33',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 4,
-		'match': None,
-		'modified': '2011-06-24 18:24:25',
-		'modified_by': 'Administrator',
-		'name': 'PERM00839',
-		'owner': 'sanjeeva@vencesystem.com',
-		'parent': 'Expense Voucher',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'System Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 1,
-		'cancel': 0,
-		'create': 1,
-		'creation': '2011-02-27 18:38:25',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 5,
-		'match': None,
-		'modified': '2011-06-24 18:24:25',
-		'modified_by': 'Administrator',
-		'name': 'PERM00817',
-		'owner': 'sanjeeva@vencesystem.com',
-		'parent': 'Expense Voucher',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'HR User',
-		'submit': 0,
-		'write': 1
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2011-02-27 18:38:25',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 6,
-		'match': None,
-		'modified': '2011-06-24 18:24:25',
-		'modified_by': 'Administrator',
-		'name': 'PERM00816',
-		'owner': 'sanjeeva@vencesystem.com',
-		'parent': 'Expense Voucher',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'HR Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2011-02-27 18:38:25',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 7,
-		'match': 'owner',
-		'modified': '2011-06-24 18:24:25',
-		'modified_by': 'Administrator',
-		'name': 'PERM00815',
-		'owner': 'sanjeeva@vencesystem.com',
-		'parent': 'Expense Voucher',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'Employee',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 1,
-		'cancel': 0,
-		'create': 1,
-		'creation': '2011-05-12 23:27:50',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 8,
-		'match': None,
-		'modified': '2011-06-24 18:24:25',
-		'modified_by': 'Administrator',
-		'name': '000011974',
-		'owner': 'sanjeeva@vencesystem.com',
-		'parent': 'Expense Voucher',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'HR User',
-		'submit': 0,
-		'write': 1
-	},
-	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2011-05-12 23:27:50',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 9,
-		'match': None,
-		'modified': '2011-06-24 18:24:25',
-		'modified_by': 'Administrator',
-		'name': '000011973',
-		'owner': 'sanjeeva@vencesystem.com',
-		'parent': 'Expense Voucher',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'HR Manager',
-		'submit': 1,
-		'write': 1
-	},
-	{
-		'amend': 1,
-		'cancel': 0,
-		'create': 1,
-		'creation': '2011-05-29 14:17:03',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 10,
-		'match': None,
-		'modified': '2011-06-24 18:24:25',
-		'modified_by': 'Administrator',
-		'name': 'PERM00842',
-		'owner': 'sanjeeva@vencesystem.com',
-		'parent': 'Expense Voucher',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'HR User',
-		'submit': 0,
-		'write': 1
+		'role': 'All',
+		'submit': None,
+		'write': None
 	},
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-09-03 16:45:05',
+		'creation': '2011-06-27 14:39:09',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -301,9 +232,9 @@
 		'idx': 1,
 		'in_filter': None,
 		'label': 'Details',
-		'modified': '2011-06-24 18:24:25',
+		'modified': '2011-06-27 14:39:09',
 		'modified_by': 'Administrator',
-		'name': 'FL03870',
+		'name': 'FL05648',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -324,7 +255,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-09-03 16:45:05',
+		'creation': '2010-09-03 16:45:08',
 		'default': 'Draft',
 		'depends_on': None,
 		'description': None,
@@ -337,9 +268,9 @@
 		'idx': 2,
 		'in_filter': 1,
 		'label': 'Approval Status',
-		'modified': '2011-06-24 18:24:25',
+		'modified': '2011-06-27 14:39:09',
 		'modified_by': 'Administrator',
-		'name': 'FL03871',
+		'name': 'FL03883',
 		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'approval_status',
@@ -360,7 +291,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-09-03 16:45:05',
+		'creation': '2010-09-03 16:45:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -373,9 +304,9 @@
 		'idx': 3,
 		'in_filter': 1,
 		'label': 'From Employee',
-		'modified': '2011-06-24 18:24:25',
+		'modified': '2011-06-27 14:39:09',
 		'modified_by': 'Administrator',
-		'name': 'FL03872',
+		'name': 'FL03884',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'employee',
@@ -396,7 +327,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-09-03 16:45:05',
+		'creation': '2010-09-03 16:45:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -409,9 +340,9 @@
 		'idx': 4,
 		'in_filter': 1,
 		'label': 'Employee Name',
-		'modified': '2011-06-24 18:24:25',
+		'modified': '2011-06-27 14:39:09',
 		'modified_by': 'Administrator',
-		'name': 'FL03873',
+		'name': 'FL03885',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'employee_name',
@@ -432,7 +363,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-09-03 16:45:05',
+		'creation': '2010-09-03 16:45:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -445,9 +376,9 @@
 		'idx': 5,
 		'in_filter': 1,
 		'label': 'Fiscal Year',
-		'modified': '2011-06-24 18:24:25',
+		'modified': '2011-06-27 14:39:09',
 		'modified_by': 'Administrator',
-		'name': 'FL03874',
+		'name': 'FL03886',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'fiscal_year',
@@ -468,7 +399,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-09-03 16:45:05',
+		'creation': '2010-09-03 16:45:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -481,14 +412,14 @@
 		'idx': 6,
 		'in_filter': 1,
 		'label': 'Company',
-		'modified': '2011-06-24 18:24:25',
+		'modified': '2011-06-27 14:39:09',
 		'modified_by': 'Administrator',
-		'name': 'FL03875',
+		'name': 'FL03887',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'company',
 		'oldfieldtype': 'Link',
-		'options': 'Link:Company',
+		'options': 'Company',
 		'owner': 'ashwini@webnotestech.com',
 		'parent': 'Expense Voucher',
 		'parentfield': 'fields',
@@ -504,7 +435,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-09-03 16:45:05',
+		'creation': '2011-06-27 14:39:09',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -517,9 +448,9 @@
 		'idx': 7,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-24 18:24:25',
+		'modified': '2011-06-27 14:39:09',
 		'modified_by': 'Administrator',
-		'name': 'FL03876',
+		'name': 'FL05649',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -540,7 +471,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-09-03 16:45:05',
+		'creation': '2010-09-03 16:45:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -553,9 +484,9 @@
 		'idx': 8,
 		'in_filter': 1,
 		'label': 'Posting Date',
-		'modified': '2011-06-24 18:24:25',
+		'modified': '2011-06-27 14:39:09',
 		'modified_by': 'Administrator',
-		'name': 'FL03877',
+		'name': 'FL03889',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'posting_date',
@@ -576,7 +507,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-09-03 16:45:05',
+		'creation': '2010-09-03 16:45:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -589,9 +520,9 @@
 		'idx': 9,
 		'in_filter': None,
 		'label': 'Approver',
-		'modified': '2011-06-24 18:24:25',
+		'modified': '2011-06-27 14:39:09',
 		'modified_by': 'Administrator',
-		'name': 'FL03878',
+		'name': 'FL03890',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'exp_approver',
@@ -612,7 +543,7 @@
 	{
 		'allow_on_submit': 1,
 		'colour': 'White:FFF',
-		'creation': '2010-09-03 16:45:05',
+		'creation': '2010-09-03 16:45:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -625,9 +556,9 @@
 		'idx': 10,
 		'in_filter': None,
 		'label': 'Remark',
-		'modified': '2011-06-24 18:24:25',
+		'modified': '2011-06-27 14:39:09',
 		'modified_by': 'Administrator',
-		'name': 'FL03879',
+		'name': 'FL03891',
 		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'remark',
@@ -648,7 +579,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-09-03 16:45:05',
+		'creation': '2010-09-03 16:45:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -661,9 +592,9 @@
 		'idx': 11,
 		'in_filter': None,
 		'label': 'Amended From',
-		'modified': '2011-06-24 18:24:25',
+		'modified': '2011-06-27 14:39:09',
 		'modified_by': 'Administrator',
-		'name': 'FL03880',
+		'name': 'FL03892',
 		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'amended_from',
@@ -684,7 +615,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-09-03 16:45:05',
+		'creation': '2010-09-03 16:45:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -697,9 +628,9 @@
 		'idx': 12,
 		'in_filter': None,
 		'label': 'Amendment Date',
-		'modified': '2011-06-24 18:24:25',
+		'modified': '2011-06-27 14:39:09',
 		'modified_by': 'Administrator',
-		'name': 'FL03881',
+		'name': 'FL03893',
 		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'amendment_date',
@@ -720,7 +651,7 @@
 	{
 		'allow_on_submit': 1,
 		'colour': None,
-		'creation': '2010-09-03 16:45:05',
+		'creation': '2010-09-03 16:45:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -733,9 +664,9 @@
 		'idx': 13,
 		'in_filter': None,
 		'label': 'Approve',
-		'modified': '2011-06-24 18:24:25',
+		'modified': '2011-06-27 14:39:09',
 		'modified_by': 'Administrator',
-		'name': 'FL03882',
+		'name': 'FL03894',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -756,7 +687,7 @@
 	{
 		'allow_on_submit': 1,
 		'colour': None,
-		'creation': '2010-09-03 16:45:05',
+		'creation': '2010-09-03 16:45:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -769,9 +700,9 @@
 		'idx': 14,
 		'in_filter': None,
 		'label': 'Reject',
-		'modified': '2011-06-24 18:24:25',
+		'modified': '2011-06-27 14:39:09',
 		'modified_by': 'Administrator',
-		'name': 'FL03883',
+		'name': 'FL03895',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -792,7 +723,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-09-03 16:45:05',
+		'creation': '2011-06-27 14:39:09',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -805,9 +736,9 @@
 		'idx': 15,
 		'in_filter': None,
 		'label': 'Expense Details',
-		'modified': '2011-06-24 18:24:25',
+		'modified': '2011-06-27 14:39:09',
 		'modified_by': 'Administrator',
-		'name': 'FL03884',
+		'name': 'FL05650',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -828,7 +759,7 @@
 	{
 		'allow_on_submit': 1,
 		'colour': 'White:FFF',
-		'creation': '2010-09-03 16:45:05',
+		'creation': '2010-09-03 16:45:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -841,9 +772,9 @@
 		'idx': 16,
 		'in_filter': None,
 		'label': 'Calculate Total Amount',
-		'modified': '2011-06-24 18:24:25',
+		'modified': '2011-06-27 14:39:09',
 		'modified_by': 'Administrator',
-		'name': 'FL03885',
+		'name': 'FL03897',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -864,7 +795,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-09-03 16:45:05',
+		'creation': '2010-09-03 16:45:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -877,9 +808,9 @@
 		'idx': 17,
 		'in_filter': 0,
 		'label': 'Total Claimed Amount',
-		'modified': '2011-06-24 18:24:25',
+		'modified': '2011-06-27 14:39:09',
 		'modified_by': 'Administrator',
-		'name': 'FL03886',
+		'name': 'FL03898',
 		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'total_claimed_amount',
@@ -900,7 +831,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-09-03 16:45:05',
+		'creation': '2010-09-03 16:45:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -913,9 +844,9 @@
 		'idx': 18,
 		'in_filter': 0,
 		'label': 'Total Sanctioned Amount',
-		'modified': '2011-06-24 18:24:25',
+		'modified': '2011-06-27 14:39:09',
 		'modified_by': 'Administrator',
-		'name': 'FL03887',
+		'name': 'FL03899',
 		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'total_sanctioned_amount',
@@ -936,7 +867,7 @@
 	{
 		'allow_on_submit': 1,
 		'colour': None,
-		'creation': '2010-09-03 16:45:05',
+		'creation': '2010-09-03 16:45:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -949,9 +880,9 @@
 		'idx': 19,
 		'in_filter': None,
 		'label': 'Update Voucher',
-		'modified': '2011-06-24 18:24:25',
+		'modified': '2011-06-27 14:39:09',
 		'modified_by': 'Administrator',
-		'name': 'FL03888',
+		'name': 'FL03900',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -972,7 +903,7 @@
 	{
 		'allow_on_submit': 1,
 		'colour': None,
-		'creation': '2010-09-03 16:45:05',
+		'creation': '2010-09-03 16:45:08',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -985,9 +916,9 @@
 		'idx': 20,
 		'in_filter': None,
 		'label': 'Expense Voucher Details',
-		'modified': '2011-06-24 18:24:25',
+		'modified': '2011-06-27 14:39:09',
 		'modified_by': 'Administrator',
-		'name': 'FL03889',
+		'name': 'FL03901',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'expense_voucher_details',
@@ -1008,7 +939,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-10-15 14:56:33',
+		'creation': '2010-10-15 14:56:34',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1021,9 +952,9 @@
 		'idx': 21,
 		'in_filter': None,
 		'label': 'Employees Email Id',
-		'modified': '2011-06-24 18:24:25',
+		'modified': '2011-06-27 14:39:09',
 		'modified_by': 'Administrator',
-		'name': 'FL03982',
+		'name': 'FL04039',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'email_id',
diff --git a/payroll/doctype/salary_slip/salary_slip.txt b/payroll/doctype/salary_slip/salary_slip.txt
index d072e26..3677016 100644
--- a/payroll/doctype/salary_slip/salary_slip.txt
+++ b/payroll/doctype/salary_slip/salary_slip.txt
@@ -29,7 +29,7 @@
 		'istable': None,
 		'max_attachments': None,
 		'menu_index': None,
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:16',
 		'modified_by': 'Administrator',
 		'module': 'Payroll',
 		'name': 'Salary Slip',
@@ -59,51 +59,97 @@
 		'amend': 0,
 		'cancel': 0,
 		'create': 0,
-		'creation': '2011-02-17 13:25:56',
+		'creation': '2011-02-14 11:35:30',
 		'docstatus': 0,
 		'doctype': 'DocPerm',
 		'execute': None,
-		'idx': 1,
+		'idx': None,
 		'match': 'owner',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-02-14 11:35:30',
 		'modified_by': 'Administrator',
-		'name': 'PERM00798',
-		'owner': 'sanjeeva@vencesystem.com',
+		'name': 'PERM00811',
+		'owner': 'Administrator',
 		'parent': 'Salary Slip',
 		'parentfield': 'permissions',
 		'parenttype': 'DocType',
 		'permlevel': 0,
 		'read': 1,
-		'role': 'Employee',
+		'role': None,
 		'submit': 0,
 		'write': 0
 	},
 	{
-		'amend': 1,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2011-05-31 10:10:38',
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'creation': '2011-02-14 11:35:30',
 		'docstatus': 0,
 		'doctype': 'DocPerm',
 		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2011-06-27 11:12:33',
+		'idx': None,
+		'match': 'owner',
+		'modified': '2011-02-14 11:35:30',
 		'modified_by': 'Administrator',
-		'name': 'PERM00853',
-		'owner': 'sanjeeva@vencesystem.com',
+		'name': 'PERM00812',
+		'owner': 'Administrator',
 		'parent': 'Salary Slip',
 		'parentfield': 'permissions',
 		'parenttype': 'DocType',
 		'permlevel': 0,
 		'read': 1,
-		'role': 'System Manager',
-		'submit': 1,
-		'write': 1
+		'role': None,
+		'submit': 0,
+		'write': 0
 	},
 	{
 		'amend': 0,
 		'cancel': 0,
+		'create': 0,
+		'creation': '2011-02-14 11:38:07',
+		'docstatus': 0,
+		'doctype': 'DocPerm',
+		'execute': None,
+		'idx': None,
+		'match': 'owner',
+		'modified': '2011-02-14 11:38:07',
+		'modified_by': 'Administrator',
+		'name': 'PERM00817',
+		'owner': 'Administrator',
+		'parent': 'Salary Slip',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'role': None,
+		'submit': 0,
+		'write': 0
+	},
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'creation': '2011-02-14 11:38:07',
+		'docstatus': 0,
+		'doctype': 'DocPerm',
+		'execute': None,
+		'idx': None,
+		'match': 'owner',
+		'modified': '2011-02-14 11:38:07',
+		'modified_by': 'Administrator',
+		'name': 'PERM00818',
+		'owner': 'Administrator',
+		'parent': 'Salary Slip',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'role': None,
+		'submit': 0,
+		'write': 0
+	},
+	{
+		'amend': 0,
+		'cancel': None,
 		'create': 1,
 		'creation': '2010-08-08 17:09:20',
 		'docstatus': 0,
@@ -111,7 +157,7 @@
 		'execute': None,
 		'idx': 3,
 		'match': None,
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2010-08-08 17:09:20',
 		'modified_by': 'Administrator',
 		'name': 'PERM00455',
 		'owner': 'harshada@webnotestech.com',
@@ -125,8 +171,8 @@
 		'write': 1
 	},
 	{
-		'amend': 0,
-		'cancel': 0,
+		'amend': 1,
+		'cancel': 1,
 		'create': 1,
 		'creation': '2010-08-08 17:09:20',
 		'docstatus': 0,
@@ -134,7 +180,7 @@
 		'execute': None,
 		'idx': 4,
 		'match': None,
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2010-08-08 17:09:20',
 		'modified_by': 'Administrator',
 		'name': 'PERM00456',
 		'owner': 'harshada@webnotestech.com',
@@ -148,16 +194,16 @@
 		'write': 1
 	},
 	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
+		'amend': None,
+		'cancel': None,
+		'create': None,
 		'creation': '2010-08-08 17:09:20',
 		'docstatus': 0,
 		'doctype': 'DocPerm',
 		'execute': None,
 		'idx': 5,
 		'match': None,
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2010-08-08 17:09:20',
 		'modified_by': 'Administrator',
 		'name': 'PERM00457',
 		'owner': 'harshada@webnotestech.com',
@@ -167,20 +213,20 @@
 		'permlevel': 1,
 		'read': 1,
 		'role': 'HR User',
-		'submit': 0,
-		'write': 0
+		'submit': None,
+		'write': None
 	},
 	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
+		'amend': None,
+		'cancel': None,
+		'create': None,
 		'creation': '2010-08-08 17:09:20',
 		'docstatus': 0,
 		'doctype': 'DocPerm',
 		'execute': None,
 		'idx': 6,
 		'match': None,
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2010-08-08 17:09:20',
 		'modified_by': 'Administrator',
 		'name': 'PERM00458',
 		'owner': 'harshada@webnotestech.com',
@@ -190,13 +236,13 @@
 		'permlevel': 1,
 		'read': 1,
 		'role': 'HR Manager',
-		'submit': 0,
-		'write': 0
+		'submit': None,
+		'write': None
 	},
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-04-05 17:13:17',
+		'creation': '2011-06-27 14:39:16',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -209,9 +255,9 @@
 		'idx': 1,
 		'in_filter': None,
 		'label': 'Basic Info',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:16',
 		'modified_by': 'Administrator',
-		'name': '000002460',
+		'name': 'FL05707',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -232,7 +278,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-04-05 17:13:17',
+		'creation': '2011-06-27 14:39:16',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -245,9 +291,9 @@
 		'idx': 2,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:16',
 		'modified_by': 'Administrator',
-		'name': '000002461',
+		'name': 'FL05708',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -281,7 +327,7 @@
 		'idx': 3,
 		'in_filter': 1,
 		'label': 'Employee',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:15',
 		'modified_by': 'Administrator',
 		'name': 'FL02891',
 		'no_column': None,
@@ -317,7 +363,7 @@
 		'idx': 4,
 		'in_filter': 1,
 		'label': 'Employee Name',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:15',
 		'modified_by': 'Administrator',
 		'name': 'FL02893',
 		'no_column': None,
@@ -353,7 +399,7 @@
 		'idx': 5,
 		'in_filter': 1,
 		'label': 'Department',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:15',
 		'modified_by': 'Administrator',
 		'name': 'FL02894',
 		'no_column': None,
@@ -389,7 +435,7 @@
 		'idx': 6,
 		'in_filter': 1,
 		'label': 'Designation',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:15',
 		'modified_by': 'Administrator',
 		'name': 'FL02895',
 		'no_column': None,
@@ -425,7 +471,7 @@
 		'idx': 7,
 		'in_filter': 1,
 		'label': 'Branch',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:15',
 		'modified_by': 'Administrator',
 		'name': 'FL02896',
 		'no_column': None,
@@ -461,7 +507,7 @@
 		'idx': 8,
 		'in_filter': 1,
 		'label': 'Grade',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:15',
 		'modified_by': 'Administrator',
 		'name': 'FL02897',
 		'no_column': None,
@@ -497,7 +543,7 @@
 		'idx': 9,
 		'in_filter': None,
 		'label': 'PF No.',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:15',
 		'modified_by': 'Administrator',
 		'name': 'FL02898',
 		'no_column': None,
@@ -533,7 +579,7 @@
 		'idx': 10,
 		'in_filter': None,
 		'label': 'ESIC No.',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:15',
 		'modified_by': 'Administrator',
 		'name': 'FL02899',
 		'no_column': None,
@@ -556,7 +602,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-04-19 11:19:04',
+		'creation': '2011-06-27 14:39:13',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -569,9 +615,9 @@
 		'idx': 11,
 		'in_filter': None,
 		'label': 'Letter Head',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:13',
 		'modified_by': 'Administrator',
-		'name': '000003743',
+		'name': 'FL05672',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -592,7 +638,79 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-04-05 17:13:17',
+		'creation': '2011-06-27 14:39:15',
+		'default': None,
+		'depends_on': None,
+		'description': None,
+		'docstatus': 0,
+		'doctype': 'DocField',
+		'fieldname': 'letter_head',
+		'fieldtype': 'Link',
+		'hidden': None,
+		'icon': None,
+		'idx': 11,
+		'in_filter': None,
+		'label': 'Letter Head',
+		'modified': '2011-06-27 14:39:15',
+		'modified_by': 'Administrator',
+		'name': 'FL05687',
+		'no_column': None,
+		'no_copy': None,
+		'oldfieldname': None,
+		'oldfieldtype': None,
+		'options': 'Letter Head',
+		'owner': 'sanjeeva@vencesystem.com',
+		'parent': 'Salary Slip',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'print_hide': None,
+		'report_hide': None,
+		'reqd': None,
+		'search_index': None,
+		'trigger': None,
+		'width': None
+	},
+	{
+		'allow_on_submit': None,
+		'colour': None,
+		'creation': '2011-06-27 14:39:15',
+		'default': None,
+		'depends_on': None,
+		'description': None,
+		'docstatus': 0,
+		'doctype': 'DocField',
+		'fieldname': 'letter_head',
+		'fieldtype': 'Link',
+		'hidden': None,
+		'icon': None,
+		'idx': 11,
+		'in_filter': None,
+		'label': 'Letter Head',
+		'modified': '2011-06-27 14:39:15',
+		'modified_by': 'Administrator',
+		'name': 'FL05702',
+		'no_column': None,
+		'no_copy': None,
+		'oldfieldname': None,
+		'oldfieldtype': None,
+		'options': 'Letter Head',
+		'owner': 'sanjeeva@vencesystem.com',
+		'parent': 'Salary Slip',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'print_hide': None,
+		'report_hide': None,
+		'reqd': None,
+		'search_index': None,
+		'trigger': None,
+		'width': None
+	},
+	{
+		'allow_on_submit': None,
+		'colour': None,
+		'creation': '2011-06-27 14:39:16',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -605,9 +723,9 @@
 		'idx': 12,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:16',
 		'modified_by': 'Administrator',
-		'name': '000002462',
+		'name': 'FL05709',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -641,7 +759,7 @@
 		'idx': 13,
 		'in_filter': 1,
 		'label': 'Fiscal Year',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:15',
 		'modified_by': 'Administrator',
 		'name': 'FL02884',
 		'no_column': None,
@@ -664,7 +782,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-06-27 11:12:33',
+		'creation': '2011-06-27 14:39:13',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -677,9 +795,81 @@
 		'idx': 14,
 		'in_filter': 1,
 		'label': 'Company',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:13',
 		'modified_by': 'Administrator',
-		'name': 'FL05405',
+		'name': 'FL05674',
+		'no_column': None,
+		'no_copy': None,
+		'oldfieldname': None,
+		'oldfieldtype': None,
+		'options': 'Link:Company',
+		'owner': 'Administrator',
+		'parent': 'Salary Slip',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'print_hide': None,
+		'report_hide': None,
+		'reqd': 1,
+		'search_index': None,
+		'trigger': None,
+		'width': None
+	},
+	{
+		'allow_on_submit': None,
+		'colour': None,
+		'creation': '2011-06-27 14:39:15',
+		'default': None,
+		'depends_on': None,
+		'description': None,
+		'docstatus': 0,
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Select',
+		'hidden': None,
+		'icon': None,
+		'idx': 14,
+		'in_filter': 1,
+		'label': 'Company',
+		'modified': '2011-06-27 14:39:15',
+		'modified_by': 'Administrator',
+		'name': 'FL05689',
+		'no_column': None,
+		'no_copy': None,
+		'oldfieldname': None,
+		'oldfieldtype': None,
+		'options': 'Link:Company',
+		'owner': 'Administrator',
+		'parent': 'Salary Slip',
+		'parentfield': 'fields',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'print_hide': None,
+		'report_hide': None,
+		'reqd': 1,
+		'search_index': None,
+		'trigger': None,
+		'width': None
+	},
+	{
+		'allow_on_submit': None,
+		'colour': None,
+		'creation': '2011-06-27 14:39:15',
+		'default': None,
+		'depends_on': None,
+		'description': None,
+		'docstatus': 0,
+		'doctype': 'DocField',
+		'fieldname': 'company',
+		'fieldtype': 'Select',
+		'hidden': None,
+		'icon': None,
+		'idx': 14,
+		'in_filter': 1,
+		'label': 'Company',
+		'modified': '2011-06-27 14:39:15',
+		'modified_by': 'Administrator',
+		'name': 'FL05704',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -713,7 +903,7 @@
 		'idx': 15,
 		'in_filter': 1,
 		'label': 'Month',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:16',
 		'modified_by': 'Administrator',
 		'name': 'FL02886',
 		'no_column': None,
@@ -749,7 +939,7 @@
 		'idx': 16,
 		'in_filter': None,
 		'label': 'Total days in month',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:16',
 		'modified_by': 'Administrator',
 		'name': 'FL02903',
 		'no_column': None,
@@ -785,7 +975,7 @@
 		'idx': 17,
 		'in_filter': None,
 		'label': 'Leave Without Pay',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:16',
 		'modified_by': 'Administrator',
 		'name': 'FL02904',
 		'no_column': None,
@@ -821,7 +1011,7 @@
 		'idx': 18,
 		'in_filter': None,
 		'label': 'Payment days',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:16',
 		'modified_by': 'Administrator',
 		'name': 'FL02907',
 		'no_column': None,
@@ -857,7 +1047,7 @@
 		'idx': 19,
 		'in_filter': None,
 		'label': 'Bank Name',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:16',
 		'modified_by': 'Administrator',
 		'name': 'FL02905',
 		'no_column': None,
@@ -893,7 +1083,7 @@
 		'idx': 20,
 		'in_filter': None,
 		'label': 'Bank Account No.',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:16',
 		'modified_by': 'Administrator',
 		'name': 'FL02906',
 		'no_column': None,
@@ -929,7 +1119,7 @@
 		'idx': 21,
 		'in_filter': None,
 		'label': 'Email',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:16',
 		'modified_by': 'Administrator',
 		'name': 'FL02908',
 		'no_column': None,
@@ -965,7 +1155,7 @@
 		'idx': 22,
 		'in_filter': None,
 		'label': 'Amended From',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:16',
 		'modified_by': 'Administrator',
 		'name': 'FL02901',
 		'no_column': None,
@@ -1001,7 +1191,7 @@
 		'idx': 23,
 		'in_filter': None,
 		'label': 'Amendment Date',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:16',
 		'modified_by': 'Administrator',
 		'name': 'FL02902',
 		'no_column': None,
@@ -1024,7 +1214,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-04-05 17:13:17',
+		'creation': '2011-06-27 14:39:16',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1037,9 +1227,9 @@
 		'idx': 24,
 		'in_filter': None,
 		'label': 'Earning & Deduction',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:16',
 		'modified_by': 'Administrator',
-		'name': '000002463',
+		'name': 'FL05710',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1060,7 +1250,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-04-05 17:13:17',
+		'creation': '2011-06-27 14:39:16',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1073,9 +1263,9 @@
 		'idx': 25,
 		'in_filter': None,
 		'label': 'Earning',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:16',
 		'modified_by': 'Administrator',
-		'name': '000002464',
+		'name': 'FL05711',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1109,7 +1299,7 @@
 		'idx': 26,
 		'in_filter': None,
 		'label': 'Earning Details',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:16',
 		'modified_by': 'Administrator',
 		'name': 'FL02914',
 		'no_column': None,
@@ -1132,7 +1322,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-04-05 17:13:17',
+		'creation': '2011-06-27 14:39:16',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1145,9 +1335,9 @@
 		'idx': 27,
 		'in_filter': None,
 		'label': 'Deduction',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:16',
 		'modified_by': 'Administrator',
-		'name': '000002465',
+		'name': 'FL05712',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1181,7 +1371,7 @@
 		'idx': 28,
 		'in_filter': None,
 		'label': 'Deduction Details',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:16',
 		'modified_by': 'Administrator',
 		'name': 'FL02917',
 		'no_column': None,
@@ -1204,7 +1394,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-04-05 17:13:17',
+		'creation': '2011-06-27 14:39:16',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1217,9 +1407,9 @@
 		'idx': 29,
 		'in_filter': None,
 		'label': 'Totals',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:16',
 		'modified_by': 'Administrator',
-		'name': '000002466',
+		'name': 'FL05713',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1240,7 +1430,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-04-05 17:13:17',
+		'creation': '2011-06-27 14:39:16',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1253,9 +1443,9 @@
 		'idx': 30,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:16',
 		'modified_by': 'Administrator',
-		'name': '000002467',
+		'name': 'FL05714',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1289,7 +1479,7 @@
 		'idx': 31,
 		'in_filter': None,
 		'label': 'Arrear Amount',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:16',
 		'modified_by': 'Administrator',
 		'name': 'FL02909',
 		'no_column': None,
@@ -1312,7 +1502,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-02-17 13:25:56',
+		'creation': '2011-02-14 10:34:35',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1325,9 +1515,9 @@
 		'idx': 32,
 		'in_filter': None,
 		'label': 'Leave Encashment Amount',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:16',
 		'modified_by': 'Administrator',
-		'name': 'FL04573',
+		'name': 'FL04586',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'encashment_amount',
@@ -1361,7 +1551,7 @@
 		'idx': 33,
 		'in_filter': None,
 		'label': 'Gross Pay',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:16',
 		'modified_by': 'Administrator',
 		'name': 'FL02920',
 		'no_column': None,
@@ -1397,7 +1587,7 @@
 		'idx': 34,
 		'in_filter': None,
 		'label': 'Total Deduction',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:16',
 		'modified_by': 'Administrator',
 		'name': 'FL02922',
 		'no_column': None,
@@ -1420,7 +1610,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-04-05 17:13:17',
+		'creation': '2011-06-27 14:39:16',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1433,9 +1623,9 @@
 		'idx': 35,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:16',
 		'modified_by': 'Administrator',
-		'name': '000002468',
+		'name': 'FL05715',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1469,7 +1659,7 @@
 		'idx': 36,
 		'in_filter': None,
 		'label': 'Net Pay',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:16',
 		'modified_by': 'Administrator',
 		'name': 'FL02924',
 		'no_column': None,
@@ -1492,7 +1682,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-04-05 17:13:17',
+		'creation': '2011-04-06 09:24:46',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1505,9 +1695,9 @@
 		'idx': 37,
 		'in_filter': None,
 		'label': 'Rounded Total',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:16',
 		'modified_by': 'Administrator',
-		'name': '000002458',
+		'name': '000001892',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1528,7 +1718,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-04-05 17:13:17',
+		'creation': '2011-04-06 09:24:46',
 		'default': None,
 		'depends_on': None,
 		'description': 'Net Pay (in words) will be visible once you save the Salary Slip.',
@@ -1541,9 +1731,9 @@
 		'idx': 38,
 		'in_filter': None,
 		'label': 'Total in words',
-		'modified': '2011-06-27 11:12:33',
+		'modified': '2011-06-27 14:39:16',
 		'modified_by': 'Administrator',
-		'name': '000002459',
+		'name': '000001893',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'net_pay_in_words',
diff --git a/payroll/doctype/salary_structure/salary_structure.txt b/payroll/doctype/salary_structure/salary_structure.txt
index fdd0d64..71b3664 100644
--- a/payroll/doctype/salary_structure/salary_structure.txt
+++ b/payroll/doctype/salary_structure/salary_structure.txt
@@ -13,7 +13,7 @@
 		'client_script_core': None,
 		'client_string': None,
 		'colour': 'White:FFF',
-		'creation': '2010-12-30 13:02:26',
+		'creation': '2010-12-14 16:50:05',
 		'description': None,
 		'docstatus': 0,
 		'doctype': 'DocType',
@@ -29,7 +29,7 @@
 		'istable': None,
 		'max_attachments': None,
 		'menu_index': None,
-		'modified': '2011-06-27 11:09:01',
+		'modified': '2011-06-27 14:39:11',
 		'modified_by': 'Administrator',
 		'module': 'Payroll',
 		'name': 'Salary Structure',
@@ -57,201 +57,224 @@
 	},
 	{
 		'amend': 0,
-		'cancel': 1,
-		'create': 1,
-		'creation': '2011-04-26 17:22:35',
+		'cancel': 0,
+		'create': 0,
+		'creation': '2011-02-14 11:38:05',
 		'docstatus': 0,
 		'doctype': 'DocPerm',
 		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2011-06-27 11:09:01',
+		'idx': None,
+		'match': 'owner',
+		'modified': '2011-02-14 11:38:05',
 		'modified_by': 'Administrator',
-		'name': '000005552',
-		'owner': 'sanjeeva@vencesystem.com',
+		'name': 'PERM00816',
+		'owner': 'Administrator',
 		'parent': 'Salary Structure',
 		'parentfield': 'permissions',
 		'parenttype': 'DocType',
 		'permlevel': 0,
 		'read': 1,
-		'role': 'System Manager',
+		'role': None,
 		'submit': 0,
-		'write': 1
+		'write': 0
 	},
 	{
 		'amend': 0,
 		'cancel': 0,
 		'create': 0,
-		'creation': '2011-04-26 17:22:57',
+		'creation': '2011-02-14 11:38:05',
+		'docstatus': 0,
+		'doctype': 'DocPerm',
+		'execute': None,
+		'idx': None,
+		'match': 'owner',
+		'modified': '2011-02-14 11:38:05',
+		'modified_by': 'Administrator',
+		'name': 'PERM00815',
+		'owner': 'Administrator',
+		'parent': 'Salary Structure',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'role': None,
+		'submit': 0,
+		'write': 0
+	},
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'creation': '2011-02-14 10:34:34',
+		'docstatus': 0,
+		'doctype': 'DocPerm',
+		'execute': None,
+		'idx': None,
+		'match': 'owner',
+		'modified': '2011-02-14 10:34:34',
+		'modified_by': 'Administrator',
+		'name': 'PERM00810',
+		'owner': 'Administrator',
+		'parent': 'Salary Structure',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'role': None,
+		'submit': 0,
+		'write': 0
+	},
+	{
+		'amend': 0,
+		'cancel': 0,
+		'create': 0,
+		'creation': '2011-02-14 10:34:34',
+		'docstatus': 0,
+		'doctype': 'DocPerm',
+		'execute': None,
+		'idx': None,
+		'match': 'owner',
+		'modified': '2011-02-14 10:34:34',
+		'modified_by': 'Administrator',
+		'name': 'PERM00809',
+		'owner': 'Administrator',
+		'parent': 'Salary Structure',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': 1,
+		'role': None,
+		'submit': 0,
+		'write': 0
+	},
+	{
+		'amend': None,
+		'cancel': None,
+		'create': None,
+		'creation': '2011-01-25 12:33:10',
+		'docstatus': 0,
+		'doctype': 'DocPerm',
+		'execute': None,
+		'idx': None,
+		'match': None,
+		'modified': '2011-01-25 12:33:10',
+		'modified_by': 'umair@iwebnotes.com',
+		'name': 'PERM00793',
+		'owner': 'umair@iwebnotes.com',
+		'parent': 'Salary Structure',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'permlevel': 0,
+		'read': None,
+		'role': 'Sales User',
+		'submit': None,
+		'write': None
+	},
+	{
+		'amend': None,
+		'cancel': None,
+		'create': None,
+		'creation': '2010-12-14 16:50:05',
 		'docstatus': 0,
 		'doctype': 'DocPerm',
 		'execute': None,
 		'idx': 2,
-		'match': 'owner',
-		'modified': '2011-06-27 11:09:01',
+		'match': None,
+		'modified': '2010-12-14 16:50:05',
 		'modified_by': 'Administrator',
-		'name': '000005553',
-		'owner': 'sanjeeva@vencesystem.com',
+		'name': 'PERM00764',
+		'owner': 'Administrator',
 		'parent': 'Salary Structure',
 		'parentfield': 'permissions',
 		'parenttype': 'DocType',
-		'permlevel': 0,
+		'permlevel': 1,
 		'read': 1,
-		'role': 'Employee',
-		'submit': 0,
+		'role': 'All',
+		'submit': None,
 		'write': 0
 	},
 	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2011-05-12 23:34:49',
+		'amend': None,
+		'cancel': None,
+		'create': 1,
+		'creation': '2010-12-14 16:50:05',
 		'docstatus': 0,
 		'doctype': 'DocPerm',
 		'execute': None,
 		'idx': 3,
-		'match': 'owner',
-		'modified': '2011-06-27 11:09:01',
+		'match': None,
+		'modified': '2010-12-14 16:50:05',
 		'modified_by': 'Administrator',
-		'name': '000011977',
-		'owner': 'sanjeeva@vencesystem.com',
+		'name': 'PERM00765',
+		'owner': 'harshada@webnotestech.com',
 		'parent': 'Salary Structure',
 		'parentfield': 'permissions',
 		'parenttype': 'DocType',
 		'permlevel': 0,
 		'read': 1,
-		'role': 'Employee',
-		'submit': 0,
-		'write': 0
+		'role': 'HR User',
+		'submit': None,
+		'write': 1
 	},
 	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2011-02-17 13:25:56',
+		'amend': None,
+		'cancel': None,
+		'create': 1,
+		'creation': '2010-12-14 16:50:05',
 		'docstatus': 0,
 		'doctype': 'DocPerm',
 		'execute': None,
 		'idx': 4,
-		'match': 'owner',
-		'modified': '2011-06-27 11:09:01',
+		'match': None,
+		'modified': '2010-12-14 16:50:05',
 		'modified_by': 'Administrator',
-		'name': 'PERM00795',
-		'owner': 'sanjeeva@vencesystem.com',
+		'name': 'PERM00766',
+		'owner': 'harshada@webnotestech.com',
 		'parent': 'Salary Structure',
 		'parentfield': 'permissions',
 		'parenttype': 'DocType',
 		'permlevel': 0,
 		'read': 1,
-		'role': 'Employee',
-		'submit': 0,
-		'write': 0
+		'role': 'HR Manager',
+		'submit': None,
+		'write': 1
 	},
 	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2011-02-17 13:25:56',
+		'amend': None,
+		'cancel': None,
+		'create': None,
+		'creation': '2010-12-14 16:50:05',
 		'docstatus': 0,
 		'doctype': 'DocPerm',
 		'execute': None,
 		'idx': 5,
-		'match': 'owner',
-		'modified': '2011-06-27 11:09:01',
+		'match': None,
+		'modified': '2010-12-14 16:50:05',
 		'modified_by': 'Administrator',
-		'name': 'PERM00796',
-		'owner': 'sanjeeva@vencesystem.com',
+		'name': 'PERM00767',
+		'owner': 'harshada@webnotestech.com',
 		'parent': 'Salary Structure',
 		'parentfield': 'permissions',
 		'parenttype': 'DocType',
-		'permlevel': 0,
+		'permlevel': 1,
 		'read': 1,
-		'role': 'Employee',
-		'submit': 0,
-		'write': 0
+		'role': 'HR Manager',
+		'submit': None,
+		'write': None
 	},
 	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 1,
-		'creation': '2010-12-30 13:02:27',
+		'amend': None,
+		'cancel': None,
+		'create': None,
+		'creation': '2010-12-14 16:50:05',
 		'docstatus': 0,
 		'doctype': 'DocPerm',
 		'execute': None,
 		'idx': 6,
 		'match': None,
-		'modified': '2011-06-27 11:09:01',
+		'modified': '2010-12-14 16:50:05',
 		'modified_by': 'Administrator',
-		'name': 'PERM00786',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Salary Structure',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'HR User',
-		'submit': 0,
-		'write': 1
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 1,
-		'creation': '2010-12-30 13:02:27',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 7,
-		'match': None,
-		'modified': '2011-06-27 11:09:01',
-		'modified_by': 'Administrator',
-		'name': 'PERM00787',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Salary Structure',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'HR Manager',
-		'submit': 0,
-		'write': 1
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-12-30 13:02:27',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 8,
-		'match': None,
-		'modified': '2011-06-27 11:09:01',
-		'modified_by': 'Administrator',
-		'name': 'PERM00788',
-		'owner': 'harshada@webnotestech.com',
-		'parent': 'Salary Structure',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'HR Manager',
-		'submit': 0,
-		'write': 0
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 0,
-		'creation': '2010-12-30 13:02:27',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 9,
-		'match': None,
-		'modified': '2011-06-27 11:09:01',
-		'modified_by': 'Administrator',
-		'name': 'PERM00789',
+		'name': 'PERM00768',
 		'owner': 'harshada@webnotestech.com',
 		'parent': 'Salary Structure',
 		'parentfield': 'permissions',
@@ -259,13 +282,13 @@
 		'permlevel': 1,
 		'read': 1,
 		'role': 'HR User',
-		'submit': 0,
-		'write': 0
+		'submit': None,
+		'write': None
 	},
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-18 22:32:31',
+		'creation': '2011-06-27 14:39:11',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -278,9 +301,9 @@
 		'idx': 1,
 		'in_filter': None,
 		'label': 'Basic Info',
-		'modified': '2011-06-27 11:09:01',
+		'modified': '2011-06-27 14:39:11',
 		'modified_by': 'Administrator',
-		'name': 'FL04655',
+		'name': 'FL05662',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'basic_info',
@@ -301,7 +324,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-18 22:32:31',
+		'creation': '2011-06-27 14:39:11',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -314,9 +337,9 @@
 		'idx': 2,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-27 11:09:01',
+		'modified': '2011-06-27 14:39:11',
 		'modified_by': 'Administrator',
-		'name': 'FL04656',
+		'name': 'FL05663',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -337,7 +360,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-12-30 13:02:27',
+		'creation': '2010-12-14 16:50:05',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -350,9 +373,9 @@
 		'idx': 3,
 		'in_filter': 1,
 		'label': 'Employee',
-		'modified': '2011-06-27 11:09:01',
+		'modified': '2011-06-27 14:39:11',
 		'modified_by': 'Administrator',
-		'name': 'FL04446',
+		'name': 'FL04302',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'employee',
@@ -373,7 +396,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-12-30 13:02:27',
+		'creation': '2010-12-14 16:50:05',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -386,9 +409,9 @@
 		'idx': 4,
 		'in_filter': None,
 		'label': 'Employee Name',
-		'modified': '2011-06-27 11:09:01',
+		'modified': '2011-06-27 14:39:11',
 		'modified_by': 'Administrator',
-		'name': 'FL04447',
+		'name': 'FL04304',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'employee_name',
@@ -409,7 +432,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-12-30 13:02:27',
+		'creation': '2010-12-14 16:50:05',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -422,9 +445,9 @@
 		'idx': 5,
 		'in_filter': 1,
 		'label': 'Branch',
-		'modified': '2011-06-27 11:09:01',
+		'modified': '2011-06-27 14:39:11',
 		'modified_by': 'Administrator',
-		'name': 'FL04448',
+		'name': 'FL04305',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'branch',
@@ -445,7 +468,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-12-30 13:02:27',
+		'creation': '2010-12-14 16:50:05',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -458,9 +481,9 @@
 		'idx': 6,
 		'in_filter': 1,
 		'label': 'Designation',
-		'modified': '2011-06-27 11:09:01',
+		'modified': '2011-06-27 14:39:11',
 		'modified_by': 'Administrator',
-		'name': 'FL04449',
+		'name': 'FL04306',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'designation',
@@ -481,7 +504,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-12-30 13:02:27',
+		'creation': '2010-12-14 16:50:05',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -494,9 +517,9 @@
 		'idx': 7,
 		'in_filter': 1,
 		'label': 'Department',
-		'modified': '2011-06-27 11:09:01',
+		'modified': '2011-06-27 14:39:11',
 		'modified_by': 'Administrator',
-		'name': 'FL04450',
+		'name': 'FL04307',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'department',
@@ -517,7 +540,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-12-30 13:02:27',
+		'creation': '2010-12-14 16:50:05',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -530,9 +553,9 @@
 		'idx': 8,
 		'in_filter': 1,
 		'label': 'Grade',
-		'modified': '2011-06-27 11:09:01',
+		'modified': '2011-06-27 14:39:11',
 		'modified_by': 'Administrator',
-		'name': 'FL04451',
+		'name': 'FL04308',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'grade',
@@ -553,7 +576,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-18 22:32:31',
+		'creation': '2011-06-27 14:39:11',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -566,9 +589,9 @@
 		'idx': 9,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-27 11:09:01',
+		'modified': '2011-06-27 14:39:11',
 		'modified_by': 'Administrator',
-		'name': 'FL04657',
+		'name': 'FL05664',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -589,7 +612,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-12-30 13:02:27',
+		'creation': '2010-12-14 16:50:05',
 		'default': 'Yes',
 		'depends_on': None,
 		'description': None,
@@ -602,9 +625,9 @@
 		'idx': 10,
 		'in_filter': 1,
 		'label': 'Is Active',
-		'modified': '2011-06-27 11:09:01',
+		'modified': '2011-06-27 14:39:11',
 		'modified_by': 'Administrator',
-		'name': 'FL04453',
+		'name': 'FL04311',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'is_active',
@@ -625,7 +648,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-12-30 13:02:27',
+		'creation': '2010-12-14 16:50:06',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -638,9 +661,9 @@
 		'idx': 11,
 		'in_filter': None,
 		'label': 'From Date',
-		'modified': '2011-06-27 11:09:01',
+		'modified': '2011-06-27 14:39:11',
 		'modified_by': 'Administrator',
-		'name': 'FL04454',
+		'name': 'FL04313',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'from_date',
@@ -661,7 +684,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-12-30 13:02:27',
+		'creation': '2010-12-14 16:50:06',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -674,9 +697,9 @@
 		'idx': 12,
 		'in_filter': None,
 		'label': 'To Date',
-		'modified': '2011-06-27 11:09:01',
+		'modified': '2011-06-27 14:39:11',
 		'modified_by': 'Administrator',
-		'name': 'FL04455',
+		'name': 'FL04314',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'to_date',
@@ -697,7 +720,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-12-30 13:02:27',
+		'creation': '2010-12-14 16:50:06',
 		'default': None,
 		'depends_on': None,
 		'description': 'Cost to Company',
@@ -710,9 +733,9 @@
 		'idx': 13,
 		'in_filter': 1,
 		'label': 'CTC',
-		'modified': '2011-06-27 11:09:01',
+		'modified': '2011-06-27 14:39:11',
 		'modified_by': 'Administrator',
-		'name': 'FL04456',
+		'name': 'FL04315',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'ctc',
@@ -733,7 +756,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-06-27 11:09:01',
+		'creation': '2011-06-27 14:39:11',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -746,9 +769,9 @@
 		'idx': 14,
 		'in_filter': 1,
 		'label': 'Company',
-		'modified': '2011-06-27 11:09:01',
+		'modified': '2011-06-27 14:39:11',
 		'modified_by': 'Administrator',
-		'name': 'FL05404',
+		'name': 'FL05658',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -769,7 +792,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-18 22:32:31',
+		'creation': '2011-06-27 14:39:11',
 		'default': None,
 		'depends_on': None,
 		'description': 'You can create more earning and deduction type from Setup --> HR',
@@ -782,9 +805,9 @@
 		'idx': 15,
 		'in_filter': None,
 		'label': 'Earning & Deduction',
-		'modified': '2011-06-27 11:09:01',
+		'modified': '2011-06-27 14:39:11',
 		'modified_by': 'Administrator',
-		'name': 'FL04658',
+		'name': 'FL05665',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'earning_deduction',
@@ -805,7 +828,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-02-18 22:32:31',
+		'creation': '2011-06-27 14:39:11',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -818,9 +841,9 @@
 		'idx': 16,
 		'in_filter': None,
 		'label': 'Earning',
-		'modified': '2011-06-27 11:09:01',
+		'modified': '2011-06-27 14:39:11',
 		'modified_by': 'Administrator',
-		'name': 'FL04659',
+		'name': 'FL05666',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'col_brk2',
@@ -841,7 +864,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-12-30 13:02:27',
+		'creation': '2010-12-14 16:50:06',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -854,9 +877,9 @@
 		'idx': 17,
 		'in_filter': None,
 		'label': 'Earning1',
-		'modified': '2011-06-27 11:09:01',
+		'modified': '2011-06-27 14:39:11',
 		'modified_by': 'Administrator',
-		'name': 'FL04459',
+		'name': 'FL04319',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'earning_details',
@@ -877,7 +900,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-02-18 22:32:31',
+		'creation': '2011-06-27 14:39:11',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -890,9 +913,9 @@
 		'idx': 18,
 		'in_filter': None,
 		'label': 'Deduction',
-		'modified': '2011-06-27 11:09:01',
+		'modified': '2011-06-27 14:39:11',
 		'modified_by': 'Administrator',
-		'name': 'FL04660',
+		'name': 'FL05667',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'col_brk3',
@@ -913,7 +936,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-12-30 13:02:27',
+		'creation': '2010-12-14 16:50:06',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -926,9 +949,9 @@
 		'idx': 19,
 		'in_filter': None,
 		'label': 'Deduction1',
-		'modified': '2011-06-27 11:09:01',
+		'modified': '2011-06-27 14:39:11',
 		'modified_by': 'Administrator',
-		'name': 'FL04462',
+		'name': 'FL04324',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'deduction_details',
@@ -949,7 +972,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-18 22:32:31',
+		'creation': '2011-06-27 14:39:11',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -962,9 +985,9 @@
 		'idx': 20,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-27 11:09:01',
+		'modified': '2011-06-27 14:39:11',
 		'modified_by': 'Administrator',
-		'name': 'FL04661',
+		'name': 'FL05668',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -985,7 +1008,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-18 22:32:31',
+		'creation': '2011-06-27 14:39:11',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -998,9 +1021,9 @@
 		'idx': 21,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-27 11:09:01',
+		'modified': '2011-06-27 14:39:11',
 		'modified_by': 'Administrator',
-		'name': 'FL04662',
+		'name': 'FL05669',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1021,7 +1044,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-12-30 13:02:27',
+		'creation': '2010-12-14 16:50:06',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1034,9 +1057,9 @@
 		'idx': 22,
 		'in_filter': None,
 		'label': 'Total Earning',
-		'modified': '2011-06-27 11:09:01',
+		'modified': '2011-06-27 14:39:11',
 		'modified_by': 'Administrator',
-		'name': 'FL04465',
+		'name': 'FL04327',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'total_earning',
@@ -1057,7 +1080,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-12-30 13:02:27',
+		'creation': '2010-12-14 16:50:06',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1070,9 +1093,9 @@
 		'idx': 23,
 		'in_filter': None,
 		'label': 'Total Deduction',
-		'modified': '2011-06-27 11:09:01',
+		'modified': '2011-06-27 14:39:11',
 		'modified_by': 'Administrator',
-		'name': 'FL04468',
+		'name': 'FL04334',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'total_deduction',
@@ -1093,7 +1116,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-18 22:32:31',
+		'creation': '2011-06-27 14:39:11',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1106,9 +1129,9 @@
 		'idx': 24,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-06-27 11:09:01',
+		'modified': '2011-06-27 14:39:11',
 		'modified_by': 'Administrator',
-		'name': 'FL04663',
+		'name': 'FL05670',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -1129,7 +1152,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-02-17 13:25:56',
+		'creation': '2011-02-14 10:34:31',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -1142,9 +1165,9 @@
 		'idx': 25,
 		'in_filter': None,
 		'label': 'Net Pay',
-		'modified': '2011-06-27 11:09:01',
+		'modified': '2011-06-27 14:39:11',
 		'modified_by': 'Administrator',
-		'name': 'FL04559',
+		'name': 'FL04572',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
diff --git a/tools/doctype/rename_tool/rename_tool.txt b/tools/doctype/rename_tool/rename_tool.txt
index a2df8c5..5947e67 100755
--- a/tools/doctype/rename_tool/rename_tool.txt
+++ b/tools/doctype/rename_tool/rename_tool.txt
@@ -13,7 +13,7 @@
 		'client_script_core': None,
 		'client_string': None,
 		'colour': 'White:FFF',
-		'creation': '2011-06-22 16:08:49',
+		'creation': '2011-06-23 11:03:25',
 		'description': None,
 		'docstatus': 0,
 		'doctype': 'DocType',
@@ -29,7 +29,7 @@
 		'istable': None,
 		'max_attachments': None,
 		'menu_index': None,
-		'modified': '2011-06-22 16:24:18',
+		'modified': '2011-06-23 11:03:25',
 		'modified_by': 'Administrator',
 		'module': 'Tools',
 		'name': 'Rename Tool',
@@ -59,15 +59,15 @@
 		'amend': None,
 		'cancel': None,
 		'create': 1,
-		'creation': '2011-06-22 16:08:49',
+		'creation': '2011-06-23 11:03:25',
 		'docstatus': 0,
 		'doctype': 'DocPerm',
 		'execute': None,
 		'idx': 1,
 		'match': None,
-		'modified': '2011-06-22 16:24:18',
+		'modified': '2011-06-23 11:03:25',
 		'modified_by': 'Administrator',
-		'name': 'PERM00829',
+		'name': 'PERM00859',
 		'owner': 'Administrator',
 		'parent': 'Rename Tool',
 		'parentfield': 'permissions',
@@ -81,7 +81,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-06-22 16:08:49',
+		'creation': '2011-06-23 11:03:25',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -94,9 +94,9 @@
 		'idx': 1,
 		'in_filter': None,
 		'label': 'Select DocType',
-		'modified': '2011-06-22 16:24:18',
+		'modified': '2011-06-23 11:03:25',
 		'modified_by': 'Administrator',
-		'name': 'FL05282',
+		'name': 'FL05599',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -117,7 +117,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-06-22 16:08:49',
+		'creation': '2011-06-23 11:03:25',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -130,9 +130,9 @@
 		'idx': 2,
 		'in_filter': None,
 		'label': 'Document to rename',
-		'modified': '2011-06-22 16:24:18',
+		'modified': '2011-06-23 11:03:25',
 		'modified_by': 'Administrator',
-		'name': 'FL05283',
+		'name': 'FL05600',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -153,7 +153,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-06-22 16:08:49',
+		'creation': '2011-06-23 11:03:25',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -166,9 +166,9 @@
 		'idx': 3,
 		'in_filter': None,
 		'label': 'New Name',
-		'modified': '2011-06-22 16:24:18',
+		'modified': '2011-06-23 11:03:25',
 		'modified_by': 'Administrator',
-		'name': 'FL05284',
+		'name': 'FL05601',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
@@ -189,7 +189,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-06-22 16:08:49',
+		'creation': '2011-06-23 11:03:25',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -202,9 +202,9 @@
 		'idx': 4,
 		'in_filter': None,
 		'label': 'Rename',
-		'modified': '2011-06-22 16:24:18',
+		'modified': '2011-06-23 11:03:25',
 		'modified_by': 'Administrator',
-		'name': 'FL05285',
+		'name': 'FL05602',
 		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
diff --git a/tools/doctype/reposting_tool/reposting_tool.py b/tools/doctype/reposting_tool/reposting_tool.py
index b4d5421..34bf8cc 100644
--- a/tools/doctype/reposting_tool/reposting_tool.py
+++ b/tools/doctype/reposting_tool/reposting_tool.py
@@ -57,7 +57,7 @@
 		
 
 		# get reserved_qty
-		res_qty =sql("select sum(if ( ifnull(t2.qty, 0) > ifnull(t2.delivered_qty, 0), ifnull(t2.qty, 0) - ifnull(t2.delivered_qty, 0) , 0) ) from `tabSales Order` t1, `tabSales Order Detail` t2 where	t1.name = t2.parent and t1.docstatus = 1 and t2.reserved_warehouse = '%s' and t2.item_code = '%s' " % (wh, item))
+		res_qty =sql("select sum(if ( ifnull(t2.qty, 0) > ifnull(t2.delivered_qty, 0), ifnull(t2.qty, 0) - ifnull(t2.delivered_qty, 0) , 0) ) from `tabSales Order` t1, `tabSales Order Detail` t2 where t1.name = t2.parent and t1.docstatus = 1 and t2.reserved_warehouse = '%s' and t2.item_code = '%s' " % (wh, item))
 		res_qty = res_qty and flt(res_qty[0][0]) or 0
 
 		# get planned_qty 
@@ -95,8 +95,9 @@
 			# check bin qty
 			self.check_bin_qty(bin_obj, qty_dict)
 
+			projected_qty = flt(qty_dict['indented_qty']) + flt(qty_dict['ordered_qty']) - flt(qty_dict['reserved_qty']) + flt(qty_dict['planned_qty']) + flt(qty_dict['actual_qty'])
 			# update indented_qty, ordered_qty, reserved_qty, planned_qty
-			sql("update `tabBin` set indented_qty = '%s', ordered_qty = '%s', reserved_qty = '%s', planned_qty = '%s' where warehouse = '%s' and item_code = '%s'" % ( flt(qty_dict['indented_qty']), flt(qty_dict['ordered_qty']), flt(qty_dict['reserved_qty']), flt(qty_dict['planned_qty']),	bin_obj.doc.warehouse, bin_obj.doc.item_code))
+			sql("update `tabBin` set indented_qty = '%s', ordered_qty = '%s', reserved_qty = '%s', planned_qty = '%s', projected_qty = '%s' where warehouse = '%s' and item_code = '%s'" % ( flt(qty_dict['indented_qty']), flt(qty_dict['ordered_qty']), flt(qty_dict['reserved_qty']), flt(qty_dict['planned_qty']), projected_qty, bin_obj.doc.warehouse, bin_obj.doc.item_code))
  
 			# update projected_qty
 			sql("update `tabBin` set projected_qty = ifnull(indented_qty, 0) + ifnull(ordered_qty,0) + ifnull(actual_qty, 0) + ifnull(planned_qty, 0) - ifnull(reserved_qty,0) where warehouse = '%s' and item_code = '%s' " % (bin_obj.doc.warehouse, bin_obj.doc.item_code))
@@ -115,7 +116,7 @@
 				sql("commit")
 				sql("start transaction")
 			cnt += 1
-			
+	
 			self.repair_bin(bin[0])
 
 	# =============================================================================