summaryrefslogtreecommitdiff
path: root/bin/addons/base/ir/workflow
diff options
context:
space:
mode:
authorHarry (OpenERP) <hmo@tinyerp.com>2010-10-01 16:36:58 +0530
committerHarry (OpenERP) <hmo@tinyerp.com>2010-10-01 16:36:58 +0530
commitfeed93480113e3000b26c0b7da6cc22bab86dc31 (patch)
tree542c9a727b4dd2a8b0bb89e1d4b30d88cdba56e0 /bin/addons/base/ir/workflow
parent1d0b30bbe13446f9e0fb88b65503e9561f0ce1a6 (diff)
parent34230abf26b0570018362826626f818a0cd7c4ff (diff)
[MERGE]
bzr revid: hmo@tinyerp.com-20101001110658-zrmg32f4hmwc21ww
Diffstat (limited to 'bin/addons/base/ir/workflow')
-rw-r--r--bin/addons/base/ir/workflow/workflow_view.xml46
1 files changed, 26 insertions, 20 deletions
diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml
index 3fb98efb8f9..c3e5c3f3c98 100644
--- a/bin/addons/base/ir/workflow/workflow_view.xml
+++ b/bin/addons/base/ir/workflow/workflow_view.xml
@@ -15,11 +15,11 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Workflow">
- <group col="6" colspan="4" >
- <field name="name"/>
- <field name="osv"/>
- <field name="on_create"/>
- </group>
+ <group col="6" colspan="4" >
+ <field name="name"/>
+ <field name="osv"/>
+ <field name="on_create"/>
+ </group>
<separator colspan="4" string="Activities"/>
<field colspan="4" name="activities" nolabel="1"/>
</form>
@@ -94,10 +94,10 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Activity">
- <group col="6" colspan="4">
- <field name="name"/>
- <field name="wkf_id"/>
- <field name="kind"/>
+ <group col="6" colspan="4">
+ <field name="name"/>
+ <field name="wkf_id"/>
+ <field name="kind"/>
</group>
<group colspan="2">
<field name="flow_start"/>
@@ -181,9 +181,9 @@
<field name="action_id"/>
<field name="action"/>
<newline/>
- <group expand="0" string="Group By...">
- <filter string="Workflow" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'wkf_id'}"/>
- </group>
+ <group expand="0" string="Group By...">
+ <filter string="Workflow" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'wkf_id'}"/>
+ </group>
</search>
</field>
</record>
@@ -210,14 +210,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Transition">
- <group col="6" colspan ="4">
- <field name="act_from"/>
- <field name="act_to"/>
- <field name="signal"/>
- <field name="condition"/>
- <field name="trigger_model"/>
- <field name="trigger_expr_id"/>
- <field name="role_id"/>
+ <group col="6" colspan ="4">
+ <field name="act_from"/>
+ <field name="act_to"/>
+ <field name="signal"/>
+ <field name="condition"/>
+ <field name="trigger_model"/>
+ <field name="trigger_expr_id"/>
+ <field name="role_id"/>
</group>
</form>
</field>
@@ -299,6 +299,8 @@
<field name="type">search</field>
<field name="arch" type="xml">
<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="res_id"/>
@@ -313,6 +315,7 @@
<field name="res_model">workflow.instance</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_workflow_instance_tree"/>
+ <field name="context">{'search_default_active':1}</field>
<field name="search_view_id" ref="view_workflow_instance_search"/>
</record>
<menuitem action="action_workflow_instance_form" id="menu_workflow_instance" parent="base.menu_low_workflow"/>
@@ -355,6 +358,8 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Workflow Workitems">
+ <filter icon="terp-camera_test" string="Active" name="active" domain="[('state','=','active')]"/>
+ <separator orientation="vertical"/>
<field name="act_id"/>
<field name="subflow_id"/>
<field name="inst_id"/>
@@ -368,6 +373,7 @@
<field name="res_model">workflow.workitem</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_workflow_workitem_tree"/>
+ <field name="context">{'search_default_active':1}</field>
<field name="search_view_id" ref="view_workflow_workitem_search"/>
</record>
<menuitem action="action_workflow_workitem_form" id="menu_workflow_workitem" parent="base.menu_low_workflow"/>