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

---
 MANIFEST.in                        |   1 +
 company.xml                        | 188 ++---------------------------
 cron.xml                           |  13 +-
 setup.py                           |   3 +-
 view/company_config_start_form.xml |   8 ++
 view/company_form.xml              |  29 +++++
 view/company_list.xml              |   6 +
 view/company_tree.xml              |  10 ++
 view/cron_form.xml                 |   8 ++
 view/employee_form.xml             |  12 ++
 view/employee_form2.xml            |   9 ++
 view/employee_tree.xml             |   7 ++
 view/property_form.xml             |   9 ++
 view/property_tree.xml             |   8 ++
 view/sequence_form.xml             |   9 ++
 view/sequence_tree.xml             |   8 ++
 view/user_form.xml                 |  15 +++
 view/user_form_preferences.xml     |  12 ++
 18 files changed, 167 insertions(+), 188 deletions(-)
 create mode 100644 view/company_config_start_form.xml
 create mode 100644 view/company_form.xml
 create mode 100644 view/company_list.xml
 create mode 100644 view/company_tree.xml
 create mode 100644 view/cron_form.xml
 create mode 100644 view/employee_form.xml
 create mode 100644 view/employee_form2.xml
 create mode 100644 view/employee_tree.xml
 create mode 100644 view/property_form.xml
 create mode 100644 view/property_tree.xml
 create mode 100644 view/sequence_form.xml
 create mode 100644 view/sequence_tree.xml
 create mode 100644 view/user_form.xml
 create mode 100644 view/user_form_preferences.xml

diff --git a/MANIFEST.in b/MANIFEST.in
index 3e52948d52..99c60a7be3 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/company.xml b/company.xml
index 9891cdfba0..a7cc7f9374 100644
--- a/company.xml
+++ b/company.xml
@@ -7,70 +7,19 @@ this repository contains the full copyright notices and license terms. -->
             <field name="model">company.company</field>
             <field name="type">form</field>
             <field name="inherit" ref="party.party_view_form"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form"
-                        position="replace_attributes">
-                        <form string="Company"/>
-                    </xpath>
-                    <xpath
-                        expr="/form/group[@id=&quot;checkboxes&quot;]"
-                        position="after">
-                        <label name="currency"/>
-                        <field name="currency"/>
-                        <label name="vat_country"/>
-                        <field name="vat_country"/>
-                        <label name="vat_number"/>
-                        <field name="vat_number"/>
-                    </xpath>
-                    <xpath
-                        expr="/form/notebook/page[@id=&quot;general&quot;]"
-                        position="after">
-                        <page string="Company" col="2" id="company">
-                            <label name="parent"/>
-                            <field name="parent"/>
-                            <field name="employees" colspan="2"/>
-                        </page>
-                        <page string="Reports" col="1" id="reports">
-                            <separator name="header"/>
-                            <field name="header"/>
-                            <separator name="footer"/>
-                            <field name="footer"/>
-                        </page>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">company_form</field>
         </record>
         <record model="ir.ui.view" id="company_view_tree">
             <field name="model">company.company</field>
             <field name="type">tree</field>
             <field name="field_childs">childs</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Companies">
-                    <field name="name"/>
-                    <field name="currency"/>
-                    <field name="vat_code"/>
-                    <field name="parent" tree_invisible="1"/>
-                    <field name="childs" tree_invisible="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">company_tree</field>
         </record>
         <record model="ir.ui.view" id="company_view_list">
             <field name="model">company.company</field>
             <field name="type">tree</field>
             <field name="priority" eval="10"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Companies">
-                    <field name="name"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">company_list</field>
         </record>
         <record model="ir.action.act_window" id="act_company_tree">
             <field name="name">Companies</field>
@@ -130,72 +79,22 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="user_view_form">
             <field name="model">res.user</field>
             <field name="inherit" ref="res.user_view_form"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <data>
-                        <xpath
-                            expr="/form/notebook/page/separator[@name=&quot;signature&quot;]"
-                            position="before">
-                            <label name="main_company"/>
-                            <field name="main_company" widget="selection"/>
-                            <label name="company"/>
-                            <field name="company" widget="selection"/>
-                            <label name="employee"/>
-                            <field name="employee"/>
-                            <field name="employees" colspan="4"/>
-                        </xpath>
-                    </data>
-                ]]>
-            </field>
+            <field name="name">user_form</field>
         </record>
         <record model="ir.ui.view" id="user_view_form_preferences">
             <field name="model">res.user</field>
             <field name="inherit" ref="res.user_view_form_preferences"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <data>
-                        <xpath
-                            expr="/form/notebook/page/separator[@name=&quot;signature&quot;]"
-                            position="before">
-                            <label name="company"/>
-                            <field name="company" widget="selection"/>
-                            <label name="employee"/>
-                            <field name="employee" widget="selection"/>
-                        </xpath>
-                    </data>
-                ]]>
-            </field>
+            <field name="name">user_form_preferences</field>
         </record>
         <record model="ir.ui.view" id="property_view_form">
             <field name="model">ir.property</field>
             <field name="inherit" ref="ir.property_view_form"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <data>
