fixed conflict

patches/april_2012/change_cacheitem_schema.py

@@ -1,6 +0,0 @@
-from __future__ import unicode_literals
-def execute():
-	import webnotes
-	webnotes.conn.commit()
-	webnotes.conn.sql("alter table __CacheItem modify `value` longtext")
-	webnotes.conn.begin()

patches/june_2012/cache_item_table.py

@@ -1,12 +0,0 @@
-from __future__ import unicode_literals
-def execute():
-	"""drop and create __CacheItem table again"""
-	import webnotes
-	webnotes.conn.commit()
-	webnotes.conn.sql("drop table __CacheItem")
-	webnotes.conn.sql("""create table __CacheItem(
-		`key` VARCHAR(180) NOT NULL PRIMARY KEY,
-		`value` LONGTEXT,
-		`expires_on` DATETIME
-		) ENGINE=MyISAM DEFAULT CHARSET=utf8""")
-	webnotes.conn.begin()

patches/mar_2012/doctype_get_refactor.py

@@ -116,8 +116,8 @@ def create_file_list():
 		obj.make_file_list()
 		from webnotes.model.db_schema import updatedb
 		updatedb(obj.doc.name)
-		from webnotes.utils.cache import CacheItem
-		CacheItem(obj.doc.name).clear()
+
+		webnotes.clear_cache(doctype=obj.doc.name)
 
 def change_to_decimal():
 	print "in change to decimal"

patches/may_2012/remove_communication_log.py

@@ -50,9 +50,8 @@ def move_customizations():
 	webnotes.conn.sql("""\
 		delete from `tabProperty Setter`
 		where doc_type='Communication Log'""")
-		
-	from webnotes.utils.cache import CacheItem
-	CacheItem('Communication').clear()
+
+	webnotes.clear_cache(doctype="Communication")
 
 def remove_communication_log():
 	import webnotes

patches/november_2012/add_employee_field_in_employee.py

@@ -0,0 +1,6 @@
+import webnotes
+
+def execute():
+	webnotes.clear_perms("Employee")
+	webnotes.reload_doc("hr", "doctype", "employee")
+	webnotes.conn.sql("""update tabEmployee set employee=name""")

patches/november_2012/leave_application_cleanup.py

@@ -0,0 +1,9 @@
+import webnotes
+
+def execute():
+	webnotes.clear_perms("Leave Application")
+	webnotes.reload_doc("hr", "doctype", "leave_application")
+	webnotes.conn.sql("""update `tabLeave Application` set status='Approved'
+		where docstatus=1""")
+	webnotes.conn.sql("""update `tabLeave Application` set status='Open'
+		where docstatus=0""")		

patches/patch_list.py

@@ -278,11 +278,6 @@ patch_list = [
 		'patch_file': 'after_sync_cleanup',
 		'description': 'cleanup after sync'
 	},
-	{
-		'patch_module': 'patches.april_2012',
-		'patch_file': 'change_cacheitem_schema',
-		'description': 'Modified datatype of `value` column from text to longtext'
-	},
 	{
 		'patch_module': 'patches.april_2012',
 		'patch_file': 'remove_default_from_rv_detail',
@@ -458,11 +453,6 @@ patch_list = [
 		'patch_file': 'delete_about_contact',
 		'description': "delete depracated doctypes of website module"
 	},
-	{
-		'patch_module': 'patches.june_2012',
-		'patch_file': 'cache_item_table',
-		'description': "create cache item table again"
-	},
 	{
 		'patch_module': 'patches.july_2012',
 		'patch_file': 'reload_pr_po_mapper',
@@ -699,6 +689,14 @@ patch_list = [
 		'patch_module': 'patches.november_2012',
 		'patch_file': 'add_theme_to_profile',
 	},
+	{
+		'patch_module': 'patches.november_2012',
+		'patch_file': 'add_employee_field_in_employee',
+	},
+	{
+		'patch_module': 'patches.november_2012',
+		'patch_file': 'leave_application_cleanup',
+	},
 	{
 		'patch_module': 'patches.november_2012',
 		'patch_file': 'production_order_patch',