commit 52b1d5aac88b1feb9fca9a1ec1c218209cc18239
author Anand Doshi <anand@iwebnotes.com> Thu Jul 07 18:41:12 2011 +0530
committer Anand Doshi <anand@iwebnotes.com> Thu Jul 07 18:41:12 2011 +0530
tree 51f3fbca92472116916296dcd41649676405be64
parent 56ab7e4bb3888fe24f7429290d9cc6a0a4a336ab
parent cfc5dff4b4d2a17fee0a3441aa907bb42ed1ec58

Merge branch 'master' of github.com:webnotes/erpnext

Conflicts:
	patches/patch.py

patches/patch.py

diff --git a/patches/patch.py b/patches/patch.py
index 7f023e2..3d5e308 100644
--- a/patches/patch.py
+++ b/patches/patch.py
@@ -1,7 +1,7 @@
 # REMEMBER to update this
 # ========================
 
-last_patch = 318
+last_patch = 319
 
 #-------------------------------------------
 
@@ -1276,6 +1276,7 @@
 	elif patch_no == 317:
 		sql("update `tabPage` set name = 'profile-settings' where page_name = 'Profile Settings'")	
 	elif patch_no == 318:
+		reload_doc('utilities', 'doctype', 'bulk_rename_tool')
+	elif patch_no == 319:
 		sql("delete from tabFeed where doc_name like 'New %'")
 
-