-                        <xpath
-                            expr="/form/field[@name='field']"
-                            position="after">
-                            <label name="company"/>
-                            <field name="company" colspan="3"/>
-                        </xpath>
-                    </data>
-                ]]>
-            </field>
+            <field name="name">property_form</field>
         </record>
         <record model="ir.ui.view" id="property_view_tree">
             <field name="model">ir.property</field>
             <field name="inherit" ref="ir.property_view_tree"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <data>
-                        <xpath
-                            expr="/tree/field[@name='field']"
-                            position="after">
-                            <field name="company"/>
-                        </xpath>
-                    </data>
-                ]]>
-            </field>
+            <field name="name">property_tree</field>
         </record>
 
         <record model="ir.rule.group" id="rule_group_property">
@@ -214,33 +113,12 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="sequence_view_form">
             <field name="model">ir.sequence</field>
             <field name="inherit" ref="ir.sequence_view_form"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form/field[@name=&quot;active&quot;]"
-                        position="after">
-                        <label name="company"/>
-                        <field name="company" colspan="3"/>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">sequence_form</field>
         </record>
         <record model="ir.ui.view" id="sequence_view_tree">
             <field name="model">ir.sequence</field>
             <field name="inherit" ref="ir.sequence_view_tree"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/tree/field[@name=&quot;code&quot;]"
-                        position="after">
-                        <field name="company"/>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">sequence_tree</field>
         </record>
 
         <record model="ir.rule.group" id="rule_group_sequence">
@@ -272,16 +150,7 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="company_config_start_view_form">
             <field name="model">company.company.config.start</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Create Company" col="2">
-                    <image name="tryton-dialog-information" xexpand="0"
-                        xfill="0"/>
-                    <label string="You can now add your company into the system." id="add"
-                        yalign="0.0" xalign="0.0" xexpand="1"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">company_config_start_form</field>
         </record>
 
         <record model="ir.action.wizard" id="act_company_config">
@@ -299,51 +168,20 @@ this repository contains the full copyright notices and license terms. -->
             <field name="type">form</field>
             <field name="inherit" ref="party.party_view_form"/>
             <field name="priority">10</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form"
-                        position="replace_attributes">
-                        <form string="Employee"/>
-                    </xpath>
-                    <xpath expr="/form/group/label[@name='active']"
-                        position="before">
-                        <label name="company"/>
-                        <field name="company"/>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">employee_form</field>
         </record>
 
         <record model="ir.ui.view" id="employee_view_form2">
             <field name="model">company.employee</field>
             <field name="type">form</field>
             <field name="priority">20</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Employee">
-                    <label name="party"/>
-                    <field name="party"/>
-                    <label name="company"/>
-                    <field name="company"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">employee_form2</field>
         </record>
 
         <record model="ir.ui.view" id="employee_view_tree">
             <field name="model">company.employee</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Employees">
-                    <field name="name"/>
-                    <field name="company"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">employee_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="act_employee_form">
diff --git a/cron.xml b/cron.xml
index 6aa9cc5732..292c7e30e9 100644
--- a/cron.xml
+++ b/cron.xml
@@ -3,21 +3,10 @@
 this repository contains the full copyright notices and license terms. -->
 <tryton>
     <data>
-
         <record model="ir.ui.view" id="cron_view_form">
             <field name="model">ir.cron</field>
             <field name="inherit" ref="ir.cron_view_form"/>
