[MERGE] lp:~openerp/openobject-addons/trunk-clean_form_view-stw

bzr revid: stw@openerp.com-20120618213057-u21b63az5pqxafig

1 files changed, 142 insertions, 136 deletions

diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index 268820f92d3..7a456fc2d89 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -14,76 +14,78 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Process" version="7.0">
-                <group col="4">
-                    <field name="name"/>
-                    <field name="model_id"/>
-                    <field name="active"/>
-                </group>
-                <notebook colspan="4">
-                    <page string="Nodes">
-                        <field name="node_ids" colspan="4" nolabel="1">
-                            <tree string="Process Nodes">
-                                <field name="name"/>
-                                <field name="model_id"/>
-                                <field name="kind"/>
-                                <field name="flow_start"/>
-                            </tree>
-                            <form string="Process Node" version="7.0">
-                                <group colspan="4" col="4">
+                <sheet>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="model_id"/>
+                        <field name="active"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Nodes">
+                            <field name="node_ids" colspan="4" nolabel="1">
+                                <tree string="Process Nodes">
                                     <field name="name"/>
-                                    <field name="flow_start"/>
+                                    <field name="model_id"/>
                                     <field name="kind"/>
-                                    <field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
-
-                                </group>
-                                <notebook colspan="4">
-                                    <page string="Properties">
-                                        <group colspan="4" col="6">
-                                            <field name="model_id"/>
-                                            <field name="menu_id"/>
-                                            <field name="help_url" widget="url"/>
-                                        </group>
-                                        <separator string="Conditions" colspan="4"/>
-                                        <field name="model_states"/>
-                                        <field name="condition_ids" nolabel="1" colspan="4">
-                                            <tree string="Other Conditions" editable="top">
-                                                <field name="name"/>
+                                    <field name="flow_start"/>
+                                </tree>
+                                <form string="Process Node" version="7.0">
+                                    <group colspan="4" col="4">
+                                        <field name="name"/>
+                                        <field name="flow_start"/>
+                                        <field name="kind"/>
+                                        <field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
+    
+                                    </group>
+                                    <notebook colspan="4">
+                                        <page string="Properties">
+                                            <group colspan="4" col="6">
                                                 <field name="model_id"/>
-                                                <field name="model_states"/>
-                                            </tree>
-                                        </field>
-                                    </page>
-                                    <page string="Transitions">
-                                        <group colspan="4" col="4">
-                                            <group colspan="2" col="2">
-                                                <field name="transition_in" nolabel="1" height="400">
-                                                    <tree string="Incoming Transitions">
-                                                        <field name="name"/>
-                                                        <field name="source_node_id"/>
-                                                    </tree>
-                                                </field>
-                                           </group>
-                                           <group colspan="2" col="2">
-                                                <field name="transition_out" nolabel="1" height="400">
-                                                    <tree string="Outgoing Transitions">
-                                                        <field name="name"/>
-                                                        <field name="target_node_id"/>
-                                                    </tree>
-                                                </field>
-                                           </group>
-                                        </group>
-                                    </page>
-                                    <page string="Notes">
-                                       <field name="note" nolabel="1" colspan="4"/>
-                                    </page>
-                                </notebook>
-                            </form>
-                        </field>
-                    </page>
-                    <page string="Notes">
-                        <field name="note" colspan="4" nolabel="1"/>
-                    </page>
-                </notebook>
+                                                <field name="menu_id"/>
+                                                <field name="help_url" widget="url"/>
+                                            </group>
+                                            <separator string="Conditions" colspan="4"/>
+                                            <field name="model_states"/>
+                                            <field name="condition_ids" nolabel="1" colspan="4">
+                                                <tree string="Other Conditions" editable="top">
+                                                    <field name="name"/>
+                                                    <field name="model_id"/>
+                                                    <field name="model_states"/>
+                                                </tree>
+                                            </field>
+                                        </page>
+                                        <page string="Transitions">
+                                            <group colspan="4" col="4">
+                                                <group colspan="2" col="2">
+                                                    <field name="transition_in" nolabel="1" height="400">
+                                                        <tree string="Incoming Transitions">
+                                                            <field name="name"/>
+                                                            <field name="source_node_id"/>
+                                                        </tree>
+                                                    </field>
+                                               </group>
+                                               <group colspan="2" col="2">
+                                                    <field name="transition_out" nolabel="1" height="400">
+                                                        <tree string="Outgoing Transitions">
+                                                            <field name="name"/>
+                                                            <field name="target_node_id"/>
+                                                        </tree>
+                                                    </field>
+                                               </group>
+                                            </group>
+                                        </page>
+                                        <page string="Notes">
+                                           <field name="note" nolabel="1" colspan="4"/>
+                                        </page>
+                                    </notebook>
+                                </form>
+                            </field>
+                        </page>
+                        <page string="Notes">
+                            <field name="note" colspan="4" nolabel="1"/>
+                        </page>
+                    </notebook>
+                </sheet>
             </form>
         </field>
     </record>
