diff options
| author | uco (Open ERP) <uco@tinyerp.com> | 2010-08-26 11:20:54 +0530 |
|---|---|---|
| committer | uco (Open ERP) <uco@tinyerp.com> | 2010-08-26 11:20:54 +0530 |
| commit | 8ec99b95d536b385e6acf83ec85d4cd5ee2ac2db (patch) | |
| tree | d6c0262e822e8c3b1974e625895181e2afdaaf05 /bin/addons | |
| parent | a7c77ed348b98e44c128250080a47e22c1b79702 (diff) | |
[IMP] base: Improved views of Workflow activities and Request.
bzr revid: uco@tinyerp.com-20100826055054-8zoixe7souvqx38e
Diffstat (limited to 'bin/addons')
| -rw-r--r-- | bin/addons/base/ir/workflow/workflow_view.xml | 82 | ||||
| -rw-r--r-- | bin/addons/base/res/res_request_view.xml | 4 |
2 files changed, 45 insertions, 41 deletions
diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml index 4f70d77f119..a0f016e94c9 100644 --- a/bin/addons/base/ir/workflow/workflow_view.xml +++ b/bin/addons/base/ir/workflow/workflow_view.xml @@ -99,45 +99,49 @@ <field name="flow_start"/> <field name="flow_stop"/> </group> - <separator string="Properties" colspan="4"/> - <group colspan="4" col="6"> - <group colspan="1" col="2"> - <separator string="Subflow" colspan="2"/> - <field name="subflow_id" attrs="{'readonly':[('kind','<>','subflow')]}"/> - <field name="signal_send"/> - </group> - <group colspan="1" col="2"> - <separator string="Conditions" colspan="2"/> - <field name="split_mode"/> - <field name="join_mode"/> - </group> - <group colspan="4" col="2"> - <separator string="Actions" colspan="2"/> - <field name="action_id"/> - <field name="action" attrs="{'readonly':[('kind','=','dummy')]}"/> - </group> - </group> - <separator string="Transitions" colspan="4"/> - <group colspan="4" col="4"> - <group col="2" colspan="2"> - <field name="in_transitions" nolabel="1"> - <tree string="Incoming Transitions"> - <field name="act_from"/> - <field name="signal"/> - <field name="condition"/> - </tree> - </field> - </group> - <group col="2" colspan="2"> - <field name="out_transitions" nolabel="1"> - <tree string="Outgoing Transitions"> - <field name="act_to"/> - <field name="signal"/> - <field name="condition"/> - </tree> - </field> - </group> - </group> + <notebook colspan="4"> + <page string="Properties"> + <group colspan="4" col="6"> + <group colspan="1" col="2"> + <separator string="Subflow" colspan="2"/> + <field name="subflow_id" attrs="{'readonly':[('kind','<>','subflow')]}"/> + <field name="signal_send"/> + </group> + <group colspan="1" col="2"> + <separator string="Conditions" colspan="2"/> + <field name="split_mode"/> + <field name="join_mode"/> + </group> + <group colspan="1" col="2"> + <separator string="Actions" colspan="2"/> + <field name="action_id"/> + <field name="action" attrs="{'readonly':[('kind','=','dummy')]}"/> + </group> + </group> + </page> + <page string="Transitions"> + <group colspan="4" col="4"> + <group col="2" colspan="2"> + <field name="in_transitions" nolabel="1" height="400"> + <tree string="Incoming Transitions"> + <field name="act_from"/> + <field name="signal"/> + <field name="condition"/> + </tree> + </field> + </group> + <group col="2" colspan="2"> + <field name="out_transitions" nolabel="1" height="400"> + <tree string="Outgoing Transitions"> + <field name="act_to"/> + <field name="signal"/> + <field name="condition"/> + </tree> + </field> + </group> + </group> + </page> + </notebook> </form> </field> </record> diff --git a/bin/addons/base/res/res_request_view.xml b/bin/addons/base/res/res_request_view.xml index 1853682908f..ffc50168861 100644 --- a/bin/addons/base/res/res_request_view.xml +++ b/bin/addons/base/res/res_request_view.xml @@ -24,7 +24,7 @@ <field name="arch" type="xml"> <form string="Requests"> <group colspan="4" col="6"> - <field name="name"/> + <field name="name" colspan="4"/> <field name="create_date" string="Request Date"/> <newline/> <field name="act_from"/> @@ -38,7 +38,7 @@ <separator colspan="4" string="Description"/> <newline/> <field colspan="4" name="body" nolabel="1"/> - <group col="4" colspan="4"> + <group col="5" colspan="4"> <field name="state"/> <button name="request_close" states="waiting,draft,active" string="End of Request" type="object"/> <button name="request_send" states="draft,active" string="Send" type="object"/> |