From 8358b2ef15dc1ed831f3e4c0bb0a2bf8fe712bb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Thu, 7 Mar 2013 20:58:02 +0100
Subject: [PATCH] Use separate XML files for views

---
 MANIFEST.in                  |   1 +
 currency.xml                 | 108 ++---------------------------------
 setup.py                     |   2 +-
 view/currency_form.xml       |  56 ++++++++++++++++++
 view/currency_rate_form.xml  |  12 ++++
 view/currency_rate_graph.xml |  11 ++++
 view/currency_rate_list.xml  |   8 +++
 view/currency_tree.xml       |  11 ++++
 8 files changed, 105 insertions(+), 104 deletions(-)
 create mode 100644 view/currency_form.xml
 create mode 100644 view/currency_rate_form.xml
 create mode 100644 view/currency_rate_graph.xml
 create mode 100644 view/currency_rate_list.xml
 create mode 100644 view/currency_tree.xml

diff --git a/MANIFEST.in b/MANIFEST.in
index f55ca198cf..2f34bcdd96 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,6 +6,7 @@ include COPYRIGHT
 include LICENSE
 include tryton.cfg
 include *.xml
+include view/*.xml
 include *.odt
 include locale/*.po
 include doc/*
diff --git a/currency.xml b/currency.xml
index e2d9af7334..3d6dae9c87 100644
--- a/currency.xml
+++ b/currency.xml
@@ -28,79 +28,12 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="currency_view_form">
             <field name="model">currency.currency</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Currency" col="6">
-                    <label name="name"/>
-                    <field name="name"/>
-                    <label name="symbol"/>
-                    <field name="symbol"/>
-                    <label name="active"/>
-                    <field name="active" xexpand="0" width="100"/>
-                    <label name="code"/>
-                    <field name="code"/>
-                    <label name="numeric_code"/>
-                    <field name="numeric_code"/>
-                    <label name="rounding"/>
-                    <field name="rounding"/>
-                    <notebook colspan="6">
-                        <page string="Rates" id="rates">
-                            <label name="rate"/>
-                            <field name="rate"/>
-                            <field name="rates" colspan="4" mode="tree,form,graph"/>
-                        </page>
-                        <page string="Formatting" col="6" id="formatting">
-                            <label name="digits"/>
-                            <field name="digits"/>
-                            <newline/>
-                            <label name="mon_grouping"/>
-                            <field name="mon_grouping"/>
-                            <label name="mon_thousands_sep"/>
-                            <field name="mon_thousands_sep"/>
-                            <label name="mon_decimal_point"/>
-                            <field name="mon_decimal_point"/>
-                            <newline/>
-                            <label name="positive_sign"/>
-                            <field name="positive_sign"/>
-                            <label name="negative_sign"/>
-                            <field name="negative_sign"/>
-                            <newline/>
-                            <label name="p_sign_posn"/>
-                            <field name="p_sign_posn"/>
-                            <label name="n_sign_posn"/>
-                            <field name="n_sign_posn"/>
-                            <newline/>
-                            <label name="p_cs_precedes"/>
-                            <field name="p_cs_precedes"/>
-                            <label name="n_cs_precedes"/>
-                            <field name="n_cs_precedes"/>
-                            <newline/>
-                            <label name="p_sep_by_space"/>
-                            <field name="p_sep_by_space"/>
-                            <label name="n_sep_by_space"/>
-                            <field name="n_sep_by_space"/>
-                            <newline/>
-                        </page>
-                    </notebook>
-                </form>
-                ]]>
-            </field>
+            <field name="name">currency_form</field>
         </record>
         <record model="ir.ui.view" id="currency_view_tree">
             <field name="model">currency.currency</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Currencies">
-                    <field name="name"/>
-                    <field name="symbol"/>
-                    <field name="code"/>
-                    <field name="numeric_code"/>
-                    <field name="rate"/>
-                    <field name="active" tree_invisible="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">currency_tree</field>
         </record>
         <record model="ir.action.act_window" id="act_currency_form">
             <field name="name">Currencies</field>
@@ -137,50 +70,19 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="currency_rate_view_list">
             <field name="model">currency.currency.rate</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Rates">
-                    <field name="currency"/>
-                    <field name="date"/>
-                    <field name="rate"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">currency_rate_list</field>
         </record>
 
         <record model="ir.ui.view" id="currency_rate_view_form">
             <field name="model">currency.currency.rate</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Rate">
-                    <label name="currency"/>
-                    <field name="currency"/>
-                    <newline/>
-                    <label name="date"/>
-                    <field name="date"/>
-                    <label name="rate"/>
-                    <field name="rate"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">currency_rate_form</field>
         </record>
 
         <record model="ir.ui.view" id="currency_rate_view_graph">
             <field name="model">currency.currency.rate</field>
             <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <graph string="Rates" type="line">
-                    <x>
-                        <field name="date"/>
-                    </x>
-                    <y>
-                        <field name="rate" fill="1" empty="0"/>
-                    </y>
-                </graph>
-                ]]>
-            </field>
+            <field name="name">currency_rate_graph</field>
         </record>
 
         <record model="ir.model.access" id="access_currency_rate">
diff --git a/setup.py b/setup.py
index f7974d1c41..81ac17667a 100644
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,7 @@ setup(name='trytond_currency',
         ],
     package_data={
         'trytond.modules.currency': (info.get('xml', [])
-            + ['tryton.cfg', 'locale/*.po', 'icons/*.svg']),
+            + ['tryton.cfg', 'view/*.xml', 'locale/*.po', 'icons/*.svg']),
         },
     classifiers=[
         'Development Status :: 5 - Production/Stable',
diff --git a/view/currency_form.xml b/view/currency_form.xml
new file mode 100644
index 0000000000..eadd4072a5
--- /dev/null
+++ b/view/currency_form.xml
@@ -0,0 +1,56 @@
+<?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. -->
+<form string="Currency" col="6">
+    <label name="name"/>
+    <field name="name"/>
+    <label name="symbol"/>
+    <field name="symbol"/>
+    <label name="active"/>
+    <field name="active" xexpand="0" width="100"/>
+    <label name="code"/>
+    <field name="code"/>
+    <label name="numeric_code"/>
+    <field name="numeric_code"/>
+    <label name="rounding"/>
+    <field name="rounding"/>
+    <notebook colspan="6">
+        <page string="Rates" id="rates">
+            <label name="rate"/>
+            <field name="rate"/>
+            <field name="rates" colspan="4" mode="tree,form,graph"/>
+        </page>
+        <page string="Formatting" col="6" id="formatting">
+            <label name="digits"/>
+            <field name="digits"/>
+            <newline/>
+            <label name="mon_grouping"/>
+            <field name="mon_grouping"/>
+            <label name="mon_thousands_sep"/>
+            <field name="mon_thousands_sep"/>
+            <label name="mon_decimal_point"/>
+            <field name="mon_decimal_point"/>
+            <newline/>
+            <label name="positive_sign"/>
+            <field name="positive_sign"/>
+            <label name="negative_sign"/>
+            <field name="negative_sign"/>
+            <newline/>
+            <label name="p_sign_posn"/>
+            <field name="p_sign_posn"/>
+            <label name="n_sign_posn"/>
+            <field name="n_sign_posn"/>
+            <newline/>
+            <label name="p_cs_precedes"/>
+            <field name="p_cs_precedes"/>
+            <label name="n_cs_precedes"/>
+            <field name="n_cs_precedes"/>
+            <newline/>
+            <label name="p_sep_by_space"/>
+            <field name="p_sep_by_space"/>
+            <label name="n_sep_by_space"/>
+            <field name="n_sep_by_space"/>
+            <newline/>
+        </page>
+    </notebook>
+</form>
diff --git a/view/currency_rate_form.xml b/view/currency_rate_form.xml
new file mode 100644
index 0000000000..f0d64d9cdc
--- /dev/null
+++ b/view/currency_rate_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. -->
+<form string="Rate">
+    <label name="currency"/>
+    <field name="currency"/>
+    <newline/>
+    <label name="date"/>
+    <field name="date"/>
+    <label name="rate"/>
+    <field name="rate"/>
+</form>
diff --git a/view/currency_rate_graph.xml b/view/currency_rate_graph.xml
new file mode 100644
index 0000000000..3496229b33
--- /dev/null
+++ b/view/currency_rate_graph.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. -->
+<graph string="Rates" type="line">
+    <x>
+        <field name="date"/>
+    </x>
+    <y>
+        <field name="rate" fill="1" empty="0"/>
+    </y>
+</graph>
diff --git a/view/currency_rate_list.xml b/view/currency_rate_list.xml
new file mode 100644
index 0000000000..33edc50b2e
--- /dev/null
+++ b/view/currency_rate_list.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. -->
+<tree string="Rates">
+    <field name="currency"/>
+    <field name="date"/>
+    <field name="rate"/>
+</tree>
diff --git a/view/currency_tree.xml b/view/currency_tree.xml
new file mode 100644
index 0000000000..5dd9f4a7cf
--- /dev/null
+++ b/view/currency_tree.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. -->
+<tree string="Currencies">
+    <field name="name"/>
+    <field name="symbol"/>
+    <field name="code"/>
+    <field name="numeric_code"/>
+    <field name="rate"/>
+    <field name="active" tree_invisible="1"/>
+</tree>