@@ -153,47 +155,49 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Process Node" version="7.0">
-                <group colspan="4" col="6">
-                    <field name="name"/>
-                    <field name="process_id"/>
-                    <field name="flow_start"/>
-                    <field name="kind"/>
-                    <field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
-                </group>
-                <notebook>
-                    <page string="Properties">
-                        <group col="4">
-                            <field name="model_id"/>
-                            <field name="menu_id"/>
-                            <field name="help_url" widget="url"/>
-                            <field name="model_states"/>
-                        </group>
-                        <field name="condition_ids">
-                            <tree string="Other Conditions" editable="bottom">
-                                <field name="name"/>
+                <sheet layout="auto">
+                    <group colspan="4" col="6">
+                        <field name="name"/>
+                        <field name="process_id"/>
+                        <field name="flow_start"/>
+                        <field name="kind"/>
+                        <field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
+                    </group>
+                    <notebook>
+                        <page string="Properties">
+                            <group col="4">
                                 <field name="model_id"/>
+                                <field name="menu_id"/>
+                                <field name="help_url" widget="url"/>
                                 <field name="model_states"/>
-                            </tree>
-                        </field>
-                    </page>
-                    <page string="Transitions">
-                        <field name="transition_in" nolabel="1" height="400">
-                            <tree string="Incoming Transitions">
-                                <field name="name"/>
-                                <field name="source_node_id"/>
-                            </tree>
-                        </field>
-                        <field name="transition_out" nolabel="1" height="400">
-                            <tree string="Outgoing Transitions">
-                                <field name="name"/>
-                                <field name="target_node_id"/>
-                            </tree>
-                        </field>
-                    </page>
-                    <page string="Notes">
-                       <field name="note"/>
-                    </page>
-                </notebook>
+                            </group>
+                            <field name="condition_ids">
+                                <tree string="Other Conditions" editable="bottom">
+                                    <field name="name"/>
+                                    <field name="model_id"/>
+                                    <field name="model_states"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="Transitions">
+                            <field name="transition_in" nolabel="1" height="400">
+                                <tree string="Incoming Transitions">
+                                    <field name="name"/>
+                                    <field name="source_node_id"/>
+                                </tree>
+                            </field>
+                            <field name="transition_out" nolabel="1" height="400">
+                                <tree string="Outgoing Transitions">
+                                    <field name="name"/>
+                                    <field name="target_node_id"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="Notes">
+                           <field name="note"/>
+                        </page>
+                    </notebook>
+                </sheet>
             </form>
         </field>
     </record>
@@ -252,38 +256,40 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Process Transition" version="7.0">
-                <group col="4">
-                    <field name="name"/>
-                    <field name="source_node_id"/>
-                    <field name="target_node_id"/>
-                </group>
-                <notebook>
-                    <page string="Actions">
-                        <field name="action_ids">
-                            <tree string="Actions">
-                                <field name="name"/>
-                                <field name="state"/>
-                                <field name="action"/>
-                            </tree>
-                            <form string="Actions" version="7.0">
-                                <group col="4">
-                                    <field name="name" colspan="4"/>
+                <sheet layout="auto">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="source_node_id"/>
+                        <field name="target_node_id"/>
+                    </group>
+                    <notebook>
+                        <page string="Actions">
+                            <field name="action_ids">
+                                <tree string="Actions">
+                                    <field name="name"/>
                                     <field name="state"/>
                                     <field name="action"/>
-                                </group>
-                            </form>
-                        </field>
-                    </page>
-                    <page string="Workflow Transitions">
-                        <field name="transition_ids"/>
-                    </page>
-                    <page string="Associated Groups">
-                        <field name="group_ids"/>
-                    </page>
-                    <page string="Notes">
-                        <field name="note"/>
-                    </page>
-                </notebook>
+                                </tree>
+                                <form string="Actions" version="7.0">
+                                    <group col="4">
+                                        <field name="name" colspan="4"/>
+                                        <field name="state"/>
+                                        <field name="action"/>
+                                    </group>
+                                </form>
+                            </field>
+                        </page>
+                        <page string="Workflow Transitions">
+                            <field name="transition_ids"/>
+                        </page>
+                        <page string="Associated Groups">
+                            <field name="group_ids"/>
+                        </page>
+                        <page string="Notes">
+                            <field name="note"/>
+                        </page>
+                    </notebook>
+                </sheet>
             </form>
         </field>
     </record>