From 6d9f68d4b22cd69f4cf1b0660c11eaebfa27bb18 Mon Sep 17 00:00:00 2001
From: Maxime Richez <maxime.richez@saluc.com>
Date: Tue, 5 Apr 2022 23:52:58 +0200
Subject: [PATCH] Add location or warehouse in shipment tree view

issue6549
review40401002
---
 CHANGELOG                         | 1 +
 view/shipment_in_return_tree.xml  | 1 +
 view/shipment_in_tree.xml         | 1 +
 view/shipment_out_return_tree.xml | 1 +
 view/shipment_out_tree.xml        | 1 +
 5 files changed, 5 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index df94ef29a4..b8ef2f1cb9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+* Add location or warehouse in shipment tree view
 * Warn user when deactivating a product that has stock
 * Add support for Python 3.10
 * Remove support for Python 3.6
diff --git a/view/shipment_in_return_tree.xml b/view/shipment_in_return_tree.xml
index dacab58457..37aed7589a 100644
--- a/view/shipment_in_return_tree.xml
+++ b/view/shipment_in_return_tree.xml
@@ -7,6 +7,7 @@ this repository contains the full copyright notices and license terms. -->
     <field name="reference" expand="1" optional="0"/>
     <field name="planned_date" optional="0"/>
     <field name="effective_date" optional="0"/>
+    <field name="from_location" expand="1" optional="0"/>
     <field name="supplier" expand="1" optional="0"/>
     <field name="delivery_address" optional="0"/>
     <field name="state"/>
diff --git a/view/shipment_in_tree.xml b/view/shipment_in_tree.xml
index 39c658cbe4..1aa783de4a 100644
--- a/view/shipment_in_tree.xml
+++ b/view/shipment_in_tree.xml
@@ -7,6 +7,7 @@ this repository contains the full copyright notices and license terms. -->
     <field name="reference" expand="1" optional="0"/>
     <field name="planned_date" optional="0"/>
     <field name="effective_date" optional="0"/>
+    <field name="warehouse" expand="1" optional="0"/>
     <field name="supplier" expand="2" optional="0"/>
     <field name="contact_address" optional="1"/>
     <field name="state"/>
diff --git a/view/shipment_out_return_tree.xml b/view/shipment_out_return_tree.xml
index 0c58b66a0d..ca964f77be 100644
--- a/view/shipment_out_return_tree.xml
+++ b/view/shipment_out_return_tree.xml
@@ -7,6 +7,7 @@ this repository contains the full copyright notices and license terms. -->
     <field name="reference" expand="1" optional="0"/>
     <field name="planned_date" optional="0"/>
     <field name="effective_date" optional="0"/>
+    <field name="warehouse" expand="1" optional="0"/>
     <field name="customer" expand="2" optional="0"/>
     <field name="delivery_address" optional="1"/>
     <field name="state"/>
diff --git a/view/shipment_out_tree.xml b/view/shipment_out_tree.xml
index 2d9a09772a..0f5875dbb7 100644
--- a/view/shipment_out_tree.xml
+++ b/view/shipment_out_tree.xml
@@ -7,6 +7,7 @@ this repository contains the full copyright notices and license terms. -->
     <field name="reference" expand="1" optional="0"/>
     <field name="planned_date" optional="0"/>
     <field name="effective_date" optional="0"/>
+    <field name="warehouse" expand="1" optional="0"/>
     <field name="customer" expand="2" optional="0"/>
     <field name="delivery_address" optional="0"/>
     <field name="state"/>