From 87df3d85aa22a7b2e393f95cc125329efb238382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sat, 28 Sep 2019 23:59:09 +0200
Subject: [PATCH] Add expand on tree view

and unify layout of form view.

issue8644
review262131002
---
 view/account_form.xml                |  6 ++----
 view/account_list.xml                |  4 ++--
 view/account_list2.xml               |  2 +-
 view/account_tree.xml                |  6 ++----
 view/account_tree2.xml               |  2 +-
 view/analytic_account_entry_tree.xml |  6 +++---
 view/line_tree.xml                   |  2 +-
 view/move_line_list.xml              | 10 +++++-----
 view/rule_list.xml                   |  8 ++++----
 9 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/view/account_form.xml b/view/account_form.xml
index d8662b1b78..5521e4fd44 100644
--- a/view/account_form.xml
+++ b/view/account_form.xml
@@ -31,8 +31,6 @@ this repository contains the full copyright notices and license terms. -->
             <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>
diff --git a/view/account_list.xml b/view/account_list.xml
index 81409e7917..ae307d1624 100644
--- a/view/account_list.xml
+++ b/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"/>
diff --git a/view/account_list2.xml b/view/account_list2.xml
index 2444e72562..6ba968cc75 100644
--- a/view/account_list2.xml
+++ b/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>
diff --git a/view/account_tree.xml b/view/account_tree.xml
index 1da6929f04..ae307d1624 100644
--- a/view/account_tree.xml
+++ b/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>
diff --git a/view/account_tree2.xml b/view/account_tree2.xml
index 0e7382e793..9c808fe67d 100644
--- a/view/account_tree2.xml
+++ b/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"/>
diff --git a/view/analytic_account_entry_tree.xml b/view/analytic_account_entry_tree.xml
index 7625751211..6cb3b646ae 100644
--- a/view/analytic_account_entry_tree.xml
+++ b/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>
diff --git a/view/line_tree.xml b/view/line_tree.xml
index 2badc4c7b2..f6dd1dae22 100644
--- a/view/line_tree.xml
+++ b/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"/>
diff --git a/view/move_line_list.xml b/view/move_line_list.xml
index 6c5e549056..fc2c406ed5 100644
--- a/view/move_line_list.xml
+++ b/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"/>
diff --git a/view/rule_list.xml b/view/rule_list.xml
index 5b75129e34..149e0bb947 100644
--- a/view/rule_list.xml
+++ b/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>