From 75c2aa02389786337cf31483560894287c8f6b3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sat, 9 Mar 2013 15:24:45 +0100
Subject: [PATCH] Use separate XML files for views

---
 MANIFEST.in           |  1 +
 address.xml           | 28 ++--------------------------
 party.xml             | 26 ++------------------------
 setup.py              |  2 +-
 view/address_form.xml | 12 ++++++++++++
 view/address_tree.xml |  8 ++++++++
 view/party_form.xml   | 10 ++++++++++
 view/party_tree.xml   |  8 ++++++++
 8 files changed, 44 insertions(+), 51 deletions(-)
 create mode 100644 view/address_form.xml
 create mode 100644 view/address_tree.xml
 create mode 100644 view/party_form.xml
 create mode 100644 view/party_tree.xml

diff --git a/MANIFEST.in b/MANIFEST.in
index 97a95966de..25699556d2 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,6 +6,7 @@ include CHANGELOG
 include LICENSE
 include tryton.cfg
 include *.xml
+include view/*.xml
 include *.odt
 include locale/*.po
 include doc/*
diff --git a/address.xml b/address.xml
index a23bec5b85..1e8b443cbd 100644
--- a/address.xml
+++ b/address.xml
@@ -6,36 +6,12 @@ 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="inherit" ref="party.address_view_tree"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/tree/field[@name=&quot;subdivision&quot;]"
-                        position="after">
-                        <field name="siret"/>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">address_tree</field>
         </record>
         <record model="ir.ui.view" id="address_view_form">
             <field name="model">party.address</field>
             <field name="inherit" ref="party.address_view_form"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form/field[@name=&quot;subdivision&quot;]"
-                        position="after">
-                        <newline/>
-                        <label name="siret"/>
-                        <field name="siret"/>
-                        <label name="siret_nic"/>
-                        <field name="siret_nic"/>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">address_form</field>
         </record>
     </data>
 </tryton>
diff --git a/party.xml b/party.xml
index 1123e6cfd1..85f307213f 100644
--- a/party.xml
+++ b/party.xml
@@ -6,34 +6,12 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="party_view_tree">
             <field name="model">party.party</field>
             <field name="inherit" ref="party.party_view_tree"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/tree/field[@name=&quot;vat_code&quot;]"
-                        position="after">
-                        <field name="siren"/>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">party_tree</field>
         </record>
         <record model="ir.ui.view" id="party_view_form">
             <field name="model">party.party</field>
             <field name="inherit" ref="party.party_view_form"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form/group[@id=&quot;checkboxes&quot;]"
-                        position="after">
-                        <label name="siren"/>
-                        <field name="siren"/>
-                        <newline/>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">party_form</field>
         </record>
     </data>
 </tryton>
diff --git a/setup.py b/setup.py
index 7a946b1ecd..194b0cf345 100644
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,7 @@ setup(name='trytond_party_siret',
         ],
     package_data={
         'trytond.modules.party_siret': (info.get('xml', [])
-            + ['tryton.cfg', 'locale/*.po']),
+            + ['tryton.cfg', 'view/*.xml', 'locale/*.po']),
         },
     classifiers=[
         'Development Status :: 5 - Production/Stable',
diff --git a/view/address_form.xml b/view/address_form.xml
new file mode 100644
index 0000000000..2a9537c3bc
--- /dev/null
+++ b/view/address_form.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+    <xpath expr="/form/field[@name='subdivision']" position="after">
+        <newline/>
+        <label name="siret"/>
+        <field name="siret"/>
+        <label name="siret_nic"/>
+        <field name="siret_nic"/>
+    </xpath>
+</data>
diff --git a/view/address_tree.xml b/view/address_tree.xml
new file mode 100644
index 0000000000..72867e1cf1
--- /dev/null
+++ b/view/address_tree.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+    <xpath expr="/tree/field[@name='subdivision']" position="after">
+        <field name="siret"/>
+    </xpath>
+</data>
diff --git a/view/party_form.xml b/view/party_form.xml
new file mode 100644
index 0000000000..b256385e04
--- /dev/null
+++ b/view/party_form.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+    <xpath expr="/form/group[@id='checkboxes']" position="after">
+        <label name="siren"/>
+        <field name="siren"/>
+        <newline/>
+    </xpath>
+</data>
diff --git a/view/party_tree.xml b/view/party_tree.xml
new file mode 100644
index 0000000000..551c8adcc5
--- /dev/null
+++ b/view/party_tree.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+    <xpath expr="/tree/field[@name='vat_code']" position="after">
+        <field name="siren"/>
+    </xpath>
+</data>