Merge branch 'master' into 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__ = '8.0.56'
+__version__ = '8.0.57'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/email/doctype/email_alert/email_alert.py

@@ -200,6 +200,7 @@ def trigger_email_alerts(doc, method=None):
 			alert = frappe.get_doc("Email Alert", alert)
 			for doc in alert.get_documents_for_today():
 				evaluate_alert(doc, alert, alert.event)
+				frappe.db.commit()
 
 def evaluate_alert(doc, alert, event):
 	from jinja2 import TemplateError

frappe/public/js/lib/microtemplate.js

@@ -96,8 +96,10 @@ frappe.render_grid = function(opts) {
 	}
 
 	// show landscape view if columns more than 10
-	if(opts.columns.length > 10) {
+	if (opts.columns && opts.columns.length > 10) {
 		opts.landscape = true;
+	} else {
+		opts.landscape = false;
 	}
 
 	// render content