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

---
 MANIFEST.in                |  1 +
 category.xml               | 37 ++---------------
 product.xml                | 85 ++------------------------------------
 setup.py                   |  2 +-
 uom.xml                    | 54 ++----------------------
 view/category_form.xml     | 16 +++++++
 view/category_list.xml     |  7 ++++
 view/category_tree.xml     |  8 ++++
 view/product_form.xml      | 16 +++++++
 view/product_tree.xml      | 11 +++++
 view/template_form.xml     | 28 +++++++++++++
 view/template_tree.xml     | 12 ++++++
 view/uom_category_form.xml |  7 ++++
 view/uom_category_tree.xml |  6 +++
 view/uom_form.xml          | 21 ++++++++++
 view/uom_tree.xml          | 12 ++++++
 16 files changed, 157 insertions(+), 166 deletions(-)
 create mode 100644 view/category_form.xml
 create mode 100644 view/category_list.xml
 create mode 100644 view/category_tree.xml
 create mode 100644 view/product_form.xml
 create mode 100644 view/product_tree.xml
 create mode 100644 view/template_form.xml
 create mode 100644 view/template_tree.xml
 create mode 100644 view/uom_category_form.xml
 create mode 100644 view/uom_category_tree.xml
 create mode 100644 view/uom_form.xml
 create mode 100644 view/uom_tree.xml

diff --git a/MANIFEST.in b/MANIFEST.in
index e4632a141f..732a76eded 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/category.xml b/category.xml
index 712193a9d8..fb008df3a7 100644
--- a/category.xml
+++ b/category.xml
@@ -7,50 +7,19 @@ this repository contains the full copyright notices and license terms. -->
             <field name="model">product.category</field>
             <field name="type">tree</field>
             <field name="priority">10</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Product Categories">
-                    <field name="name"/>
-                    <field name="rec_name"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">category_list</field>
         </record>
         <record model="ir.ui.view" id="category_view_tree">
             <field name="model">product.category</field>
             <field name="type">tree</field>
             <field name="priority">20</field>
             <field name="field_childs">childs</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Product Categories" keyword_open="1">
-                    <field name="name"/>
-                    <field name="parent" tree_invisible="1"/>
-                    <field name="childs" tree_invisible="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">category_tree</field>
         </record>
         <record model="ir.ui.view" id="category_view_form">
             <field name="model">product.category</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Product Category">
-                    <label name="name"/>
-                    <field name="name"/>
-                    <label name="parent"/>
-                    <field name="parent"/>
-                    <label name="rec_name"/>
-                    <field name="rec_name" colspan="3"/>
-                    <notebook colspan="4">
-                        <page string="Children" col="1" id="childs">
-                            <field name="childs"/>
-                        </page>
-                    </notebook>
-                </form>
-                ]]>
-            </field>
+            <field name="name">category_form</field>
         </record>
 
         <record model="ir.action.act_window" id="act_category_tree">
diff --git a/product.xml b/product.xml
index f726a0a897..e4c61e28f3 100644
--- a/product.xml
+++ b/product.xml
@@ -26,104 +26,27 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="template_view_tree">
             <field name="model">product.template</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <tree string="Product Templates">
-                        <field name="name"/>
-                        <field name="list_price_uom"/>
-                        <field name="cost_price_uom"/>
-                        <field name="type"/>
-                        <field name="category"/>
-                        <field name="default_uom"/>
-                        <field name="active" tree_invisible="1"/>
-                    </tree>
-                    ]]>
-            </field>
+            <field name="name">template_tree</field>
         </record>
 
         <record model="ir.ui.view" id="template_view_form">
             <field name="model">product.template</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <form string="Product Template" col="6">
-                      <label name="name"/>
-                      <field name="name" xexpand="1"/>
-                      <label name="active"/>
-                      <field name="active" xexpand="0" width="100"/>
-                      <notebook colspan="6">
-                          <page string="General" id="general">
-                              <label name="type"/>
-                              <field name="type"/>
-                              <label name="consumable"/>
-                              <field name="consumable"/>
-                              <label name="category"/>
-                              <field name="category" />
-                              <label name="default_uom"/>
-                              <field name="default_uom" />
-                              <label name="list_price"/>
-                              <field name="list_price"/>
-                              <newline/>
-                              <label name="cost_price"/>
-                              <field name="cost_price"/>
-                              <label name="cost_price_method"/>
-                              <field name="cost_price_method"/>
-                          </page>
-                      </notebook>
-                    </form>
-                    ]]>
-            </field>
+            <field name="name">template_form</field>
         </record>
 
         <record model="ir.ui.view" id="product_view_tree">
             <field name="model">product.product</field>
             <field name="type">tree</field>
             <field name="inherit" ref="template_view_tree"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/tree"
