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

---
 MANIFEST.in                                   |   1 +
 configuration.xml                             |  17 +-
 inventory.xml                                 |  74 +---
 location.xml                                  |  79 +----
 move.xml                                      |  59 +---
 period.xml                                    |  55 +--
 product.xml                                   |  69 +---
 setup.py                                      |   4 +-
 shipment.xml                                  | 328 +-----------------
 view/configuration_form.xml                   |  15 +
 view/inventory_form.xml                       |  26 ++
 view/inventory_line_form.xml                  |  18 +
 view/inventory_line_tree.xml                  |  10 +
 view/inventory_tree.xml                       |  10 +
 view/location_form.xml                        |  27 ++
 view/location_list.xml                        |   9 +
 view/location_quantity_tree.xml               |  11 +
 view/location_tree.xml                        |  11 +
 view/move_form.xml                            |  30 ++
 view/move_tree.xml                            |  14 +
 view/move_tree_simple.xml                     |   9 +
 view/party_address_form.xml                   |  10 +
 view/party_address_tree.xml                   |   8 +
 view/party_form.xml                           |  13 +
 view/period_cache_form.xml                    |  13 +
 view/period_cache_list.xml                    |   9 +
 view/period_form.xml                          |  15 +
 view/period_list.xml                          |   8 +
 view/product_by_location_start_form.xml       |   7 +
 view/product_quantities_warehouse_graph.xml   |  12 +
 view/product_quantities_warehouse_list.xml    |   7 +
 ...roduct_quantities_warehouse_start_form.xml |   7 +
 view/product_tree_qty.xml                     |  13 +
 view/products_by_locations_start_form.xml     |   7 +
 view/shipment_in_form.xml                     |  39 +++
 .../shipment_in_return_assign_failed_form.xml |  10 +
 view/shipment_in_return_form.xml              |  27 ++
 view/shipment_in_return_tree.xml              |  13 +
 view/shipment_in_tree.xml                     |  13 +
 view/shipment_internal_form.xml               |  29 ++
 view/shipment_internal_tree.xml               |  13 +
 view/shipment_out_form.xml                    |  42 +++
 view/shipment_out_return_form.xml             |  39 +++
 view/shipment_out_return_tree.xml             |  13 +
 view/shipment_out_tree.xml                    |  13 +
 45 files changed, 611 insertions(+), 645 deletions(-)
 create mode 100644 view/configuration_form.xml
 create mode 100644 view/inventory_form.xml
 create mode 100644 view/inventory_line_form.xml
 create mode 100644 view/inventory_line_tree.xml
 create mode 100644 view/inventory_tree.xml
 create mode 100644 view/location_form.xml
 create mode 100644 view/location_list.xml
 create mode 100644 view/location_quantity_tree.xml
 create mode 100644 view/location_tree.xml
 create mode 100644 view/move_form.xml
 create mode 100644 view/move_tree.xml
 create mode 100644 view/move_tree_simple.xml
 create mode 100644 view/party_address_form.xml
 create mode 100644 view/party_address_tree.xml
 create mode 100644 view/party_form.xml
 create mode 100644 view/period_cache_form.xml
 create mode 100644 view/period_cache_list.xml
 create mode 100644 view/period_form.xml
 create mode 100644 view/period_list.xml
 create mode 100644 view/product_by_location_start_form.xml
 create mode 100644 view/product_quantities_warehouse_graph.xml
 create mode 100644 view/product_quantities_warehouse_list.xml
 create mode 100644 view/product_quantities_warehouse_start_form.xml
 create mode 100644 view/product_tree_qty.xml
 create mode 100644 view/products_by_locations_start_form.xml
 create mode 100644 view/shipment_in_form.xml
 create mode 100644 view/shipment_in_return_assign_failed_form.xml
 create mode 100644 view/shipment_in_return_form.xml
 create mode 100644 view/shipment_in_return_tree.xml
 create mode 100644 view/shipment_in_tree.xml
 create mode 100644 view/shipment_internal_form.xml
 create mode 100644 view/shipment_internal_tree.xml
 create mode 100644 view/shipment_out_form.xml
 create mode 100644 view/shipment_out_return_form.xml
 create mode 100644 view/shipment_out_return_tree.xml
 create mode 100644 view/shipment_out_tree.xml

diff --git a/MANIFEST.in b/MANIFEST.in
index 501657d122..f040e5e2bc 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/configuration.xml b/configuration.xml
index 94c9a9b442..5a20963ae1 100644
--- a/configuration.xml
+++ b/configuration.xml
@@ -6,22 +6,7 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="stock_configuration_view_form">
             <field name="model">stock.configuration</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Stock Configuration">
-                    <label name="shipment_in_sequence"/>
-                    <field name="shipment_in_sequence"/>
-                    <label name="shipment_in_return_sequence"/>
-                    <field name="shipment_in_return_sequence"/>
-                    <label name="shipment_out_sequence"/>
-                    <field name="shipment_out_sequence"/>
-                    <label name="shipment_out_return_sequence"/>
-                    <field name="shipment_out_return_sequence"/>
-                    <label name="shipment_internal_sequence"/>
-                    <field name="shipment_internal_sequence"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">configuration_form</field>
         </record>
         <record model="ir.action.act_window" id="act_stock_configuration_form">
             <field name="name">Stock Configuration</field>
diff --git a/inventory.xml b/inventory.xml
index 7f938936c9..6446b99765 100644
--- a/inventory.xml
+++ b/inventory.xml
@@ -7,50 +7,12 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="inventory_view_form">
             <field name="model">stock.inventory</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <form string="Inventory" col="4">
-                        <label name="location"/>
-                        <field name="location"/>
-                        <label name="lost_found"/>
-                        <field name="lost_found"/>
-                        <label name="date"/>
-                        <field name="date"/>
-                        <label name="company"/>
-                        <field name="company"/>
-                        <label colspan="2" id="empty"/>
-                        <button string="Complete Inventory"
-                            name="complete_lines" colspan="2"
-                            help="Add an inventory line for each missing products"/>
-                        <field name="lines" colspan="4"/>
-                        <group col="4" colspan="4" id="group_buttons">
-                            <label name="state"/>
-                            <field name="state"/>
-                            <group colspan="2" col="3" id="buttons">
-                                <button string="Cancel" name="cancel"
-                                    icon="tryton-cancel" />
-                                <button string="Confirm" name="confirm"
-                                    icon="tryton-ok"/>
-                            </group>
-                        </group>
-                    </form>
-                ]]>
-            </field>
+            <field name="name">inventory_form</field>
         </record>
         <record model="ir.ui.view" id="inventory_view_tree">
             <field name="model">stock.inventory</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <tree string="Inventories">
-                        <field name="location"/>
-                        <field name="date"/>
-                        <field name="state"/>
-                        <field name="company"/>
-                        <field name="create_date" tree_invisible="1"/>
-                    </tree>
-                ]]>
-            </field>
+            <field name="name">inventory_tree</field>
         </record>
         <record model="ir.action.act_window" id="act_inventory_form">
             <field name="name">Inventories</field>
@@ -87,40 +49,12 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="inventory_line_view_form">
             <field name="model">stock.inventory.line</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <form string="Inventory Line" col="4">
