From 71068b38e77b7bea929a085cb28aaf174f6e76a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Wed, 6 Mar 2013 23:14:31 +0100
Subject: [PATCH] Use separate XML files for views

---
 MANIFEST.in            |  1 +
 carrier.xml            | 30 ++----------------------------
 setup.py               |  2 +-
 view/carrier_form.xml  | 13 +++++++++++++
 view/carrier_form2.xml | 11 +++++++++++
 5 files changed, 28 insertions(+), 29 deletions(-)
 create mode 100644 view/carrier_form.xml
 create mode 100644 view/carrier_form2.xml

diff --git a/MANIFEST.in b/MANIFEST.in
index 07449ffdc7..05c3f792e3 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -5,6 +5,7 @@ include CHANGELOG
 include LICENSE
 include tryton.cfg
 include *.xml
+include view/*.xml
 include *.odt
 include locale/*.po
 include doc/*
diff --git a/carrier.xml b/carrier.xml
index 54b1631de0..9fccef0359 100644
--- a/carrier.xml
+++ b/carrier.xml
@@ -6,40 +6,14 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="carrier_view_form">
             <field name="model">carrier</field>
             <field name="inherit" ref="carrier.carrier_view_form"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form/notebook/page[@id='carrier']/field[@name='carrier_cost_method']"
-                        position="after">
-                        <newline/>
-                        <label name="percentage"/>
-                        <field name="percentage"/>
-                        <newline/>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">carrier_form</field>
         </record>
 
         <record model="ir.ui.view" id="carrier_view_form2">
             <field name="model">carrier</field>
             <field name="type">form</field>
             <field name="inherit" ref="carrier.carrier_view_form2"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form/field[@name='carrier_cost_method']"
-                        position="after">
-                        <newline/>
-                        <label name="percentage"/>
-                        <field name="percentage"/>
-                        <newline/>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">carrier_form2</field>
         </record>
     </data>
 </tryton>
diff --git a/setup.py b/setup.py
index 3971f4f45a..6806903634 100644
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,7 @@ setup(name='trytond_carrier_percentage',
         ],
     package_data={
         'trytond.modules.carrier_percentage': (info.get('xml', [])
-            + ['tryton.cfg', 'locale/*.po', 'tests/*.rst']),
+            + ['tryton.cfg', 'view/*.xml', 'locale/*.po', 'tests/*.rst']),
         },
     classifiers=[
         'Development Status :: 5 - Production/Stable',
diff --git a/view/carrier_form.xml b/view/carrier_form.xml
new file mode 100644
index 0000000000..761795f839
--- /dev/null
+++ b/view/carrier_form.xml
@@ -0,0 +1,13 @@
+<?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/notebook/page[@id='carrier']/field[@name='carrier_cost_method']"
+        position="after">
+        <newline/>
+        <label name="percentage"/>
+        <field name="percentage"/>
+        <newline/>
+    </xpath>
+</data>
diff --git a/view/carrier_form2.xml b/view/carrier_form2.xml
new file mode 100644
index 0000000000..f933186092
--- /dev/null
+++ b/view/carrier_form2.xml
@@ -0,0 +1,11 @@
+<?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='carrier_cost_method']" position="after">
+        <newline/>
+        <label name="percentage"/>
+        <field name="percentage"/>
+        <newline/>
+    </xpath>
+</data>