From db62d96fafbc6e8a27cebeafb422ac07c0f61648 Mon Sep 17 00:00:00 2001
From: Victor Feyens <vfe@odoo.com>
Date: Thu, 1 Feb 2024 15:44:13 +0100
Subject: [PATCH] [FIX] sale: wrong invoicing address on portal

The address displayed as 'Invoicing address' was
the main SO address and not the invoicing one.

Also, the pencil icon link to update the customer main address
was always displayed next to the invoicing address, even if:

* the so does not belong to the customer
* the invoicing address is different than the
customer main address

This commit fixes those two issues.

opw-3653190

closes odoo/odoo#152298

Signed-off-by: Victor Feyens (vfe) <vfe@odoo.com>
---
 addons/sale/views/sale_portal_templates.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/views/sale_portal_templates.xml b/addons/sale/views/sale_portal_templates.xml
index f578dae1407..d676763860c 100644
--- a/addons/sale/views/sale_portal_templates.xml
+++ b/addons/sale/views/sale_portal_templates.xml
@@ -465,14 +465,14 @@
                         <t t-else="">
                             Invoicing Address
                         </t>
-                        <small t-if="sale_order.partner_id == sale_order.partner_id">
+                        <small t-if="sale_order.partner_id == sale_order.partner_invoice_id == sale_order.env.user.partner_id">
                             <a class="small" t-attf-href="/my/account?redirect={{sale_order.get_portal_url()}}">
                                 <i class="fa fa-fw fa-pencil"/>
                             </a>
                         </small>
                     </h4>
                     <hr class="mt-1 mb-2"/>
-                    <div t-field="sale_order.partner_id" t-options="{ 'widget': 'contact', 'fields': [ 'name', 'address', 'phone', 'email']}"/>
+                    <div t-field="sale_order.partner_invoice_id" t-options="{'widget': 'contact', 'fields': ['name', 'address', 'phone', 'email']}"/>
                     <span t-if="sale_order.partner_shipping_id != sale_order.partner_invoice_id"
                             id="shipping_address"
                             class="col-lg-6">