-                        <label name="product"/>
-                        <field name="product"/>
-                        <label name="uom"/>
-                        <field name="uom"/>
-                        <label name="expected_quantity"/>
-                        <field name="expected_quantity"/>
-                        <label name="quantity"/>
-                        <field name="quantity"/>
-                        <label name="move"/>
-                        <field name="move"/>
-                        <label name="inventory"/>
-                        <field name="inventory"/>
-                        <field name="unit_digits" invisible="1" colspan="4"/>
-                    </form>
-                ]]>
-            </field>
+            <field name="name">inventory_line_form</field>
         </record>
         <record model="ir.ui.view" id="inventory_line_view_tree">
             <field name="model">stock.inventory.line</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <tree string="Inventory Lines" editable="bottom">
-                        <field name="product"/>
-                        <field name="expected_quantity"/>
-                        <field name="quantity"/>
-                        <field name="uom"/>
-                        <field name="unit_digits" tree_invisible="1"/>
-                    </tree>
-                ]]>
-            </field>
+            <field name="name">inventory_line_tree</field>
         </record>
 
         <record model="ir.model.access" id="access_inventory">
diff --git a/location.xml b/location.xml
index f67398fa20..41d2f3e137 100644
--- a/location.xml
+++ b/location.xml
@@ -6,67 +6,20 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="location_view_form">
             <field name="model">stock.location</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <form string="Location">
-                        <label name="name"/>
-                        <field name="name"/>
-                        <label name="code"/>
-                        <field name="code"/>
-                        <label name="parent"/>
-                        <field name="parent"/>
-                        <label name="active"/>
-                        <field name="active"/>
-                        <label name="type"/>
-                        <field name="type"/>
-                        <newline/>
-                        <label name="address"/>
-                        <field name="address"/>
-                        <newline/>
-                        <label name="input_location"/>
-                        <field name="input_location"/>
-                        <newline/>
-                        <label name="output_location"/>
-                        <field name="output_location"/>
-                        <newline/>
-                        <label name="storage_location"/>
-                        <field name="storage_location"/>
-                    </form>
-                ]]>
-            </field>
+            <field name="name">location_form</field>
         </record>
         <record model="ir.ui.view" id="location_view_tree">
             <field name="model">stock.location</field>
             <field name="type">tree</field>
             <field name="priority" eval="20"/>
             <field name="field_childs">childs</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <tree string="Locations" keyword_open="1">
-                        <field name="name"/>
-                        <field name="code"/>
-                        <field name="type"/>
-                        <field name="active" tree_invisible="1"/>
-                        <field name="parent" tree_invisible="1"/>
-                        <field name="childs" tree_invisible="1"/>
-                    </tree>
-                ]]>
-            </field>
+            <field name="name">location_tree</field>
         </record>
         <record model="ir.ui.view" id="location_view_list">
             <field name="model">stock.location</field>
             <field name="type">tree</field>
             <field name="priority" eval="10"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <tree string="Locations">
-                        <field name="name"/>
-                        <field name="code"/>
-                        <field name="type"/>
-                        <field name="active" tree_invisible="1"/>
-                    </tree>
-                ]]>
-            </field>
+            <field name="name">location_list</field>
         </record>
 
         <record model="ir.action.act_window" id="act_location_tree">
@@ -153,35 +106,13 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="party_view_form">
             <field name="model">party.party</field>
             <field name="inherit" ref="party.party_view_form"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form/notebook/page[@id=&quot;accounting&quot;]"
-                        position="after">
-                        <page string="Stock" id="stock">
-                            <label name="customer_location"/>
-                            <field name="customer_location"/>
-                            <label name="supplier_location"/>
-                            <field name="supplier_location"/>
-                        </page>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">party_form</field>
         </record>
 
         <record model="ir.ui.view" id="products_by_locations_start_view_form">
             <field name="model">stock.products_by_locations.start</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Products by Locations">
-                    <label name="forecast_date"/>
-                    <field name="forecast_date"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">products_by_locations_start_form</field>
         </record>
 
     </data>
diff --git a/move.xml b/move.xml
index ba2efd3d3e..5c2c2fbcae 100644
--- a/move.xml
+++ b/move.xml
@@ -6,73 +6,20 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="move_view_form">
             <field name="model">stock.move</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <form string="Move" col="4">
-                        <label name="from_location"/>
-                        <field name="from_location"/>
-                        <label name="to_location"/>
-                        <field name="to_location"/>
-                        <label name="product"/>
-                        <field name="product"/>
-                        <label name="company"/>
-                        <field name="company"/>
-                        <label name="quantity"/>
-                        <field name="quantity"/>
-                        <label name="uom"/>
-                        <field name="uom"/>
-                        <label name="unit_price"/>
-                        <field name="unit_price"/>
-                        <label name="currency"/>
-                        <field name="currency"/>
-                        <label name="planned_date"/>
-                        <field name="planned_date"/>
-                        <label name="effective_date"/>
-                        <field name="effective_date"/>
-                        <separator colspan="4" id="separator"/>
-                        <label name="state"/>
-                        <field name="state"/>
-                        <field name="unit_price_required" invisible="1" colspan="4"/>
-                        <field name="unit_digits" invisible="1" colspan="4"/>
-                    </form>
-                ]]>
-            </field>
+            <field name="name">move_form</field>
         </record>
         <record model="ir.ui.view" id="move_view_tree">
             <field name="model">stock.move</field>
             <field name="type">tree</field>
             <field name="priority" eval="10"/>
-            <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="planned_date"/>
-                        <field name="state"/>
-                        <field name="unit_digits" tree_invisible="1"/>
-                        <field name="create_date" tree_invisible="1"/>
-                    </tree>
-                ]]>
-            </field>
+            <field name="name">move_tree</field>
         </record>
 
         <record model="ir.ui.view" id="move_view_tree_simple">
             <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="quantity"/>
-                    <field name="uom" expand="1"/>
-                    <field name="unit_digits" tree_invisible="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">move_tree_simple</field>
         </record>
 
         <record model="ir.action.act_window" id="act_move_form">
diff --git a/period.xml b/period.xml
index 7c107cda88..7365018907 100644
--- a/period.xml
+++ b/period.xml
@@ -6,37 +6,12 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="period_view_form">
             <field name="model">stock.period</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Period">
-                    <label name="company"/>
-                    <field name="company"/>
-                    <label name="date"/>
-                    <field name="date"/>
-                    <label name="state"/>
-                    <field name="state"/>
-                    <group col="2" colspan="2" id="buttons">
-                        <button name="draft" string="Draft"
-                            icon="tryton-clear"/>
-                        <button name="close" string="Close"
-                            icon="tryton-ok"/>
-                    </group>
-                </form>
-                ]]>
-            </field>
+            <field name="name">period_form</field>
         </record>
         <record model="ir.ui.view" id="period_view_list">
             <field name="model">stock.period</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Periods">
-                    <field name="date"/>
-                    <field name="company"/>
-                    <field name="state"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">period_list</field>
         </record>
 
         <record model="ir.action.act_window" id="act_period_list">
@@ -103,34 +78,12 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="period_cache_view_form">
             <field name="model">stock.period.cache</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Period Cache" col="6">
