diff --git a/bin/addons/base/base_menu.xml b/bin/addons/base/base_menu.xml index b37b78f6740..9aab35b5d81 100644 --- a/bin/addons/base/base_menu.xml +++ b/bin/addons/base/base_menu.xml @@ -21,7 +21,7 @@ groups="base.group_extended"/> - diff --git a/bin/addons/base/ir/workflow/workflow.py b/bin/addons/base/ir/workflow/workflow.py index 8074d784e3c..30fd666c03e 100644 --- a/bin/addons/base/ir/workflow/workflow.py +++ b/bin/addons/base/ir/workflow/workflow.py @@ -171,7 +171,6 @@ class wkf_instance(osv.osv): _log_access = False _columns = { 'wkf_id': fields.many2one('workflow', 'Workflow', ondelete='cascade', select=True), - 'uid': fields.integer('User ID'), 'res_id': fields.integer('Resource ID', select=True), 'res_type': fields.char('Resource Object', size=64, select=True), 'state': fields.char('State', size=32, select=True), @@ -194,6 +193,7 @@ class wkf_workitem(osv.osv): _rec_name = 'state' _columns = { 'act_id': fields.many2one('workflow.activity', 'Activity', required=True, ondelete="cascade", select=True), + 'wkf_id': fields.related('act_id','wkf_id', type='many2one', relation='workflow', string='Workflow'), 'subflow_id': fields.many2one('workflow.instance', 'Subflow', ondelete="cascade", select=True), 'inst_id': fields.many2one('workflow.instance', 'Instance', required=True, ondelete="cascade", select=True), 'state': fields.char('State', size=64, select=True), diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml index c3e5c3f3c98..9adbec0fc56 100644 --- a/bin/addons/base/ir/workflow/workflow_view.xml +++ b/bin/addons/base/ir/workflow/workflow_view.xml @@ -272,7 +272,6 @@
- @@ -286,7 +285,6 @@ - @@ -301,8 +299,7 @@ - - + @@ -332,6 +329,7 @@ form + @@ -345,6 +343,7 @@ tree + @@ -360,6 +359,7 @@ + diff --git a/bin/addons/base/res/res_request_view.xml b/bin/addons/base/res/res_request_view.xml index 53b7044f8ff..7cec248b990 100644 --- a/bin/addons/base/res/res_request_view.xml +++ b/bin/addons/base/res/res_request_view.xml @@ -42,7 +42,7 @@ -