Merge branch 'hotfix'
This commit is contained in:
commit
c7d567c54d
3 changed files with 5 additions and 1 deletions
|
|
@ -24,7 +24,7 @@ if sys.version[0] == '2':
|
|||
reload(sys)
|
||||
sys.setdefaultencoding("utf-8")
|
||||
|
||||
__version__ = '11.1.12'
|
||||
__version__ = '11.1.13'
|
||||
__title__ = "Frappe Framework"
|
||||
|
||||
local = Local()
|
||||
|
|
|
|||
|
|
@ -202,6 +202,7 @@ def get_error_snapshot_path():
|
|||
|
||||
def get_frame_locals():
|
||||
traceback = sys.exc_info()[2]
|
||||
frames = []
|
||||
if traceback:
|
||||
frames = inspect.getinnerframes(traceback, context=0)
|
||||
_locals = ['Locals (most recent call last):']
|
||||
|
|
|
|||
|
|
@ -17,6 +17,9 @@ class WorkflowAction(Document):
|
|||
pass
|
||||
|
||||
|
||||
def on_doctype_update():
|
||||
frappe.db.add_index("Workflow Action", ["status", "user"])
|
||||
|
||||
def get_permission_query_conditions(user):
|
||||
if not user: user = frappe.session.user
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue