From 46b993df894914c7a9ab97fed0cf4d780fd1ba65 Mon Sep 17 00:00:00 2001
From: Parthiv Patel <parthiv@techreceptives.com>
Date: Thu, 14 Dec 2023 08:34:23 +0000
Subject: [PATCH] [PATCH] Upstream patch - 14122023

---
 addons/delivery/models/delivery_carrier.py         | 5 ++++-
 addons/delivery/views/delivery_portal_template.xml | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/delivery/models/delivery_carrier.py b/addons/delivery/models/delivery_carrier.py
index f45649db95..c24060eb21 100644
--- a/addons/delivery/models/delivery_carrier.py
+++ b/addons/delivery/models/delivery_carrier.py
@@ -196,7 +196,10 @@ class DeliveryCarrier(models.Model):
     def get_return_label(self,pickings, tracking_number=None, origin_date=None):
         self.ensure_one()
         if self.can_generate_return:
-            return getattr(self, '%s_get_return_label' % self.delivery_type)(pickings, tracking_number, origin_date)
+            res = getattr(self, '%s_get_return_label' % self.delivery_type)(pickings, tracking_number, origin_date)
+            if self.get_return_label_from_portal:
+                pickings.return_label_ids.generate_access_token()
+            return res
 
     def get_return_label_prefix(self):
         return 'ReturnLabel-%s' % self.delivery_type
diff --git a/addons/delivery/views/delivery_portal_template.xml b/addons/delivery/views/delivery_portal_template.xml
index 5997df5a7d..8e80ee92c8 100644
--- a/addons/delivery/views/delivery_portal_template.xml
+++ b/addons/delivery/views/delivery_portal_template.xml
@@ -21,7 +21,7 @@
             </div>
             <t t-if="i.carrier_id.get_return_label_from_portal and i.return_label_ids">
                 <div>
-                    <a class="ml-3"  t-attf-href="/web/content/#{i.return_label_ids[:1].id}" target="_blank">Print Return Label</a>
+                    <a class="ml-3"  t-attf-href="/web/content/#{i.return_label_ids[:1].id}?access_token=#{i.return_label_ids[:1].access_token}" target="_blank">Print Return Label</a>
                 </div>
             </t>
         </xpath>