-                    <label name="period"/>
-                    <field name="period" colspan="5"/>
-                    <label name="location"/>
-                    <field name="location"/>
-                    <label name="product"/>
-                    <field name="product"/>
-                    <label name="internal_quantity"/>
-                    <field name="internal_quantity"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">period_cache_form</field>
         </record>
         <record model="ir.ui.view" id="period_cache_view_list">
             <field name="model">stock.period.cache</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Period Caches">
-                    <field name="period"/>
-                    <field name="location"/>
-                    <field name="product"/>
-                    <field name="internal_quantity"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">period_cache_list</field>
         </record>
 
         <record model="ir.model.access" id="access_period_cache_cache">
diff --git a/product.xml b/product.xml
index f3b6801971..3f8fe0e30c 100644
--- a/product.xml
+++ b/product.xml
@@ -7,20 +7,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="model">product.product</field>
             <field name="type">tree</field>
             <field name="priority">20</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <tree string="Products">
-                        <field name="name"/>
-                        <field name="code"/>
-                        <field name="quantity"/>
-                        <field name="cost_value"/>
-                        <field name="forecast_quantity"/>
-                        <field name="default_uom"/>
-                        <field name="type"/>
-                        <field name="active"/>
-                    </tree>
-                ]]>
-            </field>
+            <field name="name">product_tree_qty</field>
         </record>
 
         <record model="ir.ui.view" id="location_quantity_view_tree">
@@ -28,18 +15,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="type">tree</field>
             <field name="field_childs">childs</field>
             <field name="priority" eval="20"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <tree string="Location Quantity">
-                        <field name="name"/>
-                        <field name="quantity"/>
-                        <field name="forecast_quantity"/>
-                        <field name="cost_value"/>
-                        <field name="parent" tree_invisible="1"/>
-                        <field name="childs" tree_invisible="1"/>
-                    </tree>
-                ]]>
-            </field>
+            <field name="name">location_quantity_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="act_location_quantity_tree">
@@ -73,45 +49,19 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="product_by_location_start_view_form">
             <field name="model">product.by_location.start</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Product by Location">
-                    <label name="forecast_date"/>
-                    <field name="forecast_date"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">product_by_location_start_form</field>
         </record>
 
         <record model="ir.ui.view" id="product_quantities_warehouse_view_graph">
             <field name="model">stock.product_quantities_warehouse</field>
             <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <graph string="Product Quantities By Warehouse" type="line"
-                    legend="0">
-                    <x>
-                        <field name="date"/>
-                    </x>
-                    <y>
-                        <field name="quantity" empty="0" interpolation="constant-left" fill="1"/>
-                    </y>
-                </graph>
-                ]]>
-            </field>
+            <field name="name">product_quantities_warehouse_graph</field>
         </record>
 
         <record model="ir.ui.view" id="product_quantities_warehouse_view_list">
             <field name="model">stock.product_quantities_warehouse</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Product Quantities By Warehouse">
-                    <field name="date"/>
-                    <field name="quantity"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">product_quantities_warehouse_list</field>
         </record>
 
         <record model="ir.action.act_window"
@@ -136,14 +86,7 @@ this repository contains the full copyright notices and license terms. -->
             <field
                 name="model">stock.product_quantities_warehouse.start</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Product Quantities By Warehouse">
-                    <label name="warehouse"/>
-                    <field name="warehouse"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">product_quantities_warehouse_start_form</field>
         </record>
 
         <record model="ir.action.wizard"
diff --git a/setup.py b/setup.py
index aab758066b..1c22e720e5 100644
--- a/setup.py
+++ b/setup.py
@@ -47,8 +47,8 @@ setup(name='trytond_stock',
         ],
     package_data={
         'trytond.modules.stock': (info.get('xml', [])
-            + ['tryton.cfg', 'locale/*.po', '*.odt', 'icons/*.svg',
-                'tests/*.rst']),
+            + ['tryton.cfg', 'view/*.xml', 'locale/*.po', '*.odt',
+                'icons/*.svg', 'tests/*.rst']),
         },
     classifiers=[
         'Development Status :: 5 - Production/Stable',
diff --git a/shipment.xml b/shipment.xml
index ef285d0d6b..22ecf68614 100644
--- a/shipment.xml
+++ b/shipment.xml
@@ -4,72 +4,15 @@ this repository contains the full copyright notices and license terms. -->
 <tryton>
     <data>
 
-        <!--Shipment in view-->
         <record model="ir.ui.view" id="shipment_in_view_form">
             <field name="model">stock.shipment.in</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <form string="Supplier Shipment" col="4" cursor="supplier">
-                        <label name="reference"/>
-                        <field name="reference"/>
-                        <label name="code"/>
-                        <field name="code"/>
-                        <label name="supplier"/>
-                        <field name="supplier"/>
-                        <label name="contact_address"/>
-                        <field name="contact_address"/>
-                        <label name="planned_date"/>
-                        <field name="planned_date"/>
-                        <label name="effective_date"/>
-                        <field name="effective_date"/>
-                        <label name="company"/>
-                        <field name="company"/>
-                        <label name="warehouse"/>
-                        <field name="warehouse"/>
-                        <notebook colspan="6">
-                            <page string="Incoming Moves" id="incoming_moves">
-                                <field name="incoming_moves" colspan="4"/>
-                            </page>
-                            <page string="Inventory Moves" id="inventory_moves">
-                                <field name="inventory_moves" colspan="4"/>
-                            </page>
-                        </notebook>
-                        <group col="4" colspan="6" id="state_buttons">
-                            <label name="state"/>
-                            <field name="state"/>
-                            <group col="5" colspan="2" id="buttons">
-                                <button string="Cancel" name="cancel"
-                                    icon="tryton-cancel"/>
-                                <button string="Receive" name="receive"
-                                    icon="tryton-go-next"/>
-                                <button string="Done" name="done"
-                                    icon="tryton-ok"/>
-                                <button string="Reset to Draft" name="draft"
-                                    icon="tryton-clear"/>
-                            </group>
-                        </group>
-                    </form>
-                    ]]>
-            </field>
+            <field name="name">shipment_in_form</field>
         </record>
         <record model="ir.ui.view" id="shipment_in_view_tree">
             <field name="model">stock.shipment.in</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <tree string="Supplier Shipments">
-                        <field name="code"/>
-                        <field name="reference"/>
-                        <field name="planned_date"/>
-                        <field name="effective_date"/>
-                        <field name="supplier"/>
-                        <field name="contact_address"/>
-                        <field name="state"/>
-                        <field name="create_date" tree_invisible="1"/>
-                    </tree>
-                ]]>
-            </field>
+            <field name="name">shipment_in_tree</field>
         </record>
         <record model="ir.action.act_window" id="act_shipment_in_form">
             <field name="name">Supplier Shipments</field>
@@ -109,7 +52,6 @@ this repository contains the full copyright notices and license terms. -->
         <menuitem parent="menu_stock" sequence="20"
             action="act_shipment_in_form" id="menu_shipment_in_form"/>
 
-        <!-- Shipment In Return view-->
         <record model="ir.action.wizard" id="wizard_shipment_in_return_assign">
             <field name="name">Assign Purchase Return Shipment</field>
             <field name="wiz_name">stock.shipment.in.return.assign</field>
