From d7776dca5030aed2b3ebd02a42776f2e81463015 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Tue, 31 Jan 2012 23:30:10 +0100
Subject: [PATCH] Replace nested view by reference id

issue2401
review227001
---
 journal.xml |  94 ++++++++++++++++++++++++++++++--------
 move.xml    | 128 +++++++++++++++++++++++++++++++---------------------
 tax.xml     |  43 +++++++++---------
 3 files changed, 172 insertions(+), 93 deletions(-)

diff --git a/journal.xml b/journal.xml
index 90c0d87fdb..b89c6a853d 100644
--- a/journal.xml
+++ b/journal.xml
@@ -92,26 +92,8 @@ this repository contains the full copyright notices and license terms. -->
                 <form string="Journal View" col="2">
                     <label name="name"/>
                     <field name="name"/>
-                    <field name="columns" colspan="2">
-                        <tree string="View Columns" sequence="sequence" editable="bottom">
-                            <field name="name"/>
-                            <field name="field"/>
-                            <field name="required"/>
-                            <field name="readonly"/>
-                        </tree>
-                        <form string="View Column">
-                            <label name="name"/>
-                            <field name="name"/>
-                            <label name="sequence"/>
-                            <field name="sequence"/>
-                            <label name="field"/>
-                            <field name="field"/>
-                            <newline/>
-                            <label name="required"/>
-                            <field name="required"/>
-                            <label name="readonly"/>
-                            <field name="readonly"/>
-                        </form>
+                    <field name="columns" colspan="2"
+                        view_ids="account.journal_view_column_view_list_sequence">
                     </field>
                 </form>
                 ]]>
@@ -161,6 +143,78 @@ this repository contains the full copyright notices and license terms. -->
             <field name="perm_delete" eval="True"/>
         </record>
 
+        <record model="ir.ui.view" id="journal_view_column_view_list">
+            <field name="model">account.journal.view.column</field>
+            <field name="type">tree</field>
+            <field name="priority" eval="10"/>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <tree string="View Columns">
+                    <field name="view"/>
+                    <field name="name"/>
+                    <field name="field"/>
+                    <field name="required"/>
+                    <field name="readonly"/>
+                </tree>
+                ]]>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="journal_view_column_view_list_sequence">
+            <field name="model">account.journal.view.column</field>
+            <field name="type">tree</field>
+            <field name="priority" eval="20"/>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <tree string="View Columns" sequence="sequence" editable="bottom">
+                    <field name="name"/>
+                    <field name="field"/>
+                    <field name="required"/>
+                    <field name="readonly"/>
+                </tree>
+                ]]>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="journal_view_column_view_form">
+            <field name="model">account.journal.view.column</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <form string="View Column">
+                    <label name="name"/>
+                    <field name="name"/>
+                    <label name="sequence"/>
+                    <field name="sequence"/>
+                    <label name="field"/>
+                    <field name="field"/>
+                    <label name="view"/>
+                    <field name="view"/>
+                    <label name="required"/>
+                    <field name="required"/>
+                    <label name="readonly"/>
+                    <field name="readonly"/>
+                </form>
+                ]]>
+            </field>
+        </record>
+
+        <record model="ir.model.access" id="access_journal_view_column">
+            <field name="model" search="[('model', '=', 'account.journal.view.column')]"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_delete" eval="False"/>
+        </record>
+        <record model="ir.model.access" id="access_journal_view_column_account_admin">
+            <field name="model" search="[('model', '=', 'account.journal.view.column')]"/>
+            <field name="group" ref="group_account_admin"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="True"/>
+            <field name="perm_create" eval="True"/>
+            <field name="perm_delete" eval="True"/>
+        </record>
+
         <record model="ir.ui.view" id="journal_view_form">
             <field name="model">account.journal</field>
             <field name="type">form</field>
diff --git a/move.xml b/move.xml
index 78eb90094b..d2bf66c54a 100644
--- a/move.xml
+++ b/move.xml
@@ -21,58 +21,8 @@ this repository contains the full copyright notices and license terms. -->
                     <field name="date"/>
                     <label name="post_date"/>
                     <field name="post_date"/>
