From 55a565d0c6e186449f3e08198c522dc3fa1d45a8 Mon Sep 17 00:00:00 2001 From: "uco (Open ERP)" Date: Wed, 25 Aug 2010 14:21:11 +0530 Subject: [PATCH 1/3] [IMP] base: Improved views of Workflow Activities, Workflow transitions and added help for transition fields. bzr revid: uco@tinyerp.com-20100825085111-jmobp7abfi131obf --- bin/addons/base/ir/workflow/workflow.py | 16 ++- bin/addons/base/ir/workflow/workflow_view.xml | 132 +++++++++++------- 2 files changed, 95 insertions(+), 53 deletions(-) diff --git a/bin/addons/base/ir/workflow/workflow.py b/bin/addons/base/ir/workflow/workflow.py index dae77781503..8074d784e3c 100644 --- a/bin/addons/base/ir/workflow/workflow.py +++ b/bin/addons/base/ir/workflow/workflow.py @@ -146,11 +146,17 @@ class wkf_transition(osv.osv): _columns = { 'trigger_model': fields.char('Trigger Object', size=128), 'trigger_expr_id': fields.char('Trigger Expression', size=128), - 'signal': fields.char('Signal (button Name)', size=64), - 'role_id': fields.many2one('res.roles', 'Role Required'), - 'condition': fields.char('Condition', required=True, size=128), - 'act_from': fields.many2one('workflow.activity', 'Source Activity', required=True, select=True, ondelete='cascade'), - 'act_to': fields.many2one('workflow.activity', 'Destination Activity', required=True, select=True, ondelete='cascade'), + 'signal': fields.char('Signal (button Name)', size=64, + help="When the operation of transition comes from a button pressed in the client form, "\ + "signal tests the name of the pressed button. If signal is NULL, no button is necessary to validate this transition."), + 'role_id': fields.many2one('res.roles', 'Role Required', + help="The role that a user must have to validate this transition."), + 'condition': fields.char('Condition', required=True, size=128, + help="Expression to be satisfied if we want the transition done."), + 'act_from': fields.many2one('workflow.activity', 'Source Activity', required=True, select=True, ondelete='cascade', + help="Source activity. When this activity is over, the condition is tested to determine if we can start the ACT_TO activity."), + 'act_to': fields.many2one('workflow.activity', 'Destination Activity', required=True, select=True, ondelete='cascade', + help="The destination activity."), 'wkf_id': fields.related('act_from','wkf_id', type='many2one', relation='workflow', string='Workflow', select=True), } _defaults = { diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml index 8431cdd43d7..27f7ff826f2 100644 --- a/bin/addons/base/ir/workflow/workflow_view.xml +++ b/bin/addons/base/ir/workflow/workflow_view.xml @@ -92,40 +92,52 @@ form
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -138,19 +150,33 @@ - - + + + workflow.activity.search + workflow.activity + search + + + + + + + + + + Activities workflow.activity form + @@ -167,8 +193,8 @@ form
- - + + @@ -186,22 +212,32 @@ - - - + + workflow.transition.search + workflow.transition + search + + + + + + + + - - Transitions - workflow.transition - form - - - + + Transitions + workflow.transition + form + + + + @@ -276,8 +274,8 @@ form - - + + @@ -293,6 +291,17 @@ + + ir.actions.actions.search + ir.actions.actions + search + + + + + + + Actions @@ -300,6 +309,7 @@ ir.actions.actions form + @@ -313,8 +323,8 @@
- - + + @@ -335,14 +345,34 @@ tree - - + + + + + + + ir.filters.search + ir.filters + search + + + + + + + + + + + + + @@ -352,6 +382,7 @@ ir.filters form + @@ -366,8 +397,8 @@ form - - + + @@ -384,6 +415,23 @@ + + ir.actions.report.custom.search + ir.actions.report.custom + search + + + + + + + + + + + + + Report Custom @@ -391,6 +439,7 @@ ir.actions.report.custom form + @@ -455,6 +504,26 @@ + + ir.actions.report.xml.search + ir.actions.report.xml + search + + + + + + + + + + + + + + + + Report Xml @@ -462,6 +531,7 @@ ir.actions.report.xml form + @@ -540,11 +610,31 @@ + + ir.actions.windows.search + ir.actions.act_window + search + + + + + + + + + + + + + + + Window Actions ir.actions.act_window ir.actions.act_window form + @@ -579,20 +669,38 @@ form
- - - + + + - + + + + +
- + + + ir.actions.wizard.search + ir.actions.wizard + search + + + + + + + + + Wizards ir.actions.act_window ir.actions.wizard form + @@ -858,6 +966,24 @@
+ + ir.attachment.search + ir.attachment + search + + + + + + + + + + + + + + Attachments @@ -865,6 +991,7 @@ ir.attachment form + diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml index 27f7ff826f2..4f70d77f119 100644 --- a/bin/addons/base/ir/workflow/workflow_view.xml +++ b/bin/addons/base/ir/workflow/workflow_view.xml @@ -251,11 +251,11 @@ form
- - - - - + + + + + @@ -273,12 +273,27 @@ + + workflow.instance.search + workflow.instance + search + + + + + + + + + + Instances workflow.instance form + @@ -294,10 +309,10 @@ form
- - - - + + + + @@ -314,12 +329,26 @@ + + workflow.workitem.search + workflow.workitem + search + + + + + + + + + Workitems workflow.workitem form + diff --git a/bin/addons/base/res/res_request_view.xml b/bin/addons/base/res/res_request_view.xml index 6fd72238306..1853682908f 100644 --- a/bin/addons/base/res/res_request_view.xml +++ b/bin/addons/base/res/res_request_view.xml @@ -23,56 +23,68 @@ form
- - - + + + + + + + + + + - - - + + + +