-                        position="replace_attributes">
-                        <tree string="Products"/>
-                    </xpath>
-                    <xpath
-                        expr="/tree/field[@name=&quot;name&quot;]"
-                        position="after">
-                        <field name="code"/>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">product_tree</field>
         </record>
 
         <record model="ir.ui.view" id="product_view_form">
             <field name="model">product.product</field>
             <field name="type">form</field>
             <field name="inherit" ref="template_view_form"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form"
-                        position="replace_attributes">
-                        <form string="Products"/>
-                    </xpath>
-                    <xpath
-                        expr="/form/field[@name='name']"
-                        position="after">
-                        <label name="code"/>
-                        <field name="code"/>
-                    </xpath>
-                    <xpath
-                        expr="/form/notebook/page[@id=&quot;general&quot;]"
-                        position="inside">
-                        <separator name="description" colspan="4"/>
-                        <field name="description" colspan="4"/>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">product_form</field>
         </record>
 
         <record model="ir.action.act_window" id="act_product_form">
diff --git a/setup.py b/setup.py
index 5197ecfddc..63b67ed625 100644
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,7 @@ setup(name='trytond_product',
         ],
     package_data={
         'trytond.modules.product': (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/uom.xml b/uom.xml
index 48ea756b43..540ba56d28 100644
--- a/uom.xml
+++ b/uom.xml
@@ -6,45 +6,12 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="uom_view_tree">
             <field name="model">product.uom</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Units of Measure">
-                    <field name="name"/>
-                    <field name="symbol"/>
-                    <field name="category"/>
-                    <field name="factor"/>
-                    <field name="rate"/>
-                    <field name="rounding"/>
-                    <field name="active" tree_invisible="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">uom_tree</field>
         </record>
         <record model="ir.ui.view" id="uom_view_form">
             <field name="model">product.uom</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Unit of Measure" col="4">
-                    <label name="name"/>
-                    <field name="name"/>
-                    <label name="category"/>
-                    <field name="category"/>
-                    <label name="symbol"/>
-                    <field name="symbol"/>
-                    <label name="active"/>
-                    <field name="active"/>
-                    <label name="factor"/>
-                    <field name="factor"/>
-                    <label name="rate"/>
-                    <field name="rate"/>
-                    <label name="rounding"/>
-                    <field name="rounding"/>
-                    <label name="digits"/>
-                    <field name="digits"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">uom_form</field>
         </record>
         <record model="ir.action.act_window" id="act_uom_form">
             <field name="name">Units of Measure</field>
@@ -66,26 +33,13 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="uom_category_view_tree">
             <field name="model">product.uom.category</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-              <![CDATA[
-              <tree string="Categories of Unit of Measure">
-                    <field name="name"/>
-              </tree>
-              ]]>
-            </field>
+            <field name="name">uom_category_tree</field>
         </record>
 
         <record model="ir.ui.view" id="uom_category_view_form">
             <field name="model">product.uom.category</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Category of Unit of Measure" col="6">
-                    <label name="name"/>
-                    <field name="name"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">uom_category_form</field>
         </record>
 
         <record model="ir.action.act_window" id="act_uom_category_form">
diff --git a/view/category_form.xml b/view/category_form.xml
new file mode 100644
index 0000000000..8b2528550a
--- /dev/null
+++ b/view/category_form.xml
@@ -0,0 +1,16 @@
+<?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="Product Category">
+    <label name="name"/>
+    <field name="name"/>
+    <label name="parent"/>
+    <field name="parent"/>
+    <label name="rec_name"/>
+    <field name="rec_name" colspan="3"/>
+    <notebook colspan="4">
+        <page string="Children" col="1" id="childs">
+            <field name="childs"/>
+        </page>
+    </notebook>
+</form>
diff --git a/view/category_list.xml b/view/category_list.xml
new file mode 100644
index 0000000000..af5b4a6692
--- /dev/null
+++ b/view/category_list.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="Product Categories">
+    <field name="name"/>
+    <field name="rec_name"/>
+</tree>
diff --git a/view/category_tree.xml b/view/category_tree.xml
new file mode 100644
index 0000000000..409e11d77d
--- /dev/null
+++ b/view/category_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. -->
+<tree string="Product Categories" keyword_open="1">
+    <field name="name"/>
+    <field name="parent" tree_invisible="1"/>
+    <field name="childs" tree_invisible="1"/>
+</tree>
diff --git a/view/product_form.xml b/view/product_form.xml
new file mode 100644
index 0000000000..bbdc6f7814
--- /dev/null
+++ b/view/product_form.xml
@@ -0,0 +1,16 @@
+<?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="Products"/>
+    </xpath>
+    <xpath expr="/form/field[@name='name']" position="after">
+        <label name="code"/>
+        <field name="code"/>
+    </xpath>
+    <xpath expr="/form/notebook/page[@id='general']" position="inside">
+        <separator name="description" colspan="4"/>
+        <field name="description" colspan="4"/>
+    </xpath>
+</data>
diff --git a/view/product_tree.xml b/view/product_tree.xml
new file mode 100644
index 0000000000..932584a2d1
--- /dev/null
+++ b/view/product_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. -->
+<data>
+    <xpath expr="/tree" position="replace_attributes">
+        <tree string="Products"/>
+    </xpath>
+    <xpath expr="/tree/field[@name='name']" position="after">
+        <field name="code"/>
+    </xpath>
+</data>
diff --git a/view/template_form.xml b/view/template_form.xml
new file mode 100644
index 0000000000..c8b049c249
--- /dev/null
+++ b/view/template_form.xml
@@ -0,0 +1,28 @@
+<?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="Product Template" col="6">
+  <label name="name"/>
+  <field name="name" xexpand="1"/>
+  <label name="active"/>
+  <field name="active" xexpand="0" width="100"/>
+  <notebook colspan="6">
+      <page string="General" id="general">
+          <label name="type"/>
+          <field name="type"/>
+          <label name="consumable"/>
+          <field name="consumable"/>
+          <label name="category"/>
+          <field name="category" />
+          <label name="default_uom"/>
+          <field name="default_uom" />
+          <label name="list_price"/>
+          <field name="list_price"/>
+          <newline/>
+          <label name="cost_price"/>
+          <field name="cost_price"/>
+          <label name="cost_price_method"/>
+          <field name="cost_price_method"/>
+      </page>
+  </notebook>
+</form>
diff --git a/view/template_tree.xml b/view/template_tree.xml
new file mode 100644
index 0000000000..35cfa8d5c5
--- /dev/null
+++ b/view/template_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="Product Templates">
+    <field name="name"/>
+    <field name="list_price_uom"/>
+    <field name="cost_price_uom"/>
+    <field name="type"/>
+    <field name="category"/>
+    <field name="default_uom"/>
+    <field name="active" tree_invisible="1"/>
+</tree>
diff --git a/view/uom_category_form.xml b/view/uom_category_form.xml
new file mode 100644
index 0000000000..e4e18480d2
--- /dev/null
+++ b/view/uom_category_form.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. -->
+<form string="Category of Unit of Measure" col="6">
+    <label name="name"/>
+    <field name="name"/>
+</form>
diff --git a/view/uom_category_tree.xml b/view/uom_category_tree.xml
new file mode 100644
index 0000000000..c2f4ce42b5
--- /dev/null
+++ b/view/uom_category_tree.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="Categories of Unit of Measure">
+    <field name="name"/>
+</tree>
diff --git a/view/uom_form.xml b/view/uom_form.xml
new file mode 100644
index 0000000000..614bce1d65
--- /dev/null
+++ b/view/uom_form.xml
@@ -0,0 +1,21 @@
+<?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="Unit of Measure" col="4">
+    <label name="name"/>
+    <field name="name"/>
+    <label name="category"/>
+    <field name="category"/>
+    <label name="symbol"/>
+    <field name="symbol"/>
+    <label name="active"/>
+    <field name="active"/>
+    <label name="factor"/>
+    <field name="factor"/>
+    <label name="rate"/>
+    <field name="rate"/>
+    <label name="rounding"/>
+    <field name="rounding"/>
+    <label name="digits"/>
+    <field name="digits"/>
+</form>
diff --git a/view/uom_tree.xml b/view/uom_tree.xml
new file mode 100644
index 0000000000..db0df8c9b0
--- /dev/null
+++ b/view/uom_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="Units of Measure">
+    <field name="name"/>
+    <field name="symbol"/>
+    <field name="category"/>
+    <field name="factor"/>
+    <field name="rate"/>
+    <field name="rounding"/>
+    <field name="active" tree_invisible="1"/>
+</tree>