fixed conflict

patches/april_2013/p05_update_file_data.py

@@ -5,28 +5,36 @@ def execute():
 	webnotes.reload_doc("core", "doctype", "file_data")
 	webnotes.reset_perms("File Data")
 	
-	singles = webnotes.conn.sql_list("""select name from tabDocType
-		where ifnull(issingle,0)=1""")
+	singles = get_single_doctypes()
+	
 	for doctype in webnotes.conn.sql_list("""select parent from tabDocField where 
 		fieldname='file_list' and fieldtype='Text'"""):
-		if doctype in singles:
-			doc = webnotes.doc(doctype, doctype)
-			if doc.file_list:
-				update_for_doc(doctype, doc)
-				webnotes.conn.set_value(doctype, None, "file_list", None)
-		else:
-			try:
-				for doc in webnotes.conn.sql("""select name, file_list from `tab%s` where 
-					ifnull(file_list, '')!=''""" % doctype, as_dict=True):
-					update_for_doc(doctype, doc)
-				webnotes.conn.commit()
-				webnotes.conn.sql("""alter table `tab%s` drop column file_list""" % doctype)
-			except Exception, e:
-				if e.args[0]!=1054: raise e
+		update_file_list(doctype, singles)
 		
 		webnotes.conn.sql("""delete from tabDocField where fieldname='file_list'
 				and parent=%s""", doctype)
+		
 		# export_to_files([["DocType", doctype]])
+		
+def get_single_doctypes():
+	return webnotes.conn.sql_list("""select name from tabDocType
+			where ifnull(issingle,0)=1""")
+		
+def update_file_list(doctype, singles):
+	if doctype in singles:
+		doc = webnotes.doc(doctype, doctype)
+		if doc.file_list:
+			update_for_doc(doctype, doc)
+			webnotes.conn.set_value(doctype, None, "file_list", None)
+	else:
+		try:
+			for doc in webnotes.conn.sql("""select name, file_list from `tab%s` where 
+				ifnull(file_list, '')!=''""" % doctype, as_dict=True):
+				update_for_doc(doctype, doc)
+			webnotes.conn.commit()
+			webnotes.conn.sql("""alter table `tab%s` drop column file_list""" % doctype)
+		except Exception, e:
+			if e.args[0]!=1054: raise e
 
 def update_for_doc(doctype, doc):
 	for filedata in doc.file_list.split("\n"):
@@ -45,10 +53,17 @@ def update_for_doc(doctype, doc):
 				exists = False
 
 		if exists:
-			webnotes.conn.sql("""update `tabFile Data` 
-				set attached_to_doctype=%s, attached_to_name=%s
-				where name=%s""", (doctype, doc.name, fileid))
-		
+			if webnotes.conn.exists("File Data", fileid):
+				fd = webnotes.bean("File Data", fileid)
+				if not (fd.doc.attached_to_doctype and fd.doc.attached_to_name):
+					fd.doc.attached_to_doctype = doctype
+					fd.doc.attached_to_name = doc.name
+					fd.save()
+				else:
+					fd = webnotes.bean("File Data", copy=fd.doclist)
+					fd.doc.attached_to_doctype = doctype
+					fd.doc.attached_to_name = doc.name
+					fd.insert()
 		else:
 			webnotes.conn.sql("""delete from `tabFile Data` where name=%s""",
-				fileid)	
+				fileid)

patches/april_2013/p07_update_file_data_custom_field.py

@@ -0,0 +1,11 @@
+import webnotes
+def execute():
+	from patches.april_2013.p05_update_file_data import update_file_list, get_single_doctypes
+	singles = get_single_doctypes()
+	for doctype in webnotes.conn.sql("""select parent from `tabCustom Field` where 
+		fieldname='file_list' and fieldtype='Text'"""):
+			update_file_list(doctype, singles)
+			
+			webnotes.conn.sql("""delete from `tabCustom Field` where fieldname='file_list'
+					and parent=%s""", doctype)
+	

patches/patch_list.py

@@ -247,5 +247,6 @@ patch_list = [
     "execute:webnotes.reload_doc('Stock', 'DocType', 'Delivery Note Item')",
 	"patches.april_2013.p06_default_cost_center",
 	"execute:webnotes.reset_perms('File Data')",
+	"patches.april_2013.p07_update_file_data_custom_field",
 	"patches.april_2013.rebuild_sales_browser",
 ]