diff --git a/addons/stock_delivery/models/delivery_carrier.py b/addons/stock_delivery/models/delivery_carrier.py index 314f8b039f8..322c16536a3 100644 --- a/addons/stock_delivery/models/delivery_carrier.py +++ b/addons/stock_delivery/models/delivery_carrier.py @@ -50,9 +50,12 @@ 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)( + 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 'LabelReturn-%s' % self.delivery_type diff --git a/addons/stock_delivery/views/delivery_portal_template.xml b/addons/stock_delivery/views/delivery_portal_template.xml index f5cc4d94315..36e40bc5ca0 100644 --- a/addons/stock_delivery/views/delivery_portal_template.xml +++ b/addons/stock_delivery/views/delivery_portal_template.xml @@ -25,7 +25,7 @@
- + Print Return Label