Merge with openobject-addons

bzr revid: ruchakpatel@gmail.com-20080917114446-29unqnjx5mke7pfn

1 files changed, 163 insertions, 173 deletions

diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index dfafcf1c90e..ac3020cea59 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -2,186 +2,176 @@
 <openerp>
 <data>
 
-	<menuitem
-		id="menu_process"
-		name="Enterprise Process"
-		parent="base.menu_custom"/>
+    <menuitem
+        id="menu_process"
+        name="Enterprise Process"
+        parent="base.menu_custom"/>
 
-	<!-- Views for Process -->
-	<record model="ir.ui.view" id="view_process_form">
-		<field name="name">process.process.form</field>
-		<field name="model">process.process</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Process">
-				<notebook>
-				<page string="Process">
-					<field name="name" select="1"/>
-					<field name="active" select="2"/>
-					<field name="note" colspan="4"/>
-				</page><page string="Nodes">
-					<field name="node_ids" colspan="4" nolabel="1"/>
-				</page>
-				</notebook>
-			</form>
-		</field>
-	</record>
+    <!-- Views for Process -->
+    <record model="ir.ui.view" id="view_process_form">
+        <field name="name">process.process.form</field>
+        <field name="model">process.process</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Process">
+                <group colspan="4" string="Details">
+                    <field name="name" select="1"/>
+                    <field name="active" select="2"/>
+                </group>
+                <notebook colspan="4">
+                    <page string="Nodes">
+                        <field name="node_ids" colspan="4" nolabel="1">
+                            <form string="Process Node">
+                                <group colspan="4" string="Details">
+                                    <field name="name" select="1"/>
+                                    <field name="flow_start"/>
+                                    <newline/>                                    
+                                    <field name="model_id" select="1"/>
+                                    <field name="menu_id" select="2"/>                                    
+                                    <newline/>
+                                    <field name="kind" select="1"/>
+                                    <field name="model_states"/>
+                                </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"/>
+                                                </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="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="Extra Information">
+                                        <field name="note" nolabel="1" colspan="4"/>
+                                    </page>
+                                </notebook>
+                            </form>                            
+                        </field>
+                    </page>
+                    <page string="Extra Information">
+                        <field name="note" colspan="4" nolabel="1"/>
+                    </page>
+                </notebook>
+            </form>
+        </field>
+    </record>
 
-	<record model="ir.ui.view" id="view_process_tree">
-		<field name="name">process.process.tree</field>
-		<field name="model">process.process</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Process">
-				<field name="name"/>
-				<field name="active"/>
-			</tree>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_process_tree">
+        <field name="name">process.process.tree</field>
+        <field name="model">process.process</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Process">
+                <field name="name"/>
+                <field name="active"/>
+            </tree>
+        </field>
+    </record>
 
-	<record model="ir.actions.act_window" id="action_process_form">
-		<field name="name">Process</field>
-		<field name="res_model">process.process</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-	</record>
-	<menuitem
-		id="menu_process_form"
-		action="action_process_form"
-		parent="menu_process"/>
+    <record model="ir.actions.act_window" id="action_process_form">
+        <field name="name">Process</field>
+        <field name="res_model">process.process</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+    <menuitem
+        id="menu_process_form"
+        action="action_process_form"
+        parent="menu_process"/>
 
-	<!-- Views for Process Nodes -->
+    <!-- Transitions -->
 
-	<record model="ir.ui.view" id="view_process_node_tree">
-		<field name="name">process.node.tree</field>
-		<field name="model">process.node</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Process Node">
-				<field name="name"/>
-				<field name="process_id"/>
-				<field name="flow_start"/>
-				<field name="kind"/>
-				<field name="model_id"/>
-			</tree>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_process_transition_tree">
+        <field name="name">process.transition.tree</field>
+        <field name="model">process.transition</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Process Transition">
+                <field name="name"/>
+                <field name="source_node_id"/>
+                <field name="target_node_id"/>
+            </tree>
+        </field>
+    </record>
 
