mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-02 19:59:12 +00:00
[fix] [minor] merge conflict fixed
This commit is contained in:
8
patches/1311/p04_update_comments.py
Normal file
8
patches/1311/p04_update_comments.py
Normal 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()
|
||||
|
||||
16
patches/1311/p05_website_brand_html.py
Normal file
16
patches/1311/p05_website_brand_html.py
Normal 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
|
||||
Reference in New Issue
Block a user