diff --git a/frappe/__init__.py b/frappe/__init__.py index 666290f93f..15a89c8c21 100644 --- a/frappe/__init__.py +++ b/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() diff --git a/frappe/email/doctype/email_alert/email_alert.py b/frappe/email/doctype/email_alert/email_alert.py index d69e88413d..f12cb26046 100755 --- a/frappe/email/doctype/email_alert/email_alert.py +++ b/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 diff --git a/frappe/public/js/lib/microtemplate.js b/frappe/public/js/lib/microtemplate.js index fb1595de2f..a84ca70b9c 100644 --- a/frappe/public/js/lib/microtemplate.js +++ b/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