-	<record model="ir.ui.view" id="view_process_node_form">
-		<field name="name">process.node.form</field>
-		<field name="model">process.node</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Process Node">
-				<notebook>
-					<page string="Node Description">
-						<field name="name" select="1"/>
-						<newline/>
-						<field name="process_id" select="1"/>
-						<field name="flow_start"/>
-						<field name="kind" select="1"/>
-						<field name="model_id" select="1"/>
-						<field name="model_states"/>
-						<newline/>
-						<field name="menu_id" select="2"/>
-						<separator string="Outgoing Transitions" colspan="4"/>
-						<field name="transition_out" colspan="4" nolabel="1">
-							<tree string="Outgoing Transitions">
-								<field name="name"/>
-								<field name="node_to_id"/>
-							</tree>
-							<form string="Outgoing Transitions">
-								<notebook>
-								<page string="Description">
-									<field name="name"/>
-									<newline/>
-									<field name="node_from_id"/>
-									<field name="node_to_id"/>
-									<field name="note" colspan="4"/>
-								</page><page string="Transitions">
-									<field name="action_ids" colspan="4"/>
-									<field name="transition_ids" colspan="4"/>
-								</page>
-								</notebook>
-							</form>
-						</field>
-					</page>
-					<page string="Extra Information">
-						<field name="note" nolabel="1" colspan="4"/>
-					</page>
-				</notebook>
-			</form>
-		</field>
-	</record>
+    <record model="ir.ui.view" id="view_process_transition_form">
+        <field name="name">process.transition.form</field>
+        <field name="model">process.transition</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Process Transition">
+                <group string="Details">
+                    <field name="name" select="1"/>
+                    <newline/>
+                    <field name="source_node_id" select="1"/>
+                    <field name="target_node_id" select="1"/>
+                </group>
+                <notebook colspan="4">
+                    <page string="Actions">
+                        <field name="action_ids" nolabel="1" colspan="4">
+                            <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">
+                        <field name="transition_ids" nolabel="1" colspan="4"/>
+                    </page><page string="Notes">
+                        <field name="note" nolabel="1" colspan="4"/>
+                    </page>
+                </notebook>
+            </form>
+        </field>
+    </record>
 
-	<record model="ir.actions.act_window" id="action_process_node_form">
-		<field name="name">Process Node</field>
-		<field name="res_model">process.node</field>
-		<field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-	</record>
-	<menuitem 
-		action="action_process_node_form" 
-		parent="menu_process" 
-		id="menu_partner_address_form"/>
-
-
-	<!-- Views for Partners -->
-	<record model="ir.ui.view" id="view_transition_form">
-		<field name="name">Process Transitions</field>
-		<field name="model">process.transition</field>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<form string="Transitions">
-				<notebook>
-				<page string="Description">
-					<field name="name"/>
-					<newline/>
-					<field name="node_from_id"/>
-					<field name="node_to_id"/>
-					<field name="note" colspan="4"/>
-				</page><page string="Transitions">
-					<field name="action_ids" colspan="4">
-						<tree string="Actions">
-							<field name="name"/>
-							<field name="state"/>
-							<field name="action"/>
-						</tree>
-						<form string="Actions">
-							<field name="name"/>
-							<newline/>
-							<field name="state"/>
-							<field name="action"/>
-						</form>
-					</field>
-					<field name="transition_ids" colspan="4"/>
-				</page>
-				</notebook>
-			</form>
-		</field>
-	</record>
-	<record model="ir.ui.view" id="view_transition_tree">
-		<field name="name">Process Transitions</field>
-		<field name="model">process.transition</field>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<tree string="Transitions">
-				<field name="name"/>
-				<field name="node_from_id"/>
-				<field name="node_to_id"/>
-			</tree>
-		</field>
-	</record>
-
-	<record model="ir.actions.act_window" id="action_transition_open">
-		<field name="name">Process Transitions</field>
-		<field name="res_model">process.transition</field>
-		<field name="view_type">form</field>
-	</record>
-	<menuitem 
-		action="action_transition_open"
-		parent="menu_process"
-		id="menu_action_transition_open"/>
+    <record model="ir.actions.act_window" id="action_process_transition_form">
+        <field name="name">Process Transitions</field>
+        <field name="res_model">process.transition</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+    <menuitem
+        id="menu_process_transition_form"
+        action="action_process_transition_form"
+        parent="menu_process"/>
 
 </data>
 </openerp>