Merge branch 'master' into develop

frappe/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = "6.27.16"
+__version__ = "6.27.17"

frappe/email/doctype/email_alert/email_alert.py

@@ -51,7 +51,7 @@ def trigger_email_alerts(doc, method=None):
 				diff_days = -diff_days
 
 			for name in frappe.db.sql_list("""select name from `tab{0}` where
-				DATE({1}) = ADDDATE(DATE(%s), INTERVAL %s DAY)""".format(alert.document_type, alert.date_changed),
+				DATE(`{1}`) = ADDDATE(DATE(%s), INTERVAL %s DAY)""".format(alert.document_type, alert.date_changed),
 					(nowdate(), diff_days or 0)):
 
 				evaluate_alert(frappe.get_doc(alert.document_type, name),

frappe/hooks.py

@@ -5,7 +5,7 @@ app_publisher = "Frappe Technologies"
 app_description = "Full stack web framework with Python, Javascript, MariaDB, Redis, Node"
 
 app_icon = "octicon octicon-circuit-board"
-app_version = "6.27.16"
+app_version = "6.27.17"
 app_color = "orange"
 source_link = "https://github.com/frappe/frappe"
 app_license = "MIT"

frappe/public/js/frappe/ui/toolbar/navbar.html

@@ -40,7 +40,7 @@
 	    					{%= __("Documentation") %}</a></li>
 	    				<li><a href="https://discuss.erpnext.com" target="_blank">
 	    					{%= __("Forums") %}</a></li>
-	    				<li><a href="https://github.com/frappe/erpnext/issues" target="_blank">
+	    				<li><a href="https://github.com/frappe/frappe/issues" target="_blank" data-link="issues">
 	    					{%= __("Report an Issue") %}</a></li>
 	                    <li class="divider"></li>
 	        			<li><a href="#" onclick="return frappe.app.logout();">

frappe/public/js/frappe/ui/toolbar/offcanvas_left_sidebar.html

@@ -27,7 +27,7 @@
 			{%= __("Documentation") %}</a></li>
 		<li><a href="https://discuss.erpnext.com" target="_blank">
 			{%= __("Forums") %}</a></li>
-		<li><a href="https://github.com/frappe/erpnext/issues" target="_blank">
+		<li><a href="https://github.com/frappe/frappe/issues" target="_blank" data-link="issues">
 			{%= __("Report an Issue") %}</a></li>
 		<li><a href="#" onclick="return frappe.ui.toolbar.clear_cache();">
 	        {%= __("Reload") %}</a></li>

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 from pip.req import parse_requirements
 
-version = "6.27.16"
+version = "6.27.17"
 requirements = parse_requirements("requirements.txt", session="")
 
 setup(