From 06c6ca3c5c1aa0fdc7bce8d1b73cb044c7c602a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Mon, 11 Mar 2013 16:29:18 +0100
Subject: [PATCH] Use separate XML files for views

---
 MANIFEST.in                                 |   1 +
 configuration.xml                           |  11 +-
 product.xml                                 |  15 +-
 purchase.xml                                | 339 +-------------------
 setup.py                                    |   2 +-
 stock.xml                                   |  15 +-
 view/configuration_form.xml                 |   9 +
 view/handle_invoice_exception_ask_form.xml  |   9 +
 view/handle_shipment_exception_ask_form.xml |  10 +
 view/move_form.xml                          |  25 ++
 view/move_list_shipment.xml                 |  13 +
 view/product_list_purchase_line.xml         |  13 +
 view/product_supplier_form.xml              |  21 ++
 view/product_supplier_price_form.xml        |  11 +
 view/product_supplier_price_tree.xml        |   8 +
 view/product_supplier_tree.xml              |  10 +
 view/product_supplier_tree_sequence.xml     |   8 +
 view/purchase_form.xml                      |  79 +++++
 view/purchase_line_form.xml                 |  39 +++
 view/purchase_line_tree.xml                 |  15 +
 view/purchase_line_tree_sequence.xml        |  15 +
 view/purchase_tree.xml                      |  19 ++
 view/template_form.xml                      |  23 ++
 view/template_tree.xml                      |   8 +
 24 files changed, 355 insertions(+), 363 deletions(-)
 create mode 100644 view/configuration_form.xml
 create mode 100644 view/handle_invoice_exception_ask_form.xml
 create mode 100644 view/handle_shipment_exception_ask_form.xml
 create mode 100644 view/move_form.xml
 create mode 100644 view/move_list_shipment.xml
 create mode 100644 view/product_list_purchase_line.xml
 create mode 100644 view/product_supplier_form.xml
 create mode 100644 view/product_supplier_price_form.xml
 create mode 100644 view/product_supplier_price_tree.xml
 create mode 100644 view/product_supplier_tree.xml
 create mode 100644 view/product_supplier_tree_sequence.xml
 create mode 100644 view/purchase_form.xml
 create mode 100644 view/purchase_line_form.xml
 create mode 100644 view/purchase_line_tree.xml
 create mode 100644 view/purchase_line_tree_sequence.xml
 create mode 100644 view/purchase_tree.xml
 create mode 100644 view/template_form.xml
 create mode 100644 view/template_tree.xml

diff --git a/MANIFEST.in b/MANIFEST.in
index 97a95966de..25699556d2 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 8c2ad6e9f9..9cdc959bb9 100644
--- a/configuration.xml
+++ b/configuration.xml
@@ -6,16 +6,7 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="purchase_configuration_view_form">
             <field name="model">purchase.configuration</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Purchase Configuration">
-                    <label name="purchase_sequence"/>
-                    <field name="purchase_sequence"/>
-                    <label name="purchase_invoice_method" />
-                    <field name="purchase_invoice_method" />
-                </form>
-                ]]>
-            </field>
+            <field name="name">configuration_form</field>
         </record>
         <record model="ir.action.act_window" id="act_purchase_configuration_form">
             <field name="name">Purchase Configuration</field>
diff --git a/product.xml b/product.xml
index e2cf5166b1..d63e0d8e89 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" 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>
+            <field name="name">product_list_purchase_line</field>
         </record>
     </data>
 </tryton>
diff --git a/purchase.xml b/purchase.xml
index 2f3ad285f0..2e2d6b4cac 100644
--- a/purchase.xml
+++ b/purchase.xml
@@ -58,110 +58,12 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="purchase_view_form">
             <field name="model">purchase.purchase</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Purchase" col="6">
