diff --git a/account_payment_view.diff b/account_payment_view.diff
new file mode 100644
index 0000000..7710e0c
--- /dev/null
+++ b/account_payment_view.diff
@@ -0,0 +1,12 @@
+diff -r 4e9d9963d09b view/move_line_list.xml
+--- a/trytond/trytond/modules/account_payment/view/move_line_list.xml	Mon May 06 14:56:47 2019 +0200
++++ b/trytond/trytond/modules/account_payment/view/move_line_list.xml	Wed Sep 18 16:18:53 2019 +0200
+@@ -3,7 +3,7 @@
+ this repository contains the full copyright notices and license terms. -->
+ <tree>
+     <field name="move"/>
+-    <field name="origin"/>
++    <field name="move_origin"/>
+     <field name="description"/>
+     <field name="party"/>
+     <field name="maturity_date"/>
diff --git a/issue262131002_284001002.diff b/issue262131002_284001002.diff
new file mode 100644
index 0000000..ff8e6d9
--- /dev/null
+++ b/issue262131002_284001002.diff
@@ -0,0 +1,4791 @@
+# HG changeset patch
+# User Cédric Krier <cedric.krier@b2ck.com>
+Add expand on tree view
+
+tryton-env: Add expand on tree view
+
+and unify layout of form view.
+
+issue8644
+
+review262131002
+
+Index: modules/account/fiscalyear.py
+===================================================================
+--- a/trytond/trytond/modules/account/fiscalyear.py
++++ b/trytond/trytond/modules/account/fiscalyear.py
+@@ -35,7 +35,11 @@
+         domain=[('end_date', '>=', Eval('start_date', None))],
+         depends=DEPENDS + ['start_date'])
+     periods = fields.One2Many('account.period', 'fiscalyear', 'Periods',
+-            states=STATES, depends=DEPENDS)
++        states=STATES,
++        domain=[
++            ('company', '=', Eval('company')),
++            ],
++        depends=DEPENDS + ['company'])
+     state = fields.Selection([
+             ('open', 'Open'),
+             ('close', 'Close'),
+Index: modules/account/view/account_list.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/account_list.xml
++++ b/trytond/trytond/modules/account/view/account_list.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="rec_name"/>
+-    <field name="company"/>
+-    <field name="type"/>
++    <field name="rec_name" expand="2"/>
++    <field name="company" expand="1"/>
++    <field name="type" expand="1"/>
+ </tree>
+Index: modules/account/view/account_list_balance_sheet.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/account_list_balance_sheet.xml
++++ b/trytond/trytond/modules/account/view/account_list_balance_sheet.xml
+@@ -2,8 +2,8 @@
+ <!-- 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 keyword_open="1">
+-    <field name="name"/>
+     <field name="code"/>
++    <field name="name" expand="1"/>
+     <field name="debit"/>
+     <field name="credit"/>
+     <field name="balance"/>
+Index: modules/account/view/account_template_list.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/account_template_list.xml
++++ b/trytond/trytond/modules/account/view/account_template_list.xml
+@@ -2,6 +2,6 @@
+ <!-- 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>
+-    <field name="rec_name"/>
+-    <field name="type"/>
++    <field name="rec_name" expand="2"/>
++    <field name="type" expand="1"/>
+ </tree>
+Index: modules/account/view/account_template_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/account_template_tree.xml
++++ b/trytond/trytond/modules/account/view/account_template_tree.xml
+@@ -2,6 +2,6 @@
+ <!-- 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>
+-    <field name="rec_name"/>
+-    <field name="type"/>
++    <field name="rec_name" expand="2"/>
++    <field name="type" expand="1"/>
+ </tree>
+Index: modules/account/view/account_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/account_tree.xml
++++ b/trytond/trytond/modules/account/view/account_tree.xml
+@@ -2,9 +2,7 @@
+ <!-- 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>
+-    <field name="rec_name"/>
+-    <field name="company"/>
+-    <field name="type"/>
+-    <field name="parent" tree_invisible="1"/>
+-    <field name="childs" tree_invisible="1"/>
++    <field name="rec_name" expand="2"/>
++    <field name="company" expand="1"/>
++    <field name="type" expand="1"/>
+ </tree>
+Index: modules/account/view/account_tree2.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/account_tree2.xml
++++ b/trytond/trytond/modules/account/view/account_tree2.xml
+@@ -2,7 +2,7 @@
+ <!-- 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 keyword_open="1">
+-    <field name="name"/>
++    <field name="name" expand="2"/>
+     <field name="code"/>
+     <field name="debit"/>
+     <field name="credit"/>
+Index: modules/account/view/account_type_list.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/account_type_list.xml
++++ b/trytond/trytond/modules/account/view/account_type_list.xml
+@@ -2,5 +2,5 @@
+ <!-- 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>
+-    <field name="rec_name"/>
++    <field name="rec_name" expand="1"/>
+ </tree>
+Index: modules/account/view/account_type_template_list.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/account_type_template_list.xml
++++ b/trytond/trytond/modules/account/view/account_type_template_list.xml
+@@ -2,5 +2,5 @@
+ <!-- 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>
+-    <field name="rec_name"/>
++    <field name="rec_name" expand="1"/>
+ </tree>
+Index: modules/account/view/account_type_template_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/account_type_template_tree.xml
++++ b/trytond/trytond/modules/account/view/account_type_template_tree.xml
+@@ -2,5 +2,5 @@
+ <!-- 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>
+-    <field name="name"/>
++    <field name="name" expand="1"/>
+ </tree>
+Index: modules/account/view/account_type_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/account_type_tree.xml
++++ b/trytond/trytond/modules/account/view/account_type_tree.xml
+@@ -2,7 +2,5 @@
+ <!-- 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>
+-    <field name="name"/>
+-    <field name="parent" tree_invisible="1"/>
+-    <field name="childs" tree_invisible="1"/>
++    <field name="name" expand="1"/>
+ </tree>
+Index: modules/account/view/aged_balance_list.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/aged_balance_list.xml
++++ b/trytond/trytond/modules/account/view/aged_balance_list.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="party"/>
++    <field name="party" expand="2"/>
+     <field name="term0" expand="1"/>
+     <field name="term1" expand="1"/>
+     <field name="term2" expand="1"/>
+Index: modules/account/view/fiscalyear_form.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/fiscalyear_form.xml
++++ b/trytond/trytond/modules/account/view/fiscalyear_form.xml
+@@ -3,15 +3,13 @@
+ this repository contains the full copyright notices and license terms. -->
+ <form>
+     <label name="name"/>
+-    <field name="name" colspan="3"/>
++    <field name="name"/>
++    <label name="company"/>
++    <field name="company"/>
+     <label name="start_date"/>
+     <field name="start_date"/>
+     <label name="end_date"/>
+     <field name="end_date"/>
+-    <label name="company"/>
+-    <field name="company"/>
+-    <label name="state"/>
+-    <field name="state"/>
+     <notebook colspan="4">
+         <page string="Periods" id="periods">
+             <field name="periods" colspan="4"/>
+@@ -25,4 +23,6 @@
+             <field name="post_move_sequence"/>
+         </page>
+     </notebook>
++    <label name="state" colspan="3"/>
++    <field name="state"/>
+ </form>
+Index: modules/account/view/fiscalyear_list_close.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/fiscalyear_list_close.xml
++++ b/trytond/trytond/modules/account/view/fiscalyear_list_close.xml
+@@ -2,8 +2,8 @@
+ <!-- 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>
+-    <field name="name" icon="icon"/>
+-    <field name="company"/>
++    <field name="name" icon="icon" expand="1"/>
++    <field name="company" expand="1"/>
+     <button name="reopen"/>
+     <button name="close"/>
+     <button name="lock"/>
+Index: modules/account/view/general_ledger_line_list.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/general_ledger_line_list.xml
++++ b/trytond/trytond/modules/account/view/general_ledger_line_list.xml
+@@ -3,8 +3,8 @@
+ this repository contains the full copyright notices and license terms. -->
+ <tree>
+     <field name="date"/>
+-    <field name="account"/>
+-    <field name="party"/>
++    <field name="account" expand="1"/>
++    <field name="party" expand="1"/>
+     <field name="move"/>
+     <field name="description" expand="1"/>
+     <field name="move_description" expand="1"/>
+Index: modules/account/view/journal_form.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/journal_form.xml
++++ b/trytond/trytond/modules/account/view/journal_form.xml
+@@ -8,12 +8,8 @@
+     <field name="code"/>
+     <label name="active"/>
+     <field name="active" xexpand="0" width="100"/>
+-    <notebook colspan="6">
+-        <page string="General Information" id="general">
+-            <label name="type"/>
+-            <field name="type"/>
+-            <label name="sequence"/>
+-            <field name="sequence"/>
+-        </page>
+-    </notebook>
++    <label name="type"/>
++    <field name="type"/>
++    <label name="sequence"/>
++    <field name="sequence"/>
+ </form>
+Index: modules/account/view/journal_list_cash.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/journal_list_cash.xml
++++ b/trytond/trytond/modules/account/view/journal_list_cash.xml
+@@ -2,8 +2,8 @@
+ <!-- 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>
+-    <field name="name"/>
+     <field name="code"/>
++    <field name="name" expand="1"/>
+     <field name="debit"/>
+     <field name="credit"/>
+     <field name="balance"/>
+Index: modules/account/view/journal_period_list_close.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/journal_period_list_close.xml
++++ b/trytond/trytond/modules/account/view/journal_period_list_close.xml
+@@ -2,8 +2,8 @@
+ <!-- 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>
+-    <field name="journal" icon="icon"/>
+-    <field name="period"/>
++    <field name="journal" icon="icon" expand="1"/>
++    <field name="period" expand="1"/>
+     <button name="reopen" string="Re-Open"/>
+     <button name="close" string="Close"/>
+     <field name="state" tree_invisible="1"/>
+Index: modules/account/view/journal_period_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/journal_period_tree.xml
++++ b/trytond/trytond/modules/account/view/journal_period_tree.xml
+@@ -2,7 +2,7 @@
+ <!-- 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 keyword_open="1">
+-    <field name="journal"/>
+-    <field name="period"/>
++    <field name="journal" expand="1"/>
++    <field name="period" expand="1"/>
+     <field name="state"/>
+ </tree>
+Index: modules/account/view/journal_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/journal_tree.xml
++++ b/trytond/trytond/modules/account/view/journal_tree.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="name"/>
+     <field name="code"/>
++    <field name="name" expand="1"/>
+     <field name="type"/>
+ </tree>
+Index: modules/account/view/move_line_form_move.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/move_line_form_move.xml
++++ b/trytond/trytond/modules/account/view/move_line_form_move.xml
+@@ -31,7 +31,6 @@
+             <field name="tax_lines" colspan="4"/>
+         </page>
+     </notebook>
+-    <label id="empty" colspan="2"/>
+     <label name="state"/>
+     <field name="state"/>
+ </form>
+Index: modules/account/view/move_line_template_list.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/move_line_template_list.xml
++++ b/trytond/trytond/modules/account/view/move_line_template_list.xml
+@@ -2,9 +2,9 @@
+ <!-- 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 editable="top">
+-    <field name="move"/>
+-    <field name="account"/>
+-    <field name="party"/>
++    <field name="move" expand="1"/>
++    <field name="account" expand="1"/>
++    <field name="party" expand="1"/>
+     <field name="operation"/>
+     <field name="amount"/>
+     <field name="description"/>
+Index: modules/account/view/move_line_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/move_line_tree.xml
++++ b/trytond/trytond/modules/account/view/move_line_tree.xml
+@@ -3,15 +3,15 @@
+ this repository contains the full copyright notices and license terms. -->
+ <tree editable="top" on_write="on_write">
+     <field name="move"/>
+-    <field name="origin"/>
++    <field name="origin" expand="1"/>
+     <field name="date"/>
+-    <field name="account"/>
+-    <field name="party"/>
++    <field name="account" expand="1"/>
++    <field name="party" expand="1"/>
+     <field name="debit" sum="Debit"/>
+     <field name="credit" sum="Credit"/>
+     <field name="tax_lines"/>
+-    <field name="description"/>
+-    <field name="move_description"/>
++    <field name="description" expand="1"/>
++    <field name="move_description" expand="1"/>
+     <field name="reconciliation"/>
+     <field name="state"/>
+     <field name="move_state"/>
+Index: modules/account/view/move_line_tree_move.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/move_line_tree_move.xml
++++ b/trytond/trytond/modules/account/view/move_line_tree_move.xml
+@@ -3,11 +3,11 @@
+ this repository contains the full copyright notices and license terms. -->
+ <tree editable="top">
+     <field name="move"/>
+-    <field name="account"/>
+-    <field name="party"/>
++    <field name="account" expand="1"/>
++    <field name="party" expand="1"/>
+     <field name="debit" sum="Debit"/>
+     <field name="credit" sum="Credit"/>
+     <field name="tax_lines"/>
+-    <field name="description"/>
++    <field name="description" expand="1"/>
+     <field name="reconciliation"/>
+ </tree>
+Index: modules/account/view/move_template_list.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/move_template_list.xml
++++ b/trytond/trytond/modules/account/view/move_template_list.xml
+@@ -2,5 +2,5 @@
+ <!-- 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>
+-    <field name="name"/>
++    <field name="name" expand="1"/>
+ </tree>
+Index: modules/account/view/move_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/move_tree.xml
++++ b/trytond/trytond/modules/account/view/move_tree.xml
+@@ -10,7 +10,7 @@
+     <field name="date"/>
+     <field name="post_date"/>
+     <field name="origin"/>
+-    <field name="description"/>
++    <field name="description" expand="1"/>
+     <field name="state"/>
+     <button name="post"/>
+ </tree>
+Index: modules/account/view/period_form.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/period_form.xml
++++ b/trytond/trytond/modules/account/view/period_form.xml
+@@ -4,18 +4,21 @@
+ <form>
+     <label name="name"/>
+     <field name="name"/>
++    <label name="company"/>
++    <field name="company"/>
++    <label name="start_date"/>
++    <group id="start_end_date" col="-1">
++        <field name="start_date"/>
++        <label name="end_date"/>
++        <field name="end_date"/>
++    </group>
+     <label name="fiscalyear"/>
+     <field name="fiscalyear"/>
+-    <label name="start_date"/>
+-    <field name="start_date"/>
+-    <label name="end_date"/>
+-    <field name="end_date"/>
+     <label name="type"/>
+     <field name="type"/>
+-    <newline/>
+     <label name="post_move_sequence"/>
+     <field name="post_move_sequence"/>
+     <newline/>
+-    <label name="state"/>
+-    <field name="state" colspan="3"/>
++    <label name="state" colspan="3"/>
++    <field name="state"/>
+ </form>
+Index: modules/account/view/period_list_close.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/period_list_close.xml
++++ b/trytond/trytond/modules/account/view/period_list_close.xml
+@@ -2,9 +2,9 @@
+ <!-- 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>
+-    <field name="name" icon="icon"/>
+-    <field name="company"/>
+-    <field name="fiscalyear"/>
++    <field name="name" icon="icon" expand="1"/>
++    <field name="company" expand="1"/>
++    <field name="fiscalyear" expand="1"/>
+     <field name="type"/>
+     <button name="reopen"/>
+     <button name="close"/>
+Index: modules/account/view/tax_code_line_template_list.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/tax_code_line_template_list.xml
++++ b/trytond/trytond/modules/account/view/tax_code_line_template_list.xml
+@@ -2,9 +2,9 @@
+ <!-- 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>
+-    <field name="code"/>
++    <field name="code" expand="1"/>
+     <field name="operator"/>
+-    <field name="tax"/>
++    <field name="tax" expand="1"/>
+     <field name="amount"/>
+     <field name="type"/>
+ </tree>
+Index: modules/account/view/tax_code_list.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/tax_code_list.xml
++++ b/trytond/trytond/modules/account/view/tax_code_list.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="name"/>
+     <field name="code"/>
+-    <field name="company"/>
++    <field name="name" expand="2"/>
++    <field name="company" expand="1"/>
+ </tree>
+Index: modules/account/view/tax_code_template_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/tax_code_template_tree.xml
++++ b/trytond/trytond/modules/account/view/tax_code_template_tree.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="name"/>
++    <field name="name" expand="2"/>
+     <field name="code"/>
+-    <field name="account"/>
++    <field name="account" expand="1"/>
+ </tree>
+Index: modules/account/view/tax_code_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/tax_code_tree.xml
++++ b/trytond/trytond/modules/account/view/tax_code_tree.xml
+@@ -2,9 +2,7 @@
+ <!-- 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>
+-    <field name="name"/>
+     <field name="code"/>
+-    <field name="company"/>
+-    <field name="parent" tree_invisible="1"/>
+-    <field name="childs" tree_invisible="1"/>
++    <field name="name" expand="2"/>
++    <field name="company" expand="2"/>
+ </tree>
+Index: modules/account/view/tax_code_tree2.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/tax_code_tree2.xml
++++ b/trytond/trytond/modules/account/view/tax_code_tree2.xml
+@@ -2,7 +2,7 @@
+ <!-- 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 keyword_open="1">
+-    <field name="name"/>
+     <field name="code"/>
++    <field name="name" expand="1"/>
+     <field name="amount"/>
+ </tree>
+Index: modules/account/view/tax_form.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/tax_form.xml
++++ b/trytond/trytond/modules/account/view/tax_form.xml
+@@ -1,9 +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>
++<form col="6">
+     <label name="name"/>
+     <field name="name"/>
++    <label name="company"/>
++    <field name="company"/>
+     <group col="-1" colspan="2" id="checkboxes">
+         <label name="active"/>
+         <field name="active" xexpand="0" width="100"/>
+@@ -11,17 +13,21 @@
+         <field name="template_override" xexpand="0" width="100"/>
+     </group>
+     <label name="description"/>
+-    <field name="description" colspan="3"/>
+-    <notebook colspan="4">
++    <field name="description" colspan="5"/>
++    <notebook colspan="6">
+         <page string="General Information" id="general">
+             <label name="group"/>
+             <field name="group"/>
+             <label name="sequence"/>
+             <field name="sequence"/>
+             <label name="start_date"/>
+-            <field name="start_date"/>
+-            <label name="end_date"/>
+-            <field name="end_date"/>
++            <group col="-1" id="start_end_date">
++                <field name="start_date"/>
++                <label name="end_date"/>
++                <field name="end_date"/>
++            </group>
++            <label name="update_unit_price"/>
++            <field name="update_unit_price"/>
+             <label name="type"/>
+             <field name="type"/>
+             <group col="1" id="label_amount_rate">
+@@ -35,18 +41,10 @@
+                     <label name="rate" string="%" xalign="0.0" xexpand="1"/>
+                 </group>
+             </group>
+-            <label name="company"/>
+-            <field name="company"/>
+-            <newline/>
+-            <label name="update_unit_price"/>
+-            <field name="update_unit_price"/>
+-            <newline/>
+             <label name="invoice_account"/>
+             <field name="invoice_account"/>
+-            <newline/>
+             <label name="credit_note_account"/>
+             <field name="credit_note_account"/>
+-            <newline/>
+             <field name="childs" colspan="4"
+                 view_ids="account.tax_view_list"/>
+         </page>
+Index: modules/account/view/tax_group_form.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/tax_group_form.xml
++++ b/trytond/trytond/modules/account/view/tax_group_form.xml
+@@ -1,7 +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>
++<form col="6">
+     <label name="name"/>
+     <field name="name"/>
+     <label name="code"/>
+Index: modules/account/view/tax_group_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/tax_group_tree.xml
++++ b/trytond/trytond/modules/account/view/tax_group_tree.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="name"/>
+-    <field name="code"/>
++    <field name="name" expand="2"/>
++    <field name="code" expand="1"/>
+     <field name="kind"/>
+ </tree>
+Index: modules/account/view/tax_line_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/tax_line_tree.xml
++++ b/trytond/trytond/modules/account/view/tax_line_tree.xml
+@@ -2,7 +2,7 @@
+ <!-- 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 editable="bottom">
+-    <field name="tax"/>
++    <field name="tax" expand="1"/>
+     <field name="amount"/>
+     <field name="type"/>
+     <field name="move_line"/>
+Index: modules/account/view/tax_list.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/tax_list.xml
++++ b/trytond/trytond/modules/account/view/tax_list.xml
+@@ -2,7 +2,8 @@
+ <!-- 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 sequence="sequence">
+-    <field name="name"/>
++    <field name="name" expand="1"/>
+     <field name="group"/>
+     <field name="type"/>
++    <field name="company" expand="1"/>
+ </tree>
+Index: modules/account/view/tax_rule_line_template_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/tax_rule_line_template_tree.xml
++++ b/trytond/trytond/modules/account/view/tax_rule_line_template_tree.xml
+@@ -2,9 +2,9 @@
+ <!-- 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>
+-    <field name="rule"/>
++    <field name="rule" expand="2"/>
+     <field name="group"/>
+-    <field name="origin_tax"/>
+-    <field name="tax"/>
++    <field name="origin_tax" expand="2"/>
++    <field name="tax" expand="2"/>
+     <field name="keep_origin"/>
+ </tree>
+Index: modules/account/view/tax_rule_line_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/tax_rule_line_tree.xml
++++ b/trytond/trytond/modules/account/view/tax_rule_line_tree.xml
+@@ -2,9 +2,9 @@
+ <!-- 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>
+-    <field name="rule"/>
++    <field name="rule" expand="2"/>
+     <field name="group"/>
+-    <field name="origin_tax"/>
+-    <field name="tax"/>
++    <field name="origin_tax" expand="2"/>
++    <field name="tax" expand="2"/>
+     <field name="keep_origin"/>
+ </tree>
+Index: modules/account/view/tax_rule_line_tree_sequence.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/tax_rule_line_tree_sequence.xml
++++ b/trytond/trytond/modules/account/view/tax_rule_line_tree_sequence.xml
+@@ -3,7 +3,7 @@
+ this repository contains the full copyright notices and license terms. -->
+ <tree sequence="sequence">
+     <field name="group"/>
+-    <field name="origin_tax"/>
+-    <field name="tax"/>
++    <field name="origin_tax" expand="2"/>
++    <field name="tax" expand="2"/>
+     <field name="keep_origin"/>
+ </tree>
+Index: modules/account/view/tax_rule_template_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/tax_rule_template_tree.xml
++++ b/trytond/trytond/modules/account/view/tax_rule_template_tree.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="account"/>
+-    <field name="name"/>
++    <field name="account" expand="1"/>
++    <field name="name" expand="2"/>
+     <field name="kind"/>
+ </tree>
+Index: modules/account/view/tax_rule_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/tax_rule_tree.xml
++++ b/trytond/trytond/modules/account/view/tax_rule_tree.xml
+@@ -2,6 +2,6 @@
+ <!-- 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>
+-    <field name="name"/>
++    <field name="name" expand="1"/>
+     <field name="kind"/>
+ </tree>
+Index: modules/account/view/tax_template_form.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/tax_template_form.xml
++++ b/trytond/trytond/modules/account/view/tax_template_form.xml
+@@ -20,9 +20,13 @@
+             <label name="sequence"/>
+             <field name="sequence"/>
+             <label name="start_date"/>
+-            <field name="start_date"/>
+-            <label name="end_date"/>
+-            <field name="end_date"/>
++            <group col="-1" id="start_end_date">
++                <field name="start_date"/>
++                <label name="end_date"/>
++                <field name="end_date"/>
++            </group>
++            <label name="update_unit_price"/>
++            <field name="update_unit_price"/>
+             <label name="type"/>
+             <field name="type"/>
+             <group col="1" id="label_amount_rate">
+@@ -36,16 +40,10 @@
+                     <label name="rate" string="%" xalign="0.0" xexpand="1"/>
+                 </group>
+             </group>
+-            <newline/>
+-            <label name="update_unit_price"/>
+-            <field name="update_unit_price"/>
+-            <newline/>
+             <label name="invoice_account"/>
+             <field name="invoice_account"/>
+-            <newline/>
+             <label name="credit_note_account"/>
+             <field name="credit_note_account"/>
+-            <newline/>
+             <field name="childs" colspan="4"
+                 view_ids="account.tax_template_view_list"/>
+         </page>
+Index: modules/account/view/tax_template_list.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/tax_template_list.xml
++++ b/trytond/trytond/modules/account/view/tax_template_list.xml
+@@ -2,8 +2,8 @@
+ <!-- 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 sequence="sequence">
+-    <field name="name"/>
++    <field name="name" expand="1"/>
+     <field name="group"/>
+     <field name="type"/>
+-    <field name="account"/>
++    <field name="account" expand="1"/>
+ </tree>
+Index: modules/account/view/tax_template_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/tax_template_tree.xml
++++ b/trytond/trytond/modules/account/view/tax_template_tree.xml
+@@ -2,8 +2,8 @@
+ <!-- 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>
+-    <field name="name"/>
++    <field name="name" expand="1"/>
+     <field name="group"/>
+     <field name="type"/>
+-    <field name="account"/>
++    <field name="account" expand="1"/>
+ </tree>
+Index: modules/account/view/writeoff_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/account/view/writeoff_tree.xml
++++ b/trytond/trytond/modules/account/view/writeoff_tree.xml
+@@ -2,6 +2,7 @@
+ <!-- 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>
+-    <field name="company"/>
+-    <field name="name"/>
++    <field name="name" expand="2"/>
++    <field name="journal" expand="1"/>
++    <field name="company" expand="1"/>
+ </tree>
+Index: modules/account_asset/view/asset_form.xml
+===================================================================
+--- a/trytond/trytond/modules/account_asset/view/asset_form.xml
++++ b/trytond/trytond/modules/account_asset/view/asset_form.xml
+@@ -23,17 +23,6 @@
+     <notebook colspan="6">
+         <page string="Lines" id="lines">
+             <field name="lines" colspan="4"/>
+-            <group col="4" colspan="4" id="state_buttons">
+-                <label name="state"/>
+-                <field name="state"/>
+-                <group col="-1" colspan="2" id="buttons">
+-                    <button name="clear_lines" icon="tryton-clear"/>
+-                    <button name="create_lines" icon="tryton-launch"/>
+-                    <button name="update" icon="tryton-create"/>
+-                    <button name="run" icon="tryton-forward"/>
+-                    <button name="close" icon="tryton-close"/>
+-                </group>
+-            </group>
+         </page>
+         <page string="Other Info" id="info">
+             <label name="company"/>
+@@ -56,4 +45,13 @@
+             <field name="comment" colspan="4"/>
+         </page>
+     </notebook>
++    <label name="state"/>
++    <field name="state"/>
++    <group col="-1" colspan="4" id="buttons">
++        <button name="clear_lines" icon="tryton-clear"/>
++        <button name="create_lines" icon="tryton-launch"/>
++        <button name="update" icon="tryton-create"/>
++        <button name="run" icon="tryton-forward"/>
++        <button name="close" icon="tryton-close"/>
++    </group>
+ </form>
+Index: modules/account_asset/view/asset_line_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/account_asset/view/asset_line_tree.xml
++++ b/trytond/trytond/modules/account_asset/view/asset_line_tree.xml
+@@ -2,10 +2,10 @@
+ <!-- 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>
+-    <field name="asset"/>
++    <field name="asset" expand="2"/>
+     <field name="date"/>
+     <field name="actual_value" expand="1"/>
+     <field name="depreciation" expand="1"/>
+     <field name="accumulated_depreciation" expand="1"/>
+-    <field name="move"/>
++    <field name="move" expand="1"/>
+ </tree>
+Index: modules/account_credit_limit/account.xml
+===================================================================
+--- a/trytond/trytond/modules/account_credit_limit/account.xml
++++ b/trytond/trytond/modules/account_credit_limit/account.xml
+@@ -41,5 +41,17 @@
+             <field name="inherit" ref="account_dunning.dunning_level_view_form"/>
+             <field name="name">dunning_level_form</field>
+         </record>
++
++        <record model="ir.ui.view" id="dunning_level_view_list">
++            <field name="model">account.dunning.level</field>
++            <field name="inherit" ref="account_dunning.dunning_level_view_list"/>
++            <field name="name">dunning_level_list</field>
++        </record>
++
++        <record model="ir.ui.view" id="dunning_level_view_list_sequence">
++            <field name="model">account.dunning.level</field>
++            <field name="inherit" ref="account_dunning.dunning_level_view_list_sequence"/>
++            <field name="name">dunning_level_list</field>
++        </record>
+     </data>
+ </tryton>
+Index: modules/account_credit_limit/view/dunning_level_list.xml
+===================================================================
+new file mode 100644
+--- /dev/null
++++ b/trytond/trytond/modules/account_credit_limit/view/dunning_level_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. -->
++<data>
++    <xpath expr="/tree/field[@name='overdue']" position="after">
++        <field name="credit_limit"/>
++    </xpath>
++</data>
+Index: modules/account_deposit/view/invoice_form.xml
+===================================================================
+--- a/trytond/trytond/modules/account_deposit/view/invoice_form.xml
++++ b/trytond/trytond/modules/account_deposit/view/invoice_form.xml
+@@ -2,9 +2,7 @@
+ <!-- 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='invoice']/field[@name='lines']"
+-        position="before">
+-        <newline/>
++    <xpath expr="//field[@name='total_amount']" position="after">
+         <button name="recall_deposit" colspan="2"/>
+     </xpath>
+ </data>
+Index: modules/account_dunning/view/dunning_level_form.xml
+===================================================================
+--- a/trytond/trytond/modules/account_dunning/view/dunning_level_form.xml
++++ b/trytond/trytond/modules/account_dunning/view/dunning_level_form.xml
+@@ -1,12 +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. -->
+-<form>
++<form cursor="overdue">
+     <label name="procedure"/>
+-    <field name="procedure" colspan="3"/>
++    <field name="procedure"/>
+     <label name="sequence"/>
+     <field name="sequence"/>
+-    <newline/>
++
+     <label name="overdue"/>
+     <field name="overdue"/>
+ </form>
+Index: modules/account_dunning_fee/view/dunning_fee_dunning_level_list.xml
+===================================================================
+--- a/trytond/trytond/modules/account_dunning_fee/view/dunning_fee_dunning_level_list.xml
++++ b/trytond/trytond/modules/account_dunning_fee/view/dunning_fee_dunning_level_list.xml
+@@ -2,8 +2,8 @@
+ <!-- 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>
+-    <field name="dunning"/>
+-    <field name="level"/>
++    <field name="dunning" expand="2"/>
++    <field name="level" expand="1"/>
+     <field name="amount"/>
+     <field name="currency"/>
+ </tree>
+Index: modules/account_dunning_fee/view/dunning_fee_list.xml
+===================================================================
+--- a/trytond/trytond/modules/account_dunning_fee/view/dunning_fee_list.xml
++++ b/trytond/trytond/modules/account_dunning_fee/view/dunning_fee_list.xml
+@@ -2,8 +2,8 @@
+ <!-- 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>
+-    <field name="name"/>
+-    <field name="product"/>
+-    <field name="journal"/>
++    <field name="name" expand="2"/>
++    <field name="product" expand="1"/>
++    <field name="journal" expand="1"/>
+     <field name="compute_method"/>
+ </tree>
+
+Index: modules/account_invoice/view/contact_mechanism_form.xml
+===================================================================
+--- a/trytond/trytond/modules/account_invoice/view/contact_mechanism_form.xml
++++ b/trytond/trytond/modules/account_invoice/view/contact_mechanism_form.xml
+@@ -2,7 +2,7 @@
+ <!-- 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[@id='checkboxes']" position="inside">
++    <xpath expr="/form/group[@id='checkboxes']/field[@name='active']" position="after">
+         <label name="invoice"/>
+         <field name="invoice" xexpand="0" width="25"/>
+     </xpath>
+Index: modules/account_invoice/view/contact_mechanism_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/account_invoice/view/contact_mechanism_tree.xml
++++ b/trytond/trytond/modules/account_invoice/view/contact_mechanism_tree.xml
+@@ -2,7 +2,7 @@
+ <!-- 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">
++    <xpath expr="/tree/field[@name='party']" position="after">
+         <field name="invoice"/>
+     </xpath>
+ </data>
+Index: modules/account_invoice/view/invoice_form.xml
+===================================================================
+--- a/trytond/trytond/modules/account_invoice/view/invoice_form.xml
++++ b/trytond/trytond/modules/account_invoice/view/invoice_form.xml
+@@ -28,10 +28,10 @@
+             <field name="currency"/>
+             <field name="lines" colspan="6"
+                 view_ids="account_invoice.invoice_line_view_tree_sequence"/>
+-            <group col="2" colspan="6" id="taxes_amount_state_buttons">
++            <group col="2" colspan="6" id="taxes_amount_state">
+                 <field name="taxes"
+                     view_ids="account_invoice.invoice_tax_view_tree_sequence"/>
+-                <group col="4" colspan="1" id="amount_state_buttons" yfill="1">
++                <group col="4" colspan="1" id="amount_state" yfill="1">
+                     <group col="2" colspan="2" id="reconciled_state" yfill="1">
+                         <label name="reconciled"/>
+                         <field name="reconciled"/>
+@@ -46,13 +46,6 @@
+                         <label name="total_amount" xalign="1.0" xexpand="1"/>
+                         <field name="total_amount" xalign="1.0" xexpand="0"/>
+                     </group>
+-                    <group col="-1" colspan="4" id="buttons">
+-                        <button name="cancel" icon="tryton-cancel"/>
+-                        <button name="draft" icon="tryton-back"/>
+-                        <button name="validate_invoice" icon="tryton-forward"/>
+-                        <button name="post" icon="tryton-ok"/>
+-                        <button name="pay" icon="tryton-forward"/>
+-                    </group>
+                 </group>
+             </group>
+         </page>
+@@ -82,5 +75,13 @@
+             <field name="reconciliation_lines" colspan="4" view_ids="account_invoice.move_line_view_list_payment"/>
+         </page>
+     </notebook>
++    <label id="empty" colspan="3"/>
++    <group col="-1" colspan="3" id="buttons">
++        <button name="cancel" icon="tryton-cancel"/>
++        <button name="draft" icon="tryton-back"/>
++        <button name="validate_invoice" icon="tryton-forward"/>
++        <button name="post" icon="tryton-ok"/>
++        <button name="pay" icon="tryton-forward"/>
++    </group>
+     <field name="party_lang" invisible="1" colspan="6"/>
+ </form>
+Index: modules/account_invoice/view/invoice_line_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/account_invoice/view/invoice_line_tree.xml
++++ b/trytond/trytond/modules/account_invoice/view/invoice_line_tree.xml
+@@ -2,10 +2,10 @@
+ <!-- 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>
+-    <field name="invoice"/>
++    <field name="invoice" expand="1"/>
+     <field name="type"/>
+-    <field name="product"/>
+-    <field name="account"/>
++    <field name="product" expand="1"/>
++    <field name="account" expand="1"/>
+     <field name="quantity"/>
+     <field name="unit"/>
+     <field name="unit_price"/>
+Index: modules/account_invoice/view/invoice_line_tree_sequence.xml
+===================================================================
+--- a/trytond/trytond/modules/account_invoice/view/invoice_line_tree_sequence.xml
++++ b/trytond/trytond/modules/account_invoice/view/invoice_line_tree_sequence.xml
+@@ -2,13 +2,13 @@
+ <!-- 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 sequence="sequence">
+-    <field name="invoice"/>
++    <field name="invoice" expand="1"/>
+     <field name="type"/>
+-    <field name="product"/>
+-    <field name="account"/>
++    <field name="product" expand="1"/>
++    <field name="account" expand="1"/>
+     <field name="quantity"/>
+     <field name="unit"/>
+     <field name="unit_price"/>
+     <field name="taxes"/>
+-    <field name="amount" expand="1"/>
++    <field name="amount"/>
+ </tree>
+Index: modules/account_invoice/view/invoice_tax_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/account_invoice/view/invoice_tax_tree.xml
++++ b/trytond/trytond/modules/account_invoice/view/invoice_tax_tree.xml
+@@ -2,10 +2,10 @@
+ <!-- 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>
+-    <field name="invoice"/>
+-    <field name="tax"/>
+-    <field name="description"/>
+-    <field name="account"/>
++    <field name="invoice" expand="1"/>
++    <field name="tax" expand="1"/>
++    <field name="description" expand="1"/>
++    <field name="account" expand="1"/>
+     <field name="manual"/>
+     <field name="base"/>
+     <field name="amount"/>
+Index: modules/account_invoice/view/invoice_tax_tree_sequence.xml
+===================================================================
+--- a/trytond/trytond/modules/account_invoice/view/invoice_tax_tree_sequence.xml
++++ b/trytond/trytond/modules/account_invoice/view/invoice_tax_tree_sequence.xml
+@@ -2,9 +2,9 @@
+ <!-- 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 sequence="sequence">
+-    <field name="description"/>
++    <field name="description" expand="1"/>
+     <field name="base"/>
+-    <field name="amount" expand="1"/>
++    <field name="amount"/>
+     <field name="sequence" tree_invisible="1"/>
+     <field name="manual" tree_invisible="1"/>
+     <field name="account" tree_invisible="1"/>
+Index: modules/account_invoice/view/invoice_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/account_invoice/view/invoice_tree.xml
++++ b/trytond/trytond/modules/account_invoice/view/invoice_tree.xml
+@@ -6,14 +6,14 @@
+     <field name="number"/>
+     <field name="reference"/>
+     <field name="invoice_date"/>
+-    <field name="party"/>
++    <field name="party" expand="2"/>
+     <field name="currency"/>
+     <field name="untaxed_amount"/>
+     <field name="tax_amount"/>
+     <field name="total_amount"/>
+     <field name="state"/>
+     <field name="amount_to_pay_today"/>
+-    <field name="description"/>
++    <field name="description" expand="1"/>
+     <button name="cancel" tree_invisible="1"/>
+     <button name="draft" tree_invisible="1"/>
+     <button name="validate_invoice" tree_invisible="1"/>
+Index: modules/account_invoice/view/move_line_list_payment.xml
+===================================================================
+--- a/trytond/trytond/modules/account_invoice/view/move_line_list_payment.xml
++++ b/trytond/trytond/modules/account_invoice/view/move_line_list_payment.xml
+@@ -8,6 +8,4 @@
+     <field name="amount_second_currency"
+         sum="Amount Second Currency"/>
+     <field name="second_currency"/>
+-    <field name="currency_digits" tree_invisible="1"/>
+-    <field name="second_currency_digits" tree_invisible="1"/>
+ </tree>
+Index: modules/account_invoice/view/payment_method_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/account_invoice/view/payment_method_tree.xml
++++ b/trytond/trytond/modules/account_invoice/view/payment_method_tree.xml
+@@ -2,6 +2,7 @@
+ <!-- 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>
+-    <field name="company"/>
+-    <field name="name"/>
++    <field name="name" expand="2"/>
++    <field name="journal" expand="1"/>
++    <field name="company" expand="1"/>
+ </tree>
+Index: modules/account_invoice/view/payment_term_line_list.xml
+===================================================================
+--- a/trytond/trytond/modules/account_invoice/view/payment_term_line_list.xml
++++ b/trytond/trytond/modules/account_invoice/view/payment_term_line_list.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="payment"/>
++    <field name="payment" expand="1"/>
+     <field name="type"/>
+     <field name="ratio" factor="100">
+         <suffix string="%" name="ratio"/>
+Index: modules/account_invoice/view/payment_term_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/account_invoice/view/payment_term_tree.xml
++++ b/trytond/trytond/modules/account_invoice/view/payment_term_tree.xml
+@@ -2,5 +2,5 @@
+ <!-- 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>
+-    <field name="name"/>
++    <field name="name" expand="1"/>
+ </tree>
+Index: modules/account_invoice_line_standalone/view/invoice_line_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/account_invoice_line_standalone/view/invoice_line_tree.xml
++++ b/trytond/trytond/modules/account_invoice_line_standalone/view/invoice_line_tree.xml
+@@ -5,13 +5,13 @@
+     <xpath
+         expr="/tree/field[@name='invoice']"
+         position="before">
+-        <field name="party"/>
++        <field name="party" expand="1"/>
+         <field name="invoice_type"/>
+     </xpath>
+     <xpath
+         expr="/tree/field[@name='amount']"
+         position="after">
+         <field name="currency"/>
+-        <field name="company"/>
++        <field name="company" expand="1"/>
+     </xpath>
+ </data>
+Index: modules/account_invoice_line_standalone/view/invoice_line_tree_sequence.xml
+===================================================================
+--- a/trytond/trytond/modules/account_invoice_line_standalone/view/invoice_line_tree_sequence.xml
++++ b/trytond/trytond/modules/account_invoice_line_standalone/view/invoice_line_tree_sequence.xml
+@@ -3,6 +3,6 @@
+ this repository contains the full copyright notices and license terms. -->
+ <data>
+     <xpath expr="//field[@name='invoice']" position="before">
+-        <field name="origin"/>
++        <field name="origin" expand="1"/>
+     </xpath>
+ </data>
+Index: modules/account_payment/view/payment_journal_list.xml
+===================================================================
+--- a/trytond/trytond/modules/account_payment/view/payment_journal_list.xml
++++ b/trytond/trytond/modules/account_payment/view/payment_journal_list.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="name"/>
++    <field name="name" expand="1"/>
+     <field name="currency"/>
+     <field name="process_method"/>
+ </tree>
+Index: modules/account_payment/view/payment_list.xml
+===================================================================
+--- a/trytond/trytond/modules/account_payment/view/payment_list.xml
++++ b/trytond/trytond/modules/account_payment/view/payment_list.xml
+@@ -2,9 +2,9 @@
+ <!-- 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>
+-    <field name="journal"/>
++    <field name="journal" expand="1"/>
+     <field name="kind"/>
+-    <field name="party"/>
++    <field name="party" expand="2"/>
+     <field name="amount"/>
+     <field name="currency"/>
+     <field name="date"/>
+Index: modules/account_payment_sepa/view/mandate_list.xml
+===================================================================
+--- a/trytond/trytond/modules/account_payment_sepa/view/mandate_list.xml
++++ b/trytond/trytond/modules/account_payment_sepa/view/mandate_list.xml
+@@ -2,9 +2,9 @@
+ <!-- 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>
+-    <field name="party"/>
+-    <field name="account_number"/>
+-    <field name="identification"/>
++    <field name="party" expand="2"/>
++    <field name="account_number" expand="1"/>
++    <field name="identification" expand="1"/>
+     <field name="type"/>
+     <field name="state"/>
+ </tree>
+Index: modules/account_product/view/analytic_account_rule_list.xml
+===================================================================
+--- a/trytond/trytond/modules/account_product/view/analytic_account_rule_list.xml
++++ b/trytond/trytond/modules/account_product/view/analytic_account_rule_list.xml
+@@ -3,7 +3,7 @@
+ this repository contains the full copyright notices and license terms. -->
+ <data>
+     <xpath expr="//field[@name='journal']" position="after">
+-        <field name="product"/>
+-        <field name="product_category"/>
++        <field name="product" expand="1"/>
++        <field name="product_category" expand="1"/>
+     </xpath>
+ </data>
+Index: modules/account_product/view/template_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/account_product/view/template_tree.xml
++++ b/trytond/trytond/modules/account_product/view/template_tree.xml
+@@ -3,6 +3,6 @@
+ this repository contains the full copyright notices and license terms. -->
+ <data>
+     <xpath expr="/tree/field[@name='type']" position="after">
+-        <field name="account_category"/>
++        <field name="account_category" expand="1"/>
+     </xpath>
+ </data>
+Index: modules/account_statement/view/statement_form.xml
+===================================================================
+--- a/trytond/trytond/modules/account_statement/view/statement_form.xml
++++ b/trytond/trytond/modules/account_statement/view/statement_form.xml
+@@ -9,7 +9,11 @@
+     <label name="date"/>
+     <field name="date"/>
+     <label name="start_balance"/>
+-    <field name="start_balance"/>
++    <group id="balances" col="-1">
++        <field name="start_balance"/>
++        <label name="balance"/>
++        <field name="balance"/>
++    </group>
+     <label name="end_balance"/>
+     <field name="end_balance"/>
+     <label name="total_amount"/>
+@@ -22,19 +26,6 @@
+         <page string="Statement Lines" col="4" id="statement_lines">
+             <field name="lines" colspan="4"
+                 view_ids="account_statement.statement_line_view_tree_editable"/>
+-            <group col="6" colspan="4" id="state_buttons">
+-                <label name="balance"/>
+-                <field name="balance"/>
+-                <label name="state"/>
+-                <field name="state"/>
+-                <group col="-1" colspan="2" id="buttons">
+-                    <button name="cancel" icon="tryton-cancel"/>
+-                    <button name="draft" icon="tryton-undo"/>
+-                    <button name="validate_statement" icon="tryton-forward"/>
+-                    <button name="reconcile" icon="tryton-search"/>
+-                    <button name="post" icon="tryton-ok"/>
+-                </group>
+-            </group>
+         </page>
+         <page name="origins">
+             <field name="origins" colspan="4"/>
+@@ -46,4 +37,13 @@
+             <field name="company"/>
+         </page>
+     </notebook>
++    <label name="state"/>
++    <field name="state"/>
++    <group col="-1" colspan="2" id="buttons">
++        <button name="cancel" icon="tryton-cancel"/>
++        <button name="draft" icon="tryton-undo"/>
++        <button name="validate_statement" icon="tryton-forward"/>
++        <button name="reconcile" icon="tryton-search"/>
++        <button name="post" icon="tryton-ok"/>
++    </group>
+ </form>
+Index: modules/account_statement/view/statement_journal_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/account_statement/view/statement_journal_tree.xml
++++ b/trytond/trytond/modules/account_statement/view/statement_journal_tree.xml
+@@ -2,9 +2,9 @@
+ <!-- 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>
+-    <field name="name"/>
+-    <field name="journal"/>
++    <field name="name" expand="2"/>
++    <field name="journal" expand="1"/>
+     <field name="currency"/>
+-    <field name="company"/>
+-    <field name="bank_account"/>
++    <field name="company" expand="1"/>
++    <field name="bank_account" expand="1"/>
+ </tree>
+Index: modules/account_statement/view/statement_line_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/account_statement/view/statement_line_tree.xml
++++ b/trytond/trytond/modules/account_statement/view/statement_line_tree.xml
+@@ -2,12 +2,12 @@
+ <!-- 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>
+-    <field name="statement"/>
++    <field name="statement" expand="1"/>
+     <field name="number"/>
+     <field name="date"/>
+     <field name="amount"/>
+-    <field name="party"/>
+-    <field name="account"/>
+-    <field name="invoice"/>
+-    <field name="description"/>
++    <field name="party" expand="1"/>
++    <field name="account" expand="1"/>
++    <field name="invoice" expand="1"/>
++    <field name="description" expand="1"/>
+ </tree>
+Index: modules/account_statement/view/statement_line_tree_editable.xml
+===================================================================
+--- a/trytond/trytond/modules/account_statement/view/statement_line_tree_editable.xml
++++ b/trytond/trytond/modules/account_statement/view/statement_line_tree_editable.xml
+@@ -2,12 +2,12 @@
+ <!-- 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 editable="bottom" sequence="sequence">
+-    <field name="statement"/>
++    <field name="statement" expand="1"/>
+     <field name="number"/>
+     <field name="date"/>
+     <field name="amount" sum="Amount"/>
+-    <field name="party"/>
+-    <field name="invoice"/>
+-    <field name="account"/>
+-    <field name="description"/>
++    <field name="party" expand="1"/>
++    <field name="invoice" expand="1"/>
++    <field name="account" expand="1"/>
++    <field name="description" expand="1"/>
+ </tree>
+Index: modules/account_statement/view/statement_origin_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/account_statement/view/statement_origin_tree.xml
++++ b/trytond/trytond/modules/account_statement/view/statement_origin_tree.xml
+@@ -2,12 +2,12 @@
+ <!-- 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>
+-    <field name="statement"/>
++    <field name="statement" expand="1"/>
+     <field name="number"/>
+     <field name="date"/>
+     <field name="amount" sum="Amount"/>
+     <field name="pending_amount"/>
+-    <field name="party"/>
+-    <field name="account"/>
+-    <field name="description"/>
++    <field name="party" expand="1"/>
++    <field name="account" expand="1"/>
++    <field name="description" expand="1"/>
+ </tree>
+Index: modules/account_statement/view/statement_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/account_statement/view/statement_tree.xml
++++ b/trytond/trytond/modules/account_statement/view/statement_tree.xml
+@@ -2,8 +2,8 @@
+ <!-- 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>
+-    <field name="journal"/>
+-    <field name="name"/>
++    <field name="journal" expand="1"/>
++    <field name="name" expand="2"/>
+     <field name="date"/>
+     <field name="state"/>
+ </tree>
+Index: modules/account_statement_rule/view/rule_information_list.xml
+===================================================================
+--- a/trytond/trytond/modules/account_statement_rule/view/rule_information_list.xml
++++ b/trytond/trytond/modules/account_statement_rule/view/rule_information_list.xml
+@@ -2,6 +2,6 @@
+ <!-- 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 sequence="sequence">
+-    <field name="rule"/>
+-    <field name="key"/>
++    <field name="rule" expand="1"/>
++    <field name="key" expand="1"/>
+ </tree>
+Index: modules/account_statement_rule/view/rule_line_list.xml
+===================================================================
+--- a/trytond/trytond/modules/account_statement_rule/view/rule_line_list.xml
++++ b/trytond/trytond/modules/account_statement_rule/view/rule_line_list.xml
+@@ -2,8 +2,8 @@
+ <!-- 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 sequence="sequence">
+-    <field name="rule"/>
++    <field name="rule" expand="1"/>
+     <field name="amount"/>
+-    <field name="party"/>
+-    <field name="account"/>
++    <field name="party" expand="1"/>
++    <field name="account" expand="1"/>
+ </tree>
+Index: modules/account_statement_rule/view/rule_list.xml
+===================================================================
+--- a/trytond/trytond/modules/account_statement_rule/view/rule_list.xml
++++ b/trytond/trytond/modules/account_statement_rule/view/rule_list.xml
+@@ -2,5 +2,5 @@
+ <!-- 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 sequence="sequence">
+-    <field name="name"/>
++    <field name="name" expand="1"/>
+ </tree>
+Index: modules/account_stock_landed_cost/view/landed_cost_list.xml
+===================================================================
+--- a/trytond/trytond/modules/account_stock_landed_cost/view/landed_cost_list.xml
++++ b/trytond/trytond/modules/account_stock_landed_cost/view/landed_cost_list.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="number"/>
++    <field name="number" expand="1"/>
+     <field name="posted_date"/>
+     <field name="state"/>
+ </tree>
+
+Index: modules/analytic_account/view/account_form.xml
+===================================================================
+--- a/trytond/trytond/modules/analytic_account/view/account_form.xml
++++ b/trytond/trytond/modules/analytic_account/view/account_form.xml
+@@ -31,8 +31,6 @@
+             <field name="note"/>
+         </page>
+     </notebook>
+-    <group colspan="6" col="2" id="state">
+-        <label name="state"/>
+-        <field name="state"/>
+-    </group>
++    <label name="state" colspan="3"/>
++    <field name="state" colspan="3"/>
+ </form>
+Index: modules/analytic_account/view/account_list.xml
+===================================================================
+--- a/trytond/trytond/modules/analytic_account/view/account_list.xml
++++ b/trytond/trytond/modules/analytic_account/view/account_list.xml
+@@ -2,8 +2,8 @@
+ <!-- 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>
+-    <field name="rec_name"/>
+-    <field name="company"/>
++    <field name="rec_name" expand="2"/>
++    <field name="company" expand="1"/>
+     <field name="type"/>
+     <field name="name" tree_invisible="1"/>
+     <field name="code" tree_invisible="1"/>
+Index: modules/analytic_account/view/account_list2.xml
+===================================================================
+--- a/trytond/trytond/modules/analytic_account/view/account_list2.xml
++++ b/trytond/trytond/modules/analytic_account/view/account_list2.xml
+@@ -3,6 +3,6 @@
+ this repository contains the full copyright notices and license terms. -->
+ <tree>
+     <field name="code"/>
+-    <field name="name"/>
++    <field name="name" expand="1"/>
+     <field name="type"/>
+ </tree>
+Index: modules/analytic_account/view/account_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/analytic_account/view/account_tree.xml
++++ b/trytond/trytond/modules/analytic_account/view/account_tree.xml
+@@ -2,11 +2,9 @@
+ <!-- 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>
+-    <field name="rec_name"/>
+-    <field name="company"/>
++    <field name="rec_name" expand="2"/>
++    <field name="company" expand="1"/>
+     <field name="type"/>
+     <field name="name" tree_invisible="1"/>
+     <field name="code" tree_invisible="1"/>
+-    <field name="parent" tree_invisible="1"/>
+-    <field name="childs" tree_invisible="1"/>
+ </tree>
+Index: modules/analytic_account/view/account_tree2.xml
+===================================================================
+--- a/trytond/trytond/modules/analytic_account/view/account_tree2.xml
++++ b/trytond/trytond/modules/analytic_account/view/account_tree2.xml
+@@ -2,7 +2,7 @@
+ <!-- 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 keyword_open="1">
+-    <field name="name"/>
++    <field name="name" expand="2"/>
+     <field name="code"/>
+     <field name="debit"/>
+     <field name="credit"/>
+Index: modules/analytic_account/view/analytic_account_entry_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/analytic_account/view/analytic_account_entry_tree.xml
++++ b/trytond/trytond/modules/analytic_account/view/analytic_account_entry_tree.xml
+@@ -2,7 +2,7 @@
+ <!-- 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 editable="bottom">
+-    <field name="root"/>
+-    <field name="account"/>
+-    <field name="origin"/>
++    <field name="root" expand="1"/>
++    <field name="account" expand="2"/>
++    <field name="origin" expand="1"/>
+ </tree>
+Index: modules/analytic_account/view/line_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/analytic_account/view/line_tree.xml
++++ b/trytond/trytond/modules/analytic_account/view/line_tree.xml
+@@ -3,7 +3,7 @@
+ this repository contains the full copyright notices and license terms. -->
+ <tree editable="top">
+     <field name="move_line"/>
+-    <field name="account"/>
++    <field name="account" expand="1"/>
+     <field name="date"/>
+     <field name="debit"/>
+     <field name="credit"/>
+Index: modules/analytic_account/view/move_line_list.xml
+===================================================================
+--- a/trytond/trytond/modules/analytic_account/view/move_line_list.xml
++++ b/trytond/trytond/modules/analytic_account/view/move_line_list.xml
+@@ -3,12 +3,12 @@
+ this repository contains the full copyright notices and license terms. -->
+ <tree>
+     <field name="move"/>
+-    <field name="origin"/>
+-    <field name="description"/>
+-    <field name="move_description"/>
++    <field name="origin" expand="1"/>
++    <field name="description" expand="1"/>
++    <field name="move_description" expand="1"/>
+     <field name="date"/>
+-    <field name="account"/>
+-    <field name="party"/>
++    <field name="account" expand="1"/>
++    <field name="party" expand="1"/>
+     <field name="debit" sum="Debit"/>
+     <field name="credit" sum="Credit"/>
+     <field name="analytic_state"/>
+Index: modules/analytic_account/view/rule_list.xml
+===================================================================
+--- a/trytond/trytond/modules/analytic_account/view/rule_list.xml
++++ b/trytond/trytond/modules/analytic_account/view/rule_list.xml
+@@ -2,8 +2,8 @@
+ <!-- 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 sequence="sequence">
+-    <field name="company"/>
+-    <field name="account"/>
+-    <field name="party"/>
+-    <field name="journal"/>
++    <field name="company" expand="1"/>
++    <field name="account" expand="2"/>
++    <field name="party" expand="1"/>
++    <field name="journal" expand="1"/>
+ </tree>
+Index: modules/bank/view/bank_account_list.xml
+===================================================================
+--- a/trytond/trytond/modules/bank/view/bank_account_list.xml
++++ b/trytond/trytond/modules/bank/view/bank_account_list.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="rec_name"/>
+-    <field name="bank"/>
++    <field name="rec_name" string="Number" expand="2"/>
++    <field name="bank" expand="1"/>
+     <field name="currency"/>
+ </tree>
+Index: modules/bank/view/bank_account_number_list.xml
+===================================================================
+--- a/trytond/trytond/modules/bank/view/bank_account_number_list.xml
++++ b/trytond/trytond/modules/bank/view/bank_account_number_list.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="account"/>
++    <field name="account" expand="1"/>
+     <field name="type"/>
+-    <field name="number"/>
++    <field name="number" expand="1"/>
+ </tree>
+Index: modules/bank/view/bank_account_number_list_sequence.xml
+===================================================================
+--- a/trytond/trytond/modules/bank/view/bank_account_number_list_sequence.xml
++++ b/trytond/trytond/modules/bank/view/bank_account_number_list_sequence.xml
+@@ -2,7 +2,7 @@
+ <!-- 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 sequence="sequence">
+-    <field name="account"/>
++    <field name="account" expand="1"/>
+     <field name="type"/>
+-    <field name="number"/>
++    <field name="number" expand="1"/>
+ </tree>
+Index: modules/bank/view/bank_list.xml
+===================================================================
+--- a/trytond/trytond/modules/bank/view/bank_list.xml
++++ b/trytond/trytond/modules/bank/view/bank_list.xml
+@@ -2,6 +2,6 @@
+ <!-- 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>
+-    <field name="party"/>
+-    <field name="bic"/>
++    <field name="party" expand="2"/>
++    <field name="bic" expand="1"/>
+ </tree>
+Index: modules/carrier/view/carrier_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/carrier/view/carrier_tree.xml
++++ b/trytond/trytond/modules/carrier/view/carrier_tree.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="party"/>
+-    <field name="carrier_product"/>
++    <field name="party" expand="1"/>
++    <field name="carrier_product" expand="1"/>
+     <field name="carrier_cost_method"/>
+ </tree>
+
+Index: modules/commission/view/agent_list.xml
+===================================================================
+--- a/trytond/trytond/modules/commission/view/agent_list.xml
++++ b/trytond/trytond/modules/commission/view/agent_list.xml
+@@ -2,9 +2,9 @@
+ <!-- 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>
+-    <field name="party"/>
++    <field name="party" expand="1"/>
+     <field name="type_"/>
+-    <field name="company"/>
+-    <field name="plan"/>
++    <field name="company" expand="1"/>
++    <field name="plan" expand="1"/>
+     <field name="pending_amount"/>
+ </tree>
+Index: modules/commission/view/commission_list.xml
+===================================================================
+--- a/trytond/trytond/modules/commission/view/commission_list.xml
++++ b/trytond/trytond/modules/commission/view/commission_list.xml
+@@ -3,7 +3,7 @@
+ this repository contains the full copyright notices and license terms. -->
+ <tree>
+     <field name="type_"/>
+-    <field name="agent"/>
++    <field name="agent" expand="1"/>
+     <field name="date"/>
+     <field name="amount"/>
+     <field name="currency"/>
+Index: modules/commission/view/plan_line_list.xml
+===================================================================
+--- a/trytond/trytond/modules/commission/view/plan_line_list.xml
++++ b/trytond/trytond/modules/commission/view/plan_line_list.xml
+@@ -2,9 +2,9 @@
+ <!-- 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>
+-    <field name="plan"/>
++    <field name="plan" expand="1"/>
+     <field name="sequence"/>
+-    <field name="category"/>
+-    <field name="product"/>
+-    <field name="formula"/>
++    <field name="category" expand="1"/>
++    <field name="product" expand="1"/>
++    <field name="formula" expand="2"/>
+ </tree>
+Index: modules/commission/view/plan_line_list_sequence.xml
+===================================================================
+--- a/trytond/trytond/modules/commission/view/plan_line_list_sequence.xml
++++ b/trytond/trytond/modules/commission/view/plan_line_list_sequence.xml
+@@ -2,7 +2,7 @@
+ <!-- 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 sequence="sequence">
+-    <field name="category"/>
+-    <field name="product"/>
+-    <field name="formula"/>
++    <field name="category" expand="1"/>
++    <field name="product" expand="1"/>
++    <field name="formula" expand="2"/>
+ </tree>
+Index: modules/commission/view/plan_list.xml
+===================================================================
+--- a/trytond/trytond/modules/commission/view/plan_list.xml
++++ b/trytond/trytond/modules/commission/view/plan_list.xml
+@@ -2,5 +2,5 @@
+ <!-- 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>
+-    <field name="name"/>
++    <field name="name" expand="1"/>
+ </tree>
+Index: modules/company/view/company_list.xml
+===================================================================
+--- a/trytond/trytond/modules/company/view/company_list.xml
++++ b/trytond/trytond/modules/company/view/company_list.xml
+@@ -2,5 +2,5 @@
+ <!-- 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>
+-    <field name="party"/>
++    <field name="party" expand="1"/>
+ </tree>
+Index: modules/company/view/company_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/company/view/company_tree.xml
++++ b/trytond/trytond/modules/company/view/company_tree.xml
+@@ -2,8 +2,6 @@
+ <!-- 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>
+-    <field name="party"/>
++    <field name="party" expand="1"/>
+     <field name="currency"/>
+-    <field name="parent" tree_invisible="1"/>
+-    <field name="childs" tree_invisible="1"/>
+ </tree>
+Index: modules/company/view/employee_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/company/view/employee_tree.xml
++++ b/trytond/trytond/modules/company/view/employee_tree.xml
+@@ -2,8 +2,8 @@
+ <!-- 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>
+-    <field name="party"/>
+-    <field name="company"/>
++    <field name="party" expand="1"/>
++    <field name="company" expand="1"/>
+     <field name="start_date"/>
+     <field name="end_date"/>
+ </tree>
+Index: modules/company/view/sequence_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/company/view/sequence_tree.xml
++++ b/trytond/trytond/modules/company/view/sequence_tree.xml
+@@ -3,6 +3,6 @@
+ this repository contains the full copyright notices and license terms. -->
+ <data>
+     <xpath expr="/tree/field[@name='code']" position="after">
+-        <field name="company"/>
++        <field name="company" expand="1"/>
+     </xpath>
+ </data>
+Index: modules/country/view/country_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/country/view/country_tree.xml
++++ b/trytond/trytond/modules/country/view/country_tree.xml
+@@ -2,6 +2,6 @@
+ <!-- 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>
+-    <field name="name"/>
++    <field name="name" expand="1"/>
+     <field name="code"/>
+ </tree>
+Index: modules/country/view/subdivision_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/country/view/subdivision_tree.xml
++++ b/trytond/trytond/modules/country/view/subdivision_tree.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="name"/>
++    <field name="name" expand="1"/>
+     <field name="code"/>
+     <field name="type"/>
+ </tree>
+Index: modules/country/view/zip_list.xml
+===================================================================
+--- a/trytond/trytond/modules/country/view/zip_list.xml
++++ b/trytond/trytond/modules/country/view/zip_list.xml
+@@ -2,8 +2,8 @@
+ <!-- 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>
+-    <field name="country"/>
+-    <field name="subdivision"/>
+-    <field name="zip"/>
+-    <field name="city"/>
++    <field name="country" expand="1"/>
++    <field name="subdivision" expand="1"/>
++    <field name="zip" expand="1"/>
++    <field name="city" expand="1"/>
+ </tree>
+Index: modules/currency/view/currency_rate_list.xml
+===================================================================
+--- a/trytond/trytond/modules/currency/view/currency_rate_list.xml
++++ b/trytond/trytond/modules/currency/view/currency_rate_list.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="currency"/>
++    <field name="currency" expand="2"/>
+     <field name="date"/>
+-    <field name="rate"/>
++    <field name="rate" expand="1"/>
+ </tree>
+Index: modules/currency/view/currency_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/currency/view/currency_tree.xml
++++ b/trytond/trytond/modules/currency/view/currency_tree.xml
+@@ -2,9 +2,9 @@
+ <!-- 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>
+-    <field name="name"/>
++    <field name="name" expand="2"/>
+     <field name="symbol"/>
+     <field name="code"/>
+     <field name="numeric_code"/>
+-    <field name="rate"/>
++    <field name="rate" expand="1"/>
+ </tree>
+Index: modules/customs/view/duty_rate_list.xml
+===================================================================
+--- a/trytond/trytond/modules/customs/view/duty_rate_list.xml
++++ b/trytond/trytond/modules/customs/view/duty_rate_list.xml
+@@ -2,8 +2,8 @@
+ <!-- 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>
+-    <field name="tariff_code"/>
+-    <field name="country"/>
++    <field name="tariff_code" expand="1"/>
++    <field name="country" expand="1"/>
+     <!-- TODO country group -->
+     <field name="type"/>
+     <field name="start_date"/>
+Index: modules/customs/view/product-tariff_code_list.xml
+===================================================================
+--- a/trytond/trytond/modules/customs/view/product-tariff_code_list.xml
++++ b/trytond/trytond/modules/customs/view/product-tariff_code_list.xml
+@@ -2,6 +2,6 @@
+ <!-- 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>
+-    <field name="product"/>
+-    <field name="tariff_code"/>
++    <field name="product" expand="2"/>
++    <field name="tariff_code" expand="1"/>
+ </tree>
+Index: modules/customs/view/product-tariff_code_list_sequence.xml
+===================================================================
+--- a/trytond/trytond/modules/customs/view/product-tariff_code_list_sequence.xml
++++ b/trytond/trytond/modules/customs/view/product-tariff_code_list_sequence.xml
+@@ -2,6 +2,6 @@
+ <!-- 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 sequence="sequence">
+-    <field name="product"/>
+-    <field name="tariff_code"/>
++    <field name="product" expand="2"/>
++    <field name="tariff_code" expand="1"/>
+ </tree>
+Index: modules/google_maps/view/address_form.xml
+===================================================================
+--- a/trytond/trytond/modules/google_maps/view/address_form.xml
++++ b/trytond/trytond/modules/google_maps/view/address_form.xml
+@@ -2,8 +2,7 @@
+ <!-- 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='subdivision']" position="after">
+-        <newline/>
++    <xpath expr="/form/group[@id='checkboxes']/field[@name='sequence']" position="after">
+         <label name="google_maps_url"/>
+         <field name="google_maps_url" widget="url"/>
+     </xpath>
+Index: modules/marketing_automation/view/activity_timedelta_list.xml
+===================================================================
+--- a/trytond/trytond/modules/marketing_automation/view/activity_timedelta_list.xml
++++ b/trytond/trytond/modules/marketing_automation/view/activity_timedelta_list.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="activity"/>
++    <field name="activity" expand="1"/>
+     <field name="day"/>
+     <field name="month"/>
+     <field name="weekday"/>
+Index: modules/marketing_automation/view/activity_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/marketing_automation/view/activity_tree.xml
++++ b/trytond/trytond/modules/marketing_automation/view/activity_tree.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="name"/>
++    <field name="name" expand="1"/>
+     <field name="on"/>
+     <field name="delay"/>
+     <field name="action"/>
+Index: modules/marketing_automation/view/record_activity_list.xml
+===================================================================
+--- a/trytond/trytond/modules/marketing_automation/view/record_activity_list.xml
++++ b/trytond/trytond/modules/marketing_automation/view/record_activity_list.xml
+@@ -2,8 +2,8 @@
+ <!-- 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>
+-    <field name="record"/>
+-    <field name="activity"/>
++    <field name="record" expand="1"/>
++    <field name="activity" expand="1"/>
+     <field name="at" widget="date"/>
+     <field name="at" string="Time" widget="time"/>
+     <field name="email_opened"/>
+Index: modules/marketing_automation/view/record_list.xml
+===================================================================
+--- a/trytond/trytond/modules/marketing_automation/view/record_list.xml
++++ b/trytond/trytond/modules/marketing_automation/view/record_list.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="scenario"/>
+-    <field name="record"/>
++    <field name="scenario" expand="1"/>
++    <field name="record" expand="1"/>
+     <field name="blocked"/>
+ </tree>
+Index: modules/party/view/address_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/party/view/address_tree.xml
++++ b/trytond/trytond/modules/party/view/address_tree.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="party"/>
++    <field name="party" expand="2"/>
+     <field name="party_name"/>
+     <field name="name"/>
+     <field name="zip"/>
+Index: modules/party/view/address_tree_sequence.xml
+===================================================================
+--- a/trytond/trytond/modules/party/view/address_tree_sequence.xml
++++ b/trytond/trytond/modules/party/view/address_tree_sequence.xml
+@@ -2,7 +2,7 @@
+ <!-- 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 sequence="sequence">
+-    <field name="party"/>
++    <field name="party" expand="2"/>
+     <field name="party_name"/>
+     <field name="name"/>
+     <field name="zip"/>
+Index: modules/party/view/contact_mechanism_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/party/view/contact_mechanism_tree.xml
++++ b/trytond/trytond/modules/party/view/contact_mechanism_tree.xml
+@@ -3,8 +3,7 @@
+ this repository contains the full copyright notices and license terms. -->
+ <tree>
+     <field name="type"/>
+-    <field name="value"/>
+-    <field name="name"/>
+-    <field name="party"/>
+-    <field name="active"/>
++    <field name="value" expand="1"/>
++    <field name="name" expand="1"/>
++    <field name="party" expand="2"/>
+ </tree>
+Index: modules/party/view/contact_mechanism_tree_sequence.xml
+===================================================================
+--- a/trytond/trytond/modules/party/view/contact_mechanism_tree_sequence.xml
++++ b/trytond/trytond/modules/party/view/contact_mechanism_tree_sequence.xml
+@@ -5,7 +5,7 @@
+     editable="bottom">
+     <field name="type"/>
+     <field name="value" expand="1"/>
+-    <field name="name"/>
+-    <field name="party"/>
++    <field name="name" expand="1"/>
++    <field name="party" expand="2"/>
+     <field name="url" widget="url"/>
+ </tree>
+Index: modules/party/view/party_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/party/view/party_tree.xml
++++ b/trytond/trytond/modules/party/view/party_tree.xml
+@@ -3,7 +3,7 @@
+ this repository contains the full copyright notices and license terms. -->
+ <tree>
+     <field name="code"/>
+-    <field name="name"/>
++    <field name="name" expand="1"/>
+     <field name="lang"/>
+     <field name="tax_identifier"/>
+ </tree>
+Index: modules/party_relationship/view/relation_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/party_relationship/view/relation_tree.xml
++++ b/trytond/trytond/modules/party_relationship/view/relation_tree.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="from_"/>
+-    <field name="type"/>
+-    <field name="to"/>
++    <field name="from_" expand="2"/>
++    <field name="type" expand="1"/>
++    <field name="to" expand="2"/>
+ </tree>
+Index: modules/party_relationship/view/relation_type_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/party_relationship/view/relation_type_tree.xml
++++ b/trytond/trytond/modules/party_relationship/view/relation_type_tree.xml
+@@ -2,6 +2,6 @@
+ <!-- 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>
+-    <field name="name"/>
+-    <field name="reverse"/>
++    <field name="name" expand="1"/>
++    <field name="reverse" expand="1"/>
+ </tree>
+Index: modules/party_siret/view/address_form.xml
+===================================================================
+--- a/trytond/trytond/modules/party_siret/view/address_form.xml
++++ b/trytond/trytond/modules/party_siret/view/address_form.xml
+@@ -2,11 +2,12 @@
+ <!-- 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='subdivision']" position="after">
+-        <newline/>
+-        <label name="siret"/>
+-        <field name="siret"/>
+-        <label name="siret_nic"/>
+-        <field name="siret_nic"/>
++    <xpath expr="/form/field[@name='name']" position="after">
++        <group id="siret" colspan="2" col="-1">
++            <label name="siret_nic"/>
++            <field name="siret_nic"/>
++            <label name="siret"/>
++            <field name="siret"/>
++        </group>
+     </xpath>
+ </data>
+Index: modules/party_siret/view/party_form.xml
+===================================================================
+--- a/trytond/trytond/modules/party_siret/view/party_form.xml
++++ b/trytond/trytond/modules/party_siret/view/party_form.xml
+@@ -2,7 +2,7 @@
+ <!-- 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[@id='checkboxes']" position="after">
++    <xpath expr="//page[@name='identifiers']/field[@name='identifiers']" position="before">
+         <label name="siren"/>
+         <field name="siren"/>
+         <newline/>
+Index: modules/product/view/category_list.xml
+===================================================================
+--- a/trytond/trytond/modules/product/view/category_list.xml
++++ b/trytond/trytond/modules/product/view/category_list.xml
+@@ -2,6 +2,6 @@
+ <!-- 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>
+-    <field name="rec_name"/>
++    <field name="rec_name" expand="1"/>
+     <field name="name" tree_invisible="1"/>
+ </tree>
+Index: modules/product/view/category_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/product/view/category_tree.xml
++++ b/trytond/trytond/modules/product/view/category_tree.xml
+@@ -2,7 +2,7 @@
+ <!-- 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 keyword_open="1">
+-    <field name="name"/>
++    <field name="name" expand="1"/>
+     <field name="parent" tree_invisible="1"/>
+     <field name="childs" tree_invisible="1"/>
+ </tree>
+Index: modules/product/view/product_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/product/view/product_tree.xml
++++ b/trytond/trytond/modules/product/view/product_tree.xml
+@@ -5,6 +5,6 @@
+     <xpath expr="//field[@name='products']" position="replace">
+     </xpath>
+     <xpath expr="/tree/field[@name='name']" position="before">
+-        <field name="code"/>
++        <field name="code" expand="1"/>
+     </xpath>
+ </data>
+Index: modules/product/view/product_tree_simple.xml
+===================================================================
+--- a/trytond/trytond/modules/product/view/product_tree_simple.xml
++++ b/trytond/trytond/modules/product/view/product_tree_simple.xml
+@@ -2,5 +2,5 @@
+ <!-- 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>
+-    <field name="rec_name"/>
++    <field name="rec_name" expand="1"/>
+ </tree>
+Index: modules/product/view/template_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/product/view/template_tree.xml
++++ b/trytond/trytond/modules/product/view/template_tree.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="name"/>
++    <field name="name" expand="2"/>
+     <field name="list_price"/>
+     <field name="cost_price"/>
+     <field name="type"/>
+Index: modules/product/view/uom_category_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/product/view/uom_category_tree.xml
++++ b/trytond/trytond/modules/product/view/uom_category_tree.xml
+@@ -2,5 +2,5 @@
+ <!-- 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>
+-    <field name="name"/>
++    <field name="name" expand="1"/>
+ </tree>
+Index: modules/product/view/uom_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/product/view/uom_tree.xml
++++ b/trytond/trytond/modules/product/view/uom_tree.xml
+@@ -2,9 +2,9 @@
+ <!-- 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>
+-    <field name="name"/>
++    <field name="name" expand="2"/>
+     <field name="symbol"/>
+-    <field name="category"/>
++    <field name="category" expand="1"/>
+     <field name="factor"/>
+     <field name="rate"/>
+     <field name="rounding"/>
+Index: modules/product_classification/view/classification_list.xml
+===================================================================
+--- a/trytond/trytond/modules/product_classification/view/classification_list.xml
++++ b/trytond/trytond/modules/product_classification/view/classification_list.xml
+@@ -2,6 +2,6 @@
+ <!-- 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>
+-    <field name="rec_name"/>
++    <field name="rec_name" expand="1"/>
+     <field name="selectable" tree_invisible="1"/>
+ </tree>
+Index: modules/product_classification/view/classification_tree_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/product_classification/view/classification_tree_tree.xml
++++ b/trytond/trytond/modules/product_classification/view/classification_tree_tree.xml
+@@ -3,6 +3,6 @@
+ this repository contains the full copyright notices and license terms. -->
+ <data>
+     <xpath expr="/tree/field[@name='rec_name']" position="replace">
+-        <field name="name"/>
++        <field name="name" expand="1"/>
+     </xpath>
+ </data>
+Index: modules/product_classification_taxonomic/view/cultivar_group_list.xml
+===================================================================
+--- a/trytond/trytond/modules/product_classification_taxonomic/view/cultivar_group_list.xml
++++ b/trytond/trytond/modules/product_classification_taxonomic/view/cultivar_group_list.xml
+@@ -2,5 +2,5 @@
+ <!-- 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>
+-    <field name="name"/>
++    <field name="name" expand="1"/>
+ </tree>
+Index: modules/product_price_list/view/price_list_line_form.xml
+===================================================================
+--- a/trytond/trytond/modules/product_price_list/view/price_list_line_form.xml
++++ b/trytond/trytond/modules/product_price_list/view/price_list_line_form.xml
+@@ -3,9 +3,10 @@
+ this repository contains the full copyright notices and license terms. -->
+ <form>
+     <label name="price_list"/>
+-    <field name="price_list"/>
++    <field name="price_list" colspan="3"/>
+     <label name="sequence"/>
+     <field name="sequence"/>
++    <newline/>
+     <label name="category"/>
+     <field name="category"/>
+     <label name="product"/>
+Index: modules/product_price_list/view/price_list_line_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/product_price_list/view/price_list_line_tree.xml
++++ b/trytond/trytond/modules/product_price_list/view/price_list_line_tree.xml
+@@ -2,10 +2,10 @@
+ <!-- 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>
+-    <field name="price_list"/>
++    <field name="price_list" expand="1"/>
+     <field name="sequence"/>
+-    <field name="category"/>
+-    <field name="product"/>
++    <field name="category" expand="1"/>
++    <field name="product" expand="1"/>
+     <field name="quantity"/>
+-    <field name="formula"/>
++    <field name="formula" expand="1"/>
+ </tree>
+Index: modules/product_price_list/view/price_list_line_tree_sequence.xml
+===================================================================
+--- a/trytond/trytond/modules/product_price_list/view/price_list_line_tree_sequence.xml
++++ b/trytond/trytond/modules/product_price_list/view/price_list_line_tree_sequence.xml
+@@ -2,8 +2,8 @@
+ <!-- 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 sequence="sequence">
+-    <field name="category"/>
+-    <field name="product"/>
++    <field name="category" expand="1"/>
++    <field name="product" expand="1"/>
+     <field name="quantity"/>
+-    <field name="formula"/>
++    <field name="formula" expand="1"/>
+ </tree>
+Index: modules/product_price_list/view/price_list_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/product_price_list/view/price_list_tree.xml
++++ b/trytond/trytond/modules/product_price_list/view/price_list_tree.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="name"/>
++    <field name="name" expand="1"/>
+     <field name="tax_included"/>
+     <field name="unit"/>
+ </tree>
+Index: modules/product_price_list_dates/view/price_list_line_form.xml
+===================================================================
+--- a/trytond/trytond/modules/product_price_list_dates/view/price_list_line_form.xml
++++ b/trytond/trytond/modules/product_price_list_dates/view/price_list_line_form.xml
+@@ -4,8 +4,10 @@
+ <data>
+     <xpath expr="/form/field[@name='sequence']" position="after">
+         <label name="start_date"/>
+-        <field name="start_date"/>
+-        <label name="end_date"/>
+-        <field name="end_date"/>
++        <group id="start_end_date" col="3">
++            <field name="start_date"/>
++            <label name="end_date"/>
++            <field name="end_date"/>
++        </group>
+     </xpath>
+ </data>
+Index: modules/production/view/bom_input_list.xml
+===================================================================
+--- a/trytond/trytond/modules/production/view/bom_input_list.xml
++++ b/trytond/trytond/modules/production/view/bom_input_list.xml
+@@ -2,8 +2,8 @@
+ <!-- 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>
+-    <field name="bom"/>
+-    <field name="product"/>
++    <field name="bom" expand="1"/>
++    <field name="product" expand="1"/>
+     <field name="quantity"/>
+     <field name="uom"/>
+ </tree>
+Index: modules/production/view/bom_list.xml
+===================================================================
+--- a/trytond/trytond/modules/production/view/bom_list.xml
++++ b/trytond/trytond/modules/production/view/bom_list.xml
+@@ -2,5 +2,5 @@
+ <!-- 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>
+-    <field name="name"/>
++    <field name="name" expand="1"/>
+ </tree>
+Index: modules/production/view/bom_output_list.xml
+===================================================================
+--- a/trytond/trytond/modules/production/view/bom_output_list.xml
++++ b/trytond/trytond/modules/production/view/bom_output_list.xml
+@@ -2,8 +2,8 @@
+ <!-- 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>
+-    <field name="bom"/>
+-    <field name="product"/>
++    <field name="bom" expand="1"/>
++    <field name="product" expand="1"/>
+     <field name="quantity"/>
+     <field name="uom"/>
+ </tree>
+Index: modules/production/view/production_form.xml
+===================================================================
+--- a/trytond/trytond/modules/production/view/production_form.xml
++++ b/trytond/trytond/modules/production/view/production_form.xml
+@@ -39,17 +39,15 @@
+             <field name="cost"/>
+         </page>
+     </notebook>
+-    <group col="4" colspan="4" id="state_buttons">
+-        <label name="state"/>
+-        <field name="state"/>
+-        <group col="-1" colspan="2" id="buttons">
+-            <button name="cancel" icon="tryton-cancel"/>
+-            <button name="draft"/>
+-            <button name="reset_bom" icon="tryton-clear"/>
+-            <button name="wait"/>
+-            <button name="assign_wizard" icon="tryton-forward"/>
+-            <button name="run" icon="tryton-forward"/>
+-            <button name="done" icon="tryton-forward"/>
+-        </group>
++    <label name="state"/>
++    <field name="state"/>
++    <group col="-1" colspan="2" id="buttons">
++        <button name="cancel" icon="tryton-cancel"/>
++        <button name="draft"/>
++        <button name="reset_bom" icon="tryton-clear"/>
++        <button name="wait"/>
++        <button name="assign_wizard" icon="tryton-forward"/>
++        <button name="run" icon="tryton-forward"/>
++        <button name="done" icon="tryton-forward"/>
+     </group>
+ </form>
+Index: modules/production/view/production_list.xml
+===================================================================
+--- a/trytond/trytond/modules/production/view/production_list.xml
++++ b/trytond/trytond/modules/production/view/production_list.xml
+@@ -2,9 +2,9 @@
+ <!-- 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>
+-    <field name="number"/>
+-    <field name="reference"/>
+-    <field name="product"/>
++    <field name="number" expand="1"/>
++    <field name="reference" expand="1"/>
++    <field name="product" expand="2"/>
+     <field name="quantity"/>
+     <field name="uom"/>
+     <field name="planned_start_date"/>
+Index: modules/production_outsourcing/view/routing_list.xml
+===================================================================
+--- a/trytond/trytond/modules/production_outsourcing/view/routing_list.xml
++++ b/trytond/trytond/modules/production_outsourcing/view/routing_list.xml
+@@ -3,6 +3,6 @@
+ this repository contains the full copyright notices and license terms. -->
+ <data>
+     <xpath expr="/tree" position="inside">
+-        <field name="supplier"/>
++        <field name="supplier" expand="1"/>
+     </xpath>
+ </data>
+Index: modules/production_routing/view/operation_list.xml
+===================================================================
+--- a/trytond/trytond/modules/production_routing/view/operation_list.xml
++++ b/trytond/trytond/modules/production_routing/view/operation_list.xml
+@@ -2,5 +2,5 @@
+ <!-- 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>
+-    <field name="name"/>
++    <field name="name" expand="2"/>
+ </tree>
+Index: modules/production_routing/view/routing_list.xml
+===================================================================
+--- a/trytond/trytond/modules/production_routing/view/routing_list.xml
++++ b/trytond/trytond/modules/production_routing/view/routing_list.xml
+@@ -2,5 +2,5 @@
+ <!-- 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>
+-    <field name="name"/>
++    <field name="name" expand="1"/>
+ </tree>
+Index: modules/production_routing/view/routing_step_list.xml
+===================================================================
+--- a/trytond/trytond/modules/production_routing/view/routing_step_list.xml
++++ b/trytond/trytond/modules/production_routing/view/routing_step_list.xml
+@@ -2,6 +2,6 @@
+ <!-- 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>
+-    <field name="routing"/>
+-    <field name="operation"/>
++    <field name="routing" expand="1"/>
++    <field name="operation" expand="1"/>
+ </tree>
+Index: modules/production_routing/view/routing_step_list_sequence.xml
+===================================================================
+--- a/trytond/trytond/modules/production_routing/view/routing_step_list_sequence.xml
++++ b/trytond/trytond/modules/production_routing/view/routing_step_list_sequence.xml
+@@ -2,6 +2,6 @@
+ <!-- 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 sequence="sequence">
+-    <field name="routing"/>
+-    <field name="operation"/>
++    <field name="routing" expand="1"/>
++    <field name="operation" expand="1"/>
+ </tree>
+Index: modules/production_work/view/operation_list.xml
+===================================================================
+--- a/trytond/trytond/modules/production_work/view/operation_list.xml
++++ b/trytond/trytond/modules/production_work/view/operation_list.xml
+@@ -3,6 +3,6 @@
+ this repository contains the full copyright notices and license terms. -->
+ <data>
+     <xpath expr="/tree/field[@name='name']" position="after">
+-        <field name="work_center_category"/>
++        <field name="work_center_category" expand="1"/>
+     </xpath>
+ </data>
+Index: modules/production_work/view/work_center_category_list.xml
+===================================================================
+--- a/trytond/trytond/modules/production_work/view/work_center_category_list.xml
++++ b/trytond/trytond/modules/production_work/view/work_center_category_list.xml
+@@ -2,5 +2,5 @@
+ <!-- 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>
+-    <field name="name"/>
++    <field name="name" expand="1"/>
+ </tree>
+Index: modules/production_work/view/work_center_list.xml
+===================================================================
+--- a/trytond/trytond/modules/production_work/view/work_center_list.xml
++++ b/trytond/trytond/modules/production_work/view/work_center_list.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="rec_name"/>
+-    <field name="category"/>
++    <field name="rec_name" expand="2"/>
++    <field name="category" expand="1"/>
+     <field name="warehouse" tree_invisible="1"/>
+ </tree>
+Index: modules/production_work/view/work_center_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/production_work/view/work_center_tree.xml
++++ b/trytond/trytond/modules/production_work/view/work_center_tree.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="name"/>
+-    <field name="category"/>
++    <field name="name" expand="2"/>
++    <field name="category" expand="1"/>
+     <field name="warehouse" tree_invisible="1"/>
+ </tree>
+Index: modules/production_work/view/work_list.xml
+===================================================================
+--- a/trytond/trytond/modules/production_work/view/work_list.xml
++++ b/trytond/trytond/modules/production_work/view/work_list.xml
+@@ -2,8 +2,8 @@
+ <!-- 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>
+-    <field name="production"/>
+-    <field name="operation"/>
+-    <field name="work_center"/>
++    <field name="production" expand="1"/>
++    <field name="operation" expand="1"/>
++    <field name="work_center" expand="1"/>
+     <field name="state"/>
+ </tree>
+Index: modules/production_work/view/work_list_sequence.xml
+===================================================================
+--- a/trytond/trytond/modules/production_work/view/work_list_sequence.xml
++++ b/trytond/trytond/modules/production_work/view/work_list_sequence.xml
+@@ -2,8 +2,8 @@
+ <!-- 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 sequence="sequence">
+-    <field name="production"/>
+-    <field name="operation"/>
+-    <field name="work_center"/>
++    <field name="production" expand="1"/>
++    <field name="operation" expand="1"/>
++    <field name="work_center" expand="1"/>
+     <field name="state"/>
+ </tree>
+Index: modules/project/view/work_list.xml
+===================================================================
+--- a/trytond/trytond/modules/project/view/work_list.xml
++++ b/trytond/trytond/modules/project/view/work_list.xml
+@@ -2,7 +2,7 @@
+ <!-- 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 sequence="sequence">
+-    <field name="rec_name"/>
++    <field name="rec_name" expand="1"/>
+     <field name="timesheet_duration"/>
+     <field name="total_effort"/>
+     <field name="type"/>
+Index: modules/project/view/work_list_children.xml
+===================================================================
+--- a/trytond/trytond/modules/project/view/work_list_children.xml
++++ b/trytond/trytond/modules/project/view/work_list_children.xml
+@@ -2,7 +2,7 @@
+ <!-- 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 sequence="sequence">
+-    <field name="name"/>
++    <field name="name" expand="1"/>
+     <field name="timesheet_duration"/>
+     <field name="total_effort"/>
+     <field name="type"/>
+Index: modules/project/view/work_list_simple.xml
+===================================================================
+--- a/trytond/trytond/modules/project/view/work_list_simple.xml
++++ b/trytond/trytond/modules/project/view/work_list_simple.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="rec_name"/>
++    <field name="rec_name" expand="1"/>
+     <field name="type"/>
+     <field name="state"/>
+ </tree>
+Index: modules/project/view/work_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/project/view/work_tree.xml
++++ b/trytond/trytond/modules/project/view/work_tree.xml
+@@ -2,11 +2,10 @@
+ <!-- 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 sequence="sequence">
+-    <field name="name"/>
++    <field name="name" expand="1"/>
+     <field name="timesheet_duration"/>
+     <field name="total_effort"/>
+     <field name="type"/>
+     <field name="state"/>
+     <field name="total_progress" widget="progressbar" expand="1"/>
+-    <field name="parent" tree_invisible="1"/>
+ </tree>
+Index: modules/project/view/work_tree_simple.xml
+===================================================================
+--- a/trytond/trytond/modules/project/view/work_tree_simple.xml
++++ b/trytond/trytond/modules/project/view/work_tree_simple.xml
+@@ -2,8 +2,7 @@
+ <!-- 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 sequence="sequence">
+-    <field name="name"/>
++    <field name="name" expand="1"/>
+     <field name="type"/>
+     <field name="state"/>
+-    <field name="parent" tree_invisible="1"/>
+ </tree>
+Index: modules/project_invoice/view/work_invoiced_progress_list.xml
+===================================================================
+--- a/trytond/trytond/modules/project_invoice/view/work_invoiced_progress_list.xml
++++ b/trytond/trytond/modules/project_invoice/view/work_invoiced_progress_list.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="work"/>
++    <field name="work" expand="2"/>
+     <field name="effort_duration"/>
+-    <field name="invoice_line"/>
++    <field name="invoice_line" expand="1"/>
+ </tree>
+Index: modules/purchase/view/move_list_shipment.xml
+===================================================================
+--- a/trytond/trytond/modules/purchase/view/move_list_shipment.xml
++++ b/trytond/trytond/modules/purchase/view/move_list_shipment.xml
+@@ -2,14 +2,13 @@
+ <!-- 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>
+-    <field name="product"/>
+-    <field name="from_location"/>
+-    <field name="to_location"/>
++    <field name="product" expand="1"/>
++    <field name="from_location" expand="1"/>
++    <field name="to_location" expand="1"/>
+     <field name="quantity"/>
+     <field name="uom"/>
+     <field name="state"/>
+     <field name="purchase_exception_state"/>
+     <button name="cancel" string="Cancel"/>
+     <button name="draft" string="Reset to Draft"/>
+-    <field name="unit_digits" tree_invisible="1"/>
+ </tree>
+Index: modules/purchase/view/move_list_shipment_in.xml
+===================================================================
+--- a/trytond/trytond/modules/purchase/view/move_list_shipment_in.xml
++++ b/trytond/trytond/modules/purchase/view/move_list_shipment_in.xml
+@@ -3,6 +3,6 @@
+ this repository contains the full copyright notices and license terms. -->
+ <data>
+     <xpath expr="//field[@name='shipment']" position="after">
+-        <field name="purchase"/>
++        <field name="purchase" expand="1"/>
+     </xpath>
+ </data>
+Index: modules/purchase/view/product_supplier_price_list_sequence.xml
+===================================================================
+--- a/trytond/trytond/modules/purchase/view/product_supplier_price_list_sequence.xml
++++ b/trytond/trytond/modules/purchase/view/product_supplier_price_list_sequence.xml
+@@ -2,8 +2,7 @@
+ <!-- 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 sequence="sequence">
+-    <field name="product_supplier"/>
++    <field name="product_supplier" expand="1"/>
+     <field name="quantity"/>
+     <field name="unit_price" expand="1"/>
+-    <field name="sequence" tree_invisible="1"/>
+ </tree>
+Index: modules/purchase/view/product_supplier_price_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/purchase/view/product_supplier_price_tree.xml
++++ b/trytond/trytond/modules/purchase/view/product_supplier_price_tree.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="product_supplier"/>
++    <field name="product_supplier" expand="1"/>
+     <field name="quantity"/>
+     <field name="unit_price"/>
+ </tree>
+Index: modules/purchase/view/product_supplier_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/purchase/view/product_supplier_tree.xml
++++ b/trytond/trytond/modules/purchase/view/product_supplier_tree.xml
+@@ -2,10 +2,9 @@
+ <!-- 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>
+-    <field name="template"/>
+-    <field name="product"/>
+-    <field name="party"/>
+-    <field name="name"/>
+-    <field name="code"/>
+-    <field name="sequence"/>
++    <field name="template" expand="2"/>
++    <field name="product" expand="2"/>
++    <field name="party" expand="2"/>
++    <field name="name" expand="1"/>
++    <field name="code" expand="1"/>
+ </tree>
+Index: modules/purchase/view/product_supplier_tree_sequence.xml
+===================================================================
+--- a/trytond/trytond/modules/purchase/view/product_supplier_tree_sequence.xml
++++ b/trytond/trytond/modules/purchase/view/product_supplier_tree_sequence.xml
+@@ -2,9 +2,9 @@
+ <!-- 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 sequence="sequence">
+-    <field name="template"/>
+-    <field name="product"/>
+-    <field name="party"/>
+-    <field name="name"/>
+-    <field name="code"/>
++    <field name="template" expand="2"/>
++    <field name="product" expand="2"/>
++    <field name="party" expand="2"/>
++    <field name="name" expand="1"/>
++    <field name="code" expand="1"/>
+ </tree>
+Index: modules/purchase/view/purchase_form.xml
+===================================================================
+--- a/trytond/trytond/modules/purchase/view/purchase_form.xml
++++ b/trytond/trytond/modules/purchase/view/purchase_form.xml
+@@ -32,23 +32,13 @@
+                 <label name="state"/>
+                 <field name="state"/>
+             </group>
+-            <group col="2" colspan="2" id="amount_buttons" yfill="1">
++            <group col="2" colspan="2" id="amount" yfill="1">
+                 <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="-1" colspan="2" id="buttons">
+-                    <button name="cancel" icon="tryton-cancel"/>
+-                    <button name="draft"/>
+-                    <button name="modify_header" icon="tryton-launch"/>
+-                    <button name="quote" icon="tryton-forward"/>
+-                    <button name="handle_invoice_exception" icon="tryton-forward"/>
+-                    <button name="handle_shipment_exception" icon="tryton-forward"/>
+-                    <button name="confirm" icon="tryton-ok"/>
+-                    <button name="process"/>
+-                </group>
+             </group>
+         </page>
+         <page string="Other Info" id="info">
+@@ -71,6 +61,16 @@
+             <field name="shipment_returns" colspan="4" mode="tree"/>
+         </page>
+     </notebook>
+-    <field name="currency_digits" invisible="1" colspan="6"/>
++    <label id="empty" colspan="3"/>
++    <group col="-1" colspan="3" id="buttons">
++        <button name="cancel" icon="tryton-cancel"/>
++        <button name="draft"/>
++        <button name="modify_header" icon="tryton-launch"/>
++        <button name="quote" icon="tryton-forward"/>
++        <button name="handle_invoice_exception" icon="tryton-forward"/>
++        <button name="handle_shipment_exception" icon="tryton-forward"/>
++        <button name="confirm" icon="tryton-ok"/>
++        <button name="process"/>
++    </group>
+     <field name="party_lang" invisible="1" colspan="6"/>
+ </form>
+Index: modules/purchase/view/purchase_line_form.xml
+===================================================================
+--- a/trytond/trytond/modules/purchase/view/purchase_line_form.xml
++++ b/trytond/trytond/modules/purchase/view/purchase_line_form.xml
+@@ -23,14 +23,14 @@
+             <field name="unit_price"/>
+             <label name="amount"/>
+             <field name="amount"/>
+-            <separator name="description" colspan="4"/>
+-            <field name="description" colspan="4"/>
+-            <label id="delivery_date" string="Delivery Date"/>
++            <label id="delivery_date" string="Delivery Date:"/>
+             <group id="delivery_date" col="-1">
+                 <field name="delivery_date" xexpand="0"/>
+                 <field name="delivery_date_store" xexpand="0"/>
+                 <field name="delivery_date_edit" xexpand="0"/>
+             </group>
++            <separator name="description" colspan="4"/>
++            <field name="description" colspan="4"/>
+         </page>
+         <page string="Taxes" id="taxes">
+             <field name="taxes" colspan="4"/>
+Index: modules/purchase/view/purchase_line_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/purchase/view/purchase_line_tree.xml
++++ b/trytond/trytond/modules/purchase/view/purchase_line_tree.xml
+@@ -2,14 +2,13 @@
+ <!-- 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>
+-    <field name="purchase"/>
++    <field name="purchase" expand="1"/>
+     <field name="type"/>
+-    <field name="product"/>
+-    <field name="product_supplier"/>
++    <field name="product" expand="1"/>
++    <field name="product_supplier" expand="1"/>
+     <field name="quantity"/>
+     <field name="unit"/>
+     <field name="unit_price"/>
+     <field name="taxes"/>
+     <field name="amount"/>
+-    <field name="unit_digits" tree_invisible="1"/>
+ </tree>
+Index: modules/purchase/view/purchase_line_tree_sequence.xml
+===================================================================
+--- a/trytond/trytond/modules/purchase/view/purchase_line_tree_sequence.xml
++++ b/trytond/trytond/modules/purchase/view/purchase_line_tree_sequence.xml
+@@ -2,15 +2,13 @@
+ <!-- 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 sequence="sequence">
+-    <field name="purchase"/>
++    <field name="purchase" expand="1"/>
+     <field name="type"/>
+-    <field name="product"/>
+-    <field name="product_supplier"/>
++    <field name="product" expand="1"/>
++    <field name="product_supplier" expand="1"/>
+     <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"/>
++    <field name="amount"/>
+ </tree>
+Index: modules/purchase/view/purchase_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/purchase/view/purchase_tree.xml
++++ b/trytond/trytond/modules/purchase/view/purchase_tree.xml
+@@ -2,16 +2,15 @@
+ <!-- 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>
+-    <field name="number"/>
+-    <field name="reference"/>
++    <field name="number" expand="1"/>
++    <field name="reference" expand="1"/>
+     <field name="purchase_date"/>
+-    <field name="party"/>
++    <field name="party" expand="2"/>
+     <field name="warehouse"/>
+     <field name="currency"/>
+     <field name="untaxed_amount"/>
+     <field name="state"/>
+     <field name="invoice_state"/>
+     <field name="shipment_state"/>
+-    <field name="description"/>
+-    <field name="currency_digits" tree_invisible="1"/>
++    <field name="description" expand="1"/>
+ </tree>
+Index: modules/purchase_invoice_line_standalone/view/invoice_line_tree_invoice_type.xml
+===================================================================
+--- a/trytond/trytond/modules/purchase_invoice_line_standalone/view/invoice_line_tree_invoice_type.xml
++++ b/trytond/trytond/modules/purchase_invoice_line_standalone/view/invoice_line_tree_invoice_type.xml
+@@ -2,17 +2,15 @@
+ <!-- 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>
+-    <field name="invoice"/>
++    <field name="invoice" expand="1"/>
+     <field name="invoice_type"/>
+     <field name="type"/>
+-    <field name="product"/>
++    <field name="product" expand="1"/>
+     <field name="account"/>
+-    <field name="description"/>
++    <field name="description" expand="1"/>
+     <field name="quantity"/>
+     <field name="unit"/>
+     <field name="unit_price"/>
+     <field name="taxes"/>
+     <field name="amount"/>
+-    <field name="unit_digits" tree_invisible="1"/>
+-    <field name="currency_digits" tree_invisible="1"/>
+ </tree>
+Index: modules/purchase_request/view/purchase_request_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/purchase_request/view/purchase_request_tree.xml
++++ b/trytond/trytond/modules/purchase_request/view/purchase_request_tree.xml
+@@ -2,13 +2,13 @@
+ <!-- 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>
+-    <field name="product"/>
++    <field name="product" expand="2"/>
+     <field name="quantity"/>
+     <field name="uom"/>
+-    <field name="warehouse"/>
+-    <field name="party"/>
++    <field name="warehouse" expand="1"/>
++    <field name="party" expand="2"/>
+     <field name="purchase_date"/>
+     <field name="stock_level"/>
+-    <field name="company"/>
++    <field name="company" expand="1"/>
+     <field name="state"/>
+ </tree>
+Index: modules/purchase_request_quotation/purchase.py
+===================================================================
+--- a/trytond/trytond/modules/purchase_request_quotation/purchase.py
++++ b/trytond/trytond/modules/purchase_request_quotation/purchase.py
+@@ -313,7 +313,7 @@
+         ],
+         depends=['supplier'])
+     quotation_state = fields.Function(fields.Selection(
+-            'get_quotation_state', 'Request for Quotation State'),
++            'get_quotation_state', 'Quotation State'),
+         'on_change_with_quotation_state', searcher='search_quotation_state')
+
+     @staticmethod
+Index: modules/purchase_request_quotation/view/purchase_request_form.xml
+===================================================================
+--- a/trytond/trytond/modules/purchase_request_quotation/view/purchase_request_form.xml
++++ b/trytond/trytond/modules/purchase_request_quotation/view/purchase_request_form.xml
+@@ -2,13 +2,14 @@
+ <!-- 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='state']" position="after">
+-        <separator string="Quotations" colspan="4" id="quotation"/>
+-        <label name="preferred_quotation_line"/>
+-        <field name="preferred_quotation_line"
+-            view_ids="purchase_request_quotation.purchase_request_quotation_line_view_list_request"/>
+-        <field name="quotation_lines_active" colspan="4" widget="many2many"
+-            readonly="1"
+-            view_ids="purchase_request_quotation.purchase_request_quotation_line_view_list_request"/>
++    <xpath expr="//notebook" position="inside">
++        <page id="quotation" string="Quotations">
++            <label name="preferred_quotation_line" string="Preferred Quotation:"/>
++            <field name="preferred_quotation_line"
++                view_ids="purchase_request_quotation.purchase_request_quotation_line_view_list_request"/>
++            <field name="quotation_lines_active" colspan="4" widget="many2many"
++                readonly="1" string="Quotations"
++                view_ids="purchase_request_quotation.purchase_request_quotation_line_view_list_request"/>
++        </page>
+     </xpath>
+ </data>
+Index: modules/purchase_request_quotation/view/purchase_request_quotation_form.xml
+===================================================================
+--- a/trytond/trytond/modules/purchase_request_quotation/view/purchase_request_quotation_form.xml
++++ b/trytond/trytond/modules/purchase_request_quotation/view/purchase_request_quotation_form.xml
+@@ -20,24 +20,19 @@
+         <page string="Quotation" id="quotation">
+             <field name="lines" colspan="4"
+                 view_ids="purchase_request_quotation.purchase_request_quotation_line_view_list"/>
+-            <group col="2" colspan="2" id="states" yfill="1">
+-                <label name="state"/>
+-                <field name="state"/>
+-            </group>
+-            <group col="2" colspan="2" id="amount" yfill="1">
+-                <group col="-1" colspan="2" id="buttons">
+-                    <button name="cancel" string="Cancel"
+-                        icon="tryton-cancel"/>
+-                    <button name="reject" string="Reject" icon="tryton-close"/>
+-                    <button name="draft" string="Draft"/>
+-                    <button name="send" string="Send" icon="tryton-forward"/>
+-                    <button name="receive" string="Receive" icon="tryton-ok"/>
+-                </group>
+-            </group>
+         </page>
+         <page string="Other Info" id="other_info">
+             <label name="company"/>
+             <field name="company"/>
+         </page>
+     </notebook>
++    <label name="state"/>
++    <field name="state" colspan="2"/>
++    <group col="-1" colspan="3" id="buttons">
++        <button name="cancel" string="Cancel" icon="tryton-cancel"/>
++        <button name="reject" string="Reject" icon="tryton-close"/>
++        <button name="draft" string="Draft"/>
++        <button name="send" string="Send" icon="tryton-forward"/>
++        <button name="receive" string="Receive" icon="tryton-ok"/>
++    </group>
+ </form>
+Index: modules/purchase_request_quotation/view/purchase_request_quotation_line_form.xml
+===================================================================
+--- a/trytond/trytond/modules/purchase_request_quotation/view/purchase_request_quotation_line_form.xml
++++ b/trytond/trytond/modules/purchase_request_quotation/view/purchase_request_quotation_line_form.xml
+@@ -17,10 +17,11 @@
+             <field name="unit"/>
+             <label name="unit_price"/>
+             <field name="unit_price"/>
++            <newline/>
++            <label name="supply_date"/>
++            <field name="supply_date"/>
+             <separator name="description" colspan="4"/>
+             <field name="description" colspan="4"/>
+-            <label name="supply_date"/>
+-            <field name="supply_date"/>
+         </page>
+     </notebook>
+ </form>
+Index: modules/purchase_request_quotation/view/purchase_request_quotation_line_list.xml
+===================================================================
+--- a/trytond/trytond/modules/purchase_request_quotation/view/purchase_request_quotation_line_list.xml
++++ b/trytond/trytond/modules/purchase_request_quotation/view/purchase_request_quotation_line_list.xml
+@@ -2,10 +2,10 @@
+ <!-- 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>
+-    <field name="request"/>
++    <field name="request" expand="1"/>
+     <field name="supply_date"/>
+-    <field name="product"/>
+-    <field name="description"/>
++    <field name="product" expand="1"/>
++    <field name="description" expand="1"/>
+     <field name="quantity"/>
+     <field name="unit"/>
+     <field name="unit_price"/>
+Index: modules/purchase_request_quotation/view/purchase_request_quotation_line_list_request.xml
+===================================================================
+--- a/trytond/trytond/modules/purchase_request_quotation/view/purchase_request_quotation_line_list_request.xml
++++ b/trytond/trytond/modules/purchase_request_quotation/view/purchase_request_quotation_line_list_request.xml
+@@ -2,9 +2,9 @@
+ <!-- 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 sequence="sequence">
+-    <field name="quotation"/>
++    <field name="quotation" expand="1"/>
+     <field name="supply_date"/>
+-    <field name="supplier"/>
++    <field name="supplier" expand="1"/>
+     <field name="quantity"/>
+     <field name="unit"/>
+     <field name="unit_price"/>
+Index: modules/purchase_request_quotation/view/purchase_request_quotation_list.xml
+===================================================================
+--- a/trytond/trytond/modules/purchase_request_quotation/view/purchase_request_quotation_list.xml
++++ b/trytond/trytond/modules/purchase_request_quotation/view/purchase_request_quotation_list.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="number"/>
+-    <field name="supplier"/>
++    <field name="number" expand="1"/>
++    <field name="supplier" expand="2"/>
+     <field name="state"/>
+ </tree>
+Index: modules/purchase_requisition/view/purchase_requisition_form.xml
+===================================================================
+--- a/trytond/trytond/modules/purchase_requisition/view/purchase_requisition_form.xml
++++ b/trytond/trytond/modules/purchase_requisition/view/purchase_requisition_form.xml
+@@ -19,20 +19,10 @@
+             <field name="currency"/>
+             <field name="lines" colspan="4"
+                 view_ids="purchase_requisition.purchase_requisition_line_view_list_sequence"/>
+-            <group col="2" colspan="2" id="states" yfill="1">
+-                <label name="state"/>
+-                <field name="state"/>
+-            </group>
++            <label id="empty" colspan="2"/>
+             <group col="2" colspan="2" id="amount" yfill="1">
+                 <label name="total_amount" xalign="1.0" xexpand="1"/>
+                 <field name="total_amount" xalign="1.0" xexpand="0"/>
+-                <group col="-1" colspan="2" id="buttons">
+-                    <button name="cancel" icon="tryton-cancel"/>
+-                    <button name="reject" icon="tryton-close"/>
+-                    <button name="draft"/>
+-                    <button name="wait" icon="tryton-forward"/>
+-                    <button name="approve" icon="tryton-ok"/>
+-                </group>
+             </group>
+         </page>
+         <page string="Other Info" id="other_info">
+@@ -40,4 +30,13 @@
+             <field name="company"/>
+         </page>
+     </notebook>
++    <label name="state"/>
++    <field name="state"/>
++    <group col="-1" colspan="2" id="buttons">
++        <button name="cancel" icon="tryton-cancel"/>
++        <button name="reject" icon="tryton-close"/>
++        <button name="draft"/>
++        <button name="wait" icon="tryton-forward"/>
++        <button name="approve" icon="tryton-ok"/>
++    </group>
+ </form>
+Index: modules/purchase_requisition/view/purchase_requisition_line_list.xml
+===================================================================
+--- a/trytond/trytond/modules/purchase_requisition/view/purchase_requisition_line_list.xml
++++ b/trytond/trytond/modules/purchase_requisition/view/purchase_requisition_line_list.xml
+@@ -2,9 +2,9 @@
+ <!-- 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>
+-    <field name="requisition"/>
+-    <field name="product"/>
+-    <field name="supplier"/>
++    <field name="requisition" expand="1"/>
++    <field name="product" expand="1"/>
++    <field name="supplier" expand="1"/>
+     <field name="quantity"/>
+     <field name="unit"/>
+     <field name="unit_price"/>
+Index: modules/purchase_requisition/view/purchase_requisition_line_list_sequence.xml
+===================================================================
+--- a/trytond/trytond/modules/purchase_requisition/view/purchase_requisition_line_list_sequence.xml
++++ b/trytond/trytond/modules/purchase_requisition/view/purchase_requisition_line_list_sequence.xml
+@@ -2,11 +2,11 @@
+ <!-- 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 sequence="sequence">
+-    <field name="requisition"/>
+-    <field name="product"/>
+-    <field name="supplier"/>
++    <field name="requisition" expand="1"/>
++    <field name="product" expand="1"/>
++    <field name="supplier" expand="1"/>
+     <field name="quantity"/>
+     <field name="unit"/>
+     <field name="unit_price"/>
+-    <field name="amount" expand="1"/>
++    <field name="amount"/>
+ </tree>
+Index: modules/purchase_requisition/view/purchase_requisition_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/purchase_requisition/view/purchase_requisition_tree.xml
++++ b/trytond/trytond/modules/purchase_requisition/view/purchase_requisition_tree.xml
+@@ -2,10 +2,10 @@
+ <!-- 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>
+-    <field name="number"/>
++    <field name="number" expand="1"/>
+     <field name="supply_date"/>
+-    <field name="employee"/>
+-    <field name="warehouse"/>
++    <field name="employee" expand="2"/>
++    <field name="warehouse" expand="1"/>
+     <field name="total_amount"/>
+     <field name="currency"/>
+     <field name="state"/>
+Index: modules/purchase_shipment_cost/view/shipment_in_form.xml
+===================================================================
+--- a/trytond/trytond/modules/purchase_shipment_cost/view/shipment_in_form.xml
++++ b/trytond/trytond/modules/purchase_shipment_cost/view/shipment_in_form.xml
+@@ -6,7 +6,7 @@
+         <label name="carrier"/>
+         <field name="carrier"/>
+         <label name="cost"/>
+-        <group col="2" id="cost">
++        <group col="-1" id="cost">
+             <field name="cost"/>
+             <field name="cost_currency"/>
+         </group>
+Index: modules/sale/view/move_list_shipment.xml
+===================================================================
+--- a/trytond/trytond/modules/sale/view/move_list_shipment.xml
++++ b/trytond/trytond/modules/sale/view/move_list_shipment.xml
+@@ -2,14 +2,13 @@
+ <!-- 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>
+-    <field name="product"/>
+-    <field name="from_location"/>
+-    <field name="to_location"/>
++    <field name="product" expand="1"/>
++    <field name="from_location" expand="1"/>
++    <field name="to_location" expand="1"/>
+     <field name="quantity"/>
+     <field name="uom"/>
+     <field name="state"/>
+     <field name="sale_exception_state"/>
+     <button name="cancel" string="Cancel"/>
+     <button name="draft" string="Reset to Draft"/>
+-    <field name="unit_digits" tree_invisible="1"/>
+ </tree>
+Index: modules/sale/view/sale_form.xml
+===================================================================
+--- a/trytond/trytond/modules/sale/view/sale_form.xml
++++ b/trytond/trytond/modules/sale/view/sale_form.xml
+@@ -37,23 +37,13 @@
+                 <label name="state"/>
+                 <field name="state"/>
+             </group>
+-            <group col="2" colspan="2" id="amount_buttons" yfill="1">
++            <group col="2" colspan="2" id="amount" yfill="1">
+                 <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="-1" colspan="2" id="buttons">
+-                    <button name="cancel" icon="tryton-cancel"/>
+-                    <button name="modify_header" icon="tryton-launch"/>
+-                    <button name="draft"/>
+-                    <button name="quote" icon="tryton-forward"/>
+-                    <button name="handle_invoice_exception" icon="tryton-forward"/>
+-                    <button name="handle_shipment_exception" icon="tryton-forward"/>
+-                    <button name="confirm" icon="tryton-forward"/>
+-                    <button name="process"/>
+-                </group>
+             </group>
+         </page>
+         <page string="Other Info" id="other">
+@@ -77,6 +67,16 @@
+             <field name="shipment_returns" colspan="4" mode="tree"/>
+         </page>
+     </notebook>
+-    <field name="currency_digits" invisible="1" colspan="6"/>
++    <label id="empty" colspan="3"/>
++    <group col="-1" colspan="3" id="buttons">
++        <button name="cancel" icon="tryton-cancel"/>
++        <button name="modify_header" icon="tryton-launch"/>
++        <button name="draft"/>
++        <button name="quote" icon="tryton-forward"/>
++        <button name="handle_invoice_exception" icon="tryton-forward"/>
++        <button name="handle_shipment_exception" icon="tryton-forward"/>
++        <button name="confirm" icon="tryton-forward"/>
++        <button name="process"/>
++    </group>
+     <field name="party_lang" invisible="1" colspan="6"/>
+ </form>
+Index: modules/sale/view/sale_line_form.xml
+===================================================================
+--- a/trytond/trytond/modules/sale/view/sale_line_form.xml
++++ b/trytond/trytond/modules/sale/view/sale_line_form.xml
+@@ -22,10 +22,10 @@
+             <field name="unit_price"/>
+             <label name="amount"/>
+             <field name="amount"/>
++            <label name="shipping_date"/>
++            <field name="shipping_date"/>
+             <separator name="description" colspan="4"/>
+             <field name="description" colspan="4"/>
+-            <label name="shipping_date"/>
+-            <field name="shipping_date"/>
+         </page>
+         <page string="Taxes" id="taxes">
+             <field name="taxes" colspan="4"/>
+Index: modules/sale/view/sale_line_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/sale/view/sale_line_tree.xml
++++ b/trytond/trytond/modules/sale/view/sale_line_tree.xml
+@@ -2,13 +2,12 @@
+ <!-- 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>
+-    <field name="sale"/>
++    <field name="sale" expand="1"/>
+     <field name="type"/>
+-    <field name="product"/>
++    <field name="product" expand="1"/>
+     <field name="quantity"/>
+     <field name="unit"/>
+     <field name="unit_price"/>
+     <field name="taxes"/>
+     <field name="amount"/>
+-    <field name="unit_digits" tree_invisible="1"/>
+ </tree>
+Index: modules/sale/view/sale_line_tree_sequence.xml
+===================================================================
+--- a/trytond/trytond/modules/sale/view/sale_line_tree_sequence.xml
++++ b/trytond/trytond/modules/sale/view/sale_line_tree_sequence.xml
+@@ -2,13 +2,12 @@
+ <!-- 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 sequence="sequence">
+-    <field name="sale"/>
++    <field name="sale" expand="1"/>
+     <field name="type"/>
+-    <field name="product"/>
++    <field name="product" expand="1"/>
+     <field name="quantity"/>
+     <field name="unit"/>
+     <field name="unit_price"/>
+     <field name="taxes"/>
+-    <field name="amount" expand="1"/>
+-    <field name="unit_digits" tree_invisible="1"/>
++    <field name="amount"/>
+ </tree>
+Index: modules/sale/view/sale_reporting_category_list.xml
+===================================================================
+--- a/trytond/trytond/modules/sale/view/sale_reporting_category_list.xml
++++ b/trytond/trytond/modules/sale/view/sale_reporting_category_list.xml
+@@ -2,7 +2,7 @@
+ <!-- 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 keyword_open="1">
+-    <field name="category"/>
++    <field name="category" expand="1"/>
+     <field name="number"/>
+     <field name="revenue"/>
+     <field name="revenue_trend" expand="1"/>
+Index: modules/sale/view/sale_reporting_category_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/sale/view/sale_reporting_category_tree.xml
++++ b/trytond/trytond/modules/sale/view/sale_reporting_category_tree.xml
+@@ -2,6 +2,6 @@
+ <!-- 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 keyword_open="1">
+-    <field name="name"/>
++    <field name="name" expand="1"/>
+     <field name="revenue"/>
+ </tree>
+Index: modules/sale/view/sale_reporting_customer_list.xml
+===================================================================
+--- a/trytond/trytond/modules/sale/view/sale_reporting_customer_list.xml
++++ b/trytond/trytond/modules/sale/view/sale_reporting_customer_list.xml
+@@ -2,7 +2,7 @@
+ <!-- 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 keyword_open="1">
+-    <field name="customer"/>
++    <field name="customer" expand="1"/>
+     <field name="number"/>
+     <field name="revenue"/>
+     <field name="revenue_trend" expand="1"/>
+Index: modules/sale/view/sale_reporting_product_list.xml
+===================================================================
+--- a/trytond/trytond/modules/sale/view/sale_reporting_product_list.xml
++++ b/trytond/trytond/modules/sale/view/sale_reporting_product_list.xml
+@@ -2,7 +2,7 @@
+ <!-- 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 keyword_open="1">
+-    <field name="product"/>
++    <field name="product" expand="1"/>
+     <field name="number"/>
+     <field name="revenue"/>
+     <field name="revenue_trend" expand="1"/>
+Index: modules/sale/view/sale_reporting_region_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/sale/view/sale_reporting_region_tree.xml
++++ b/trytond/trytond/modules/sale/view/sale_reporting_region_tree.xml
+@@ -2,7 +2,7 @@
+ <!-- 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 keyword_open="1">
+-    <field name="region"/>
++    <field name="region" expand="1"/>
+     <field name="number"/>
+     <field name="revenue"/>
+     <field name="revenue_trend" expand="1"/>
+Index: modules/sale/view/sale_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/sale/view/sale_tree.xml
++++ b/trytond/trytond/modules/sale/view/sale_tree.xml
+@@ -2,16 +2,15 @@
+ <!-- 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>
+-    <field name="number"/>
+-    <field name="reference"/>
++    <field name="number" expand="1"/>
++    <field name="reference" expand="1"/>
+     <field name="sale_date"/>
+-    <field name="party"/>
++    <field name="party" expand="2"/>
+     <field name="warehouse"/>
+     <field name="currency"/>
+     <field name="untaxed_amount"/>
+     <field name="state"/>
+     <field name="invoice_state"/>
+     <field name="shipment_state"/>
+-    <field name="description"/>
+-    <field name="currency_digits" tree_invisible="1"/>
++    <field name="description" expand="1"/>
+ </tree>
+Index: modules/sale_advance_payment/view/advance_payment_condition_list.xml
+===================================================================
+--- a/trytond/trytond/modules/sale_advance_payment/view/advance_payment_condition_list.xml
++++ b/trytond/trytond/modules/sale_advance_payment/view/advance_payment_condition_list.xml
+@@ -2,11 +2,11 @@
+ <!-- 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>
+-    <field name="sale"/>
+-    <field name="description"/>
+-    <field name="account"/>
++    <field name="sale" expand="1"/>
++    <field name="description" expand="1"/>
++    <field name="account" expand="1"/>
+     <field name="invoice_delay"/>
+     <field name="block_supply"/>
+     <field name="block_shipping"/>
+-    <field name="amount" expand="1"/>
++    <field name="amount"/>
+ </tree>
+Index: modules/sale_advance_payment/view/advance_payment_term_line_list.xml
+===================================================================
+--- a/trytond/trytond/modules/sale_advance_payment/view/advance_payment_term_line_list.xml
++++ b/trytond/trytond/modules/sale_advance_payment/view/advance_payment_term_line_list.xml
+@@ -2,11 +2,11 @@
+ <!-- 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>
+-    <field name="advance_payment_term"/>
+-    <field name="description"/>
+-    <field name="account"/>
++    <field name="advance_payment_term" expand="1"/>
++    <field name="description" expand="1"/>
++    <field name="account" expand="1"/>
+     <field name="invoice_delay"/>
+     <field name="block_supply"/>
+     <field name="block_shipping"/>
+-    <field name="formula" expand="1"/>
++    <field name="formula" expand="2"/>
+ </tree>
+Index: modules/sale_advance_payment/view/advance_payment_term_list.xml
+===================================================================
+--- a/trytond/trytond/modules/sale_advance_payment/view/advance_payment_term_list.xml
++++ b/trytond/trytond/modules/sale_advance_payment/view/advance_payment_term_list.xml
+@@ -2,5 +2,5 @@
+ <!-- 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>
+-    <field name="name"/>
++    <field name="name" expand="1"/>
+ </tree>
+Index: modules/sale_complaint/view/complaint_form.xml
+===================================================================
+--- a/trytond/trytond/modules/sale_complaint/view/complaint_form.xml
++++ b/trytond/trytond/modules/sale_complaint/view/complaint_form.xml
+@@ -26,16 +26,16 @@
+             <newline/>
+             <field name="description" colspan="2"/>
+             <field name="actions" colspan="2"/>
+-            <label name="state"/>
+-            <field name="state"/>
+-            <group col="-1" colspan="2" id="buttons">
+-                <button name="cancel" icon="tryton-cancel"/>
+-                <button name="draft"/>
+-                <button name="wait" icon="tryton-forward"/>
+-                <button name="approve" icon="tryton-forward"/>
+-                <button name="reject" icon="tryton-close"/>
+-                <button name="process" icon="tryton-launch"/>
+-            </group>
+         </page>
+     </notebook>
++    <label name="state"/>
++    <field name="state"/>
++    <group col="-1" colspan="2" id="buttons">
++        <button name="cancel" icon="tryton-cancel"/>
++        <button name="draft"/>
++        <button name="wait" icon="tryton-forward"/>
++        <button name="approve" icon="tryton-forward"/>
++        <button name="reject" icon="tryton-close"/>
++        <button name="process" icon="tryton-launch"/>
++    </group>
+ </form>
+Index: modules/sale_complaint/view/complaint_list.xml
+===================================================================
+--- a/trytond/trytond/modules/sale_complaint/view/complaint_list.xml
++++ b/trytond/trytond/modules/sale_complaint/view/complaint_list.xml
+@@ -2,10 +2,10 @@
+ <!-- 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>
+-    <field name="number"/>
+-    <field name="reference"/>
++    <field name="number" expand="1"/>
++    <field name="reference" expand="1"/>
+     <field name="date"/>
+-    <field name="customer"/>
++    <field name="customer" expand="2"/>
+     <field name="type"/>
+     <field name="state"/>
+     <button name="process" string="Process" tree_invisible="1"/>
+Index: modules/sale_complaint/view/type_list.xml
+===================================================================
+--- a/trytond/trytond/modules/sale_complaint/view/type_list.xml
++++ b/trytond/trytond/modules/sale_complaint/view/type_list.xml
+@@ -2,6 +2,6 @@
+ <!-- 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>
+-    <field name="name"/>
+-    <field name="origin"/>
++    <field name="name" expand="2"/>
++    <field name="origin" expand="1"/>
+ </tree>
+Index: modules/sale_extra/view/extra_line_list.xml
+===================================================================
+--- a/trytond/trytond/modules/sale_extra/view/extra_line_list.xml
++++ b/trytond/trytond/modules/sale_extra/view/extra_line_list.xml
+@@ -2,9 +2,9 @@
+ <!-- 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>
+-    <field name="extra"/>
++    <field name="extra" expand="1"/>
+     <field name="sale_amount"/>
+-    <field name="product"/>
++    <field name="product" expand="1"/>
+     <field name="quantity"/>
+     <field name="unit"/>
+     <field name="free"/>
+Index: modules/sale_extra/view/extra_line_list_sequence.xml
+===================================================================
+--- a/trytond/trytond/modules/sale_extra/view/extra_line_list_sequence.xml
++++ b/trytond/trytond/modules/sale_extra/view/extra_line_list_sequence.xml
+@@ -2,9 +2,9 @@
+ <!-- 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 sequence="sequence">
+-    <field name="extra"/>
++    <field name="extra" expand="1"/>
+     <field name="sale_amount"/>
+-    <field name="product"/>
++    <field name="product" expand="1"/>
+     <field name="quantity"/>
+     <field name="unit"/>
+     <field name="free"/>
+Index: modules/sale_extra/view/extra_list.xml
+===================================================================
+--- a/trytond/trytond/modules/sale_extra/view/extra_list.xml
++++ b/trytond/trytond/modules/sale_extra/view/extra_list.xml
+@@ -2,10 +2,10 @@
+ <!-- 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>
+-    <field name="price_list"/>
+-    <field name="name"/>
++    <field name="price_list" expand="1"/>
++    <field name="name" expand="2"/>
+     <field name="start_date"/>
+     <field name="end_date"/>
+-    <field name="company"/>
++    <field name="company" expand="1"/>
+     <field name="sale_amount"/>
+ </tree>
+Index: modules/sale_opportunity/view/opportunity_employee_monthly_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/sale_opportunity/view/opportunity_employee_monthly_tree.xml
++++ b/trytond/trytond/modules/sale_opportunity/view/opportunity_employee_monthly_tree.xml
+@@ -4,7 +4,7 @@
+ <tree>
+     <field name="year"/>
+     <field name="month"/>
+-    <field name="employee"/>
++    <field name="employee" expand="1"/>
+     <field name="number"/>
+     <field name="converted"/>
+     <field name="won"/>
+Index: modules/sale_opportunity/view/opportunity_employee_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/sale_opportunity/view/opportunity_employee_tree.xml
++++ b/trytond/trytond/modules/sale_opportunity/view/opportunity_employee_tree.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="employee"/>
++    <field name="employee" expand="1"/>
+     <field name="number"/>
+     <field name="converted"/>
+     <field name="won"/>
+Index: modules/sale_opportunity/view/opportunity_form.xml
+===================================================================
+--- a/trytond/trytond/modules/sale_opportunity/view/opportunity_form.xml
++++ b/trytond/trytond/modules/sale_opportunity/view/opportunity_form.xml
+@@ -39,17 +39,6 @@
+             <field name="comment" colspan="4"/>
+             <separator name="lost_reason" colspan="4"/>
+             <field name="lost_reason" colspan="4"/>
+-            <group col="2" colspan="2" id="state">
+-                <label name="state"/>
+-                <field name="state"/>
+-            </group>
+-            <group col="-1" colspan="2" id="buttons">
+-                <button name="cancel" icon="tryton-cancel"/>
+-                <button name="lost" icon="tryton-cancel"/>
+-                <button name="lead" icon="tryton-back"/>
+-                <button name="opportunity" icon="tryton-forward"/>
+-                <button name="convert" icon="tryton-forward"/>
+-            </group>
+         </page>
+         <page name="lines">
+             <field name="lines"/>
+@@ -58,4 +47,13 @@
+             <field name="sales" colspan="4"/>
+         </page>
+     </notebook>
++    <label name="state"/>
++    <field name="state"/>
++    <group col="-1" colspan="2" id="buttons">
++        <button name="cancel" icon="tryton-cancel"/>
++        <button name="lost" icon="tryton-cancel"/>
++        <button name="lead" icon="tryton-back"/>
++        <button name="opportunity" icon="tryton-forward"/>
++        <button name="convert" icon="tryton-forward"/>
++    </group>
+ </form>
+Index: modules/sale_promotion/view/promotion_list.xml
+===================================================================
+--- a/trytond/trytond/modules/sale_promotion/view/promotion_list.xml
++++ b/trytond/trytond/modules/sale_promotion/view/promotion_list.xml
+@@ -2,8 +2,8 @@
+ <!-- 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>
+-    <field name="name"/>
++    <field name="name" expand="2"/>
+     <field name="start_date"/>
+     <field name="end_date"/>
+-    <field name="company"/>
++    <field name="company" expand="1"/>
+ </tree>
+Index: modules/sale_promotion_coupon/view/coupon_list.xml
+===================================================================
+--- a/trytond/trytond/modules/sale_promotion_coupon/view/coupon_list.xml
++++ b/trytond/trytond/modules/sale_promotion_coupon/view/coupon_list.xml
+@@ -2,8 +2,8 @@
+ <!-- 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>
+-    <field name="promotion"/>
+-    <field name="name"/>
++    <field name="promotion" expand="1"/>
++    <field name="name" expand="1"/>
+     <field name="number_of_use"/>
+     <field name="per_party"/>
+ </tree>
+Index: modules/sale_promotion_coupon/view/coupon_number_list.xml
+===================================================================
+--- a/trytond/trytond/modules/sale_promotion_coupon/view/coupon_number_list.xml
++++ b/trytond/trytond/modules/sale_promotion_coupon/view/coupon_number_list.xml
+@@ -2,7 +2,6 @@
+ <!-- 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>
+-    <field name="coupon"/>
+-    <field name="number"/>
+-    <field name="active" tree_invisible="1"/>
++    <field name="coupon" expand="1"/>
++    <field name="number" expand="1"/>
+ </tree>
+
+Index: modules/sale_supply_drop_shipment/view/shipment_drop_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/sale_supply_drop_shipment/view/shipment_drop_tree.xml
++++ b/trytond/trytond/modules/sale_supply_drop_shipment/view/shipment_drop_tree.xml
+@@ -2,13 +2,13 @@
+ <!-- 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>
+-    <field name="code"/>
+-    <field name="reference"/>
++    <field name="code" expand="1"/>
++    <field name="reference" expand="1"/>
+     <field name="planned_date"/>
+     <field name="effective_date"/>
+-    <field name="supplier"/>
++    <field name="supplier" expand="2"/>
+     <field name="contact_address"/>
+-    <field name="customer"/>
++    <field name="customer" expand="2"/>
+     <field name="delivery_address"/>
+     <field name="state"/>
+ </tree>
+Index: modules/stock/view/inventory_form.xml
+===================================================================
+--- a/trytond/trytond/modules/stock/view/inventory_form.xml
++++ b/trytond/trytond/modules/stock/view/inventory_form.xml
+@@ -1,7 +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 col="4">
++<form>
+     <label name="location"/>
+     <field name="location"/>
+     <label name="number"/>
+@@ -15,14 +15,12 @@
+     <label name="empty_quantity"/>
+     <field name="empty_quantity"/>
+     <field name="lines" colspan="4"/>
+-    <group col="4" colspan="4" id="group_buttons">
+-        <label name="state"/>
+-        <field name="state"/>
+-        <group colspan="2" col="-1" id="buttons">
+-            <button name="cancel" icon="tryton-cancel"/>
+-            <button name="complete_lines"/>
+-            <button name="count"/>
+-            <button name="confirm" icon="tryton-ok"/>
+-        </group>
++    <label name="state"/>
++    <field name="state"/>
++    <group colspan="2" col="-1" id="buttons">
++        <button name="cancel" icon="tryton-cancel"/>
++        <button name="complete_lines"/>
++        <button name="count"/>
++        <button name="confirm" icon="tryton-ok"/>
+     </group>
+ </form>
+Index: modules/stock/view/inventory_line_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/stock/view/inventory_line_tree.xml
++++ b/trytond/trytond/modules/stock/view/inventory_line_tree.xml
+@@ -2,10 +2,9 @@
+ <!-- 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 editable="bottom">
+-    <field name="inventory"/>
+-    <field name="product"/>
++    <field name="inventory" expand="1"/>
++    <field name="product" expand="1"/>
+     <field name="expected_quantity"/>
+     <field name="quantity"/>
+     <field name="uom"/>
+-    <field name="unit_digits" tree_invisible="1"/>
+ </tree>
+Index: modules/stock/view/inventory_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/stock/view/inventory_tree.xml
++++ b/trytond/trytond/modules/stock/view/inventory_tree.xml
+@@ -2,9 +2,9 @@
+ <!-- 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>
+-    <field name="number"/>
+-    <field name="location"/>
++    <field name="number" expand="1"/>
++    <field name="location" expand="2"/>
+     <field name="date"/>
+     <field name="state"/>
+-    <field name="company"/>
++    <field name="company" expand="1"/>
+ </tree>
+
+Index: modules/stock/view/location_list.xml
+===================================================================
+--- a/trytond/trytond/modules/stock/view/location_list.xml
++++ b/trytond/trytond/modules/stock/view/location_list.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="name"/>
+     <field name="code"/>
++    <field name="name" expand="1"/>
+     <field name="type"/>
+ </tree>
+Index: modules/stock/view/location_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/stock/view/location_tree.xml
++++ b/trytond/trytond/modules/stock/view/location_tree.xml
+@@ -2,10 +2,7 @@
+ <!-- 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 keyword_open="1">
+-    <field name="name"/>
++    <field name="name" expand="1"/>
+     <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>
+Index: modules/stock/view/move_list_shipment_in.xml
+===================================================================
+--- a/trytond/trytond/modules/stock/view/move_list_shipment_in.xml
++++ b/trytond/trytond/modules/stock/view/move_list_shipment_in.xml
+@@ -2,10 +2,10 @@
+ <!-- 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>
+-    <field name="shipment"/>
+-    <field name="product"/>
+-    <field name="from_location"/>
+-    <field name="to_location"/>
++    <field name="shipment" expand="2"/>
++    <field name="product" expand="2"/>
++    <field name="from_location" expand="1"/>
++    <field name="to_location" expand="1"/>
+     <field name="quantity"/>
+     <field name="uom"/>
+     <field name="planned_date"/>
+@@ -14,5 +14,4 @@
+     <button name="cancel" string="Cancel"/>
+     <button name="draft" string="Reset to Draft"/>
+     <button name="do" string="Do"/>
+-    <field name="assignation_required" tree_invisible="1"/>
+ </tree>
+Index: modules/stock/view/move_tree_simple.xml
+===================================================================
+--- a/trytond/trytond/modules/stock/view/move_tree_simple.xml
++++ b/trytond/trytond/modules/stock/view/move_tree_simple.xml
+@@ -2,8 +2,7 @@
+ <!-- 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>
+-    <field name="product"/>
++    <field name="product" expand="1"/>
+     <field name="quantity"/>
+-    <field name="uom" expand="1"/>
+-    <field name="unit_digits" tree_invisible="1"/>
++    <field name="uom"/>
+ </tree>
+Index: modules/stock/view/period_list.xml
+===================================================================
+--- a/trytond/trytond/modules/stock/view/period_list.xml
++++ b/trytond/trytond/modules/stock/view/period_list.xml
+@@ -3,6 +3,6 @@
+ this repository contains the full copyright notices and license terms. -->
+ <tree>
+     <field name="date"/>
+-    <field name="company"/>
++    <field name="company" expand="1"/>
+     <field name="state"/>
+ </tree>
+Index: modules/stock/view/shipment_in_form.xml
+===================================================================
+--- a/trytond/trytond/modules/stock/view/shipment_in_form.xml
++++ b/trytond/trytond/modules/stock/view/shipment_in_form.xml
+@@ -33,14 +33,12 @@
+             <field name="done_by"/>
+         </page>
+     </notebook>
+-    <group col="4" colspan="6" id="state_buttons">
+-        <label name="state"/>
+-        <field name="state"/>
+-        <group col="-1" colspan="2" id="buttons">
+-            <button name="cancel" icon="tryton-cancel"/>
+-            <button name="receive" icon="tryton-forward"/>
+-            <button name="done" icon="tryton-ok"/>
+-            <button name="draft" icon="tryton-undo"/>
+-        </group>
++    <label name="state"/>
++    <field name="state"/>
++    <group col="-1" colspan="2" id="buttons">
++        <button name="cancel" icon="tryton-cancel"/>
++        <button name="receive" icon="tryton-forward"/>
++        <button name="done" icon="tryton-ok"/>
++        <button name="draft" icon="tryton-undo"/>
+     </group>
+ </form>
+Index: modules/stock/view/shipment_in_return_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/stock/view/shipment_in_return_tree.xml
++++ b/trytond/trytond/modules/stock/view/shipment_in_return_tree.xml
+@@ -6,7 +6,7 @@
+     <field name="reference"/>
+     <field name="planned_date"/>
+     <field name="effective_date"/>
+-    <field name="supplier"/>
++    <field name="supplier" expand="1"/>
+     <field name="delivery_address"/>
+     <field name="state"/>
+ </tree>
+Index: modules/stock/view/shipment_in_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/stock/view/shipment_in_tree.xml
++++ b/trytond/trytond/modules/stock/view/shipment_in_tree.xml
+@@ -2,11 +2,11 @@
+ <!-- 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>
+-    <field name="number"/>
+-    <field name="reference"/>
++    <field name="number" expand="1"/>
++    <field name="reference" expand="1"/>
+     <field name="planned_date"/>
+     <field name="effective_date"/>
+-    <field name="supplier"/>
++    <field name="supplier" expand="2"/>
+     <field name="contact_address"/>
+     <field name="state"/>
+ </tree>
+Index: modules/stock/view/shipment_internal_form.xml
+===================================================================
+--- a/trytond/trytond/modules/stock/view/shipment_internal_form.xml
++++ b/trytond/trytond/modules/stock/view/shipment_internal_form.xml
+@@ -1,7 +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 col="4" cursor="from_location">
++<form cursor="from_location">
+     <label name="reference"/>
+     <field name="reference"/>
+     <label name="number"/>
+Index: modules/stock/view/shipment_internal_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/stock/view/shipment_internal_tree.xml
++++ b/trytond/trytond/modules/stock/view/shipment_internal_tree.xml
+@@ -2,12 +2,12 @@
+ <!-- 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>
+-    <field name="number"/>
+-    <field name="reference"/>
++    <field name="number" expand="1"/>
++    <field name="reference" expand="1"/>
+     <field name="planned_start_date"/>
+     <field name="planned_date"/>
+     <field name="effective_date"/>
+-    <field name="from_location"/>
+-    <field name="to_location"/>
++    <field name="from_location" expand="1"/>
++    <field name="to_location" expand="1"/>
+     <field name="state"/>
+ </tree>
+Index: modules/stock/view/shipment_out_form.xml
+===================================================================
+--- a/trytond/trytond/modules/stock/view/shipment_out_form.xml
++++ b/trytond/trytond/modules/stock/view/shipment_out_form.xml
+@@ -1,7 +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 col="4" cursor="customer">
++<form cursor="customer">
+     <label name="reference"/>
+     <field name="reference"/>
+     <label name="number"/>
+@@ -34,18 +34,14 @@
+             <field name="done_by"/>
+         </page>
+     </notebook>
+-    <group col="4" colspan="4" id="state_buttons">
+-        <label name="state"/>
+-        <field name="state"/>
+-        <group col="-1" colspan="2" id="buttons">
+-            <button name="cancel" icon="tryton-cancel"/>
+-            <button name="draft"/>
+-            <button name="wait"/>
+-            <button name="assign_wizard" icon="tryton-forward"/>
+-            <button name="pack" icon="tryton-forward"/>
+-            <button name="done" icon="tryton-ok"/>
+-        </group>
++    <label name="state"/>
++    <field name="state"/>
++    <group col="-1" colspan="2" id="buttons">
++        <button name="cancel" icon="tryton-cancel"/>
++        <button name="draft"/>
++        <button name="wait"/>
++        <button name="assign_wizard" icon="tryton-forward"/>
++        <button name="pack" icon="tryton-forward"/>
++        <button name="done" icon="tryton-ok"/>
+     </group>
+-    <field name="warehouse_storage" invisible="1" colspan="4"/>
+-    <field name="warehouse_output" invisible="1" colspan="4"/>
+ </form>
+Index: modules/stock/view/shipment_out_return_form.xml
+===================================================================
+--- a/trytond/trytond/modules/stock/view/shipment_out_return_form.xml
++++ b/trytond/trytond/modules/stock/view/shipment_out_return_form.xml
+@@ -32,14 +32,12 @@
+             <field name="done_by"/>
+         </page>
+     </notebook>
+-    <group col="4" colspan="6" id="state_buttons">
+-        <label name="state"/>
+-        <field name="state"/>
+-        <group col="-1" colspan="2" id="buttons">
+-            <button name="cancel" icon="tryton-cancel"/>
+-            <button name="draft" icon="tryton-clear"/>
+-            <button name="receive" icon="tryton-forward"/>
+-            <button name="done" icon="tryton-ok"/>
+-        </group>
++    <label name="state"/>
++    <field name="state"/>
++    <group col="-1" colspan="2" id="buttons">
++        <button name="cancel" icon="tryton-cancel"/>
++        <button name="draft" icon="tryton-clear"/>
++        <button name="receive" icon="tryton-forward"/>
++        <button name="done" icon="tryton-ok"/>
+     </group>
+ </form>
+Index: modules/stock/view/shipment_out_return_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/stock/view/shipment_out_return_tree.xml
++++ b/trytond/trytond/modules/stock/view/shipment_out_return_tree.xml
+@@ -2,11 +2,11 @@
+ <!-- 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>
+-    <field name="number"/>
+-    <field name="reference"/>
++    <field name="number" expand="1"/>
++    <field name="reference" expand="1"/>
+     <field name="state"/>
+     <field name="planned_date"/>
+     <field name="effective_date"/>
+-    <field name="customer"/>
++    <field name="customer" expand="2"/>
+     <field name="delivery_address"/>
+ </tree>
+Index: modules/stock/view/shipment_out_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/stock/view/shipment_out_tree.xml
++++ b/trytond/trytond/modules/stock/view/shipment_out_tree.xml
+@@ -2,11 +2,11 @@
+ <!-- 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>
+-    <field name="number"/>
+-    <field name="reference"/>
++    <field name="number" expand="1"/>
++    <field name="reference" expand="1"/>
+     <field name="planned_date"/>
+     <field name="effective_date"/>
+-    <field name="customer"/>
++    <field name="customer" expand="2"/>
+     <field name="delivery_address"/>
+     <field name="state"/>
+ </tree>
+Index: modules/stock_forecast/view/forecast_form.xml
+===================================================================
+--- a/trytond/trytond/modules/stock_forecast/view/forecast_form.xml
++++ b/trytond/trytond/modules/stock_forecast/view/forecast_form.xml
+@@ -1,7 +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 col="4">
++<form>
+     <label name="warehouse"/>
+     <field name="warehouse"/>
+     <label name="destination"/>
+@@ -16,13 +16,11 @@
+         colspan="2"
+         help="Add forecast line based on past data."/>
+     <field name="lines" colspan="4"/>
+-    <group col="4" colspan="4" id="state_buttons">
+-        <label name="state"/>
+-        <field name="state"/>
+-        <group colspan="2" col="-1" id="buttons">
+-            <button name="draft" icon="tryton-clear"/>
+-            <button name="cancel" icon="tryton-cancel"/>
+-            <button name="confirm" icon="tryton-ok"/>
+-        </group>
++    <label name="state"/>
++    <field name="state"/>
++    <group colspan="2" col="-1" id="buttons">
++        <button name="draft" icon="tryton-clear"/>
++        <button name="cancel" icon="tryton-cancel"/>
++        <button name="confirm" icon="tryton-ok"/>
+     </group>
+ </form>
+Index: modules/stock_forecast/view/forecast_line_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/stock_forecast/view/forecast_line_tree.xml
++++ b/trytond/trytond/modules/stock_forecast/view/forecast_line_tree.xml
+@@ -2,11 +2,10 @@
+ <!-- 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 editable="bottom">
+-    <field name="product"/>
++    <field name="forecast" expand="2"/>
++    <field name="product" expand="1"/>
+     <field name="quantity"/>
+     <field name="minimal_quantity"/>
+     <field name="uom"/>
+     <field name="quantity_executed"/>
+-    <field name="forecast"/>
+-    <field name="unit_digits" tree_invisible="1"/>
+ </tree>
+Index: modules/stock_forecast/view/forecast_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/stock_forecast/view/forecast_tree.xml
++++ b/trytond/trytond/modules/stock_forecast/view/forecast_tree.xml
+@@ -2,9 +2,9 @@
+ <!-- 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>
+-    <field name="warehouse"/>
++    <field name="warehouse" expand="2"/>
+     <field name="state"/>
+     <field name="from_date"/>
+     <field name="to_date"/>
+-    <field name="company"/>
++    <field name="company" expand="1"/>
+ </tree>
+Index: modules/stock_lot/view/inventory_line_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/stock_lot/view/inventory_line_tree.xml
++++ b/trytond/trytond/modules/stock_lot/view/inventory_line_tree.xml
+@@ -3,6 +3,6 @@
+ this repository contains the full copyright notices and license terms. -->
+ <data>
+     <xpath expr="/tree/field[@name='product']" position="after">
+-        <field name="lot"/>
++        <field name="lot" expand="1"/>
+     </xpath>
+ </data>
+Index: modules/stock_lot/view/lot_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/stock_lot/view/lot_tree.xml
++++ b/trytond/trytond/modules/stock_lot/view/lot_tree.xml
+@@ -2,6 +2,6 @@
+ <!-- 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>
+-    <field name="number"/>
+-    <field name="product"/>
++    <field name="number" expand="1"/>
++    <field name="product" expand="1"/>
+ </tree>
+Index: modules/stock_lot/view/move_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/stock_lot/view/move_tree.xml
++++ b/trytond/trytond/modules/stock_lot/view/move_tree.xml
+@@ -3,6 +3,6 @@
+ this repository contains the full copyright notices and license terms. -->
+ <data>
+     <xpath expr="/tree/field[@name='product']" position="after">
+-        <field name="lot"/>
++        <field name="lot" expand="1"/>
+     </xpath>
+ </data>
+Index: modules/stock_package/view/package_list.xml
+===================================================================
+--- a/trytond/trytond/modules/stock_package/view/package_list.xml
++++ b/trytond/trytond/modules/stock_package/view/package_list.xml
+@@ -2,8 +2,8 @@
+ <!-- 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>
+-    <field name="rec_name"/>
+-    <field name="shipment"/>
++    <field name="shipment" expand="1"/>
++    <field name="rec_name" expand="1"/>
+     <field name="type"/>
+     <field name="state"/>
+ </tree>
+Index: modules/stock_package/view/package_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/stock_package/view/package_tree.xml
++++ b/trytond/trytond/modules/stock_package/view/package_tree.xml
+@@ -2,10 +2,8 @@
+ <!-- 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>
+-    <field name="rec_name"/>
++    <field name="shipment" expand="1"/>
++    <field name="rec_name" expand="1"/>
+     <field name="type"/>
+-    <field name="shipment"/>
+     <field name="state"/>
+-    <field name="parent" tree_invisible="1"/>
+-    <field name="children" tree_invisible="1"/>
+ </tree>
+
+Index: modules/stock_supply/view/order_point_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/stock_supply/view/order_point_tree.xml
++++ b/trytond/trytond/modules/stock_supply/view/order_point_tree.xml
+@@ -2,10 +2,10 @@
+ <!-- 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>
+-    <field name="product"/>
+-    <field name="location"/>
++    <field name="product" expand="2"/>
++    <field name="location" expand="2"/>
+     <field name="type"/>
+-    <field name="company"/>
++    <field name="company" expand="1"/>
+     <field name="min_quantity"/>
+     <field name="max_quantity"/>
+     <field name="unit"/>
+Index: modules/timesheet/view/hours_employee_monthly_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/timesheet/view/hours_employee_monthly_tree.xml
++++ b/trytond/trytond/modules/timesheet/view/hours_employee_monthly_tree.xml
+@@ -4,6 +4,6 @@
+ <tree>
+     <field name="year"/>
+     <field name="month"/>
+-    <field name="employee"/>
+-    <field name="duration"/>
++    <field name="employee" expand="2"/>
++    <field name="duration" expand="1"/>
+ </tree>
+Index: modules/timesheet/view/hours_employee_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/timesheet/view/hours_employee_tree.xml
++++ b/trytond/trytond/modules/timesheet/view/hours_employee_tree.xml
+@@ -2,6 +2,6 @@
+ <!-- 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>
+-    <field name="employee"/>
+-    <field name="duration" sum="Duration"/>
++    <field name="employee" expand="2"/>
++    <field name="duration" sum="Duration" expand="1"/>
+ </tree>
+Index: modules/timesheet/view/hours_employee_weekly_tree.xml
+===================================================================
+--- a/trytond/trytond/modules/timesheet/view/hours_employee_weekly_tree.xml
++++ b/trytond/trytond/modules/timesheet/view/hours_employee_weekly_tree.xml
+@@ -4,6 +4,6 @@
+ <tree>
+     <field name="year"/>
+     <field name="week"/>
+-    <field name="employee"/>
+-    <field name="duration"/>
++    <field name="employee" expand="2"/>
++    <field name="duration" expand="1"/>
+ </tree>
+Index: modules/timesheet/view/work_list.xml
+===================================================================
+--- a/trytond/trytond/modules/timesheet/view/work_list.xml
++++ b/trytond/trytond/modules/timesheet/view/work_list.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="rec_name"/>
++    <field name="rec_name" expand="1"/>
+     <field name="origin" tree_invisible="1"/>
+     <field name="timesheet_start_date" tree_invisible="1"/>
+     <field name="timesheet_end_date" tree_invisible="1"/>
+Index: modules/timesheet/view/work_list_report.xml
+===================================================================
+--- a/trytond/trytond/modules/timesheet/view/work_list_report.xml
++++ b/trytond/trytond/modules/timesheet/view/work_list_report.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="rec_name"/>
+-    <field name="duration"/>
++    <field name="rec_name" expand="2"/>
++    <field name="duration" expand="1"/>
+     <field name="origin" tree_invisible="1"/>
+ </tree>
+Index: modules/timesheet_cost/view/employee_form.xml
+===================================================================
+--- a/trytond/trytond/modules/timesheet_cost/view/employee_form.xml
++++ b/trytond/trytond/modules/timesheet_cost/view/employee_form.xml
+@@ -2,7 +2,7 @@
+ <!-- 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='company']" position="after">
++    <xpath expr="/form" position="inside">
+         <separator string="Cost" id="cost_prices" colspan="4"/>
+         <label name="cost_price"/>
+         <field name="cost_price"/>
+Index: modules/user_role/view/user_role_list.xml
+===================================================================
+--- a/trytond/trytond/modules/user_role/view/user_role_list.xml
++++ b/trytond/trytond/modules/user_role/view/user_role_list.xml
+@@ -2,8 +2,8 @@
+ <!-- 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>
+-    <field name="user"/>
+-    <field name="role"/>
++    <field name="user" expand="1"/>
++    <field name="role" expand="1"/>
+     <field name="from_date"/>
+     <field name="to_date"/>
+ </tree>
+
+Index: trytond/trytond/ir/export.xml
+===================================================================
+--- a/trytond/trytond/ir/export.xml
++++ b/trytond/trytond/ir/export.xml
+@@ -32,5 +32,17 @@
+         </record>
+         <menuitem parent="ir.menu_models"
+             action="act_export_form" id="menu_export_form"/>
++
++        <record model="ir.ui.view" id="export_line_view_form">
++            <field name="model">ir.export.line</field>
++            <field name="type">form</field>
++            <field name="name">export_line_form</field>
++        </record>
++        <record model="ir.ui.view" id="export_line_view_tree">
++            <field name="model">ir.export.line</field>
++            <field name="type">tree</field>
++            <field name="name">export_line_list</field>
++        </record>
++
+     </data>
+ </tryton>
+Index: trytond/trytond/ir/view/action_act_window_list.xml
+===================================================================
+--- a/trytond/trytond/ir/view/action_act_window_list.xml
++++ b/trytond/trytond/ir/view/action_act_window_list.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="name"/>
+-    <field name="res_model"/>
+-    <field name="domain"/>
++    <field name="name" expand="2"/>
++    <field name="res_model" expand="1"/>
++    <field name="domain" expand="1"/>
+ </tree>
+Index: trytond/trytond/ir/view/action_keyword_list.xml
+===================================================================
+--- a/trytond/trytond/ir/view/action_keyword_list.xml
++++ b/trytond/trytond/ir/view/action_keyword_list.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="action"/>
+-    <field name="model"/>
++    <field name="action" expand="2"/>
++    <field name="model" expand="1"/>
+     <field name="keyword"/>
+ </tree>
+Index: trytond/trytond/ir/view/action_list.xml
+===================================================================
+--- a/trytond/trytond/ir/view/action_list.xml
++++ b/trytond/trytond/ir/view/action_list.xml
+@@ -2,6 +2,6 @@
+ <!-- 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>
+-    <field name="name"/>
+-    <field name="type"/>
++    <field name="name" expand="2"/>
++    <field name="type" expand="1"/>
+ </tree>
+Index: trytond/trytond/ir/view/action_report_list.xml
+===================================================================
+--- a/trytond/trytond/ir/view/action_report_list.xml
++++ b/trytond/trytond/ir/view/action_report_list.xml
+@@ -2,9 +2,9 @@
+ <!-- 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>
+-    <field name="name"/>
+-    <field name="type"/>
+-    <field name="model"/>
+-    <field name="report_name"/>
++    <field name="name" expand="2"/>
++    <field name="type" expand="1"/>
++    <field name="model" expand="1"/>
++    <field name="report_name" expand="1"/>
+ </tree>
+
+Index: trytond/trytond/ir/view/action_url_list.xml
+===================================================================
+--- a/trytond/trytond/ir/view/action_url_list.xml
++++ b/trytond/trytond/ir/view/action_url_list.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="name"/>
+-    <field name="type"/>
+-    <field name="url"/>
++    <field name="name" expand="2"/>
++    <field name="type" expand="1"/>
++    <field name="url" expand="1"/>
+ </tree>
+Index: trytond/trytond/ir/view/action_wizard_list.xml
+===================================================================
+--- a/trytond/trytond/ir/view/action_wizard_list.xml
++++ b/trytond/trytond/ir/view/action_wizard_list.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="name"/>
+-    <field name="type"/>
+-    <field name="wiz_name"/>
++    <field name="name" expand="2"/>
++    <field name="type" expand="1"/>
++    <field name="wiz_name" expand="1"/>
+ </tree>
+Index: trytond/trytond/ir/view/attachment_list.xml
+===================================================================
+--- a/trytond/trytond/ir/view/attachment_list.xml
++++ b/trytond/trytond/ir/view/attachment_list.xml
+@@ -2,16 +2,16 @@
+ <!-- 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 editable="top">
+-    <field name="resource"/>
+-    <field name="name"/>
+-    <field name="summary"/>
+-    <field name="last_user"/>
++    <field name="resource" expand="2"/>
++    <field name="name" expand="2"/>
++    <field name="summary" expand="1"/>
++    <field name="last_user" expand="1"/>
+     <field name="last_modification" widget="date"/>
+     <field name="last_modification" widget="time"
+         string="Last Modification Time"/>
+     <field name="type"/>
+     <field name="data"/>
+-    <field name="link" widget="url"/>
++    <field name="link" widget="url" expand="1"/>
+     <!-- To allow client to set description field -->
+     <field name="description" tree_invisible="1"/>
+ </tree>
+Index: trytond/trytond/ir/view/cron_list.xml
+===================================================================
+--- a/trytond/trytond/ir/view/cron_list.xml
++++ b/trytond/trytond/ir/view/cron_list.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="method"/>
++    <field name="method" expand="1"/>
+     <field name="next_call" widget="date"/>
+     <field name="next_call" widget="time"/>
+     <field name="interval_number"/>
+Index: trytond/trytond/ir/view/export_line_form.xml
+===================================================================
+new file mode 100644
+--- /dev/null
++++ b/trytond/trytond/ir/view/export_line_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 col="2">
++    <label name="export"/>
++    <field name="export"/>
++    <label name="name"/>
++    <field name="name"/>
++</form>
+Index: trytond/trytond/ir/view/export_line_list.xml
+===================================================================
+new file mode 100644
+--- /dev/null
++++ b/trytond/trytond/ir/view/export_line_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>
++    <field name="export" expand="1"/>
++    <field name="name" expand="1"/>
++</tree>
+Index: trytond/trytond/ir/view/export_list.xml
+===================================================================
+--- a/trytond/trytond/ir/view/export_list.xml
++++ b/trytond/trytond/ir/view/export_list.xml
+@@ -2,6 +2,6 @@
+ <!-- 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>
+-    <field name="name"/>
+-    <field name="resource"/>
++    <field name="name" expand="1"/>
++    <field name="resource" expand="1"/>
+ </tree>
+Index: trytond/trytond/ir/view/icon_view_list.xml
+===================================================================
+--- a/trytond/trytond/ir/view/icon_view_list.xml
++++ b/trytond/trytond/ir/view/icon_view_list.xml
+@@ -2,8 +2,7 @@
+ <!-- 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 sequence="sequence">
+-    <field name="name" icon="name"/>
++    <field name="name" icon="name" expand="2"/>
+     <field name="module"/>
+-    <field name="path"/>
+-    <field name="sequence" tree_invisible="1"/>
++    <field name="path" expand="1"/>
+ </tree>
+Index: trytond/trytond/ir/view/model_access_form.xml
+===================================================================
+--- a/trytond/trytond/ir/view/model_access_form.xml
++++ b/trytond/trytond/ir/view/model_access_form.xml
+@@ -18,6 +18,6 @@
+         <label name="perm_delete"/>
+         <field name="perm_delete"/>
+     </group>
+-    <separator name="description" colspan="4"/>
+-    <field name="description" colspan="4"/>
++    <separator name="description" colspan="6"/>
++    <field name="description" colspan="6"/>
+ </form>
+Index: trytond/trytond/ir/view/model_access_list.xml
+===================================================================
+--- a/trytond/trytond/ir/view/model_access_list.xml
++++ b/trytond/trytond/ir/view/model_access_list.xml
+@@ -6,6 +6,6 @@
+     <field name="perm_write"/>
+     <field name="perm_create"/>
+     <field name="perm_delete"/>
+-    <field name="model"/>
+-    <field name="group"/>
++    <field name="model" expand="1"/>
++    <field name="group" expand="1"/>
+ </tree>
+Index: trytond/trytond/ir/view/model_button_click_list.xml
+===================================================================
+--- a/trytond/trytond/ir/view/model_button_click_list.xml
++++ b/trytond/trytond/ir/view/model_button_click_list.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="button"/>
+-    <field name="record_id"/>
+-    <field name="user"/>
++    <field name="button" expand="2"/>
++    <field name="record_id" expand="1"/>
++    <field name="user" expand="1"/>
+ </tree>
+Index: trytond/trytond/ir/view/model_button_list.xml
+===================================================================
+--- a/trytond/trytond/ir/view/model_button_list.xml
++++ b/trytond/trytond/ir/view/model_button_list.xml
+@@ -2,6 +2,6 @@
+ <!-- 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>
+-    <field name="model"/>
+-    <field name="name"/>
++    <field name="model" expand="1"/>
++    <field name="name" expand="1"/>
+ </tree>
+Index: trytond/trytond/ir/view/model_button_rule_list.xml
+===================================================================
+--- a/trytond/trytond/ir/view/model_button_rule_list.xml
++++ b/trytond/trytond/ir/view/model_button_rule_list.xml
+@@ -2,8 +2,8 @@
+ <!-- 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>
+-    <field name="button"/>
+-    <field name="description"/>
++    <field name="button" expand="2"/>
++    <field name="description" expand="1"/>
+     <field name="number_user"/>
+-    <field name="group"/>
++    <field name="group" expand="1"/>
+ </tree>
+Index: trytond/trytond/ir/view/model_data_list.xml
+===================================================================
+--- a/trytond/trytond/ir/view/model_data_list.xml
++++ b/trytond/trytond/ir/view/model_data_list.xml
+@@ -3,8 +3,8 @@
+ this repository contains the full copyright notices and license terms. -->
+ <tree>
+     <field name="module"/>
+-    <field name="model"/>
+-    <field name="fs_id"/>
++    <field name="model" expand="1"/>
++    <field name="fs_id" expand="1"/>
+     <field name="db_id"/>
+     <field name="noupdate"/>
+     <field name="out_of_sync"/>
+Index: trytond/trytond/ir/view/model_field_access_list.xml
+===================================================================
+--- a/trytond/trytond/ir/view/model_field_access_list.xml
++++ b/trytond/trytond/ir/view/model_field_access_list.xml
+@@ -6,6 +6,6 @@
+     <field name="perm_write"/>
+     <field name="perm_create"/>
+     <field name="perm_delete"/>
+-    <field name="field"/>
+-    <field name="group"/>
++    <field name="field" expand="1"/>
++    <field name="group" expand="1"/>
+ </tree>
+Index: trytond/trytond/ir/view/model_field_list.xml
+===================================================================
+--- a/trytond/trytond/ir/view/model_field_list.xml
++++ b/trytond/trytond/ir/view/model_field_list.xml
+@@ -2,10 +2,10 @@
+ <!-- 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>
+-    <field name="name"/>
+-    <field name="model"/>
++    <field name="name" expand="2"/>
++    <field name="model" expand="1"/>
+     <field name="ttype"/>
+-    <field name="relation"/>
+-    <field name="field_description"/>
++    <field name="relation" expand="1"/>
++    <field name="field_description" expand="1"/>
+     <field name="module"/>
+ </tree>
+Index: trytond/trytond/ir/view/model_list.xml
+===================================================================
+--- a/trytond/trytond/ir/view/model_list.xml
++++ b/trytond/trytond/ir/view/model_list.xml
+@@ -2,9 +2,9 @@
+ <!-- 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>
+-    <field name="name"/>
+-    <field name="model"/>
+-    <field name="info"/>
++    <field name="name" expand="2"/>
++    <field name="model" expand="1"/>
++    <field name="info" expand="1"/>
+     <field name="global_search_p"/>
+     <field name="module"/>
+ </tree>
+Index: trytond/trytond/ir/view/note_list.xml
+===================================================================
+--- a/trytond/trytond/ir/view/note_list.xml
++++ b/trytond/trytond/ir/view/note_list.xml
+@@ -3,9 +3,9 @@
+ this repository contains the full copyright notices and license terms. -->
+ <tree>
+     <field name="unread"/>
+-    <field name="resource"/>
+-    <field name="last_user" string="User"/>
++    <field name="resource" expand="1"/>
++    <field name="last_user" string="User" expand="1"/>
+     <field name="last_modification" widget="date" string="Date"/>
+     <field name="last_modification" widget="time" string="Time"/>
+-    <field name="message_wrapped" expand="1"/>
++    <field name="message_wrapped" expand="2"/>
+ </tree>
+Index: trytond/trytond/ir/view/rule_group_list.xml
+===================================================================
+--- a/trytond/trytond/ir/view/rule_group_list.xml
++++ b/trytond/trytond/ir/view/rule_group_list.xml
+@@ -6,8 +6,8 @@
+     <field name="perm_write"/>
+     <field name="perm_create"/>
+     <field name="perm_delete"/>
+-    <field name="model"/>
+-    <field name="name"/>
++    <field name="model" expand="1"/>
++    <field name="name" expand="1"/>
+     <field name="global_p"/>
+     <field name="default_p"/>
+ </tree>
+Index: trytond/trytond/ir/view/sequence_list.xml
+===================================================================
+--- a/trytond/trytond/ir/view/sequence_list.xml
++++ b/trytond/trytond/ir/view/sequence_list.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="name"/>
+-    <field name="code"/>
++    <field name="name" expand="2"/>
++    <field name="code" expand="1"/>
+     <field name="type"/>
+ </tree>
+Index: trytond/trytond/ir/view/sequence_type_list.xml
+===================================================================
+--- a/trytond/trytond/ir/view/sequence_type_list.xml
++++ b/trytond/trytond/ir/view/sequence_type_list.xml
+@@ -2,6 +2,6 @@
+ <!-- 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>
+-    <field name="name"/>
+-    <field name="code"/>
++    <field name="name" expand="2"/>
++    <field name="code" expand="1"/>
+ </tree>
+Index: trytond/trytond/ir/view/trigger_list.xml
+===================================================================
+--- a/trytond/trytond/ir/view/trigger_list.xml
++++ b/trytond/trytond/ir/view/trigger_list.xml
+@@ -2,8 +2,8 @@
+ <!-- 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>
+-    <field name="name"/>
+-    <field name="model"/>
++    <field name="name" expand="1"/>
++    <field name="model" expand="1"/>
+     <field name="on_time"/>
+     <field name="on_create"/>
+     <field name="on_write"/>
+Index: trytond/trytond/ir/view/ui_view_list.xml
+===================================================================
+--- a/trytond/trytond/ir/view/ui_view_list.xml
++++ b/trytond/trytond/ir/view/ui_view_list.xml
+@@ -3,9 +3,9 @@
+ this repository contains the full copyright notices and license terms. -->
+ <tree>
+     <field name="priority"/>
+-    <field name="model"/>
++    <field name="model" expand="2"/>
+     <field name="type"/>
+-    <field name="inherit"/>
+-    <field name="domain"/>
++    <field name="inherit" expand="1"/>
++    <field name="domain" expand="1"/>
+     <field name="field_childs"/>
+ </tree>
+Index: trytond/trytond/ir/view/ui_view_search_list.xml
+===================================================================
+--- a/trytond/trytond/ir/view/ui_view_search_list.xml
++++ b/trytond/trytond/ir/view/ui_view_search_list.xml
+@@ -2,6 +2,6 @@
+ <!-- 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>
+-    <field name="name"/>
+-    <field name="user"/>
++    <field name="user" expand="1"/>
++    <field name="name" expand="1"/>
+ </tree>
+Index: trytond/trytond/ir/view/ui_view_tree_state_list.xml
+===================================================================
+--- a/trytond/trytond/ir/view/ui_view_tree_state_list.xml
++++ b/trytond/trytond/ir/view/ui_view_tree_state_list.xml
+@@ -2,8 +2,8 @@
+ <!-- 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>
+-    <field name="model"/>
+-    <field name="domain"/>
+-    <field name="user"/>
++    <field name="user" expand="1"/>
++    <field name="model" expand="1"/>
++    <field name="domain" expand="1"/>
+     <field name="child_name"/>
+ </tree>
+Index: trytond/trytond/ir/view/ui_view_tree_width_list.xml
+===================================================================
+--- a/trytond/trytond/ir/view/ui_view_tree_width_list.xml
++++ b/trytond/trytond/ir/view/ui_view_tree_width_list.xml
+@@ -2,8 +2,8 @@
+ <!-- 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>
+-    <field name="model"/>
+-    <field name="field"/>
+-    <field name="user"/>
++    <field name="model" expand="1"/>
++    <field name="field" expand="1"/>
++    <field name="user" expand="1"/>
+     <field name="width"/>
+ </tree>
+Index: trytond/trytond/res/view/user_list.xml
+===================================================================
+--- a/trytond/trytond/res/view/user_list.xml
++++ b/trytond/trytond/res/view/user_list.xml
+@@ -2,7 +2,7 @@
+ <!-- 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>
+-    <field name="name"/>
+-    <field name="login"/>
++    <field name="name" expand="2"/>
++    <field name="login" expand="1"/>
+     <field name="sessions"/>
+ </tree>
diff --git a/series b/series
index 298e40d..1d446fc 100644
--- a/series
+++ b/series
@@ -1,6 +1,9 @@
+#issue262131002_284001002.diff  # [multi modules] view with expand
+
 babi_multiprocess.diff # [trytond] babi multiprocess
 trytond_test_database.diff # [trytond] avoid errors on upgrades from version 3.4
 logging_jsonrpc_exeption.diff # [trytond] logging JSONRPC Exception
+account_payment_view.diff # [account_payment]
 
 issue3932.diff # [account] rule account move and account move line by company
 issue8469.diff # [account] Wrong domain in action move line receivable