From 6928970438e0989d678a70117dbba5cd504302ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Tue, 31 Jan 2012 23:35:48 +0100
Subject: [PATCH] Replace nested view by reference id

issue2401
review220003
---
 address.xml           | 21 +++++++++++++++++++
 contact_mechanism.xml | 16 +++++++++++++++
 party.xml             | 47 ++++++++-----------------------------------
 3 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/address.xml b/address.xml
index d0d0d6d362..05f245d845 100644
--- a/address.xml
+++ b/address.xml
@@ -6,6 +6,7 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="address_view_tree">
             <field name="model">party.address</field>
             <field name="type">tree</field>
+            <field name="priority" eval="10"/>
             <field name="arch" type="xml">
                 <![CDATA[
                 <tree string="Addresses">
@@ -22,6 +23,26 @@ this repository contains the full copyright notices and license terms. -->
                 ]]>
             </field>
         </record>
+
+        <record model="ir.ui.view" id="address_view_tree_sequence">
+            <field name="model">party.address</field>
+            <field name="type">tree</field>
+            <field name="priority" eval="20"/>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <tree string="Addresses" sequence="sequence" fill="1">
+                    <field name="name"/>
+                    <field name="street"/>
+                    <field name="streetbis"/>
+                    <field name="zip"/>
+                    <field name="city"/>
+                    <field name="country"/>
+                    <field name="subdivision"/>
+                </tree>
+                ]]>
+            </field>
+        </record>
+
         <record model="ir.ui.view" id="address_view_form">
             <field name="model">party.address</field>
             <field name="type">form</field>
diff --git a/contact_mechanism.xml b/contact_mechanism.xml
index e36f43a311..08678d47a5 100644
--- a/contact_mechanism.xml
+++ b/contact_mechanism.xml
@@ -7,6 +7,7 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="contact_mechanism_view_tree">
             <field name="model">party.contact_mechanism</field>
             <field name="type">tree</field>
+            <field name="priority" eval="10"/>
             <field name="arch" type="xml">
                 <![CDATA[
                 <tree string="Contact Mechanisms">
@@ -18,6 +19,21 @@ this repository contains the full copyright notices and license terms. -->
             </field>
         </record>
 
+        <record model="ir.ui.view" id="contact_mechanism_view_tree_sequence">
+            <field name="model">party.contact_mechanism</field>
+            <field name="type">tree</field>
+            <field name="priority" eval="20"/>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <tree string="Contact Mechanisms" sequence="sequence" fill="1">
+                    <field name="type"/>
+                    <field name="value"/>
+                    <field name="comment"/>
+                </tree>
+                ]]>
+            </field>
+        </record>
+
         <record model="ir.ui.view" id="contact_mechanism_view_form">
             <field name="model">party.contact_mechanism</field>
             <field name="type">form</field>
diff --git a/party.xml b/party.xml
index 0aba0aa3b7..24ecad43d2 100644
--- a/party.xml
+++ b/party.xml
@@ -63,35 +63,16 @@ this repository contains the full copyright notices and license terms. -->
                     </group>
                     <notebook colspan="6">
                         <page string="General" id="general">
-                            <field name="addresses" mode="form,tree" colspan="4">
-                                <tree string="Addresses" sequence="sequence"
-                                    fill="1">
-                                    <field name="name"/>
-                                    <field name="street"/>
-                                    <field name="streetbis"/>
-                                    <field name="zip"/>
-                                    <field name="city"/>
-                                    <field name="country"/>
-                                    <field name="subdivision"/>
-                                </tree>
-                            </field>
+                            <field name="addresses" mode="form,tree" colspan="4"
+                                view_ids="party.address_view_form,party.address_view_tree_sequence"/>
                             <group col="2" colspan="4" id="lang">
                                 <label name="lang"/>
                                 <field name="lang" widget="selection"/>
                             </group>
-                            <field name="contact_mechanisms" colspan="2">
-                                <tree string="Contact Mechanisms" sequence="sequence"
-                                    fill="1">
-                                    <field name="type"/>
-                                    <field name="value"/>
-                                    <field name="comment"/>
-                                </tree>
-                            </field>
-                            <field name="categories" colspan="2">
-                                <tree string="Categories" fill="1">
-                                    <field name="rec_name"/>
-                                </tree>
-                            </field>
+                            <field name="contact_mechanisms" colspan="2"
+                                view_ids="party.contact_mechanism_view_tree_sequence"/>
+                            <field name="categories" colspan="2"
+                                view_ids="party.category_view_list"/>
                         </page>
                         <page string="Accounting" id="accounting">
                             <separator string="VAT" colspan="4" id="vat"/>
@@ -197,20 +178,8 @@ this repository contains the full copyright notices and license terms. -->
             <field name="arch" type="xml">
                 <![CDATA[
                 <form string="VAT Information Exchange System Results" col="1">
-                    <field name="parties_succeed">
-                        <tree string="Parties Succeed" fill="1">
-                            <field name="code"/>
-                            <field name="name"/>
-                            <field name="vat_code"/>
-                        </tree>
-                    </field>
-                    <field name="parties_failed">
-                        <tree string="Parties Failed" fill="1">
-                            <field name="code"/>
-                            <field name="name"/>
-                            <field name="vat_code"/>
-                        </tree>
-                    </field>
+                    <field name="parties_succeed"/>
+                    <field name="parties_failed"/>
                 </form>
                 ]]>
             </field>