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

issue2401
review226005
---
 __tryton__.py |  2 ++
 product.xml   | 26 ++++++++++++++
 sale.xml      | 95 +++++++++++++++++----------------------------------
 stock.xml     | 26 ++++++++++++++
 4 files changed, 86 insertions(+), 63 deletions(-)
 create mode 100644 product.xml
 create mode 100644 stock.xml

diff --git a/__tryton__.py b/__tryton__.py
index 202a73079d..b5a73bd942 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -149,6 +149,8 @@ Biedt mogelijkheden tot:
         'sale.xml',
         'configuration.xml',
         'party.xml',
+        'stock.xml',
+        'product.xml',
     ],
     'translation': [
         'locale/bg_BG.po',
diff --git a/product.xml b/product.xml
new file mode 100644
index 0000000000..adff21d2bc
--- /dev/null
+++ b/product.xml
@@ -0,0 +1,26 @@
+<?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. -->
+<tryton>
+    <data>
+        <record model="ir.ui.view" id="product_view_list_sale_line">
+            <field name="model">product.product</field>
+            <field name="type">tree</field>
+            <field name="priority" eval="20"/>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <tree string="Products">
+                    <field name="name"/>
+                    <field name="code"/>
+                    <field name="list_price_uom"/>
+                    <field name="cost_price_uom"/>
+                    <field name="quantity"/>
+                    <field name="forecast_quantity"/>
+                    <field name="default_uom"/>
+                    <field name="active"/>
+                </tree>
+                ]]>
+            </field>
+        </record>
+    </data>
+</tryton>
diff --git a/sale.xml b/sale.xml
index f631952ab4..9570d99a02 100644
--- a/sale.xml
+++ b/sale.xml
@@ -71,20 +71,8 @@ this repository contains the full copyright notices and license terms. -->
                             <field name="warehouse"/>
                             <label name="currency"/>
                             <field name="currency"/>
-                            <field name="lines" colspan="4">
-                                <tree string="Lines" sequence="sequence" fill="1">
-                                    <field name="type"/>
-                                    <field name="product"/>
-                                    <field name="description"/>
-                                    <field name="quantity"/>
-                                    <field name="unit"/>
-                                    <field name="unit_price"/>
-                                    <field name="taxes"/>
-                                    <field name="amount"/>
-                                    <field name="sequence" tree_invisible="1"/>
-                                    <field name="unit_digits" tree_invisible="1"/>
-                                </tree>
-                            </field>
+                            <field name="lines" colspan="4"
+                                view_ids="sale.sale_line_view_tree_sequence"/>
                             <group col="2" colspan="2" id="states">
                                 <label name="invoice_state"/>
                                 <field name="invoice_state"/>
@@ -141,37 +129,11 @@ this repository contains the full copyright notices and license terms. -->
                             <field name="comment" colspan="4" spell="Eval('party_lang')"/>
                         </page>
                         <page string="Invoices" id="invoices">
-                            <field name="invoices" colspan="4">
-                                <tree>
-                                  <field name="number"/>
-                                  <field name="reference"/>
-                                  <field name="invoice_date"/>
-                                  <field name="party"/>
-                                  <field name="currency"/>
-                                  <field name="untaxed_amount"/>
-                                  <field name="tax_amount"/>
-                                  <field name="total_amount"/>
-                                  <field name="state"/>
-                                  <field name="sale_exception_state"/>
-                                  <field name="amount_to_pay_today"/>
-                                  <field name="description"/>
-                                  <field name="currency_digits" tree_invisible="1"/>
-                              </tree>
-                            </field>
+                            <field name="invoices" colspan="4"/>
                         </page>
                         <page string="Shipments" id="shipments">
-                            <field name="moves" colspan="4">
-                                <tree string="Moves">
-                                    <field name="product"/>
-                                    <field name="from_location"/>
-                                    <field name="to_location"/>
-                                    <field name="quantity"/>
-                                    <field name="uom"/>
-                                    <field name="state"/>
-                                    <field name="sale_exception_state"/>
-                                    <field name="unit_digits" tree_invisible="1"/>
-                                </tree>
-                            </field>
+                            <field name="moves" colspan="4"
+                                view_ids="sale.move_view_list_shipment"/>
                             <field name="shipments" colspan="4"/>
                         </page>
                     </notebook>