-                    <field name="lines" colspan="4">
-                        <tree string="Account Move Lines" editable="top">
-                            <field name="move"/>
-                            <field name="name"/>
-                            <field name="reference"/>
-                            <field name="party"/>
-                            <field name="account"/>
-                            <field name="debit" sum="Debit"/>
-                            <field name="credit" sum="Credit"/>
-                            <field name="tax_lines"/>
-                            <field name="reconciliation"/>
-                        </tree>
-                        <form string="Account Move Line">
-                            <label name="name"/>
-                            <field name="name"/>
-                            <label name="active"/>
-                            <field name="active" xexpand="0" width="100"/>
-                            <notebook colspan="4">
-                                <page string="General Information" id="general">
-                                    <label name="account"/>
-                                    <field name="account"/>
-                                    <newline/>
-                                    <label name="reference"/>
-                                    <field name="reference"/>
-                                    <label name="party"/>
-                                    <field name="party"/>
-                                    <label name="journal"/>
-                                    <field name="journal"/>
-                                    <label name="period"/>
-                                    <field name="period"/>
-                                    <label name="debit"/>
-                                    <field name="debit"/>
-                                    <label name="credit"/>
-                                    <field name="credit"/>
-                                    <separator string="Optional Information" colspan="4"
-                                        id="optional_information"/>
-                                    <field name="tax_lines" colspan="4"/>
-                                    <label name="amount_second_currency"/>
-                                    <field name="amount_second_currency"/>
-                                    <label name="second_currency"/>
-                                    <field name="second_currency"/>
-                                    <label name="reconciliation"/>
-                                    <field name="reconciliation"/>
-                                    <label name="maturity_date"/>
-                                    <field name="maturity_date"/>
-                                    <label id="empty" colspan="2"/>
-                                    <label name="state"/>
-                                    <field name="state"/>
-                                </page>
-                            </notebook>
-                        </form>
-                    </field>
+                    <field name="lines" colspan="4"
+                        view_ids="account.move_line_view_tree_move,account.move_line_view_form_move"/>
                     <label name="state"/>
                     <field name="state"/>
                     <group col="2" colspan="2" id="buttons">
@@ -232,6 +182,7 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="move_line_view_form">
             <field name="model">account.move.line</field>
             <field name="type">form</field>
+            <field name="priority" eval="10"/>
             <field name="arch" type="xml">
                 <![CDATA[
                 <form string="Account Move Line">
@@ -281,9 +232,60 @@ this repository contains the full copyright notices and license terms. -->
                 ]]>
             </field>
         </record>
+
+        <record model="ir.ui.view" id="move_line_view_form_move">
+            <field name="model">account.move.line</field>
+            <field name="type">form</field>
+            <field name="priority" eval="20"/>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <form string="Account Move Line">
+                    <label name="name"/>
+                    <field name="name"/>
+                    <label name="active"/>
+                    <field name="active" xexpand="0" width="100"/>
+                    <notebook colspan="4">
+                        <page string="General Information" id="general">
+                            <label name="account"/>
+                            <field name="account"/>
+                            <newline/>
+                            <label name="reference"/>
+                            <field name="reference"/>
+                            <label name="party"/>
+                            <field name="party"/>
+                            <label name="journal"/>
+                            <field name="journal"/>
+                            <label name="period"/>
+                            <field name="period"/>
+                            <label name="debit"/>
+                            <field name="debit"/>
+                            <label name="credit"/>
+                            <field name="credit"/>
+                            <separator string="Optional Information" colspan="4"
+                                id="optional_information"/>
+                            <field name="tax_lines" colspan="4"/>
+                            <label name="amount_second_currency"/>
+                            <field name="amount_second_currency"/>
+                            <label name="second_currency"/>
+                            <field name="second_currency"/>
+                            <label name="reconciliation"/>
+                            <field name="reconciliation"/>
+                            <label name="maturity_date"/>
+                            <field name="maturity_date"/>
+                            <label id="empty" colspan="2"/>
+                            <label name="state"/>
+                            <field name="state"/>
+                        </page>
+                    </notebook>
+                </form>
+                ]]>
+            </field>
+        </record>
+
         <record model="ir.ui.view" id="move_line_view_tree">
             <field name="model">account.move.line</field>
             <field name="type">tree</field>