-                    <label name="party"/>
-                    <field name="party"/>
-                    <label name="invoice_address"/>
-                    <field name="invoice_address"/>
-                    <label name="supplier_reference"/>
-                    <field name="supplier_reference"/>
-                    <label name="description"/>
-                    <field name="description" colspan="3"/>
-                    <label name="reference"/>
-                    <field name="reference"/>
-                    <notebook colspan="6">
-                        <page string="Purchase" id="purchase">
-                            <label name="purchase_date"/>
-                            <field name="purchase_date"/>
-                            <label name="payment_term"/>
-                            <field name="payment_term"/>
-                            <label name="warehouse"/>
-                            <field name="warehouse"/>
-                            <label name="currency"/>
-                            <field name="currency"/>
-                            <field name="lines" colspan="4"
-                                view_ids="purchase.purchase_line_view_tree_sequence"/>
-                            <group col="2" colspan="2" id="states">
-                                <label name="invoice_state"/>
-                                <field name="invoice_state"/>
-                                <label name="shipment_state"/>
-                                <field name="shipment_state"/>
-                                <label name="state"/>
-                                <field name="state"/>
-                            </group>
-                            <group col="2" colspan="2" id="amount_buttons">
-                                <label name="untaxed_amount" xalign="1.0" xexpand="1"/>
-                                <field name="untaxed_amount" xalign="1.0" xexpand="0"/>
-                                <label name="tax_amount" xalign="1.0" xexpand="1"/>
-                                <field name="tax_amount" xalign="1.0" xexpand="0"/>
-                                <label name="total_amount" xalign="1.0" xexpand="1"/>
-                                <field name="total_amount" xalign="1.0" xexpand="0"/>
-                                <group col="6" colspan="2" id="buttons">
-                                    <button name="cancel" string="Cancel"
-                                        icon="tryton-cancel"/>
-                                    <button name="draft" string="Draft"/>
-                                    <button name="quote" string="Quote"
-                                        icon="tryton-go-next"/>
-                                    <button name="handle_invoice_exception"
-                                            string="Handle Invoice Exception"
-                                            icon="tryton-go-next"/>
-                                    <button name="handle_shipment_exception"
-                                            string="Handle Shipment Exception"
-                                            icon="tryton-go-next"/>
-                                    <button name="confirm" string="Confirm"
-                                        icon="tryton-ok"/>
-                                </group>
-                            </group>
-                        </page>
-                        <page string="Other Info" id="info">
-                            <label name="company"/>
-                            <field name="company"/>
-                            <label name="invoice_method"/>
-                            <field name="invoice_method"/>
-                            <separator name="comment" colspan="4"/>
-                            <field name="comment" colspan="4" spell="Eval('party_lang')"/>
-                        </page>
-                        <page string="Invoices" id="invoices">
-                            <field name="invoices" colspan="4"/>
-                        </page>
-                        <page string="Shipments" id="shipments">
-                            <field name="moves" colspan="4"
-                                view_ids="purchase.move_view_list_shipment"/>
-                            <field name="shipments" colspan="4"/>
-                            <field name="shipment_returns" colspan="4"/>
-                        </page>
-                    </notebook>
-                    <field name="currency_digits" invisible="1" colspan="6"/>
-                    <field name="party_lang" invisible="1" colspan="6"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">purchase_form</field>
         </record>
         <record model="ir.ui.view" id="purchase_view_tree">
             <field name="model">purchase.purchase</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Purchases">
-                    <field name="reference"/>
-                    <field name="supplier_reference"/>
-                    <field name="purchase_date"/>
-                    <field name="party"/>
-                    <field name="warehouse"/>
-                    <field name="currency"/>
-                    <field name="untaxed_amount"/>
-                    <field name="total_amount"/>
-                    <field name="state"/>
-                    <field name="invoice_state"/>
-                    <field name="shipment_state"/>
-                    <field name="description"/>
-                    <field name="currency_digits" tree_invisible="1"/>
-                    <field name="create_date" tree_invisible="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">purchase_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="act_shipment_form">
@@ -202,36 +104,13 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="handle_shipment_exception_ask_view_form">
             <field name="model">purchase.handle.shipment.exception.ask</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Handle shipment Exception" col="2">
-                    <image name="tryton-dialog-information" xexpand="0"
-                        xfill="0"/>
-                    <label string="Choose move to recreate"
-                        id="choose"
-                        yalign="0.0" xalign="0.0" xexpand="1"/>
-                    <field name="recreate_moves" colspan="2"
-                        view_ids="stock.move_view_tree"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">handle_shipment_exception_ask_form</field>
         </record>
 
         <record model="ir.ui.view" id="handle_invoice_exception_ask_view_form">
             <field name="model">purchase.handle.invoice.exception.ask</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Handle Invoice Exception" col="2">
-                    <image name="tryton-dialog-information" xexpand="0"
-                        xfill="0"/>
-                    <label string="Choose invoices to recreate"
-                        id="choose"
-                        yalign="0.0" xalign="0.0" xexpand="1"/>
-                    <field name="recreate_invoices" colspan="2"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">handle_invoice_exception_ask_form</field>
         </record>
 
         <record model="ir.action.act_window" id="act_purchase_form">
