From a5c74e661ac6f07f8d8095f0fb59ec72aa2accdd Mon Sep 17 00:00:00 2001 From: Saurabh Date: Wed, 5 Oct 2016 10:53:57 +0530 Subject: [PATCH 1/4] [minor][fix] check workflow document state messages is translatable --- frappe/translate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/translate.py b/frappe/translate.py index ea7db8b4d5..a5b97595e6 100644 --- a/frappe/translate.py +++ b/frappe/translate.py @@ -364,7 +364,7 @@ def get_messages_from_workflow(doctype=None, app_name=None): (w['name'],), as_dict=True) messages.extend([("Workflow: " + w['name'], states['message']) - for state in states if is_translatable(state['state'])]) + for state in states if is_translatable(state['message'])]) actions = frappe.db.sql( 'select distinct action from `tabWorkflow Transition` where parent=%s', From d61123180c3ea99a280f6786209c8dd6d43f76ac Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 5 Oct 2016 16:34:06 +0530 Subject: [PATCH 2/4] Add error traceback in comment if no message_log --- frappe/model/document.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/frappe/model/document.py b/frappe/model/document.py index c4049b8524..ea1489b6c8 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -999,8 +999,12 @@ def execute_action(doctype, name, action, **kwargs): getattr(doc, action)(**kwargs) except frappe.ValidationError: # add a comment (?) - doc.add_comment('Comment', - _('Action Failed') + '

' + json.loads(frappe.local.message_log[-1]).get('message')) + if frappe.local.message_log: + msg = json.loads(frappe.local.message_log[-1]).get('message') + else: + msg = '
' + frappe.get_traceback() + '
' + + doc.add_comment('Comment', _('Action Failed') + '

' + msg) doc.notify_update() except Exception: From 86cd77b44f080608b8f9fb7463a0d51f14567893 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 5 Oct 2016 16:57:04 +0530 Subject: [PATCH 3/4] Update translate.py --- frappe/translate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/translate.py b/frappe/translate.py index a5b97595e6..ab155ed044 100644 --- a/frappe/translate.py +++ b/frappe/translate.py @@ -363,7 +363,7 @@ def get_messages_from_workflow(doctype=None, app_name=None): 'select distinct message from `tabWorkflow Document State` where parent=%s and message is not null', (w['name'],), as_dict=True) - messages.extend([("Workflow: " + w['name'], states['message']) + messages.extend([("Workflow: " + w['name'], state['message']) for state in states if is_translatable(state['message'])]) actions = frappe.db.sql( From ea9749c5f93fac3274066c15db1466a4acccfc5b Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 5 Oct 2016 17:33:50 +0600 Subject: [PATCH 4/4] bumped to version 7.0.41 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 3aa25b1e7e..e8fbba56c9 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__ = "7.0.40" +__version__ = "7.0.41" local = Local()