diff --git a/accounts/doctype/account/account.txt b/accounts/doctype/account/account.txt
index 3d82261..aa3fd67 100644
--- a/accounts/doctype/account/account.txt
+++ b/accounts/doctype/account/account.txt
@@ -1,6 +1,6 @@
 [
 	{
-		'_last_update': None,
+		'_last_update': '1308811650',
 		'allow_attach': None,
 		'allow_copy': 1,
 		'allow_email': None,
@@ -29,7 +29,7 @@
 		'istable': None,
 		'max_attachments': None,
 		'menu_index': None,
-		'modified': '2011-03-18 14:30:09',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
 		'module': 'Accounts',
 		'name': 'Account',
@@ -50,8 +50,10 @@
 		'server_code_error': ' ',
 		'show_in_menu': 0,
 		'smallicon': None,
+		'subject': None,
+		'tag_fields': None,
 		'use_template': None,
-		'version': 145
+		'version': 133
 	},
 	{
 		'amend': None,
@@ -63,7 +65,7 @@
 		'execute': None,
 		'idx': 1,
 		'match': None,
-		'modified': '2010-08-08 17:08:51',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
 		'name': 'PERM00042',
 		'owner': 'Administrator',
@@ -86,7 +88,7 @@
 		'execute': None,
 		'idx': 2,
 		'match': None,
-		'modified': '2010-08-08 17:08:51',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
 		'name': 'PERM00043',
 		'owner': 'Administrator',
@@ -109,7 +111,7 @@
 		'execute': None,
 		'idx': 3,
 		'match': None,
-		'modified': '2010-08-08 17:08:51',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
 		'name': 'PERM00044',
 		'owner': 'Administrator',
@@ -132,7 +134,7 @@
 		'execute': None,
 		'idx': 4,
 		'match': None,
-		'modified': '2010-08-08 17:08:51',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
 		'name': 'PERM00045',
 		'owner': 'Administrator',
@@ -155,7 +157,7 @@
 		'execute': None,
 		'idx': 5,
 		'match': None,
-		'modified': '2010-08-08 17:08:51',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
 		'name': 'PERM00046',
 		'owner': 'Administrator',
@@ -178,7 +180,7 @@
 		'execute': None,
 		'idx': 6,
 		'match': None,
-		'modified': '2010-08-08 17:08:51',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
 		'name': 'PERM00047',
 		'owner': 'Administrator',
@@ -201,7 +203,7 @@
 		'execute': None,
 		'idx': 7,
 		'match': None,
-		'modified': '2010-08-08 17:08:51',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
 		'name': 'PERM00048',
 		'owner': 'Administrator',
@@ -224,7 +226,7 @@
 		'execute': None,
 		'idx': 8,
 		'match': None,
-		'modified': '2010-08-08 17:08:51',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
 		'name': 'PERM00049',
 		'owner': 'Administrator',
@@ -240,7 +242,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-09 10:50:47',
+		'creation': '2011-03-21 11:13:07',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -253,9 +255,10 @@
 		'idx': 1,
 		'in_filter': None,
 		'label': 'Properties',
-		'modified': '2011-05-09 10:50:47',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
-		'name': '000000166',
+		'name': '000013925',
+		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
@@ -275,7 +278,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-09 10:50:47',
+		'creation': '2011-03-21 11:13:07',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -288,9 +291,10 @@
 		'idx': 2,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-05-09 10:50:47',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
-		'name': '000000167',
+		'name': '000013926',
+		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
 		'oldfieldtype': None,
@@ -323,9 +327,10 @@
 		'idx': 3,
 		'in_filter': 1,
 		'label': 'Account Name',
-		'modified': '2011-05-09 10:50:47',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
 		'name': 'FL00433',
+		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'account_name',
 		'oldfieldtype': 'Data',
@@ -358,9 +363,10 @@
 		'idx': 4,
 		'in_filter': None,
 		'label': 'Parent Account',
-		'modified': '2011-05-09 10:50:47',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
 		'name': 'FL00434',
+		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'parent_account',
 		'oldfieldtype': 'Link',
@@ -391,11 +397,12 @@
 		'hidden': 1,
 		'icon': None,
 		'idx': 5,
-		'in_filter': 0,
+		'in_filter': None,
 		'label': 'Level',
-		'modified': '2011-05-09 10:50:47',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
 		'name': 'FL00435',
+		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'level',
 		'oldfieldtype': 'Int',
@@ -408,7 +415,7 @@
 		'print_hide': 1,
 		'report_hide': None,
 		'reqd': None,
-		'search_index': 0,
+		'search_index': None,
 		'trigger': None,
 		'width': None
 	},
@@ -428,9 +435,10 @@
 		'idx': 6,
 		'in_filter': 1,
 		'label': 'Group or Ledger',
-		'modified': '2011-05-09 10:50:47',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
 		'name': 'FL00436',
+		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'group_or_ledger',
 		'oldfieldtype': 'Select',
@@ -450,7 +458,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-09 10:50:47',
+		'creation': '2011-03-21 11:13:07',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -463,9 +471,10 @@
 		'idx': 7,
 		'in_filter': None,
 		'label': 'Convert to Group',
-		'modified': '2011-05-09 10:50:47',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
-		'name': '000000163',
+		'name': '000013923',
+		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
 		'oldfieldtype': None,
@@ -485,7 +494,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-09 10:50:47',
+		'creation': '2011-03-21 11:13:07',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -498,9 +507,10 @@
 		'idx': 8,
 		'in_filter': None,
 		'label': 'Convert to Ledger',
-		'modified': '2011-05-09 10:50:47',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
-		'name': '000000164',
+		'name': '000013924',
+		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
 		'oldfieldtype': None,
@@ -533,9 +543,10 @@
 		'idx': 9,
 		'in_filter': 1,
 		'label': 'Debit or Credit',
-		'modified': '2011-05-09 10:50:47',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
 		'name': 'FL00441',
+		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'debit_or_credit',
 		'oldfieldtype': 'Data',
@@ -568,9 +579,10 @@
 		'idx': 10,
 		'in_filter': 1,
 		'label': 'Is PL Account',
-		'modified': '2011-05-09 10:50:47',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
 		'name': 'FL00437',
+		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'is_pl_account',
 		'oldfieldtype': 'Select',
@@ -603,9 +615,10 @@
 		'idx': 11,
 		'in_filter': 1,
 		'label': 'Account Type',
-		'modified': '2011-05-09 10:50:47',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
 		'name': 'FL00439',
+		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'account_type',
 		'oldfieldtype': 'Select',
@@ -638,9 +651,10 @@
 		'idx': 12,
 		'in_filter': None,
 		'label': 'Rate',
-		'modified': '2011-05-09 10:50:47',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
 		'name': 'FL00440',
+		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'tax_rate',
 		'oldfieldtype': 'Currency',
@@ -660,7 +674,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-09 10:50:47',
+		'creation': '2011-03-21 11:13:07',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -673,9 +687,10 @@
 		'idx': 13,
 		'in_filter': None,
 		'label': None,
-		'modified': '2011-05-09 10:50:47',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
-		'name': '000000168',
+		'name': '000013927',
+		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
 		'oldfieldtype': None,
@@ -708,9 +723,10 @@
 		'idx': 14,
 		'in_filter': None,
 		'label': 'Freeze Account',
-		'modified': '2011-05-09 10:50:47',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
 		'name': 'FL00438',
+		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'freeze_account',
 		'oldfieldtype': 'Select',
@@ -743,9 +759,10 @@
 		'idx': 15,
 		'in_filter': 1,
 		'label': 'Company',
-		'modified': '2011-05-09 10:50:47',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
 		'name': 'FL00442',
+		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'company',
 		'oldfieldtype': 'Link',
@@ -778,9 +795,10 @@
 		'idx': 16,
 		'in_filter': None,
 		'label': 'Credit Days',
-		'modified': '2011-05-09 10:50:47',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
 		'name': 'FL00443',
+		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'credit_days',
 		'oldfieldtype': 'Int',
@@ -813,9 +831,10 @@
 		'idx': 17,
 		'in_filter': None,
 		'label': 'Credit Limit',
-		'modified': '2011-05-09 10:50:47',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
 		'name': 'FL00444',
+		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'credit_limit',
 		'oldfieldtype': 'Currency',
@@ -848,9 +867,10 @@
 		'idx': 18,
 		'in_filter': None,
 		'label': 'Master Type',
-		'modified': '2011-05-09 10:50:47',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
 		'name': 'FL00453',
+		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'master_type',
 		'oldfieldtype': 'Select',
@@ -883,9 +903,10 @@
 		'idx': 19,
 		'in_filter': None,
 		'label': 'Master Name',
-		'modified': '2011-05-09 10:50:47',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
 		'name': 'FL00454',
+		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'master_name',
 		'oldfieldtype': 'Link',
@@ -905,42 +926,7 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2010-08-08 17:08:51',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'address',
-		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
-		'idx': 20,
-		'in_filter': None,
-		'label': 'Address',
-		'modified': '2011-05-09 10:50:47',
-		'modified_by': 'Administrator',
-		'name': 'FL00455',
-		'no_copy': None,
-		'oldfieldname': 'address',
-		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Account',
-		'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-05-09 10:50:47',
+		'creation': '2011-03-21 11:13:07',
 		'default': None,
 		'depends_on': None,
 		'description': None,
@@ -950,12 +936,13 @@
 		'fieldtype': 'Section Break',
 		'hidden': None,
 		'icon': None,
-		'idx': 21,
+		'idx': 20,
 		'in_filter': None,
 		'label': 'TDS',
-		'modified': '2011-05-09 10:50:47',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
-		'name': '000000169',
+		'name': '000013928',
+		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
@@ -985,12 +972,13 @@
 		'fieldtype': 'Data',
 		'hidden': None,
 		'icon': None,
-		'idx': 22,
+		'idx': 21,
 		'in_filter': None,
 		'label': 'PAN Number',
-		'modified': '2011-05-09 10:50:47',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
 		'name': 'FL00451',
+		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'pan_number',
 		'oldfieldtype': 'Data',
@@ -1020,12 +1008,13 @@
 		'fieldtype': 'Select',
 		'hidden': None,
 		'icon': None,
-		'idx': 23,
+		'idx': 22,
 		'in_filter': None,
 		'label': 'TDS Applicable',
-		'modified': '2011-05-09 10:50:47',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
 		'name': 'FL00452',
+		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'tds_applicable',
 		'oldfieldtype': 'Select',
@@ -1055,12 +1044,13 @@
 		'fieldtype': 'Table',
 		'hidden': None,
 		'icon': None,
-		'idx': 24,
+		'idx': 23,
 		'in_filter': None,
 		'label': 'TDS Details',
-		'modified': '2011-05-09 10:50:47',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
 		'name': 'FL00456',
+		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'tds_details',
 		'oldfieldtype': 'Table',
@@ -1080,76 +1070,6 @@
 	{
 		'allow_on_submit': None,
 		'colour': None,
-		'creation': '2011-05-09 10:50:47',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 25,
-		'in_filter': None,
-		'label': 'Balances',
-		'modified': '2011-05-09 10:50:47',
-		'modified_by': 'Administrator',
-		'name': '000000170',
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Account',
-		'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': '2010-08-08 17:08:51',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
-		'doctype': 'DocField',
-		'fieldname': 'account_balances',
-		'fieldtype': 'Table',
-		'hidden': None,
-		'icon': None,
-		'idx': 26,
-		'in_filter': None,
-		'label': 'Account Balances',
-		'modified': '2011-05-09 10:50:47',
-		'modified_by': 'Administrator',
-		'name': 'FL00446',
-		'no_copy': None,
-		'oldfieldname': 'account_balances',
-		'oldfieldtype': 'Table',
-		'options': 'Account Balance',
-		'owner': 'Administrator',
-		'parent': 'Account',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
 		'creation': '2010-08-08 17:08:51',
 		'default': None,
 		'depends_on': None,
@@ -1160,12 +1080,13 @@
 		'fieldtype': 'Data',
 		'hidden': 1,
 		'icon': None,
-		'idx': 27,
+		'idx': 24,
 		'in_filter': None,
 		'label': 'Old Parent',
-		'modified': '2011-05-09 10:50:47',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
 		'name': 'FL00447',
+		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'old_parent',
 		'oldfieldtype': 'Data',
@@ -1195,12 +1116,13 @@
 		'fieldtype': 'Int',
 		'hidden': 1,
 		'icon': None,
-		'idx': 28,
+		'idx': 25,
 		'in_filter': 1,
 		'label': 'Lft',
-		'modified': '2011-05-09 10:50:47',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
 		'name': 'FL00448',
+		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'lft',
 		'oldfieldtype': 'Int',
@@ -1230,12 +1152,13 @@
 		'fieldtype': 'Int',
 		'hidden': 1,
 		'icon': None,
-		'idx': 29,
+		'idx': 26,
 		'in_filter': 1,
 		'label': 'Rgt',
-		'modified': '2011-05-09 10:50:47',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
 		'name': 'FL00449',
+		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'rgt',
 		'oldfieldtype': 'Int',
@@ -1265,12 +1188,13 @@
 		'fieldtype': 'Small Text',
 		'hidden': None,
 		'icon': None,
-		'idx': 30,
+		'idx': 27,
 		'in_filter': None,
 		'label': 'Trash Reason',
-		'modified': '2011-05-09 10:50:47',
+		'modified': '2011-06-23 12:36:56',
 		'modified_by': 'Administrator',
 		'name': 'FL00457',
+		'no_column': None,
 		'no_copy': None,
 		'oldfieldname': 'trash_reason',
 		'oldfieldtype': 'Small Text',
diff --git a/patches/patch.py b/patches/patch.py
index 2e01cf8..768f7cb 100644
--- a/patches/patch.py
+++ b/patches/patch.py
@@ -1,6 +1,6 @@
 # REMEMBER to update this
 # ========================
-last_patch = 292
+last_patch = 293
 
 #-------------------------------------------
 
@@ -1164,3 +1164,6 @@
 		reload_doc('tools','doctype','rename_tool')
 	elif patch_no == 292:
 		reload_doc('accounts', 'search_criteria', 'trial_balance')
+	elif patch_no == 293:
+		sql("delete from tabDocField where parent='Account' and fieldname='address'")
+		reload_doc('accounts', 'doctype', 'account')