@@ -216,14 +178,8 @@ this repository contains the full copyright notices and license terms. -->
                     <label string="Choose move to recreate"
                         id="choose"
                         yalign="0.0" xalign="0.0" xexpand="1"/>
-                    <field name="recreate_moves" colspan="2">
-                        <tree string="Recreate Moves" fill="1">
-                            <field name="product"/>
-                            <field name="quantity"/>
-                            <field name="uom"/>
-                            <field name="unit_digits" tree_invisible="1"/>
-                        </tree>
-                    </field>
+                    <field name="recreate_moves" colspan="2"
+                        view_ids="stock.move_view_tree_simple"/>
                 </form>
                 ]]>
             </field>
@@ -833,18 +789,8 @@ this repository contains the full copyright notices and license terms. -->
                             <label name="sequence"/>
                             <field name="sequence"/>
                             <label name="product"/>
-                            <field name="product">
-                                <tree string="Products">
-                                    <field name="name"/>
-                                    <field name="code"/>
-                                    <field name="list_price_uom"/>
-                                    <field name="cost_price_uom"/>
-                                    <field name="quantity"/>
-                                    <field name="forecast_quantity"/>
-                                    <field name="default_uom"/>
-                                    <field name="active"/>
-                                </tree>
-                            </field>
+                            <field name="product"
+                                view_ids="sale.product_view_list_sale_line"/>
                             <newline/>
                             <label name="description"/>
                             <field name="description" colspan="3"
@@ -872,9 +818,11 @@ this repository contains the full copyright notices and license terms. -->
                 ]]>
             </field>
         </record>
+
         <record model="ir.ui.view" id="sale_line_view_tree">
             <field name="model">sale.line</field>
             <field name="type">tree</field>
+            <field name="priority" eval="10"/>
             <field name="arch" type="xml">
                 <![CDATA[
                 <tree string="Sale Lines">
@@ -893,6 +841,27 @@ this repository contains the full copyright notices and license terms. -->
             </field>
         </record>
 
+        <record model="ir.ui.view" id="sale_line_view_tree_sequence">
+            <field name="model">sale.line</field>
+            <field name="type">tree</field>
+            <field name="priority" eval="20"/>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <tree string="Sale Lines" sequence="sequence" fill="1">
+                    <field name="type"/>
+                    <field name="product"/>
+                    <field name="description"/>
+                    <field name="quantity"/>
+                    <field name="unit"/>
+                    <field name="unit_price"/>
+                    <field name="taxes"/>
+                    <field name="amount"/>
+                    <field name="unit_digits" tree_invisible="1"/>
+                </tree>
+                ]]>
+            </field>
+        </record>
+
         <record model="ir.model.access" id="access_sale_line">
             <field name="model" search="[('model', '=', 'sale.line')]"/>
             <field name="perm_read" eval="False"/>
diff --git a/stock.xml b/stock.xml
new file mode 100644
index 0000000000..c9d079f159
--- /dev/null
+++ b/stock.xml
@@ -0,0 +1,26 @@
+<?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. -->
+<tryton>
+    <data>
+        <record model="ir.ui.view" id="move_view_list_shipment">
+            <field name="model">stock.move</field>
+            <field name="type">tree</field>
+            <field name="priority" eval="20"/>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <tree string="Moves">
+                    <field name="product"/>
+                    <field name="from_location"/>
+                    <field name="to_location"/>
+                    <field name="quantity"/>
+                    <field name="uom"/>
+                    <field name="state"/>
+                    <field name="sale_exception_state"/>
+                    <field name="unit_digits" tree_invisible="1"/>
+                </tree>
+                ]]>
+            </field>
+        </record>
+    </data>
+</tryton>