From f8cb7d15ef2ca7dedcde84b4fa09aced326ceae9 Mon Sep 17 00:00:00 2001
From: Ahmed Khalaf <ahkh@odoo.com>
Date: Wed, 31 May 2023 11:38:13 +0000
Subject: [PATCH] [FIX] stock: delivery address in picking reports

Before this commit, when printing a The picking operation or delivery slip
reports for outgoing transfers, both the delivery and customer address are displayed
showing the same address.

The expected behavior is to have customer address only of there is a commercial
partner behind the delivery address, thus the customer address is hidden
if its not the case.

opw-3289441

closes odoo/odoo#123365

X-original-commit: 5802295f3935648c4f2c5f9a45f223dcb1f7a7b8
Signed-off-by: Ahmed Khalaf (ahkh) <ahkh@odoo.com>
Signed-off-by: William Henrotin (whe) <whe@odoo.com>
---
 addons/stock/report/report_deliveryslip.xml            |  8 ++++++--
 addons/stock/report/report_stockpicking_operations.xml | 10 +++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/addons/stock/report/report_deliveryslip.xml b/addons/stock/report/report_deliveryslip.xml
index 6a693787e8e..081a6cef4b7 100644
--- a/addons/stock/report/report_deliveryslip.xml
+++ b/addons/stock/report/report_deliveryslip.xml
@@ -25,16 +25,20 @@
                 <t t-set="information_block">
                     <div class="row">
                         <div class="col-7" name="div_incoming_address">
+                            <t t-set="show_partner" t-value="False" />
                             <div name="vendor_address" t-if="o.picking_type_id.code=='incoming' and partner">
                                 <span><strong>Vendor Address:</strong></span>
+                                <t t-set="show_partner" t-value="True" />
                             </div>
                             <div name="warehouse_address" t-if="o.picking_type_id.code=='internal' and partner">
                                 <span><strong>Warehouse Address:</strong></span>
+                                <t t-set="show_partner" t-value="True" />
                             </div>
-                            <div name="customer_address" t-if="o.picking_type_id.code=='outgoing' and partner">
+                            <div name="customer_address" t-if="o.picking_type_id.code=='outgoing' and partner and partner != partner.commercial_partner_id">
                                 <span><strong>Customer Address:</strong></span>
+                                <t t-set="show_partner" t-value="True" />
                             </div>
-                            <div t-if="partner" name="partner_header">
+                            <div t-if="show_partner" name="partner_header">
                                 <div t-field="partner.commercial_partner_id"
                                      t-options='{"widget": "contact", "fields": ["address", "name", "phone", "vat"], "no_marker": True, "phone_icons": True}'/>
                             </div>
diff --git a/addons/stock/report/report_stockpicking_operations.xml b/addons/stock/report/report_stockpicking_operations.xml
index 69364700bca..994ab1bf14b 100644
--- a/addons/stock/report/report_stockpicking_operations.xml
+++ b/addons/stock/report/report_stockpicking_operations.xml
@@ -26,17 +26,21 @@
                                     </div>
                                 </div>
                                 <div class="col-5 offset-1" name="div_incoming_address">
+                                    <t t-set="show_partner" t-value="False" />
                                     <div t-if="o.picking_type_id.code=='incoming' and o.partner_id">
                                         <span><strong>Vendor Address:</strong></span>
+                                        <t t-set="show_partner" t-value="True" />
                                     </div>
                                     <div t-if="o.picking_type_id.code=='internal' and o.partner_id">
                                         <span><strong>Warehouse Address:</strong></span>
+                                        <t t-set="show_partner" t-value="True" />
                                     </div>
-                                    <div t-if="o.picking_type_id.code=='outgoing' and o.partner_id">
+                                    <div t-if="o.picking_type_id.code=='outgoing' and o.partner_id and o.partner_id != o.partner_id.commercial_partner_id">
                                         <span><strong>Customer Address:</strong></span>
+                                        <t t-set="show_partner" t-value="True" />
                                     </div>
-                                    <div t-if="o.partner_id" name="partner_header">
-                                        <div t-field="o.partner_id"
+                                    <div t-if="show_partner" name="partner_header">
+                                        <div t-field="o.partner_id.commercial_partner_id"
                                              t-options='{"widget": "contact", "fields": ["address", "name", "phone", "vat"], "no_marker": True, "phone_icons": True}'/>
                                     </div>
                                 </div>