@@ -119,56 +61,12 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="shipment_in_return_view_form">
             <field name="model">stock.shipment.in.return</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <form string="Supplier Return Shipment" col="4" cursor="from_location">
-                        <label name="reference"/>
-                        <field name="reference"/>
-                        <label name="code"/>
-                        <field name="code"/>
-                        <label name="from_location"/>
-                        <field name="from_location"/>
-                        <label name="to_location"/>
-                        <field name="to_location"/>
-                        <label name="planned_date"/>
-                        <field name="planned_date"/>
-                        <label name="effective_date"/>
-                        <field name="effective_date"/>
-                        <field name="moves"  colspan="4"/>
-                        <label name="state"/>
-                        <field name="state"/>
-                        <group col="5" colspan="2" id="buttons">
-                            <button string="Cancel" name="cancel"
-                                icon="tryton-cancel"/>
-                            <button string="Draft" name="draft"
-                                icon="tryton-go-previous"/>
-                            <button string="Wait" name="wait"/>
-                            <button string="Assign" name="assign_wizard"
-                                icon="tryton-go-next"/>
-                            <button string="Done" name="done"
-                                icon="tryton-ok"/>
-                        </group>
-                    </form>
-                    ]]>
-            </field>
+            <field name="name">shipment_in_return_form</field>
         </record>
         <record model="ir.ui.view" id="shipment_in_return_view_tree">
             <field name="model">stock.shipment.in.return</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <tree string="Supplier Return Shipments">
-                        <field name="code"/>
-                        <field name="reference"/>
-                        <field name="planned_date"/>
-                        <field name="effective_date"/>
-                        <field name="from_location"/>
-                        <field name="to_location"/>
-                        <field name="state"/>
-                        <field name="create_date" tree_invisible="1"/>
-                    </tree>
-                ]]>
-            </field>
+            <field name="name">shipment_in_return_tree</field>
         </record>
         <record model="ir.action.act_window" id="act_shipment_in_return_form">
             <field name="name">Supplier Return Shipments</field>
@@ -222,20 +120,9 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="shipment_in_return_assign_failed_view_form">
             <field name="model">stock.shipment.in.return.assign.failed</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Unable to Assign" col="2">
-                    <image name="tryton-dialog-warning" xexpand="0" xfill="0"/>
-                    <separator string="Unable to assign those products:"
-                        id="unable"/>
-                    <field name="moves" colspan="2"
-                        view_ids="stock.move_view_tree_simple"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">shipment_in_return_assign_failed_form</field>
         </record>
 
-        <!--Shipment out view-->
         <record model="ir.action.wizard" id="wizard_shipment_out_assign">
             <field name="name">Assign Shipment Out</field>
             <field name="wiz_name">stock.shipment.out.assign</field>
@@ -245,70 +132,12 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="shipment_out_view_form">
             <field name="model">stock.shipment.out</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <form string="Customer Shipment" col="4" cursor="customer">
-                        <label name="reference"/>
-                        <field name="reference"/>
-                        <label name="code"/>
-                        <field name="code"/>
-                        <label name="customer"/>
-                        <field name="customer"/>
-                        <label name="delivery_address"/>
-                        <field name="delivery_address"/>
-                        <label name="planned_date"/>
-                        <field name="planned_date"/>
-                        <label name="effective_date"/>
-                        <field name="effective_date"/>
-                        <label name="company"/>
-                        <field name="company"/>
-                        <label name="warehouse"/>
-                        <field name="warehouse"/>
-                        <notebook colspan="4">
-                            <page string="Inventory Moves" id="inventory_moves">
-                                <field name="inventory_moves" colspan="4"/>
-                            </page>
-                            <page string="Outgoing Moves" id="outgoing_moves">
-                                <field name="outgoing_moves" colspan="4"/>
-                            </page>
-                        </notebook>
-                        <group col="4" colspan="4" id="state_buttons">
-                            <label name="state"/>
-                            <field name="state"/>
-                            <group col="6" colspan="2" id="buttons">
-                                <button string="Cancel" name="cancel"
-                                    icon="tryton-cancel"/>
-                                <button string="Draft" name="draft"/>
-                                <button string="Waiting" name="wait"/>
-                                <button string="Assign" name="assign_wizard"
-                                    icon="tryton-go-next"/>
-                                <button string="Make shipment" name="pack"
-                                    icon="tryton-go-next"/>
-                                <button string="Done" name="done"
-                                    icon="tryton-ok"/>
-                            </group>
-                        </group>
-                    </form>
-                    ]]>
-            </field>
+            <field name="name">shipment_out_form</field>
         </record>
         <record model="ir.ui.view" id="shipment_out_view_tree">
             <field name="model">stock.shipment.out</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <tree string="Customer Shipments">
-                        <field name="code"/>
-                        <field name="reference"/>
-                        <field name="planned_date"/>
-                        <field name="effective_date"/>
-                        <field name="customer"/>
-                        <field name="delivery_address"/>
-                        <field name="state"/>
-                        <field name="create_date" tree_invisible="1"/>
-                    </tree>
-                ]]>
-            </field>
+            <field name="name">shipment_out_tree</field>
         </record>
 
         <record model="ir.action.wizard" id="create_shipment_out_return">
@@ -388,7 +217,6 @@ this repository contains the full copyright notices and license terms. -->
             </field>
         </record>
 
-        <!--Internal Shipment view-->
         <record model="ir.action.wizard" id="wizard_shipment_internal_assign">
             <field name="name">Assign Shipment Internal</field>
             <field name="wiz_name">stock.shipment.internal.assign</field>
@@ -398,57 +226,12 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="shipment_internal_view_form">
             <field name="model">stock.shipment.internal</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <form string="Internal Shipment" col="4" cursor="from_location">
-                        <label name="reference"/>
-                        <field name="reference"/>
-                        <label name="code"/>
-                        <field name="code"/>
-                        <label name="from_location"/>
-                        <field name="from_location"/>
-                        <label name="to_location"/>
-                        <field name="to_location"/>
-                        <label name="planned_date"/>
-                        <field name="planned_date"/>
-                        <label name="effective_date"/>
-                        <field name="effective_date"/>
-                        <label name="company"/>
-                        <field name="company"/>
-                        <field name="moves"  colspan="4"/>
-                        <label name="state"/>
-                        <field name="state"/>
-                        <group col="5" colspan="2" id="buttons">
-                            <button string="Cancel" name="cancel"
-                                icon="tryton-cancel"/>
-                            <button string="Draft" name="draft"/>
-                            <button string="Waiting" name="wait"/>
-                            <button string="Assign" name="assign_wizard"
-                                icon="tryton-go-next"/>
-                            <button string="Done" name="done"
-                                icon="tryton-ok"/>
-                        </group>
-                    </form>
-                    ]]>
-            </field>
+            <field name="name">shipment_internal_form</field>
         </record>
         <record model="ir.ui.view" id="shipment_internal_view_tree">
             <field name="model">stock.shipment.internal</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <tree string="Internal Shipments">