@@ -383,90 +262,21 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="purchase_line_view_form">
             <field name="model">purchase.line</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Purchase Line" cursor="product">
-                    <label name="purchase"/>
-                    <field name="purchase" colspan="3"/>
-                    <notebook colspan="4">
-                        <page string="General" id="general">
-                            <label name="type"/>
-                            <field name="type"/>
-                            <label name="sequence"/>
-                            <field name="sequence"/>
-                            <label name="product"/>
-                            <field name="product"
-                                view_ids="purchase.product_view_list_purchase_line"/>
-                            <newline/>
-                            <label name="description"/>
-                            <field name="description" colspan="3"
-                                spell="Get(Eval('_parent_purchase', {}), 'party_lang')"/>
-                            <label name="quantity"/>
-                            <field name="quantity"/>
-                            <label name="unit"/>
-                            <field name="unit"/>
-                            <label name="unit_price"/>
-                            <field name="unit_price"/>
-                            <label name="amount"/>
-                            <field name="amount"/>
-                            <label name="delivery_date"/>
-                            <field name="delivery_date"/>
-                            <field name="taxes" colspan="4"/>
-                        </page>
-                        <page string="Notes" id="notes">
-                            <separator name="note" colspan="4"/>
-                            <field name="note" colspan="4"
-                                spell="Get(Eval('_parent_purchase', {}), 'party_lang')"/>
-                        </page>
-                    </notebook>
-                    <field name="unit_digits" invisible="1" colspan="4"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">purchase_line_form</field>
         </record>
 
         <record model="ir.ui.view" id="purchase_line_view_tree">
             <field name="model">purchase.line</field>
             <field name="type">tree</field>
             <field name="priority" eval="10"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Purchase Lines">
-                    <field name="purchase"/>
-                    <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>
+            <field name="name">purchase_line_tree</field>
         </record>
 
         <record model="ir.ui.view" id="purchase_line_view_tree_sequence">
             <field name="model">purchase.line</field>
             <field name="type">tree</field>
             <field name="priority" eval="20"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Lines" sequence="sequence">
-                    <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" expand="1"/>
-                    <field name="sequence" tree_invisible="1"/>
-                    <field name="unit_digits" tree_invisible="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">purchase_line_tree_sequence</field>
         </record>
 
         <record model="ir.model.access" id="access_purchase_line">
@@ -488,59 +298,20 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="product_supplier_view_form">
             <field name="model">purchase.product_supplier</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Product Supplier">
-                    <label name="product"/>
-                    <field name="product" colspan="3"/>
-                    <label name="party"/>
-                    <field name="party"/>
-                    <label name="sequence"/>
-                    <field name="sequence"/>
-                    <label name="name"/>
-                    <field name="name"/>
-                    <label name="code"/>
-                    <field name="code"/>
-                    <label name="delivery_time"/>
-                    <field name="delivery_time"/>
-                    <newline/>
-                    <label name="currency"/>
-                    <field name="currency"/>
-                    <field name="prices" colspan="4"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">product_supplier_form</field>
         </record>
         <record model="ir.ui.view" id="product_supplier_view_tree">
             <field name="model">purchase.product_supplier</field>
             <field name="type">tree</field>
             <field name="priority" eval="10"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Product Suppliers">
-                    <field name="product"/>
-                    <field name="party"/>
-                    <field name="name"/>
-                    <field name="code"/>
-                    <field name="sequence"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">product_supplier_tree</field>
         </record>
 
         <record model="ir.ui.view" id="product_supplier_view_tree_sequence">
             <field name="model">purchase.product_supplier</field>
             <field name="type">tree</field>
             <field name="priority" eval="20"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Product Suppliers" sequence="sequence">
-                    <field name="party"/>
-                    <field name="name"/>
-                    <field name="code"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">product_supplier_tree_sequence</field>
         </record>
 
         <record model="ir.rule.group" id="rule_group_product_supplier">
@@ -555,109 +326,29 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="product_supplier_price_view_form">
             <field name="model">purchase.product_supplier.price</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Product Supplier Price" col="6">
