[fix] [minor] merge conflict fixed

This commit is contained in:
Akhilesh Darjee
2013-11-26 11:21:07 +05:30
50 changed files with 322 additions and 289 deletions

View File

@@ -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()

View File

@@ -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