diff options
| author | Arnold Moyaux <arm@odoo.com> | 2018-06-22 16:34:55 +0200 |
|---|---|---|
| committer | Arnold Moyaux <arm@odoo.com> | 2018-06-26 13:16:27 +0200 |
| commit | 86cb5203a14620f61ba31dcb94dda3e250e22302 (patch) | |
| tree | 0db7ae1b97d8fa2aee4ed2eb7311f49821924969 /addons | |
| parent | 3ea85a603e38bff89c542a9ea4c49043e2ac375e (diff) | |
[FIX] delivery: traceback on single tracker
When using easypost, it could exist more than one tracking
link. In this case they are stored as a json and the method
open_url try to load it as a list of url. Then it checks if there is
more than one url or not. However in a single case, there is only one
string and the lenght of a string is the number of chracter inside that
is often more than one.
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/delivery/models/stock_picking.py | 19 | ||||
| -rw-r--r-- | addons/delivery/views/delivery_view.xml | 2 |
2 files changed, 10 insertions, 11 deletions
diff --git a/addons/delivery/models/stock_picking.py b/addons/delivery/models/stock_picking.py index 78f718a1a87..7eddcc52d04 100644 --- a/addons/delivery/models/stock_picking.py +++ b/addons/delivery/models/stock_picking.py @@ -184,21 +184,20 @@ class StockPicking(models.Model): carrier_trackers = json.loads(self.carrier_tracking_url) except ValueError: carrier_trackers = self.carrier_tracking_url - - if len(carrier_trackers) > 1: + else: msg = "Tracking links for shipment: <br/>" for tracker in carrier_trackers: msg += '<a href=' + tracker[1] + '>' + tracker[0] + '</a><br/>' self.message_post(body=msg) return self.env.ref('delivery.act_delivery_trackers_url').read()[0] - else: - client_action = { - 'type': 'ir.actions.act_url', - 'name': "Shipment Tracking Page", - 'target': 'new', - 'url': self.carrier_tracking_url, - } - return client_action + + client_action = { + 'type': 'ir.actions.act_url', + 'name': "Shipment Tracking Page", + 'target': 'new', + 'url': self.carrier_tracking_url, + } + return client_action @api.one def cancel_shipment(self): diff --git a/addons/delivery/views/delivery_view.xml b/addons/delivery/views/delivery_view.xml index 4266265da67..d3e3e7e1a43 100644 --- a/addons/delivery/views/delivery_view.xml +++ b/addons/delivery/views/delivery_view.xml @@ -302,7 +302,7 @@ <form string="Trackers URL"> <group> <div class="alert alert-info"> - <p>You have multiple URL, they should be available in the chatter.</p> + <p>You have multiple tracker links, they are available in the chatter.</p> </div> </group> <footer> |