-                        <field name="code"/>
-                        <field name="reference"/>
-                        <field name="planned_date"/>
-                        <field name="effective_date"/>
-                        <field name="from_location"/>
-                        <field name="to_location"/>
-                        <field name="state"/>
-                        <field name="create_date" tree_invisible="1"/>
-                    </tree>
-                ]]>
-            </field>
+            <field name="name">shipment_internal_tree</field>
         </record>
         <record model="ir.action.act_window" id="act_shipment_internal_form">
             <field name="name">Internal Shipments</field>
@@ -515,72 +298,15 @@ this repository contains the full copyright notices and license terms. -->
             </field>
         </record>
 
-        <!--Return Shipment Out view-->
         <record model="ir.ui.view" id="shipment_out_return_view_form">
             <field name="model">stock.shipment.out.return</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <form string="Customer Return Shipment" col="4" cursor="customer">
-                        <label name="reference"/>
-                        <field name="reference"/>
-                        <label name="code"/>
-                        <field name="code"/>
-                        <label name="customer"/>
-                        <field name="customer"/>
-                        <label name="delivery_address"/>
-                        <field name="delivery_address"/>
-                        <label name="planned_date"/>
-                        <field name="planned_date"/>
-                        <label name="effective_date"/>
-                        <field name="effective_date"/>
-                        <label name="company"/>
-                        <field name="company"/>
-                        <label name="warehouse"/>
-                        <field name="warehouse"/>
-                        <notebook colspan="6">
-                            <page string="Incoming Moves" id="incoming_moves">
-                                <field name="incoming_moves" colspan="4"/>
-                            </page>
-                            <page string="Inventory Moves" id="inventory_moves">
-                                <field name="inventory_moves" colspan="4"/>
-                            </page>
-                        </notebook>
-                        <group col="4" colspan="6" id="state_buttons">
-                            <label name="state"/>
-                            <field name="state"/>
-                            <group col="5" colspan="2" id="buttons">
-                                <button string="Cancel" name="cancel"
-                                    icon="tryton-cancel"/>
-                                <button string="Draft" name="draft"
-                                    icon="tryton-clear"/>
-                                <button string="Received" name="receive"
-                                    icon="tryton-go-next"/>
-                                <button string="Done" name="done"
-                                    icon="tryton-ok"/>
-                            </group>
-                        </group>
-                    </form>
-                    ]]>
-            </field>
+            <field name="name">shipment_out_return_form</field>
         </record>
         <record model="ir.ui.view" id="shipment_out_return_view_tree">
             <field name="model">stock.shipment.out.return</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                    <tree string="Customer Return Shipments">
-                        <field name="code"/>
-                        <field name="reference"/>
-                        <field name="state"/>
-                        <field name="planned_date"/>
-                        <field name="effective_date"/>
-                        <field name="customer"/>
-                        <field name="delivery_address"/>
-                        <field name="create_date" tree_invisible="1"/>
-                    </tree>
-                ]]>
-            </field>
+            <field name="name">shipment_out_return_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="act_shipment_out_return_form">
@@ -716,7 +442,6 @@ this repository contains the full copyright notices and license terms. -->
                 <field name="code">stock.shipment.out</field>
         </record>
 
-        <!-- Sequence shipment in -->
         <record model="ir.sequence.type" id="sequence_type_shipment_in">
             <field name="name">Supplier Shipment</field>
             <field name="code">stock.shipment.in</field>
@@ -737,7 +462,6 @@ this repository contains the full copyright notices and license terms. -->
                 <field name="code">stock.shipment.in</field>
         </record>
 
-        <!-- Sequence shipment internal -->
         <record model="ir.sequence.type" id="sequence_type_shipment_internal">
             <field name="name">Internal Shipment</field>
             <field name="code">stock.shipment.internal</field>
@@ -758,7 +482,6 @@ this repository contains the full copyright notices and license terms. -->
                 <field name="code">stock.shipment.internal</field>
         </record>
 
-        <!-- Sequence shipment out return-->
         <record model="ir.sequence.type" id="sequence_type_shipment_out_return">
             <field name="name">Customer Return Shipment</field>
             <field name="code">stock.shipment.out.return</field>
@@ -800,38 +523,17 @@ this repository contains the full copyright notices and license terms. -->
                 <field name="code">stock.shipment.in.return</field>
         </record>
 
-        <!-- Add delivery field on address -->
         <record model="ir.ui.view" id="address_view_tree">
             <field name="model">party.address</field>
             <field name="inherit" ref="party.address_view_tree"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/tree/field[@name=&quot;active&quot;]" position="after">
-                        <field name="delivery"/>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">party_address_tree</field>
         </record>
         <record model="ir.ui.view" id="address_view_form">
             <field name="model">party.address</field>
             <field name="inherit" ref="party.address_view_form"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form/group/field[@name=&quot;active&quot;]"
-                        position="after">
-                        <label name="delivery"/>
-                        <field name="delivery" xexpand="0" width="25"/>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">party_address_form</field>
         </record>
-        <!-- Model Access -->
+
         <record model="ir.model.access" id="access_shipment_in">
             <field name="model" search="[('model', '=', 'stock.shipment.in')]"/>
             <field name="perm_read" eval="False"/>
@@ -1249,7 +951,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="group" ref="group_stock_force_assignment"/>
         </record>
 
-        <!-- Rule definition -->
+
         <record model="ir.rule.group" id="rule_group_shipment_in">
             <field name="model" search="[('model', '=', 'stock.shipment.in')]"/>
             <field name="global_p" eval="True"/>
