From f66beb16efe304ec7f6296f1361620c9dcd6628a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sun, 3 Mar 2013 15:07:38 +0100
Subject: [PATCH] Use separate XML files for views

---
 MANIFEST.in                           |   1 +
 journal.xml                           |  26 +------
 setup.py                              |   2 +-
 statement.xml                         | 103 ++------------------------
 view/statement_form.xml               |  38 ++++++++++
 view/statement_journal_form.xml       |  13 ++++
 view/statement_journal_tree.xml       |   9 +++
 view/statement_line_form.xml          |  22 ++++++
 view/statement_line_tree.xml          |  12 +++
 view/statement_line_tree_editable.xml |  11 +++
 view/statement_tree.xml               |  10 +++
 11 files changed, 124 insertions(+), 123 deletions(-)
 create mode 100644 view/statement_form.xml
 create mode 100644 view/statement_journal_form.xml
 create mode 100644 view/statement_journal_tree.xml
 create mode 100644 view/statement_line_form.xml
 create mode 100644 view/statement_line_tree.xml
 create mode 100644 view/statement_line_tree_editable.xml
 create mode 100644 view/statement_tree.xml

diff --git a/MANIFEST.in b/MANIFEST.in
index d57a2cc5b9..2f9d67724f 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 tests/*.rst
diff --git a/journal.xml b/journal.xml
index ea913dc530..ad9a92b493 100644
--- a/journal.xml
+++ b/journal.xml
@@ -6,34 +6,12 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="statement_journal_view_form">
             <field name="model">account.statement.journal</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Statement Journal">
-                    <label name="name"/>
-                    <field name="name"/>
-                    <label name="journal"/>
-                    <field name="journal"/>
-                    <label name="currency"/>
-                    <field name="currency"/>
-                    <label name="company"/>
-                    <field name="company"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">statement_journal_form</field>
         </record>
         <record model="ir.ui.view" id="statement_journal_view_tree">
             <field name="model">account.statement.journal</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Statement Journals">
-                    <field name="name"/>
-                    <field name="journal"/>
-                    <field name="currency"/>
-                    <field name="company"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">statement_journal_tree</field>
         </record>
         <record model="account.journal.type" id="journal_type_statement">
             <field name="name">Statement</field>
diff --git a/setup.py b/setup.py
index 1bf92d1663..141ea5bcdf 100644
--- a/setup.py
+++ b/setup.py
@@ -48,7 +48,7 @@ setup(name='trytond_account_statement',
         ],
     package_data={
         'trytond.modules.account_statement': (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/statement.xml b/statement.xml
index 21addee086..361fb22ea4 100644
--- a/statement.xml
+++ b/statement.xml
@@ -22,60 +22,12 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="statement_view_form">
             <field name="model">account.statement</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Statement">
-                    <label name="journal"/>
-                    <field name="journal"/>
-                    <label name="date"/>
-                    <field name="date"/>
-                    <label name="start_balance"/>
-                    <field name="start_balance"/>
-                    <label name="end_balance"/>
-                    <field name="end_balance"/>
-                    <notebook colspan="4">
-                        <page string="Statement Lines" col="4" id="statement_lines">
-                            <field name="lines" colspan="4"
-                                view_ids="account_statement.statement_line_view_tree_editable"/>
-                            <group col="6" colspan="4" id="state_buttons">
-                                <label name="balance"/>
-                                <field name="balance"/>
-                                <label name="state"/>
-                                <field name="state"/>
-                                <group col="4" colspan="2" id="buttons">
-                                    <button string="Validate" name="validate"/>
-                                    <button string="Cancel" name="cancel"/>
-                                    <button string="Post" name="post"/>
-                                    <button string="Reset to Draft"
-                                        name="draft"/>
-                                </group>
-                            </group>
-                        </page>
-                        <page string="Other Info" id="info">
-                            <label name="company"/>
-                            <field name="company"/>
-                            <field name="move_lines" colspan="4"/>
-                        </page>
-                    </notebook>
-                    <field name="currency_digits" colspan="4" invisible="1"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">statement_form</field>
         </record>
         <record model="ir.ui.view" id="statement_view_tree">
             <field name="model">account.statement</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Statements">
-                    <field name="journal"/>
-                    <field name="date"/>
-                    <field name="start_balance"/>
-                    <field name="end_balance"/>
-                    <field name="state"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">statement_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="act_statement_form">
@@ -135,65 +87,20 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="statement_line_view_form">
             <field name="model">account.statement.line</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Statement Line">
-                    <label name="statement"/>
-                    <field name="statement" colspan="3"/>
-                    <label name="date"/>
-                    <field name="date"/>
-                    <label name="amount"/>
-                    <field name="amount"/>
-                    <label name="party"/>
-                    <field name="party"/>
-                    <label name="account"/>
-                    <field name="account"/>
-                    <label name="invoice"/>
-                    <field name="invoice"/>
-                    <newline/>
-                    <label name="description"/>
-                    <field name="description" colspan="3"/>
-                    <label name="move"/>
-                    <field name="move"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">statement_line_form</field>
         </record>
         <record model="ir.ui.view" id="statement_line_view_tree">
             <field name="model">account.statement.line</field>
             <field name="type">tree</field>
             <field name="priority" eval="10"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Statement Lines">
-                    <field name="statement"/>
-                    <field name="date"/>
-                    <field name="amount"/>
-                    <field name="party"/>
-                    <field name="account"/>
-                    <field name="invoice"/>
-                    <field name="description"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">statement_line_tree</field>
         </record>
 
         <record model="ir.ui.view" id="statement_line_view_tree_editable">
             <field name="model">account.statement.line</field>
             <field name="type">tree</field>
             <field name="priority" eval="20"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Statement Lines" editable="bottom">
-                    <field name="date"/>
-                    <field name="amount" sum="Amount"/>
-                    <field name="party"/>
-                    <field name="account"/>
-                    <field name="invoice"/>
-                    <field name="description"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">statement_line_tree_editable</field>
         </record>
 
         <record model="ir.model.access" id="access_statement_account_admin">
diff --git a/view/statement_form.xml b/view/statement_form.xml
new file mode 100644
index 0000000000..cb5f9048f6
--- /dev/null
+++ b/view/statement_form.xml
@@ -0,0 +1,38 @@
+<?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="Statement">
+    <label name="journal"/>
+    <field name="journal"/>
+    <label name="date"/>
+    <field name="date"/>
+    <label name="start_balance"/>
+    <field name="start_balance"/>
+    <label name="end_balance"/>
+    <field name="end_balance"/>
+    <notebook colspan="4">
+        <page string="Statement Lines" col="4" id="statement_lines">
+            <field name="lines" colspan="4"
+                view_ids="account_statement.statement_line_view_tree_editable"/>
+            <group col="6" colspan="4" id="state_buttons">
+                <label name="balance"/>
+                <field name="balance"/>
+                <label name="state"/>
+                <field name="state"/>
+                <group col="4" colspan="2" id="buttons">
+                    <button string="Validate" name="validate"/>
+                    <button string="Cancel" name="cancel"/>
+                    <button string="Post" name="post"/>
+                    <button string="Reset to Draft"
+                        name="draft"/>
+                </group>
+            </group>
+        </page>
+        <page string="Other Info" id="info">
+            <label name="company"/>
+            <field name="company"/>
+            <field name="move_lines" colspan="4"/>
+        </page>
+    </notebook>
+    <field name="currency_digits" colspan="4" invisible="1"/>
+</form>
diff --git a/view/statement_journal_form.xml b/view/statement_journal_form.xml
new file mode 100644
index 0000000000..87c89a9ee8
--- /dev/null
+++ b/view/statement_journal_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. -->
+<form string="Statement Journal">
+    <label name="name"/>
+    <field name="name"/>
+    <label name="journal"/>
+    <field name="journal"/>
+    <label name="currency"/>
+    <field name="currency"/>
+    <label name="company"/>
+    <field name="company"/>
+</form>
diff --git a/view/statement_journal_tree.xml b/view/statement_journal_tree.xml
new file mode 100644
index 0000000000..458f49f9c2
--- /dev/null
+++ b/view/statement_journal_tree.xml
@@ -0,0 +1,9 @@
+<?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="Statement Journals">
+    <field name="name"/>
+    <field name="journal"/>
+    <field name="currency"/>
+    <field name="company"/>
+</tree>
diff --git a/view/statement_line_form.xml b/view/statement_line_form.xml
new file mode 100644
index 0000000000..8b65af0712
--- /dev/null
+++ b/view/statement_line_form.xml
@@ -0,0 +1,22 @@
+<?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="Statement Line">
+    <label name="statement"/>
+    <field name="statement" colspan="3"/>
+    <label name="date"/>
+    <field name="date"/>
+    <label name="amount"/>
+    <field name="amount"/>
+    <label name="party"/>
+    <field name="party"/>
+    <label name="account"/>
+    <field name="account"/>
+    <label name="invoice"/>
+    <field name="invoice"/>
+    <newline/>
+    <label name="description"/>
+    <field name="description" colspan="3"/>
+    <label name="move"/>
+    <field name="move"/>
+</form>
diff --git a/view/statement_line_tree.xml b/view/statement_line_tree.xml
new file mode 100644
index 0000000000..78f984f0da
--- /dev/null
+++ b/view/statement_line_tree.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. -->
+<tree string="Statement Lines">
+    <field name="statement"/>
+    <field name="date"/>
+    <field name="amount"/>
+    <field name="party"/>
+    <field name="account"/>
+    <field name="invoice"/>
+    <field name="description"/>
+</tree>
diff --git a/view/statement_line_tree_editable.xml b/view/statement_line_tree_editable.xml
new file mode 100644
index 0000000000..b466b2028e
--- /dev/null
+++ b/view/statement_line_tree_editable.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="Statement Lines" editable="bottom">
+    <field name="date"/>
+    <field name="amount" sum="Amount"/>
+    <field name="party"/>
+    <field name="account"/>
+    <field name="invoice"/>
+    <field name="description"/>
+</tree>
diff --git a/view/statement_tree.xml b/view/statement_tree.xml
new file mode 100644
index 0000000000..d2dd5c08ac
--- /dev/null
+++ b/view/statement_tree.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. -->
+<tree string="Statements">
+    <field name="journal"/>
+    <field name="date"/>
+    <field name="start_balance"/>
+    <field name="end_balance"/>
+    <field name="state"/>
+</tree>