From 9f3c39e9d3d24378d8e2858c47bbf583ced5568a 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/move_list_shipment.xml           | 11 +++++------
 view/sale_form.xml                    | 24 ++++++++++++------------
 view/sale_line_form.xml               |  4 ++--
 view/sale_line_tree.xml               |  5 ++---
 view/sale_line_tree_sequence.xml      |  7 +++----
 view/sale_reporting_category_list.xml |  2 +-
 view/sale_reporting_category_tree.xml |  2 +-
 view/sale_reporting_customer_list.xml |  2 +-
 view/sale_reporting_product_list.xml  |  2 +-
 view/sale_reporting_region_tree.xml   |  2 +-
 view/sale_tree.xml                    |  9 ++++-----
 11 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/view/move_list_shipment.xml b/view/move_list_shipment.xml
index 0e556280e1..303beb4539 100644
--- a/view/move_list_shipment.xml
+++ b/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"/>
+    <button name="cancel"/>
+    <button name="draft"/>
 </tree>
diff --git a/view/sale_form.xml b/view/sale_form.xml
index d4baff4691..fa882eb17c 100644
--- a/view/sale_form.xml
+++ b/view/sale_form.xml
@@ -37,23 +37,13 @@ this repository contains the full copyright notices and license terms. -->
                 <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 @@ this repository contains the full copyright notices and license terms. -->
             <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>
diff --git a/view/sale_line_form.xml b/view/sale_line_form.xml
index 14482c10f0..5bd0a70d73 100644
--- a/view/sale_line_form.xml
+++ b/view/sale_line_form.xml
@@ -22,10 +22,10 @@ this repository contains the full copyright notices and license terms. -->
             <field name="unit_price"/>
             <label name="amount"/>
             <field name="amount"/>
-            <separator name="description" colspan="4"/>
-            <field name="description" colspan="4"/>
             <label name="shipping_date"/>
             <field name="shipping_date"/>
+            <separator name="description" colspan="4"/>
+            <field name="description" colspan="4"/>
         </page>
         <page string="Taxes" id="taxes">
             <field name="taxes" colspan="4"/>
diff --git a/view/sale_line_tree.xml b/view/sale_line_tree.xml
index 6aa927b06a..0d02ff7ea1 100644
--- a/view/sale_line_tree.xml
+++ b/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>
diff --git a/view/sale_line_tree_sequence.xml b/view/sale_line_tree_sequence.xml
index b02847debf..3d932c7d91 100644
--- a/view/sale_line_tree_sequence.xml
+++ b/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>
diff --git a/view/sale_reporting_category_list.xml b/view/sale_reporting_category_list.xml
index 423416e9ee..d9f4b8bfd6 100644
--- a/view/sale_reporting_category_list.xml
+++ b/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"/>
diff --git a/view/sale_reporting_category_tree.xml b/view/sale_reporting_category_tree.xml
index 5b5d1c529a..49afe263b1 100644
--- a/view/sale_reporting_category_tree.xml
+++ b/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>
diff --git a/view/sale_reporting_customer_list.xml b/view/sale_reporting_customer_list.xml
index a68ec70554..c8727305ae 100644
--- a/view/sale_reporting_customer_list.xml
+++ b/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"/>
diff --git a/view/sale_reporting_product_list.xml b/view/sale_reporting_product_list.xml
index f6a509a482..c16aef2e72 100644
--- a/view/sale_reporting_product_list.xml
+++ b/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"/>
diff --git a/view/sale_reporting_region_tree.xml b/view/sale_reporting_region_tree.xml
index 06ae23b7e4..b4d6b40c3b 100644
--- a/view/sale_reporting_region_tree.xml
+++ b/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"/>
diff --git a/view/sale_tree.xml b/view/sale_tree.xml
index 336def25c0..90bf280fef 100644
--- a/view/sale_tree.xml
+++ b/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>