diff options
| author | Harry (OpenERP) <hmo@tinyerp.com> | 2010-10-01 17:24:15 +0530 |
|---|---|---|
| committer | Harry (OpenERP) <hmo@tinyerp.com> | 2010-10-01 17:24:15 +0530 |
| commit | ab773ebb3f40826e7fb810bef45077c6bebdb4d6 (patch) | |
| tree | 687a1ad887400c118fae053b6ba054a02d8e57a1 /bin/addons/base/ir/workflow | |
| parent | feed93480113e3000b26c0b7da6cc22bab86dc31 (diff) | |
[IMP] base:
* remove icon on reporting menu
* add wkf_id related field in workitem
* correct close button icon on request form
bzr revid: hmo@tinyerp.com-20101001115415-pbaj7bz46bkkf41l
Diffstat (limited to 'bin/addons/base/ir/workflow')
| -rw-r--r-- | bin/addons/base/ir/workflow/workflow.py | 2 | ||||
| -rw-r--r-- | bin/addons/base/ir/workflow/workflow_view.xml | 8 |
2 files changed, 5 insertions, 5 deletions
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 @@ <field name="arch" type="xml"> <form string="Workflow Instances"> <field name="wkf_id" readonly="1"/> - <field name="uid" readonly="1"/> <field name="res_id" readonly="1"/> <field name="res_type" readonly="1"/> <field name="state" readonly="1"/> @@ -286,7 +285,6 @@ <field name="arch" type="xml"> <tree string="Workflow Instances"> <field name="wkf_id"/> - <field name="uid"/> <field name="res_id"/> <field name="res_type"/> <field name="state"/> @@ -301,8 +299,7 @@ <search string="Workflow Instances"> <filter icon="terp-camera_test" string="Active" domain="[('state','=','active')]" name="active"/> <separator orientation="vertical"/> - <field name="wkf_id"/> - <field name="uid"/> + <field name="wkf_id" widget="selection"/> <field name="res_id"/> <field name="res_type"/> <field name="state"/> @@ -332,6 +329,7 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Workflow Workitems"> + <field name="wkf_id" readonly="1"/> <field name="act_id" readonly="1"/> <field name="subflow_id" readonly="1"/> <field name="inst_id" readonly="1"/> @@ -345,6 +343,7 @@ <field name="type">tree</field> <field name="arch" type="xml"> <tree string="Workflow Workitems"> + <field name="wkf_id"/> <field name="act_id"/> <field name="subflow_id"/> <field name="inst_id"/> @@ -360,6 +359,7 @@ <search string="Workflow Workitems"> <filter icon="terp-camera_test" string="Active" name="active" domain="[('state','=','active')]"/> <separator orientation="vertical"/> + <field name="wkf_id" widget="selection"/> <field name="act_id"/> <field name="subflow_id"/> <field name="inst_id"/> |