From 29ef8deca70ebbbf68b720c8cf1844f34bd6a3ff Mon Sep 17 00:00:00 2001
From: Sergi Almacellas Abellana <sergi@koolpi.com>
Date: Fri, 14 Aug 2020 14:20:42 +0200
Subject: [PATCH] Use simplified view for moves list on shipments

issue9459
review290501002
---
 CHANGELOG                         |  1 +
 move.xml                          |  7 +++++++
 view/move_list_shipment.xml       | 12 ++++++++++++
 view/move_list_shipment_in.xml    |  9 ++-------
 view/shipment_in_form.xml         |  2 +-
 view/shipment_in_return_form.xml  |  2 +-
 view/shipment_internal_form.xml   |  6 +++---
 view/shipment_out_form.xml        |  4 ++--
 view/shipment_out_return_form.xml |  4 ++--
 9 files changed, 31 insertions(+), 16 deletions(-)
 create mode 100644 view/move_list_shipment.xml

diff --git a/CHANGELOG b/CHANGELOG
index ebb6f73130..9fb5a94c4c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+* Use simplified view for moves list on shipments
 * Add a relate from product to its moves
 * Factorize the cost price of move for cost computation
 * Fill grouping values when assigning move
diff --git a/move.xml b/move.xml
index 4403f56638..5fc713561c 100644
--- a/move.xml
+++ b/move.xml
@@ -29,6 +29,13 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">move_list_shipment_in</field>
         </record>
 
+        <record model="ir.ui.view" id="move_view_list_shipment">
+            <field name="model">stock.move</field>
+            <field name="type">tree</field>
+            <field name="priority" eval="20"/>
+            <field name="name">move_list_shipment</field>
+        </record>
+
         <record model="ir.action.act_window" id="act_move_form">
             <field name="name">Moves</field>
             <field name="res_model">stock.move</field>
diff --git a/view/move_list_shipment.xml b/view/move_list_shipment.xml
new file mode 100644
index 0000000000..84d472640c
--- /dev/null
+++ b/view/move_list_shipment.xml
@@ -0,0 +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. -->
+<tree>
+    <field name="shipment" expand="2"/>
+    <field name="from_location" expand="1"/>
+    <field name="product" expand="2"/>
+    <field name="quantity"/>
+    <field name="uom"/>
+    <field name="to_location" expand="1"/>
+    <field name="state"/>
+</tree>
diff --git a/view/move_list_shipment_in.xml b/view/move_list_shipment_in.xml
index d57b523632..84d472640c 100644
--- a/view/move_list_shipment_in.xml
+++ b/view/move_list_shipment_in.xml
@@ -3,15 +3,10 @@
 this repository contains the full copyright notices and license terms. -->
 <tree>
     <field name="shipment" expand="2"/>
-    <field name="product" expand="2"/>
     <field name="from_location" expand="1"/>
-    <field name="to_location" expand="1"/>
+    <field name="product" expand="2"/>
     <field name="quantity"/>
     <field name="uom"/>
-    <field name="planned_date"/>
-    <field name="effective_date"/>
+    <field name="to_location" expand="1"/>
     <field name="state"/>
-    <button name="cancel" string="Cancel"/>
-    <button name="draft" string="Reset to Draft"/>
-    <button name="do" string="Do"/>
 </tree>
diff --git a/view/shipment_in_form.xml b/view/shipment_in_form.xml
index f7ec8c29f9..5446720297 100644
--- a/view/shipment_in_form.xml
+++ b/view/shipment_in_form.xml
@@ -24,7 +24,7 @@ this repository contains the full copyright notices and license terms. -->
                 view_ids="stock.move_view_list_shipment_in"/>
         </page>
         <page name="inventory_moves">
-            <field name="inventory_moves" colspan="4"/>
+            <field name="inventory_moves" colspan="4" view_ids="stock.move_view_list_shipment"/>
         </page>
         <page string="Other Info" id="other">
             <label name="received_by"/>
diff --git a/view/shipment_in_return_form.xml b/view/shipment_in_return_form.xml
index 4c01fe0f44..87a7e66b50 100644
--- a/view/shipment_in_return_form.xml
+++ b/view/shipment_in_return_form.xml
@@ -20,7 +20,7 @@ this repository contains the full copyright notices and license terms. -->
     <field name="effective_date"/>
     <notebook colspan="4">
         <page name="moves">
-            <field name="moves"  colspan="4"/>
+            <field name="moves" colspan="4" view_ids="stock.move_view_list_shipment"/>
         </page>
         <page string="Other Info" id="other">
             <label name="assigned_by"/>
diff --git a/view/shipment_internal_form.xml b/view/shipment_internal_form.xml
index f1c3a165a6..79eb12bc2d 100644
--- a/view/shipment_internal_form.xml
+++ b/view/shipment_internal_form.xml
@@ -22,13 +22,13 @@ this repository contains the full copyright notices and license terms. -->
     <field name="company"/>
     <notebook colspan="4">
         <page name="moves">
-            <field name="moves"  colspan="4"/>
+            <field name="moves" colspan="4" view_ids="stock.move_view_list_shipment"/>
         </page>
         <page name="outgoing_moves">
-            <field name="outgoing_moves" colspan="4"/>
+            <field name="outgoing_moves" colspan="4" view_ids="stock.move_view_list_shipment"/>
         </page>
         <page name="incoming_moves">
-            <field name="incoming_moves" colspan="4"/>
+            <field name="incoming_moves" colspan="4" view_ids="stock.move_view_list_shipment"/>
         </page>
         <page string="Other Info" id="other">
             <label name="assigned_by"/>
diff --git a/view/shipment_out_form.xml b/view/shipment_out_form.xml
index 8e8827810b..bfbd758362 100644
--- a/view/shipment_out_form.xml
+++ b/view/shipment_out_form.xml
@@ -20,10 +20,10 @@ this repository contains the full copyright notices and license terms. -->
     <field name="warehouse"/>
     <notebook colspan="4">
         <page name="inventory_moves">
-            <field name="inventory_moves" colspan="4"/>
+            <field name="inventory_moves" colspan="4" view_ids="stock.move_view_list_shipment"/>
         </page>
         <page string="Outgoing Moves" id="outgoing_moves">
-            <field name="outgoing_moves" colspan="4"/>
+            <field name="outgoing_moves" colspan="4" view_ids="stock.move_view_list_shipment"/>
         </page>
         <page string="Other Info" id="other">
             <label name="assigned_by"/>
diff --git a/view/shipment_out_return_form.xml b/view/shipment_out_return_form.xml
index 4b70b622c8..65caef688d 100644
--- a/view/shipment_out_return_form.xml
+++ b/view/shipment_out_return_form.xml
@@ -20,10 +20,10 @@ this repository contains the full copyright notices and license terms. -->
     <field name="warehouse"/>
     <notebook colspan="6">
         <page name="incoming_moves">
-            <field name="incoming_moves" colspan="4"/>
+            <field name="incoming_moves" colspan="4" view_ids="stock.move_view_list_shipment"/>
         </page>
         <page name="inventory_moves">
-            <field name="inventory_moves" colspan="4"/>
+            <field name="inventory_moves" colspan="4" view_ids="stock.move_view_list_shipment"/>
         </page>
         <page string="Other Info" id="other">
             <label name="received_by"/>