diff --git a/view/configuration_form.xml b/view/configuration_form.xml
new file mode 100644
index 0000000000..5623085bb0
--- /dev/null
+++ b/view/configuration_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. -->
+<form string="Stock Configuration">
+    <label name="shipment_in_sequence"/>
+    <field name="shipment_in_sequence"/>
+    <label name="shipment_in_return_sequence"/>
+    <field name="shipment_in_return_sequence"/>
+    <label name="shipment_out_sequence"/>
+    <field name="shipment_out_sequence"/>
+    <label name="shipment_out_return_sequence"/>
+    <field name="shipment_out_return_sequence"/>
+    <label name="shipment_internal_sequence"/>
+    <field name="shipment_internal_sequence"/>
+</form>
diff --git a/view/inventory_form.xml b/view/inventory_form.xml
new file mode 100644
index 0000000000..b139c13df0
--- /dev/null
+++ b/view/inventory_form.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. -->
+<form string="Inventory" col="4">
+    <label name="location"/>
+    <field name="location"/>
+    <label name="lost_found"/>
+    <field name="lost_found"/>
+    <label name="date"/>
+    <field name="date"/>
+    <label name="company"/>
+    <field name="company"/>
+    <label colspan="2" id="empty"/>
+    <button string="Complete Inventory"
+        name="complete_lines" colspan="2"
+        help="Add an inventory line for each missing products"/>
+    <field name="lines" colspan="4"/>
+    <group col="4" colspan="4" id="group_buttons">
+        <label name="state"/>
+        <field name="state"/>
+        <group colspan="2" col="3" id="buttons">
+            <button string="Cancel" name="cancel" icon="tryton-cancel" />
+            <button string="Confirm" name="confirm" icon="tryton-ok"/>
+        </group>
+    </group>
+</form>
diff --git a/view/inventory_line_form.xml b/view/inventory_line_form.xml
new file mode 100644
index 0000000000..1181051c8d
--- /dev/null
+++ b/view/inventory_line_form.xml
@@ -0,0 +1,18 @@
+<?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="Inventory Line" col="4">
+    <label name="product"/>
+    <field name="product"/>
+    <label name="uom"/>
+    <field name="uom"/>
+    <label name="expected_quantity"/>
+    <field name="expected_quantity"/>
+    <label name="quantity"/>
+    <field name="quantity"/>
+    <label name="move"/>
+    <field name="move"/>
+    <label name="inventory"/>
+    <field name="inventory"/>
+    <field name="unit_digits" invisible="1" colspan="4"/>
+</form>
diff --git a/view/inventory_line_tree.xml b/view/inventory_line_tree.xml
new file mode 100644
index 0000000000..76683366c5
--- /dev/null
+++ b/view/inventory_line_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="Inventory Lines" editable="bottom">
+    <field name="product"/>
+    <field name="expected_quantity"/>
+    <field name="quantity"/>
+    <field name="uom"/>
+    <field name="unit_digits" tree_invisible="1"/>
+</tree>
diff --git a/view/inventory_tree.xml b/view/inventory_tree.xml
new file mode 100644
index 0000000000..db5c5887fb
--- /dev/null
+++ b/view/inventory_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="Inventories">
+    <field name="location"/>
+    <field name="date"/>
+    <field name="state"/>
+    <field name="company"/>
+    <field name="create_date" tree_invisible="1"/>
+</tree>
diff --git a/view/location_form.xml b/view/location_form.xml
new file mode 100644
index 0000000000..04b5dbf603
--- /dev/null
+++ b/view/location_form.xml
@@ -0,0 +1,27 @@
+<?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="Location">
+    <label name="name"/>
+    <field name="name"/>
+    <label name="code"/>
+    <field name="code"/>
+    <label name="parent"/>
+    <field name="parent"/>
+    <label name="active"/>
+    <field name="active"/>
+    <label name="type"/>
+    <field name="type"/>
+    <newline/>
+    <label name="address"/>
+    <field name="address"/>
+    <newline/>
+    <label name="input_location"/>
+    <field name="input_location"/>
+    <newline/>
+    <label name="output_location"/>
+    <field name="output_location"/>
+    <newline/>
+    <label name="storage_location"/>
+    <field name="storage_location"/>
+</form>
diff --git a/view/location_list.xml b/view/location_list.xml
new file mode 100644
index 0000000000..62ffee2295
--- /dev/null
+++ b/view/location_list.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. -->
+<tree string="Locations">
+    <field name="name"/>
+    <field name="code"/>
+    <field name="type"/>
+    <field name="active" tree_invisible="1"/>
+</tree>
diff --git a/view/location_quantity_tree.xml b/view/location_quantity_tree.xml
new file mode 100644
index 0000000000..bcb3ec548e
--- /dev/null
+++ b/view/location_quantity_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. -->
+<tree string="Location Quantity">
+    <field name="name"/>
+    <field name="quantity"/>
+    <field name="forecast_quantity"/>
+    <field name="cost_value"/>
+    <field name="parent" tree_invisible="1"/>
+    <field name="childs" tree_invisible="1"/>
+</tree>
diff --git a/view/location_tree.xml b/view/location_tree.xml
new file mode 100644
index 0000000000..42b2d4a2c9
--- /dev/null
+++ b/view/location_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. -->
+<tree string="Locations" keyword_open="1">
+    <field name="name"/>
+    <field name="code"/>
+    <field name="type"/>
+    <field name="active" tree_invisible="1"/>
+    <field name="parent" tree_invisible="1"/>
+    <field name="childs" tree_invisible="1"/>
+</tree>
diff --git a/view/move_form.xml b/view/move_form.xml
new file mode 100644
index 0000000000..d401b58308
--- /dev/null
+++ b/view/move_form.xml
@@ -0,0 +1,30 @@
+<?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="Move" col="4">
+    <label name="from_location"/>
+    <field name="from_location"/>
+    <label name="to_location"/>
+    <field name="to_location"/>
+    <label name="product"/>
+    <field name="product"/>
+    <label name="company"/>
+    <field name="company"/>
+    <label name="quantity"/>
+    <field name="quantity"/>
+    <label name="uom"/>
+    <field name="uom"/>
+    <label name="unit_price"/>
+    <field name="unit_price"/>
+    <label name="currency"/>
+    <field name="currency"/>
+    <label name="planned_date"/>
+    <field name="planned_date"/>
+    <label name="effective_date"/>
+    <field name="effective_date"/>
+    <separator colspan="4" id="separator"/>
+    <label name="state"/>
+    <field name="state"/>
+    <field name="unit_price_required" invisible="1" colspan="4"/>
+    <field name="unit_digits" invisible="1" colspan="4"/>
+</form>
diff --git a/view/move_tree.xml b/view/move_tree.xml
new file mode 100644
index 0000000000..4d3623a9fd
--- /dev/null
+++ b/view/move_tree.xml
@@ -0,0 +1,14 @@
+<?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="Moves">
+    <field name="product"/>
+    <field name="from_location"/>
+    <field name="to_location"/>
+    <field name="quantity"/>
+    <field name="uom"/>
+    <field name="planned_date"/>
+    <field name="state"/>
+    <field name="unit_digits" tree_invisible="1"/>
+    <field name="create_date" tree_invisible="1"/>
+</tree>
diff --git a/view/move_tree_simple.xml b/view/move_tree_simple.xml
new file mode 100644
index 0000000000..ab8d001959
--- /dev/null
+++ b/view/move_tree_simple.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. -->
+<tree string="Moves">
+    <field name="product"/>
+    <field name="quantity"/>
+    <field name="uom" expand="1"/>
+    <field name="unit_digits" tree_invisible="1"/>
+</tree>
diff --git a/view/party_address_form.xml b/view/party_address_form.xml
new file mode 100644
index 0000000000..41a7036f56
--- /dev/null
+++ b/view/party_address_form.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. -->
+<data>
+    <xpath expr="/form/group/field[@name='active']" position="after">
+        <label name="delivery"/>
+        <field name="delivery" xexpand="0" width="25"/>
+    </xpath>
+</data>
+
diff --git a/view/party_address_tree.xml b/view/party_address_tree.xml
new file mode 100644
index 0000000000..2a8041045d
--- /dev/null
+++ b/view/party_address_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='active']" position="after">
+        <field name="delivery"/>
+    </xpath>
+</data>
diff --git a/view/party_form.xml b/view/party_form.xml
new file mode 100644
index 0000000000..4ab8eede7e
--- /dev/null
+++ b/view/party_form.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. -->
+<data>
+    <xpath expr="/form/notebook/page[@id='accounting']" position="after">
+        <page string="Stock" id="stock">
+            <label name="customer_location"/>
+            <field name="customer_location"/>
+            <label name="supplier_location"/>
+            <field name="supplier_location"/>
+        </page>
+    </xpath>
+</data>
diff --git a/view/period_cache_form.xml b/view/period_cache_form.xml
new file mode 100644
index 0000000000..5183ec715c
--- /dev/null
+++ b/view/period_cache_form.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. -->
+<form string="Period Cache" col="6">
+    <label name="period"/>
+    <field name="period" colspan="5"/>
+    <label name="location"/>
+    <field name="location"/>
+    <label name="product"/>
+    <field name="product"/>
+    <label name="internal_quantity"/>
+    <field name="internal_quantity"/>
+</form>
diff --git a/view/period_cache_list.xml b/view/period_cache_list.xml
new file mode 100644
index 0000000000..49b2f5ca6e
--- /dev/null
+++ b/view/period_cache_list.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. -->
+<tree string="Period Caches">
+    <field name="period"/>
+    <field name="location"/>
+    <field name="product"/>
+    <field name="internal_quantity"/>
+</tree>
diff --git a/view/period_form.xml b/view/period_form.xml
new file mode 100644
index 0000000000..46aee4181a
--- /dev/null
+++ b/view/period_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. -->
+<form string="Period">
+    <label name="company"/>
+    <field name="company"/>
+    <label name="date"/>
+    <field name="date"/>
+    <label name="state"/>
+    <field name="state"/>
+    <group col="2" colspan="2" id="buttons">
+        <button name="draft" string="Draft" icon="tryton-clear"/>
+        <button name="close" string="Close" icon="tryton-ok"/>
+    </group>
+</form>
diff --git a/view/period_list.xml b/view/period_list.xml
new file mode 100644
index 0000000000..aded88e186
--- /dev/null
+++ b/view/period_list.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="Periods">
+    <field name="date"/>
+    <field name="company"/>
+    <field name="state"/>
+</tree>
diff --git a/view/product_by_location_start_form.xml b/view/product_by_location_start_form.xml
new file mode 100644
index 0000000000..6d15c30a2f
--- /dev/null
+++ b/view/product_by_location_start_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="Product by Location">
+    <label name="forecast_date"/>
+    <field name="forecast_date"/>
+</form>
diff --git a/view/product_quantities_warehouse_graph.xml b/view/product_quantities_warehouse_graph.xml
new file mode 100644
index 0000000000..82118313bd
--- /dev/null
+++ b/view/product_quantities_warehouse_graph.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. -->
+<graph string="Product Quantities By Warehouse" type="line"
+    legend="0">
+    <x>
+        <field name="date"/>
+    </x>
+    <y>
+        <field name="quantity" empty="0" interpolation="constant-left" fill="1"/>
+    </y>
+</graph>
diff --git a/view/product_quantities_warehouse_list.xml b/view/product_quantities_warehouse_list.xml
new file mode 100644
index 0000000000..7cac2d25a1
--- /dev/null
+++ b/view/product_quantities_warehouse_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 Quantities By Warehouse">
+    <field name="date"/>
+    <field name="quantity"/>
+</tree>
diff --git a/view/product_quantities_warehouse_start_form.xml b/view/product_quantities_warehouse_start_form.xml
new file mode 100644
index 0000000000..10f516fdf1
--- /dev/null
+++ b/view/product_quantities_warehouse_start_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="Product Quantities By Warehouse">
+    <label name="warehouse"/>
+    <field name="warehouse"/>
+</form>
diff --git a/view/product_tree_qty.xml b/view/product_tree_qty.xml
new file mode 100644
index 0000000000..ce945fe467
--- /dev/null
+++ b/view/product_tree_qty.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="Products">
+    <field name="name"/>
+    <field name="code"/>
+    <field name="quantity"/>
+    <field name="cost_value"/>
+    <field name="forecast_quantity"/>
+    <field name="default_uom"/>
+    <field name="type"/>
+    <field name="active"/>
+</tree>
diff --git a/view/products_by_locations_start_form.xml b/view/products_by_locations_start_form.xml
new file mode 100644
index 0000000000..7bc1757728
--- /dev/null
+++ b/view/products_by_locations_start_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="Products by Locations">
+    <label name="forecast_date"/>
+    <field name="forecast_date"/>
+</form>
diff --git a/view/shipment_in_form.xml b/view/shipment_in_form.xml
new file mode 100644
index 0000000000..e9b657731d
--- /dev/null
+++ b/view/shipment_in_form.xml
@@ -0,0 +1,39 @@
+<?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="Supplier Shipment" col="4" cursor="supplier">
+    <label name="reference"/>
+    <field name="reference"/>
+    <label name="code"/>
+    <field name="code"/>
+    <label name="supplier"/>
+    <field name="supplier"/>
+    <label name="contact_address"/>
+    <field name="contact_address"/>
+    <label name="planned_date"/>
+    <field name="planned_date"/>
+    <label name="effective_date"/>
+    <field name="effective_date"/>
+    <label name="company"/>
+    <field name="company"/>
+    <label name="warehouse"/>
+    <field name="warehouse"/>
+    <notebook colspan="6">
+        <page string="Incoming Moves" id="incoming_moves">
+            <field name="incoming_moves" colspan="4"/>
+        </page>
+        <page string="Inventory Moves" id="inventory_moves">
+            <field name="inventory_moves" colspan="4"/>
+        </page>
+    </notebook>
+    <group col="4" colspan="6" id="state_buttons">
+        <label name="state"/>
+        <field name="state"/>
+        <group col="5" colspan="2" id="buttons">
+            <button string="Cancel" name="cancel" icon="tryton-cancel"/>
+            <button string="Receive" name="receive" icon="tryton-go-next"/>
+            <button string="Done" name="done" icon="tryton-ok"/>
+            <button string="Reset to Draft" name="draft" icon="tryton-clear"/>
+        </group>
+    </group>
+</form>
diff --git a/view/shipment_in_return_assign_failed_form.xml b/view/shipment_in_return_assign_failed_form.xml
new file mode 100644
index 0000000000..941e0f0af0
--- /dev/null
+++ b/view/shipment_in_return_assign_failed_form.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. -->
+<form string="Unable to Assign" col="2">
+<image name="tryton-dialog-warning" xexpand="0" xfill="0"/>
+<separator string="Unable to assign those products:"
+    id="unable"/>
+<field name="moves" colspan="2"
+    view_ids="stock.move_view_tree_simple"/>
+</form>
diff --git a/view/shipment_in_return_form.xml b/view/shipment_in_return_form.xml
new file mode 100644
index 0000000000..d599fa098e
--- /dev/null
+++ b/view/shipment_in_return_form.xml
@@ -0,0 +1,27 @@
+<?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="Supplier Return Shipment" col="4" cursor="from_location">
+    <label name="reference"/>
+    <field name="reference"/>
+    <label name="code"/>
+    <field name="code"/>
+    <label name="from_location"/>
+    <field name="from_location"/>
+    <label name="to_location"/>
+    <field name="to_location"/>
+    <label name="planned_date"/>
+    <field name="planned_date"/>
+    <label name="effective_date"/>
+    <field name="effective_date"/>
+    <field name="moves"  colspan="4"/>
+    <label name="state"/>
+    <field name="state"/>
+    <group col="5" colspan="2" id="buttons">
+        <button string="Cancel" name="cancel" icon="tryton-cancel"/>
+        <button string="Draft" name="draft" icon="tryton-go-previous"/>
+        <button string="Wait" name="wait"/>
+        <button string="Assign" name="assign_wizard" icon="tryton-go-next"/>
+        <button string="Done" name="done" icon="tryton-ok"/>
+    </group>
+</form>
diff --git a/view/shipment_in_return_tree.xml b/view/shipment_in_return_tree.xml
new file mode 100644
index 0000000000..3e6266f675
--- /dev/null
+++ b/view/shipment_in_return_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="Supplier Return Shipments">
+    <field name="code"/>
+    <field name="reference"/>
+    <field name="planned_date"/>
+    <field name="effective_date"/>
+    <field name="from_location"/>
+    <field name="to_location"/>
+    <field name="state"/>
+    <field name="create_date" tree_invisible="1"/>
+</tree>
diff --git a/view/shipment_in_tree.xml b/view/shipment_in_tree.xml
new file mode 100644
index 0000000000..7038fc1c22
--- /dev/null
+++ b/view/shipment_in_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="Supplier Shipments">
+    <field name="code"/>
+    <field name="reference"/>
+    <field name="planned_date"/>
+    <field name="effective_date"/>
+    <field name="supplier"/>
+    <field name="contact_address"/>
+    <field name="state"/>
+    <field name="create_date" tree_invisible="1"/>
+</tree>
diff --git a/view/shipment_internal_form.xml b/view/shipment_internal_form.xml
new file mode 100644
index 0000000000..5a8442bdb2
--- /dev/null
+++ b/view/shipment_internal_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. -->
+<form string="Internal Shipment" col="4" cursor="from_location">
+    <label name="reference"/>
+    <field name="reference"/>
+    <label name="code"/>
+    <field name="code"/>
+    <label name="from_location"/>
+    <field name="from_location"/>
+    <label name="to_location"/>
+    <field name="to_location"/>
+    <label name="planned_date"/>
+    <field name="planned_date"/>
+    <label name="effective_date"/>
+    <field name="effective_date"/>
+    <label name="company"/>
+    <field name="company"/>
+    <field name="moves"  colspan="4"/>
+    <label name="state"/>
+    <field name="state"/>
+    <group col="5" colspan="2" id="buttons">
+        <button string="Cancel" name="cancel" icon="tryton-cancel"/>
+        <button string="Draft" name="draft"/>
+        <button string="Waiting" name="wait"/>
+        <button string="Assign" name="assign_wizard" icon="tryton-go-next"/>
+        <button string="Done" name="done" icon="tryton-ok"/>
+    </group>
+</form>
diff --git a/view/shipment_internal_tree.xml b/view/shipment_internal_tree.xml
new file mode 100644
index 0000000000..4b4e126e28
--- /dev/null
+++ b/view/shipment_internal_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="Internal Shipments">
+    <field name="code"/>
+    <field name="reference"/>
+    <field name="planned_date"/>
+    <field name="effective_date"/>
+    <field name="from_location"/>
+    <field name="to_location"/>
+    <field name="state"/>
+    <field name="create_date" tree_invisible="1"/>
+</tree>
diff --git a/view/shipment_out_form.xml b/view/shipment_out_form.xml
new file mode 100644
index 0000000000..ac51e97ba1
--- /dev/null
+++ b/view/shipment_out_form.xml
@@ -0,0 +1,42 @@
+<?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="Customer Shipment" col="4" cursor="customer">
+    <label name="reference"/>
+    <field name="reference"/>
+    <label name="code"/>
+    <field name="code"/>
+    <label name="customer"/>
+    <field name="customer"/>
+    <label name="delivery_address"/>
+    <field name="delivery_address"/>
+    <label name="planned_date"/>
+    <field name="planned_date"/>
+    <label name="effective_date"/>
+    <field name="effective_date"/>
+    <label name="company"/>
+    <field name="company"/>
+    <label name="warehouse"/>
+    <field name="warehouse"/>
+    <notebook colspan="4">
+        <page string="Inventory Moves" id="inventory_moves">
+            <field name="inventory_moves" colspan="4"/>
+        </page>
+        <page string="Outgoing Moves" id="outgoing_moves">
+            <field name="outgoing_moves" colspan="4"/>
+        </page>
+    </notebook>
+    <group col="4" colspan="4" id="state_buttons">
+        <label name="state"/>
+        <field name="state"/>
+        <group col="6" colspan="2" id="buttons">
+            <button string="Cancel" name="cancel" icon="tryton-cancel"/>
+            <button string="Draft" name="draft"/>
+            <button string="Waiting" name="wait"/>
+            <button string="Assign" name="assign_wizard"
+                icon="tryton-go-next"/>
+            <button string="Make shipment" name="pack" icon="tryton-go-next"/>
+            <button string="Done" name="done" icon="tryton-ok"/>
+        </group>
+    </group>
+</form>
diff --git a/view/shipment_out_return_form.xml b/view/shipment_out_return_form.xml
new file mode 100644
index 0000000000..6e4bb1fc77
--- /dev/null
+++ b/view/shipment_out_return_form.xml
@@ -0,0 +1,39 @@
+<?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="Customer Return Shipment" col="4" cursor="customer">
+    <label name="reference"/>
+    <field name="reference"/>
+    <label name="code"/>
+    <field name="code"/>
+    <label name="customer"/>
+    <field name="customer"/>
+    <label name="delivery_address"/>
+    <field name="delivery_address"/>
+    <label name="planned_date"/>
+    <field name="planned_date"/>
+    <label name="effective_date"/>
+    <field name="effective_date"/>
+    <label name="company"/>
+    <field name="company"/>
+    <label name="warehouse"/>
+    <field name="warehouse"/>
+    <notebook colspan="6">
+        <page string="Incoming Moves" id="incoming_moves">
+            <field name="incoming_moves" colspan="4"/>
+        </page>
+        <page string="Inventory Moves" id="inventory_moves">
+            <field name="inventory_moves" colspan="4"/>
+        </page>
+    </notebook>
+    <group col="4" colspan="6" id="state_buttons">
+        <label name="state"/>
+        <field name="state"/>
+        <group col="5" colspan="2" id="buttons">
+            <button string="Cancel" name="cancel" icon="tryton-cancel"/>
+            <button string="Draft" name="draft" icon="tryton-clear"/>
+            <button string="Received" name="receive" icon="tryton-go-next"/>
+            <button string="Done" name="done" icon="tryton-ok"/>
+        </group>
+    </group>
+</form>
diff --git a/view/shipment_out_return_tree.xml b/view/shipment_out_return_tree.xml
new file mode 100644
index 0000000000..38950a9c45
--- /dev/null
+++ b/view/shipment_out_return_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="Customer Return Shipments">
+    <field name="code"/>
+    <field name="reference"/>
+    <field name="state"/>
+    <field name="planned_date"/>
+    <field name="effective_date"/>
+    <field name="customer"/>
+    <field name="delivery_address"/>
+    <field name="create_date" tree_invisible="1"/>
+</tree>
diff --git a/view/shipment_out_tree.xml b/view/shipment_out_tree.xml
new file mode 100644
index 0000000000..c0e54f5f98
--- /dev/null
+++ b/view/shipment_out_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="Customer Shipments">
+    <field name="code"/>
+    <field name="reference"/>
+    <field name="planned_date"/>
+    <field name="effective_date"/>
+    <field name="customer"/>
+    <field name="delivery_address"/>
+    <field name="state"/>
+    <field name="create_date" tree_invisible="1"/>
+</tree>