From 3ce57dbaa8905f3ad081d258ccf6288e6346a5c1 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/address_format_form.xml             | 10 +++++-----
 view/address_tree.xml                    |  2 +-
 view/address_tree_sequence.xml           |  2 +-
 view/contact_mechanism_form.xml          | 21 ++++++++++-----------
 view/contact_mechanism_tree.xml          |  7 +++----
 view/contact_mechanism_tree_sequence.xml |  4 ++--
 view/party_tree.xml                      |  2 +-
 7 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/view/address_format_form.xml b/view/address_format_form.xml
index a88c943070..aeb522e751 100644
--- a/view/address_format_form.xml
+++ b/view/address_format_form.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
-<form>
+<form col="6">
     <label name="country_code"/>
     <field name="country_code"/>
-    <label name="active"/>
-    <field name="active"/>
     <label name="language_code"/>
     <field name="language_code"/>
-    <separator name="format_" colspan="4"/>
-    <field name="format_" colspan="4"/>
+    <label name="active"/>
+    <field name="active"/>
+    <separator name="format_" colspan="6"/>
+    <field name="format_" colspan="6"/>
 </form>
diff --git a/view/address_tree.xml b/view/address_tree.xml
index 7d27b71063..5bbb961b35 100644
--- a/view/address_tree.xml
+++ b/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"/>
diff --git a/view/address_tree_sequence.xml b/view/address_tree_sequence.xml
index 0e725e8419..ed6e26ff9e 100644
--- a/view/address_tree_sequence.xml
+++ b/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"/>
diff --git a/view/contact_mechanism_form.xml b/view/contact_mechanism_form.xml
index 337e4b30f1..e9f29d0307 100644
--- a/view/contact_mechanism_form.xml
+++ b/view/contact_mechanism_form.xml
@@ -1,10 +1,17 @@
 <?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="6">
+<form>
     <label name="party"/>
-    <field name="party" colspan="3"/>
-    <newline/>
+    <field name="party"/>
+    <group col="-1" colspan="2" id="checkboxes">
+        <label name="active"/>
+        <field name="active" 
+            xexpand="0" width="25"/>
+        <!-- Add here some checkboxes ! -->
+        <label name="sequence"/>
+        <field name="sequence"/>
+    </group>
     <label name="type"/>
     <field name="type"/>
     <group col="2" colspan="2" id="value">
@@ -19,16 +26,8 @@ this repository contains the full copyright notices and license terms. -->
         <label name="sip"/>
         <field name="sip" widget="sip"/>
     </group>
-    <group col="-1" colspan="2" id="checkboxes">
-        <label name="active"/>
-        <field name="active" 
-            xexpand="0" width="25"/>
-        <!-- Add here some checkboxes ! -->
-    </group>
     <label name="name"/>
     <field name="name" colspan="3"/>
-    <label name="sequence"/>
-    <field name="sequence"/>
     <separator name="comment" colspan="6"/>
     <field name="comment" colspan="6"/>
 </form>
diff --git a/view/contact_mechanism_tree.xml b/view/contact_mechanism_tree.xml
index 3c624ee08d..ddcfb90ba7 100644
--- a/view/contact_mechanism_tree.xml
+++ b/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>
diff --git a/view/contact_mechanism_tree_sequence.xml b/view/contact_mechanism_tree_sequence.xml
index 39295ab475..8758fc1c13 100644
--- a/view/contact_mechanism_tree_sequence.xml
+++ b/view/contact_mechanism_tree_sequence.xml
@@ -5,7 +5,7 @@ this repository contains the full copyright notices and license terms. -->
     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>
diff --git a/view/party_tree.xml b/view/party_tree.xml
index f7a3ff6b4b..2846d4f46e 100644
--- a/view/party_tree.xml
+++ b/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>