-                    <label name="product_supplier"/>
-                    <field name="product_supplier" colspan="5"/>
-                    <label name="quantity"/>
-                    <field name="quantity"/>
-                    <label name="unit_price"/>
-                    <field name="unit_price"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">product_supplier_price_form</field>
         </record>
         <record model="ir.ui.view" id="product_supplier_price_view_tree">
             <field name="model">purchase.product_supplier.price</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Product Supplier Prices">
-                    <field name="product_supplier"/>
-                    <field name="quantity"/>
-                    <field name="unit_price"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">product_supplier_price_tree</field>
         </record>
 
         <record model="ir.ui.view" id="template_view_form">
             <field name="model">product.template</field>
             <field name="inherit" ref="product.template_view_form"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath expr="/form/notebook/page[@id=&quot;general&quot;]/field[@name=&quot;cost_price_method&quot;]"
-                        position="after">
-                        <label name="purchasable"/>
-                        <field name="purchasable"/>
-                    </xpath>
-                    <xpath expr="/form/notebook/page[@id=&quot;general&quot;]"
-                        position="after">
-                        <page string="Suppliers"
-                            states="{'invisible': Not(Bool(Eval('purchasable')))}"
-                            id="suppliers">
-                            <label name="purchasable"/>
-                            <field name="purchasable"/>
-                            <label name="purchase_uom"/>
-                            <field name="purchase_uom"/>
-                            <field name="product_suppliers" colspan="4"
-                                view_ids="purchase.product_supplier_view_tree_sequence"/>
-                        </page>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">template_form</field>
         </record>
         <record model="ir.ui.view" id="template_view_tree">
             <field name="model">product.template</field>
             <field name="inherit" ref="product.template_view_tree"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath expr="/tree/field[@name=&quot;default_uom&quot;]"
-                        position="after">
-                        <field name="purchasable"/>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">template_tree</field>
         </record>
 
         <record model="ir.ui.view" id="move_view_form">
             <field name="model">stock.move</field>
             <field name="inherit" ref="stock.move_view_form"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath expr="/form/field[@name=&quot;uom&quot;]"
-                        position="after">
-                        <label name="purchase_quantity"/>
-                        <field name="purchase_quantity"/>
-                        <label name="purchase_unit"/>
-                        <field name="purchase_unit"/>
-                    </xpath>
-                    <xpath expr="/form/field[@name=&quot;currency&quot;]"
-                        position="after">
-                        <label name="purchase_unit_price"/>
-                        <field name="purchase_unit_price"/>
-                        <label name="purchase_currency"/>
-                        <field name="purchase_currency"/>
-                    </xpath>
-                    <xpath expr="/form/field[@name=&quot;effective_date&quot;]"
-                        position="after">
-                        <label name="purchase"/>
-                        <field name="purchase"/>
-                        <newline/>
-                    </xpath>
-                    <xpath expr="/form/field[@name=&quot;unit_digits&quot;]"
-                        position="after">
-                        <field name="purchase_unit_digits" invisible="1" colspan="4"/>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">move_form</field>
         </record>
 
         <record model="ir.action.wizard" id="act_open_supplier">
