[MERGE] latest trunk

bzr revid: abo@openerp.com-20120917114455-nygv16c93qwcwnsx

1 files changed, 8 insertions, 28 deletions

diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index c5c152f9930..7e0f9c25f47 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -11,7 +11,6 @@
     <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" version="7.0">
                 <sheet>
@@ -97,7 +96,6 @@
     <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"/>
@@ -110,15 +108,10 @@
     <record id="view_process_filter" model="ir.ui.view">
             <field name="name">process.process.filter</field>
             <field name="model">process.process</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Process">
-                    <group>
-                        <field name="name" string="Process"/>
-                        <separator orientation="vertical"/>
-                        <field name="model_id"/>
-                    </group>
-                    <newline/>
+                    <field name="name" string="Process"/>
+                    <field name="model_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
                     </group>
@@ -142,7 +135,6 @@
     <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 Nodes">
                 <field name="name"/>
@@ -157,7 +149,6 @@
     <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" version="7.0">
                 <sheet layout="auto">
@@ -214,16 +205,11 @@
     <record id="view_process_node_filter" model="ir.ui.view">
         <field name="name">process.node.filter</field>
         <field name="model">process.node</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search ProcessNode">
-                <group>
-                    <field name="name" string="Process Node"/>
-                    <separator orientation="vertical"/>
-                    <field name="model_id"/>
-                    <field name="kind" />
-                </group>
-                <newline/>
+                <field name="name" string="Process Node"/>
+                <field name="kind" />
+                <field name="model_id"/>
                 <group expand="0" string="Group By...">
                     <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
                     <filter string="Kind Of Node" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'kind'}"/>
@@ -250,7 +236,6 @@
     <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"/>
@@ -263,7 +248,6 @@
     <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" version="7.0">
                 <sheet >
@@ -307,15 +291,11 @@
     <record id="view_process_transition_filter" model="ir.ui.view">
         <field name="name">process.transition.filter</field>
         <field name="model">process.transition</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Process Transition">
-                <group>
-                    <field name="name" string="Process Transition"/>
-                    <separator orientation="vertical"/>
-                    <field name="source_node_id"/>
-                    <field name="target_node_id"/>
-                </group>
+                <field name="name" string="Process Transition"/>
+                <field name="source_node_id"/>
+                <field name="target_node_id"/>
 <!--
                 <newline/>
                 <group expand="0" string="Group By..." colspan="4" col="4">