+            <field name="priority" eval="10"/>
             <field name="arch" type="xml">
                 <![CDATA[
                 <tree string="Account Move Lines" editable="top"
@@ -305,6 +307,28 @@ this repository contains the full copyright notices and license terms. -->
                 ]]>
             </field>
         </record>
+
+        <record model="ir.ui.view" id="move_line_view_tree_move">
+            <field name="model">account.move.line</field>
+            <field name="type">tree</field>
+            <field name="priority" eval="20"/>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <tree string="Account Move Lines" editable="top">
+                    <field name="move"/>
+                    <field name="name"/>
+                    <field name="reference"/>
+                    <field name="party"/>
+                    <field name="account"/>
+                    <field name="debit" sum="Debit"/>
+                    <field name="credit" sum="Credit"/>
+                    <field name="tax_lines"/>
+                    <field name="reconciliation"/>
+                </tree>
+                ]]>
+            </field>
+        </record>
+
         <record model="ir.action.act_window" id="act_move_line_form">
             <field name="name">Account Move Lines</field>
             <field name="res_model">account.move.line</field>
diff --git a/tax.xml b/tax.xml
index 6338cf22f6..a3ba795061 100644
--- a/tax.xml
+++ b/tax.xml
@@ -329,12 +329,8 @@ this repository contains the full copyright notices and license terms. -->
                             <label name="credit_note_account"/>
                             <field name="credit_note_account"/>
                             <newline/>
-                            <field name="childs" colspan="4">
-                                <tree string="Taxes" sequence="sequence">
-                                    <field name="name"/>
-                                    <field name="type"/>
-                                </tree>
-                            </field>
+                            <field name="childs" colspan="4"
+                                view_ids="account.tax_view_list"/>
                         </page>
                         <page string="Code" id="code">
                             <separator string="Invoice" colspan="4" id="invoice"/>
@@ -440,13 +436,8 @@ this repository contains the full copyright notices and license terms. -->
                             <label name="credit_note_account"/>
                             <field name="credit_note_account"/>
                             <newline/>
-                            <field name="childs" colspan="4">
-                                <tree string="Taxes" sequence="sequence">
-                                    <field name="name"/>
-                                    <field name="type"/>
-                                    <field name="active"/>
-                                </tree>
-                            </field>
+                            <field name="childs" colspan="4"
+                                view_ids="account.tax_view_list"/>
                         </page>
                         <page string="Code" id="code">
                             <separator string="Invoice" colspan="4" id="invoice"/>
@@ -706,14 +697,8 @@ this repository contains the full copyright notices and license terms. -->
                     <field name="name"/>
                     <label name="company"/>
                     <field name="company"/>
-                    <field name="lines" colspan="4">
-                        <tree string="Tax Rule Line Templates"
-                            sequence="sequence">
-                            <field name="group"/>
-                            <field name="origin_tax"/>
-                            <field name="tax"/>
-                        </tree>
-                    </field>
+                    <field name="lines" colspan="4"
+                        view_ids="account.tax_rule_line_view_tree_sequence"/>
                 </form>
                 ]]>
             </field>
@@ -847,6 +832,7 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="tax_rule_line_view_tree">
             <field name="model">account.tax.rule.line</field>
             <field name="type">tree</field>
+            <field name="priority" eval="10"/>
             <field name="arch" type="xml">
                 <![CDATA[
                 <tree string="Tax Rule Lines">
@@ -859,6 +845,21 @@ this repository contains the full copyright notices and license terms. -->
             </field>
         </record>
 
+        <record model="ir.ui.view" id="tax_rule_line_view_tree_sequence">
+            <field name="model">account.tax.rule.line</field>
+            <field name="type">tree</field>
+            <field name="priority" eval="20"/>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <tree string="Tax Rule Lines" sequence="sequence">
+                    <field name="group"/>
+                    <field name="origin_tax"/>
+                    <field name="tax"/>
+                </tree>
+                ]]>
+            </field>
+        </record>
+
         <record model="ir.model.access" id="access_tax_rule_line">
             <field name="model" search="[('model', '=', 'account.tax.rule.line')]"/>
             <field name="perm_read" eval="True"/>