From 54fcaab94d66b40762925e8e5b09867a5c2e954d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sun, 3 Apr 2011 15:06:44 +0200
Subject: [PATCH] Merge tree and list views

---
 address.xml       |  2 --
 category.xml      | 46 +++++++++++++++++++++++-----------------------
 configuration.xml |  1 -
 party.xml         |  3 ---
 4 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/address.xml b/address.xml
index 85910e419d..078f0627e0 100644
--- a/address.xml
+++ b/address.xml
@@ -60,7 +60,6 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.action.act_window" id="act_address_form">
             <field name="name">Addresses</field>
             <field name="res_model">party.address</field>
-            <field name="view_type">form</field>
         </record>
         <record model="ir.action.act_window.view" id="act_address_form_view1">
             <field name="sequence" eval="10"/>
@@ -78,7 +77,6 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.action.act_window" id="act_address_form2">
             <field name="name">Addresses</field>
             <field name="res_model">party.address</field>
-            <field name="view_type">form</field>
         </record>
         <record model="ir.action.act_window.view" id="act_address_form2_view1">
             <field name="sequence" eval="10"/>
diff --git a/category.xml b/category.xml
index a90751ecef..69ef0c284e 100644
--- a/category.xml
+++ b/category.xml
@@ -27,6 +27,19 @@ this repository contains the full copyright notices and license terms. -->
                 <![CDATA[
                 <tree string="Categories" fill="1">
                     <field name="name" select="1"/>
+                    <field name="parent" tree_invisible="1"/>
+                    <field name="childs" tree_invisible="1"/>
+                </tree>
+                ]]>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="category_view_list">
+            <field name="model">party.category</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <tree string="Categories" fill="1">
+                    <field name="rec_name" select="1"/>
                 </tree>
                 ]]>
             </field>
@@ -34,7 +47,6 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.action.act_window" id="act_category_tree">
             <field name="name">Categories</field>
             <field name="res_model">party.category</field>
-            <field name="view_type">tree</field>
             <field name="domain">[('parent', '=', False)]</field>
         </record>
         <record model="ir.action.act_window.view" id="act_category_tree_view1">
@@ -42,43 +54,31 @@ this repository contains the full copyright notices and license terms. -->
             <field name="view" ref="category_view_tree"/>
             <field name="act_window" ref="act_category_tree"/>
         </record>
+        <record model="ir.action.act_window.view" id="act_category_tree_view2">
+            <field name="sequence" eval="20"/>
+            <field name="view" ref="category_view_form"/>
+            <field name="act_window" ref="act_category_tree"/>
+        </record>
+
         <menuitem parent="menu_party"
             action="act_category_tree" id="menu_category_tree"/>
 
         <record model="ir.action.act_window" id="act_category_form">
             <field name="name">Categories</field>
             <field name="res_model">party.category</field>
-            <field name="view_type">form</field>
         </record>
         <record model="ir.action.act_window.view" id="act_category_form_view1">
             <field name="sequence" eval="10"/>
-            <field name="view" ref="category_view_tree"/>
+            <field name="view" ref="category_view_form"/>
             <field name="act_window" ref="act_category_form"/>
         </record>
         <record model="ir.action.act_window.view" id="act_category_form_view2">
             <field name="sequence" eval="20"/>
-            <field name="view" ref="category_view_form"/>
+            <field name="view" ref="category_view_list"/>
             <field name="act_window" ref="act_category_form"/>
         </record>
-        <menuitem parent="menu_configuration"
-            action="act_category_form" id="menu_category_form" sequence="10"/>
-        <record model="ir.action.act_window" id="act_category_form2">
-            <field name="name">Categories</field>
-            <field name="res_model">party.category</field>
-            <field name="view_type">form</field>
-        </record>
-        <record model="ir.action.act_window.view" id="act_category_form2_view1">
-            <field name="sequence" eval="10"/>
-            <field name="view" ref="category_view_form"/>
-            <field name="act_window" ref="act_category_form2"/>
-        </record>
-        <record model="ir.action.act_window.view" id="act_category_form2_view2">
-            <field name="sequence" eval="20"/>
-            <field name="view" ref="category_view_tree"/>
-            <field name="act_window" ref="act_category_form2"/>
-        </record>
-        <menuitem name="New category" parent="menu_category_form"
-              action="act_category_form2" id="menu_category_form2"/>
+        <menuitem name="New Category" parent="menu_category_tree"
+              action="act_category_form" id="menu_category_form"/>
 
         <record model="ir.model.access" id="access_party_category">
             <field name="model" search="[('model', '=', 'party.category')]"/>
diff --git a/configuration.xml b/configuration.xml
index 416e826d74..06fb820bdf 100644
--- a/configuration.xml
+++ b/configuration.xml
@@ -20,7 +20,6 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.action.act_window" id="act_party_configuration_form">
             <field name="name">Party Configuration</field>
             <field name="res_model">party.configuration</field>
-            <field name="view_type">form</field>
         </record>
         <record model="ir.action.act_window.view"
             id="act_party_configuration_view1">
diff --git a/party.xml b/party.xml
index 24bda1b694..f4158c86b7 100644
--- a/party.xml
+++ b/party.xml
@@ -100,7 +100,6 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.action.act_window" id="act_party_form">
             <field name="name">Parties</field>
             <field name="res_model">party.party</field>
-            <field name="view_type">form</field>
         </record>
         <record model="ir.action.act_window.view" id="act_party_form_view1">
             <field name="sequence" eval="10"/>
@@ -117,7 +116,6 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.action.act_window" id="act_party_form2">
             <field name="name">Parties</field>
             <field name="res_model">party.party</field>
-            <field name="view_type">form</field>
         </record>
         <record model="ir.action.act_window.view" id="act_party_form2_view1">
             <field name="sequence" eval="10"/>
@@ -134,7 +132,6 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.action.act_window" id="act_party_by_category">
             <field name="name">Parties by Category</field>
             <field name="res_model">party.party</field>
-            <field name="view_type">form</field>
             <field name="context">{'categories': [Eval('active_id')]}</field>
             <field name="domain">[('categories', 'child_of', [Eval('active_id')], 'parent')]</field>
         </record>