[MERGE]

bzr revid: hmo@tinyerp.com-20100826081106-w5le4x3vbyqghhfi

diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index 2b94827..b743c82 100644 (file)
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -15,10 +15,10 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Process">
-                <group colspan="4" string="Details">
-                    <field name="name" select="1"/>
+                <group colspan="4" col="6">
+                    <field name="name"/>
+                    <field name="model_id"/>
                     <field name="active"/>
-                    <field name="model_id" select="1"/>
                 </group>
                 <notebook colspan="4">
                     <page string="Nodes">
@@ -30,80 +30,54 @@
                                 <field name="flow_start"/>
                             </tree>
                             <form string="Process Node">
-                                <group colspan="4" string="Details">
-                                    <field name="name" select="1"/>
+                                <group colspan="4" col="4">
+                                    <field name="name"/>
                                     <field name="flow_start"/>
-                                    <field name="process_id" readonly="1" required="0"/> <!-- used by transition_out -->
-                                    <newline/>
-                                    <field name="model_id" select="1"/>
-                                    <field name="menu_id"/>
-                                    <newline/>
                                     <field name="kind" select="1"/>
-                                    <field name="help_url" widget="url"/>
-                                    <field name="model_states"/>
-                                    <field name="subflow_id" domain="[('name', '!=', parent.name)]" attrs="{'readonly':[('kind','=','state')]}"/>
+                                    <field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
+                        
                                 </group>
                                 <notebook colspan="4">
-                                    <page string="Outgoing Transitions">
-                                        <field name="transition_out" colspan="4" nolabel="1">
-                                            <tree string="Transitions">
-                                                <field name="name"/>
-                                                <field name="target_node_id"/>
-                                            </tree>
-                                            <form string="Transition">
-                                                <group colspan="4" string="Details">
-                                                    <field name="name"/>
-                                                    <newline/>
-                                                    <field name="target_node_id" domain="[('process_id', '=', parent.process_id)]"/>
-                                                </group>
-                                                <notebook colspan="4">
-                                                    <page string="Buttons">
-                                                        <field name="action_ids" colspan="4" nolabel="1">
-                                                            <tree string="Actions">
-                                                                <field name="name"/>
-                                                                <field name="state"/>
-                                                                <field name="action"/>
-                                                            </tree>
-                                                            <form string="Actions">
-                                                                <field name="name" colspan="4"/>
-                                                                <newline/>
-                                                                <field name="state"/>
-                                                                <field name="action"/>
-                                                            </form>
-                                                        </field>
-                                                    </page>
-                                                    <page string="Roles Required">
-                                                        <field name="role_ids" colspan="4" nolabel="1"/>
-                                                    </page>
-                                                    <page string="Roles from Workflow">
-                                                        <field name="transition_ids" colspan="4" nolabel="1"/>
-                                                    </page>
-                                                    <page string="Extra Information">
-                                                        <field name="note" colspan="4" nolabel="1"/>
-                                                    </page>
-                                                </notebook>
-                                            </form>
-                                        </field>
-                                    </page>
-                                    <page string="Conditions">
-                                        <field name="condition_ids" nolabel="1" colspan="4">
-                                            <tree string="Conditions">
-                                                <field name="name"/>
-                                                <field name="model_id"/>
-                                                <field name="model_states"/>
-                                            </tree>
-                                            <form string="Condition">
-                                                <field name="name"/>
-                                                <field name="model_id"/>
-                                                <newline/>
-                                                <field name="model_states" colspan="4"/>
-                                            </form>
-                                        </field>
-                                    </page>
-                                    <page string="Extra Information">
-                                        <field name="note" nolabel="1" colspan="4"/>
-                                    </page>
-                                </notebook>
+                                       <page string="Properties">
+                                               <group colspan="4" col="6">
+                                                   <field name="model_id" select="1"/>
+                                                   <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>
@@ -180,80 +154,55 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Process Node">
-                <group colspan="4" string="Details">
-                    <field name="name" select="1"/>
-                    <field name="flow_start"/>
+                <group colspan="4" col="6">
+                    <field name="name"/>
                     <field name="process_id"/>
-                    <newline/>
-                    <field name="model_id" select="1"/>
-                    <field name="menu_id"/>
-                    <newline/>
+                    <field name="flow_start"/>
                     <field name="kind" select="1"/>
-                    <field name="help_url" widget="url"/>
-                    <field name="model_states"/>
-                    <field name="subflow_id" attrs="{'readonly':[('kind','=','state')]}"/>
+                    <field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
+                    
                 </group>
                 <notebook colspan="4">
-                    <page string="Outgoing Transitions">
-                        <field name="transition_out" colspan="4" nolabel="1">
-                            <tree string="Transitions">
-                                <field name="name"/>
-                                <field name="target_node_id"/>
-                            </tree>
-                            <form string="Transition">
-                                <group colspan="4" string="Details">
-                                    <field name="name"/>
-                                    <newline/>
-                                    <field name="target_node_id" domain="[('process_id', '=', parent.process_id)]"/>
-                                </group>
-                                <notebook colspan="4">
-                                    <page string="Buttons">
-                                        <field name="action_ids" colspan="4" nolabel="1">
-                                            <tree string="Actions">
-                                                <field name="name"/>
-                                                <field name="state"/>
-                                                <field name="action"/>
-                                            </tree>
-                                            <form string="Actions">
-                                                <field name="name" colspan="4"/>
-                                                <newline/>
-                                                <field name="state"/>
-                                                <field name="action"/>
-                                            </form>
-                                        </field>
-                                    </page>
-                                    <page string="Roles Required">
-                                        <field name="role_ids" colspan="4" nolabel="1"/>
-                                    </page>
-                                    <page string="Roles from Workflow">
-                                        <field name="transition_ids" colspan="4" nolabel="1"/>
-                                    </page>
-                                    <page string="Extra Information">
-                                        <field name="note" colspan="4" nolabel="1"/>
-                                    </page>
-                                </notebook>
-                            </form>
-                        </field>
-                    </page>
-                    <page string="Conditions">
-                        <field name="condition_ids" nolabel="1" colspan="4">
-                            <tree string="Conditions">
-                                <field name="name"/>
-                                <field name="model_id"/>
-                                <field name="model_states"/>
-                            </tree>
-                            <form string="Condition">
-                                <field name="name"/>
-                                <field name="model_id"/>
-                                <newline/>
-                                <field name="model_states" colspan="4"/>
-                            </form>
-                        </field>
-                    </page>
-                    <page string="Extra Information">
-                        <field name="note" nolabel="1" colspan="4"/>
-                    </page>
-                </notebook>
+                       <page string="Properties">
+                               <group colspan="4" col="6">
+                                   <field name="model_id" select="1"/>
+                                   <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>
     </record>