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 @@
- Print Return Label + Print Return Label