Merge branch 'hotfix'

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.42"
+__version__ = "7.0.43"
 
 local = Local()
 

frappe/model/document.py

@@ -999,6 +999,8 @@ def execute_action(doctype, name, action, **kwargs):
 	try:
 		getattr(doc, action)(**kwargs)
 	except Exception:
+		frappe.db.rollback()
+		
 		# add a comment (?)
 		if frappe.local.message_log:
 			msg = json.loads(frappe.local.message_log[-1]).get('message')