-            <field name="arch" type="xml">
-              <![CDATA[
-                <data>
-                    <xpath
-                       expr="/form/field[@name=&quot;args&quot;]"
-                       position="after">
-                      <field name="companies" colspan="4"/>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">cron_form</field>
         </record>
     </data>
 </tryton>
diff --git a/setup.py b/setup.py
index e0dd36e0e1..fbd6ee48da 100644
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,8 @@ setup(name='trytond_company',
         ],
     package_data={
         'trytond.modules.company': (info.get('xml', [])
-            + ['tryton.cfg', 'locale/*.po', 'header_A4.odt', 'letter.odt']),
+            + ['tryton.cfg', 'view/*.xml', 'locale/*.po', 'header_A4.odt',
+                'letter.odt']),
         },
     classifiers=[
         'Development Status :: 5 - Production/Stable',
diff --git a/view/company_config_start_form.xml b/view/company_config_start_form.xml
new file mode 100644
index 0000000000..b50594b521
--- /dev/null
+++ b/view/company_config_start_form.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. -->
+<form string="Create Company" col="2">
+    <image name="tryton-dialog-information" xexpand="0" xfill="0"/>
+    <label string="You can now add your company into the system." id="add"
+        yalign="0.0" xalign="0.0" xexpand="1"/>
+</form>
diff --git a/view/company_form.xml b/view/company_form.xml
new file mode 100644
index 0000000000..be512de07d
--- /dev/null
+++ b/view/company_form.xml
@@ -0,0 +1,29 @@
+<?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" position="replace_attributes">
+        <form string="Company"/>
+    </xpath>
+    <xpath expr="/form/group[@id='checkboxes']" position="after">
+        <label name="currency"/>
+        <field name="currency"/>
+        <label name="vat_country"/>
+        <field name="vat_country"/>
+        <label name="vat_number"/>
+        <field name="vat_number"/>
+    </xpath>
+    <xpath expr="/form/notebook/page[@id='general']" position="after">
+        <page string="Company" col="2" id="company">
+            <label name="parent"/>
+            <field name="parent"/>
+            <field name="employees" colspan="2"/>
+        </page>
+        <page string="Reports" col="1" id="reports">
+            <separator name="header"/>
+            <field name="header"/>
+            <separator name="footer"/>
+            <field name="footer"/>
+        </page>
+    </xpath>
+</data>
diff --git a/view/company_list.xml b/view/company_list.xml
new file mode 100644
index 0000000000..5e20a47f28
--- /dev/null
+++ b/view/company_list.xml
@@ -0,0 +1,6 @@
+<?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="Companies">
+    <field name="name"/>
+</tree>
diff --git a/view/company_tree.xml b/view/company_tree.xml
new file mode 100644
index 0000000000..0a224583ad
--- /dev/null
+++ b/view/company_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="Companies">
+    <field name="name"/>
+    <field name="currency"/>
+    <field name="vat_code"/>
+    <field name="parent" tree_invisible="1"/>
+    <field name="childs" tree_invisible="1"/>
+</tree>
diff --git a/view/cron_form.xml b/view/cron_form.xml
new file mode 100644
index 0000000000..cc5ad3f4f8
--- /dev/null
+++ b/view/cron_form.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="/form/field[@name='args']" position="after">
+      <field name="companies" colspan="4"/>
+    </xpath>
+</data>
diff --git a/view/employee_form.xml b/view/employee_form.xml
new file mode 100644
index 0000000000..6c35910f99
--- /dev/null
+++ b/view/employee_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" position="replace_attributes">
+        <form string="Employee"/>
+    </xpath>
+    <xpath expr="/form/group/label[@name='active']" position="before">
+        <label name="company"/>
+        <field name="company"/>
+    </xpath>
+</data>
diff --git a/view/employee_form2.xml b/view/employee_form2.xml
new file mode 100644
index 0000000000..485422cca2
--- /dev/null
+++ b/view/employee_form2.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. -->
+<form string="Employee">
+    <label name="party"/>
+    <field name="party"/>
+    <label name="company"/>
+    <field name="company"/>
+</form>
diff --git a/view/employee_tree.xml b/view/employee_tree.xml
new file mode 100644
index 0000000000..bb055af56e
--- /dev/null
+++ b/view/employee_tree.xml
@@ -0,0 +1,7 @@
+<?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="Employees">
+    <field name="name"/>
+    <field name="company"/>
+</tree>
diff --git a/view/property_form.xml b/view/property_form.xml
new file mode 100644
index 0000000000..474ad2f2bd
--- /dev/null
+++ b/view/property_form.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. -->
+<data>
+    <xpath expr="/form/field[@name='field']" position="after">
+        <label name="company"/>
+        <field name="company" colspan="3"/>
+    </xpath>
+</data>
diff --git a/view/property_tree.xml b/view/property_tree.xml
new file mode 100644
index 0000000000..fb3f503eb0
--- /dev/null
+++ b/view/property_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='field']" position="after">
+        <field name="company"/>
+    </xpath>
+</data>
diff --git a/view/sequence_form.xml b/view/sequence_form.xml
new file mode 100644
index 0000000000..d116a10a91
--- /dev/null
+++ b/view/sequence_form.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. -->
+<data>
+    <xpath expr="/form/field[@name='active']" position="after">
+        <label name="company"/>
+        <field name="company" colspan="3"/>
+    </xpath>
+</data>
diff --git a/view/sequence_tree.xml b/view/sequence_tree.xml
new file mode 100644
index 0000000000..299953cd1b
--- /dev/null
+++ b/view/sequence_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='code']" position="after">
+        <field name="company"/>
+    </xpath>
+</data>
diff --git a/view/user_form.xml b/view/user_form.xml
new file mode 100644
index 0000000000..ffe15a29ce
--- /dev/null
+++ b/view/user_form.xml
@@ -0,0 +1,15 @@
+<?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/separator[@name='signature']"
+        position="before">
+        <label name="main_company"/>
+        <field name="main_company" widget="selection"/>
+        <label name="company"/>
+        <field name="company" widget="selection"/>
+        <label name="employee"/>
+        <field name="employee"/>
+        <field name="employees" colspan="4"/>
+    </xpath>
+</data>
diff --git a/view/user_form_preferences.xml b/view/user_form_preferences.xml
new file mode 100644
index 0000000000..f53ebd7f2f
--- /dev/null
+++ b/view/user_form_preferences.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/notebook/page/separator[@name='signature']"
+        position="before">
+        <label name="company"/>
+        <field name="company" widget="selection"/>
+        <label name="employee"/>
+        <field name="employee" widget="selection"/>
+    </xpath>
+</data>