From 0980318d1b0bbfc26024d90ddd463afb6690d0ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sun, 10 Mar 2013 22:39:40 +0100
Subject: [PATCH] Use separate XML files for views

---
 MANIFEST.in         |  1 +
 setup.py            |  2 +-
 view/work_form.xml  | 51 ++++++++++++++++++++++++
 view/work_list.xml  | 12 ++++++
 view/work_list2.xml | 11 ++++++
 view/work_tree.xml  | 13 +++++++
 work.xml            | 95 ++-------------------------------------------
 7 files changed, 93 insertions(+), 92 deletions(-)
 create mode 100644 view/work_form.xml
 create mode 100644 view/work_list.xml
 create mode 100644 view/work_list2.xml
 create mode 100644 view/work_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/setup.py b/setup.py
index 650248bac9..240b2d0e61 100644
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,7 @@ setup(name='trytond_project',
         ],
     package_data={
         'trytond.modules.project': (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/work_form.xml b/view/work_form.xml
new file mode 100644
index 0000000000..7d7ceb8768
--- /dev/null
+++ b/view/work_form.xml
@@ -0,0 +1,51 @@
+<?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="Works Efforts" col="6">
+    <label name="name"/>
+    <field name="name" colspan="3"/>
+    <label name="active"/>
+    <field name="active" xexpand="0"/>
+    <label name="type"/>
+    <field name="type"/>
+    <label name="parent"/>
+    <field name="parent"/>
+    <label name="sequence"/>
+    <field name="sequence"/>
+    <label name="company"/>
+    <field name="company"/>
+    <label name="party"/>
+    <field name="party"/>
+    <label name="party_address"/>
+    <field name="party_address"/>
+    <notebook colspan="8">
+        <page string="General" id="general" col="6">
+            <group col="2" colspan="6" id="timesheet_available">
+                <label name="timesheet_available"/>
+                <field name="timesheet_available"/>
+            </group>
+            <label name="hours"/>
+            <field name="hours" widget="float_time" float_time="company_work_time"/>
+            <label name="total_effort"/>
+            <field name="total_effort" widget="float_time" float_time="company_work_time"/>
+            <label name="effort"/>
+            <field name="effort" widget="float_time" float_time="company_work_time"/>
+            <separator name="comment" colspan="6"/>
+            <field name="comment" colspan="6"/>
+        </page>
+        <page string="Children" id="children"
+              states="{'invisible': Not(Equal(Eval('type'), 'project'))}">
+              <field name="children" colspan="4"/>
+        </page>
+        <page string="Timesheet" id="timesheet_lines"
+              states="{'invisible': Not(Bool(Eval('timesheet_available')))}">
+            <label name="timesheet_start_date"/>
+            <field name="timesheet_start_date"/>
+            <label name="timesheet_end_date"/>
+            <field name="timesheet_end_date"/>
+            <field name="timesheet_lines" colspan="4"/>
+        </page>
+    </notebook>
+    <label name="state"/>
+    <field name="state"/>
+</form>
diff --git a/view/work_list.xml b/view/work_list.xml
new file mode 100644
index 0000000000..b585c74f54
--- /dev/null
+++ b/view/work_list.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="Works Efforts">
+    <field name="name"/>
+    <field name="hours" widget="float_time" float_time="company_work_time"/>
+    <field name="total_effort" widget="float_time"
+        float_time="company_work_time"/>
+    <field name="type"/>
+    <field name="state"/>
+    <field name="active" tree_invisible="1"/>
+</tree>
diff --git a/view/work_list2.xml b/view/work_list2.xml
new file mode 100644
index 0000000000..1eb68ec13f
--- /dev/null
+++ b/view/work_list2.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="Tasks">
+    <field name="name"/>
+    <field name="hours" widget="float_time" float_time="company_work_time"/>
+    <field name="total_effort" widget="float_time"
+        float_time="company_work_time"/>
+    <field name="state"/>
+    <field name="active" tree_invisible="1"/>
+</tree>
diff --git a/view/work_tree.xml b/view/work_tree.xml
new file mode 100644
index 0000000000..19fd3921e9
--- /dev/null
+++ b/view/work_tree.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. -->
+<tree string="Works Efforts">
+    <field name="name"/>
+    <field name="hours" widget="float_time" float_time="company_work_time"/>
+    <field name="total_effort" widget="float_time" float_time="company_work_time"/>
+    <field name="type"/>
+    <field name="state"/>
+    <field name="active" tree_invisible="1"/>
+    <field name="parent" tree_invisible="1"/>
+    <field name="children" tree_invisible="1"/>
+</tree>
diff --git a/work.xml b/work.xml
index 814e5cb6e8..b53936134a 100644
--- a/work.xml
+++ b/work.xml
@@ -3,117 +3,30 @@
 this repository contains the full copyright notices and license terms. -->
 <tryton>
     <data>
-        <!-- default tree view -->
         <record model="ir.ui.view" id="work_view_tree">
             <field name="model">project.work</field>
             <field name="type">tree</field>
             <field name="priority" eval="20"/>
             <field name="field_childs">children</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Works Efforts">
-                    <field name="name"/>
-                    <field name="hours" widget="float_time" float_time="company_work_time"/>
-                    <field name="total_effort" widget="float_time" float_time="company_work_time"/>
-                    <field name="type"/>
-                    <field name="state"/>
-                    <field name="active" tree_invisible="1"/>
-                    <field name="parent" tree_invisible="1"/>
-                    <field name="children" tree_invisible="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">work_tree</field>
         </record>
 
         <record model="ir.ui.view" id="work_view_list">
             <field name="model">project.work</field>
             <field name="type">tree</field>
             <field name="priority" eval="10"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Works Efforts">
-                    <field name="name"/>
-                    <field name="hours" widget="float_time" float_time="company_work_time"/>
-                    <field name="total_effort" widget="float_time" float_time="company_work_time"/>
-                    <field name="type"/>
-                    <field name="state"/>
-                    <field name="active" tree_invisible="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">work_list</field>
         </record>
 
-        <!-- list view for tasks (wihtout type field) -->
         <record model="ir.ui.view" id="work_view_list2">
             <field name="model">project.work</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Tasks">
-                    <field name="name"/>
-                    <field name="hours" widget="float_time" float_time="company_work_time"/>
-                    <field name="total_effort" widget="float_time" float_time="company_work_time"/>
-                    <field name="state"/>
-                    <field name="active" tree_invisible="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">work_list2</field>
         </record>
         <record model="ir.ui.view" id="work_view_form">
             <field name="model">project.work</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Works Efforts" col="6">
-                    <label name="name"/>
-                    <field name="name" colspan="3"/>
-                    <label name="active"/>
-                    <field name="active" xexpand="0"/>
-                    <label name="type"/>
-                    <field name="type"/>
-                    <label name="parent"/>
-                    <field name="parent"/>
-                    <label name="sequence"/>
-                    <field name="sequence"/>
-                    <label name="company"/>
-                    <field name="company"/>
-                    <label name="party"/>
-                    <field name="party"/>
-                    <label name="party_address"/>
-                    <field name="party_address"/>
-                    <notebook colspan="8">
-                        <page string="General" id="general" col="6">
-                            <group col="2" colspan="6" id="timesheet_available">
-                                <label name="timesheet_available"/>
-                                <field name="timesheet_available"/>
-                            </group>
-                            <label name="hours"/>
-                            <field name="hours" widget="float_time" float_time="company_work_time"/>
-                            <label name="total_effort"/>
-                            <field name="total_effort" widget="float_time" float_time="company_work_time"/>
-                            <label name="effort"/>
-                            <field name="effort" widget="float_time" float_time="company_work_time"/>
-                            <separator name="comment" colspan="6"/>
-                            <field name="comment" colspan="6"/>
-                        </page>
-                        <page string="Children" id="children"
-                              states="{'invisible': Not(Equal(Eval('type'), 'project'))}">
-                              <field name="children" colspan="4"/>
-                        </page>
-                        <page string="Timesheet" id="timesheet_lines"
-                              states="{'invisible': Not(Bool(Eval('timesheet_available')))}">
-                            <label name="timesheet_start_date"/>
-                            <field name="timesheet_start_date"/>
-                            <label name="timesheet_end_date"/>
-                            <field name="timesheet_end_date"/>
-                            <field name="timesheet_lines" colspan="4"/>
-                        </page>
-                    </notebook>
-                    <label name="state"/>
-                    <field name="state"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">work_form</field>
         </record>
         <record model="ir.action.act_window" id="act_work_tree">
             <field name="name">Works Efforts</field>