Merge branch 'develop'

frappe/__init__.py

@@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template
 
-__version__ = "7.0.13"
+__version__ = "7.0.14"
 
 local = Local()
 

frappe/patches.txt

@@ -135,4 +135,4 @@ execute:frappe.db.sql("delete from `tabWeb Page` where ifnull(template_path, '')
 frappe.patches.v7_0.re_route #2016-06-27
 frappe.patches.v7_0.rename_newsletter_list_to_email_group
 frappe.patches.v7_0.replace_upgrade_link_limit
-execute:frappe.db.sql("update `tabEmail Group Member` set email_group = newsletter_list where email_group is null or email_group = ''")
+frappe.patches.v7_0.set_email_group

frappe/patches/v7_0/set_email_group.py

@@ -0,0 +1,11 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	frappe.reload_doc("email", "doctype", "email_group_member")
+	if "newsletter_list" in frappe.db.get_table_columns("Email Group Member"):
+		frappe.db.sql("""update `tabEmail Group Member` set email_group = newsletter_list 
+			where email_group is null or email_group = ''""")