diff options
| author | P. Christeas <p_christ@hol.gr> | 2008-11-04 22:12:38 +0200 |
|---|---|---|
| committer | P. Christeas <p_christ@hol.gr> | 2008-11-04 22:12:38 +0200 |
| commit | 8220e0ad02c27bbcdae91a0a04aa7e0d1cf72cef (patch) | |
| tree | ad40bb98b0fb987e07a4a48647d60509ad107a6d /bin/addons/base/ir/workflow/workflow_view.xml | |
| parent | 97e946c466d1dce6cb62c52ac627a2be0721cd63 (diff) | |
| parent | 1f1556ffba922823a7771ac41c1d7f3fdbaf4a29 (diff) | |
Merge commit 'origin/master' into mdv-gpl3
Conflicts:
bin/tools/convert.py
bzr revid: p_christ@hol.gr-20081025224421-g367ati5b2eeplw6
bzr revid: p_christ@hol.gr-20081104201238-oy0vgsunt2jxgu2p
Diffstat (limited to 'bin/addons/base/ir/workflow/workflow_view.xml')
| -rw-r--r-- | bin/addons/base/ir/workflow/workflow_view.xml | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml index ac1d3d4957b..20f1cf1685b 100644 --- a/bin/addons/base/ir/workflow/workflow_view.xml +++ b/bin/addons/base/ir/workflow/workflow_view.xml @@ -43,13 +43,13 @@ <field name="view_id" ref="view_workflow_tree"/> </record> <menuitem action="action_workflow_form" id="menu_workflow" parent="base.menu_workflow_root"/> - + <!-- - ================================ - Activities - ================================ - --> - + ================================ + Activities + ================================ + --> + <record id="view_workflow_activity_form" model="ir.ui.view"> <field name="name">workflow.activity.form</field> <field name="model">workflow.activity</field> @@ -59,9 +59,9 @@ <field colspan="4" name="name" select="1"/> <field name="wkf_id" select="1"/> <field name="kind" select="1"/> - <field name="action" select="1"/> - <field name="action_id" select="1"/> - <field name="subflow_id"/> + <field name="action_id" select="1" colspan="4"/> + <field name="action" select="1" colspan="4" attrs="{'readonly':[('kind','=','dummy')]}"/> + <field name="subflow_id" attrs="{'readonly':[('kind','<>','subflow')]}"/> <field name="signal_send"/> <newline/> <field name="flow_start"/> @@ -77,9 +77,7 @@ <field name="condition"/> <field name="trigger_model"/> <field name="trigger_expr_id"/> - </tree> - </field> <separator colspan="4" string="Incoming transitions"/> <field colspan="4" name="in_transitions" nolabel="1"> |