diff --git a/setup.py b/setup.py
index 0fabef116b..f9610387f7 100644
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,7 @@ setup(name='trytond_purchase',
         ],
     package_data={
         'trytond.modules.purchase': (info.get('xml', [])
-            + ['tryton.cfg', 'locale/*.po', 'purchase.odt']),
+            + ['tryton.cfg', 'view/*.xml', 'locale/*.po', 'purchase.odt']),
         },
     classifiers=[
         'Development Status :: 5 - Production/Stable',
diff --git a/stock.xml b/stock.xml
index a5dedcf4d1..8a60db8328 100644
--- a/stock.xml
+++ b/stock.xml
@@ -7,20 +7,7 @@ this repository contains the full copyright notices and license terms. -->
             <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="purchase_exception_state"/>
-                    <field name="unit_digits" tree_invisible="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">move_list_shipment</field>
         </record>
 
         <record model="ir.model.access" id="access_purchase_group_stock">
diff --git a/view/configuration_form.xml b/view/configuration_form.xml
new file mode 100644
index 0000000000..8c37150929
--- /dev/null
+++ b/view/configuration_form.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. -->
+<form string="Purchase Configuration">
+    <label name="purchase_sequence"/>
+    <field name="purchase_sequence"/>
+    <label name="purchase_invoice_method" />
+    <field name="purchase_invoice_method" />
+</form>
diff --git a/view/handle_invoice_exception_ask_form.xml b/view/handle_invoice_exception_ask_form.xml
new file mode 100644
index 0000000000..bb0cf4ab85
--- /dev/null
+++ b/view/handle_invoice_exception_ask_form.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. -->
+<form string="Handle Invoice Exception" col="2">
+    <image name="tryton-dialog-information" xexpand="0" xfill="0"/>
+    <label string="Choose invoices to recreate" id="choose"
+        yalign="0.0" xalign="0.0" xexpand="1"/>
+    <field name="recreate_invoices" colspan="2"/>
+</form>
diff --git a/view/handle_shipment_exception_ask_form.xml b/view/handle_shipment_exception_ask_form.xml
new file mode 100644
index 0000000000..5319d459c5
--- /dev/null
+++ b/view/handle_shipment_exception_ask_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="Handle shipment Exception" col="2">
+    <image name="tryton-dialog-information" xexpand="0" xfill="0"/>
+    <label string="Choose move to recreate" id="choose"
+        yalign="0.0" xalign="0.0" xexpand="1"/>
+    <field name="recreate_moves" colspan="2"
+        view_ids="stock.move_view_tree"/>
+</form>
diff --git a/view/move_form.xml b/view/move_form.xml
new file mode 100644
index 0000000000..aaf6709f64
--- /dev/null
+++ b/view/move_form.xml
@@ -0,0 +1,25 @@
+<?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/field[@name='uom']" position="after">
+        <label name="purchase_quantity"/>
+        <field name="purchase_quantity"/>
+        <label name="purchase_unit"/>
+        <field name="purchase_unit"/>
+    </xpath>
+    <xpath expr="/form/field[@name='currency']" position="after">
+        <label name="purchase_unit_price"/>
+        <field name="purchase_unit_price"/>
+        <label name="purchase_currency"/>
+        <field name="purchase_currency"/>
+    </xpath>
+    <xpath expr="/form/field[@name='effective_date']" position="after">
+        <label name="purchase"/>
+        <field name="purchase"/>
+        <newline/>
+    </xpath>
+    <xpath expr="/form/field[@name='unit_digits']" position="after">
+        <field name="purchase_unit_digits" invisible="1" colspan="4"/>
+    </xpath>
+</data>
diff --git a/view/move_list_shipment.xml b/view/move_list_shipment.xml
new file mode 100644
index 0000000000..e9d87411b7
--- /dev/null
+++ b/view/move_list_shipment.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="Moves">
+    <field name="product"/>
+    <field name="from_location"/>
+    <field name="to_location"/>
+    <field name="quantity"/>
+    <field name="uom"/>
+    <field name="state"/>
+    <field name="purchase_exception_state"/>
+    <field name="unit_digits" tree_invisible="1"/>
+</tree>
diff --git a/view/product_list_purchase_line.xml b/view/product_list_purchase_line.xml
new file mode 100644
index 0000000000..838edaf199
--- /dev/null
+++ b/view/product_list_purchase_line.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="list_price_uom"/>
+    <field name="cost_price_uom"/>
+    <field name="quantity"/>
+    <field name="forecast_quantity"/>
+    <field name="default_uom"/>
+    <field name="active"/>
+</tree>
diff --git a/view/product_supplier_form.xml b/view/product_supplier_form.xml
new file mode 100644
index 0000000000..ee69174fa7
--- /dev/null
+++ b/view/product_supplier_form.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<form string="Product Supplier">
+    <label name="product"/>
+    <field name="product" colspan="3"/>
+    <label name="party"/>
+    <field name="party"/>
+    <label name="sequence"/>
+    <field name="sequence"/>
+    <label name="name"/>
+    <field name="name"/>
+    <label name="code"/>
+    <field name="code"/>
+    <label name="delivery_time"/>
+    <field name="delivery_time"/>
+    <newline/>
+    <label name="currency"/>
+    <field name="currency"/>
+    <field name="prices" colspan="4"/>
+</form>
diff --git a/view/product_supplier_price_form.xml b/view/product_supplier_price_form.xml
new file mode 100644
index 0000000000..6237a120f8
--- /dev/null
+++ b/view/product_supplier_price_form.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. -->
+<form string="Product Supplier Price" col="6">
+    <label name="product_supplier"/>
+    <field name="product_supplier" colspan="5"/>
+    <label name="quantity"/>
+    <field name="quantity"/>
+    <label name="unit_price"/>
+    <field name="unit_price"/>
+</form>
diff --git a/view/product_supplier_price_tree.xml b/view/product_supplier_price_tree.xml
new file mode 100644
index 0000000000..4dbf5a99b5
--- /dev/null
+++ b/view/product_supplier_price_tree.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tree string="Product Supplier Prices">
+    <field name="product_supplier"/>
+    <field name="quantity"/>
+    <field name="unit_price"/>
+</tree>
diff --git a/view/product_supplier_tree.xml b/view/product_supplier_tree.xml
new file mode 100644
index 0000000000..1f9cf9e2b2
--- /dev/null
+++ b/view/product_supplier_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="Product Suppliers">
+    <field name="product"/>
+    <field name="party"/>
+    <field name="name"/>
+    <field name="code"/>
+    <field name="sequence"/>
+</tree>
diff --git a/view/product_supplier_tree_sequence.xml b/view/product_supplier_tree_sequence.xml
new file mode 100644
index 0000000000..f3ae6f642c
--- /dev/null
+++ b/view/product_supplier_tree_sequence.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tree string="Product Suppliers" sequence="sequence">
+    <field name="party"/>
+    <field name="name"/>
+    <field name="code"/>
+</tree>
diff --git a/view/purchase_form.xml b/view/purchase_form.xml
new file mode 100644
index 0000000000..20263d1c7e
--- /dev/null
+++ b/view/purchase_form.xml
@@ -0,0 +1,79 @@
+<?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="Purchase" col="6">
+    <label name="party"/>
+    <field name="party"/>
+    <label name="invoice_address"/>
+    <field name="invoice_address"/>
+    <label name="supplier_reference"/>
+    <field name="supplier_reference"/>
+    <label name="description"/>
+    <field name="description" colspan="3"/>
+    <label name="reference"/>
+    <field name="reference"/>
+    <notebook colspan="6">
+        <page string="Purchase" id="purchase">
+            <label name="purchase_date"/>
+            <field name="purchase_date"/>
+            <label name="payment_term"/>
+            <field name="payment_term"/>
+            <label name="warehouse"/>
+            <field name="warehouse"/>
+            <label name="currency"/>
+            <field name="currency"/>
+            <field name="lines" colspan="4"
+                view_ids="purchase.purchase_line_view_tree_sequence"/>
+            <group col="2" colspan="2" id="states">
+                <label name="invoice_state"/>
+                <field name="invoice_state"/>
+                <label name="shipment_state"/>
+                <field name="shipment_state"/>
+                <label name="state"/>
+                <field name="state"/>
+            </group>
+            <group col="2" colspan="2" id="amount_buttons">
+                <label name="untaxed_amount" xalign="1.0" xexpand="1"/>
+                <field name="untaxed_amount" xalign="1.0" xexpand="0"/>
+                <label name="tax_amount" xalign="1.0" xexpand="1"/>
+                <field name="tax_amount" xalign="1.0" xexpand="0"/>
+                <label name="total_amount" xalign="1.0" xexpand="1"/>
+                <field name="total_amount" xalign="1.0" xexpand="0"/>
+                <group col="6" colspan="2" id="buttons">
+                    <button name="cancel" string="Cancel"
+                        icon="tryton-cancel"/>
+                    <button name="draft" string="Draft"/>
+                    <button name="quote" string="Quote"
+                        icon="tryton-go-next"/>
+                    <button name="handle_invoice_exception"
+                            string="Handle Invoice Exception"
+                            icon="tryton-go-next"/>
+                    <button name="handle_shipment_exception"
+                            string="Handle Shipment Exception"
+                            icon="tryton-go-next"/>
+                    <button name="confirm" string="Confirm"
+                        icon="tryton-ok"/>
+                </group>
+            </group>
+        </page>
+        <page string="Other Info" id="info">
+            <label name="company"/>
+            <field name="company"/>
+            <label name="invoice_method"/>
+            <field name="invoice_method"/>
+            <separator name="comment" colspan="4"/>
+            <field name="comment" colspan="4" spell="Eval('party_lang')"/>
+        </page>
+        <page string="Invoices" id="invoices">
+            <field name="invoices" colspan="4"/>
+        </page>
+        <page string="Shipments" id="shipments">
+            <field name="moves" colspan="4"
+                view_ids="purchase.move_view_list_shipment"/>
+            <field name="shipments" colspan="4"/>
+            <field name="shipment_returns" colspan="4"/>
+        </page>
+    </notebook>
+    <field name="currency_digits" invisible="1" colspan="6"/>
+    <field name="party_lang" invisible="1" colspan="6"/>
+</form>
diff --git a/view/purchase_line_form.xml b/view/purchase_line_form.xml
new file mode 100644
index 0000000000..cda5196702
--- /dev/null
+++ b/view/purchase_line_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="Purchase Line" cursor="product">
+    <label name="purchase"/>
+    <field name="purchase" colspan="3"/>
+    <notebook colspan="4">
+        <page string="General" id="general">
+            <label name="type"/>
+            <field name="type"/>
+            <label name="sequence"/>
+            <field name="sequence"/>
+            <label name="product"/>
+            <field name="product"
+                view_ids="purchase.product_view_list_purchase_line"/>
+            <newline/>
+            <label name="description"/>
+            <field name="description" colspan="3"
+                spell="Get(Eval('_parent_purchase', {}), 'party_lang')"/>
+            <label name="quantity"/>
+            <field name="quantity"/>
+            <label name="unit"/>
+            <field name="unit"/>
+            <label name="unit_price"/>
+            <field name="unit_price"/>
+            <label name="amount"/>
+            <field name="amount"/>
+            <label name="delivery_date"/>
+            <field name="delivery_date"/>
+            <field name="taxes" colspan="4"/>
+        </page>
+        <page string="Notes" id="notes">
+            <separator name="note" colspan="4"/>
+            <field name="note" colspan="4"
+                spell="Get(Eval('_parent_purchase', {}), 'party_lang')"/>
+        </page>
+    </notebook>
+    <field name="unit_digits" invisible="1" colspan="4"/>
+</form>
diff --git a/view/purchase_line_tree.xml b/view/purchase_line_tree.xml
new file mode 100644
index 0000000000..369b3f74f4
--- /dev/null
+++ b/view/purchase_line_tree.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. -->
+<tree string="Purchase Lines">
+    <field name="purchase"/>
+    <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>
diff --git a/view/purchase_line_tree_sequence.xml b/view/purchase_line_tree_sequence.xml
new file mode 100644
index 0000000000..60eac86d94
--- /dev/null
+++ b/view/purchase_line_tree_sequence.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. -->
+<tree string="Lines" sequence="sequence">
+    <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" expand="1"/>
+    <field name="sequence" tree_invisible="1"/>
+    <field name="unit_digits" tree_invisible="1"/>
+</tree>
diff --git a/view/purchase_tree.xml b/view/purchase_tree.xml
new file mode 100644
index 0000000000..7778ed485e
--- /dev/null
+++ b/view/purchase_tree.xml
@@ -0,0 +1,19 @@
+<?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="Purchases">
+    <field name="reference"/>
+    <field name="supplier_reference"/>
+    <field name="purchase_date"/>
+    <field name="party"/>
+    <field name="warehouse"/>
+    <field name="currency"/>
+    <field name="untaxed_amount"/>
+    <field name="total_amount"/>
+    <field name="state"/>
+    <field name="invoice_state"/>
+    <field name="shipment_state"/>
+    <field name="description"/>
+    <field name="currency_digits" tree_invisible="1"/>
+    <field name="create_date" tree_invisible="1"/>
+</tree>
diff --git a/view/template_form.xml b/view/template_form.xml
new file mode 100644
index 0000000000..2afde822d6
--- /dev/null
+++ b/view/template_form.xml
@@ -0,0 +1,23 @@
+<?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='general']/field[@name='cost_price_method']"
+        position="after">
+        <label name="purchasable"/>
+        <field name="purchasable"/>
+    </xpath>
+    <xpath expr="/form/notebook/page[@id='general']" position="after">
+        <page string="Suppliers"
+            states="{'invisible': Not(Bool(Eval('purchasable')))}"
+            id="suppliers">
+            <label name="purchasable"/>
+            <field name="purchasable"/>
+            <label name="purchase_uom"/>
+            <field name="purchase_uom"/>
+            <field name="product_suppliers" colspan="4"
+                view_ids="purchase.product_supplier_view_tree_sequence"/>
+        </page>
+    </xpath>
+</data>
diff --git a/view/template_tree.xml b/view/template_tree.xml
new file mode 100644
index 0000000000..c4fd34da41
--- /dev/null
+++ b/view/template_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='default_uom']" position="after">
+        <field name="purchasable"/>
+    </xpath>
+</data>