[fix] [minor] merge conflict fixed

patches/1311/p04_update_comments.py

@@ -0,0 +1,8 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+def execute():
+	import webnotes
+	for name in webnotes.conn.sql_list("""select name from tabComment"""):
+		webnotes.get_obj("Comment", name).update_comment_in_doc()
+	

patches/1311/p05_website_brand_html.py

@@ -0,0 +1,16 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import webnotes
+
+def execute():
+	bean = webnotes.bean("Website Settings")
+	for company in webnotes.conn.sql_list("select name from `tabCompany`"):
+		if bean.doc.banner_html == ("""<h3 style='margin-bottom: 20px;'>""" + company + "</h3>"):
+			bean.doc.banner_html = None
+			if not bean.doc.brand_html:
+				bean.doc.brand_html = company
+
+			bean.save()
+			break

patches/october_2013/p01_fix_serial_no_status.py

@@ -11,7 +11,6 @@ def execute():
 		try:
 			sr_bean = webnotes.bean("Serial No", sr[0])
 			sr_bean.make_controller().via_stock_ledger = True
-			sr_bean.run_method("validate")
 			sr_bean.save()
 			webnotes.conn.commit()
 		except:

patches/patch_list.py

@@ -245,10 +245,12 @@ patch_list = [
 	"execute:webnotes.reload_doc('core', 'doctype', 'comment') #2013-11-15",
 	"patches.1311.p02_index_singles",
 	"patches.1311.p01_make_gl_entries_for_si",
-    "patches.1311.p03_update_reqd_report_fields",
+	"patches.1311.p03_update_reqd_report_fields",
 	"execute:webnotes.reload_doc('website', 'doctype', 'website_sitemap_config') #2013-11-20",
 	"execute:webnotes.reload_doc('website', 'doctype', 'website_sitemap') #2013-11-20",
 	"execute:webnotes.bean('Style Settings').save() #2013-11-20",
     "execute:webnotes.get_module('website.doctype.website_sitemap_config.website_sitemap_config').rebuild_website_sitemap_config()",
     "patches.1311.p04_update_year_end_date_of_fiscal_year",
+	"patches.1311.p04_update_comments",
+	"patches.1311.p05_website_brand_html",
 ]