[FIX] delivery: handle multiple references in delivery email

Steps to reproduce:
- install sales and easypost shipping
- have a delivery order of multiple packages with easypost
- click "send confirmation email"

previous behavior:
the template does not handle multiple package references
and the associated link is wrong

current behavior:
each reference is set in a separated link

opw-2167037

closes odoo/odoo#45507

X-original-commit: 65eaa3e7daf0b547ae2bb98e335fc5941cb200a6
Signed-off-by: mightyjol <jhk-odoo@users.noreply.github.com>
This commit is contained in:
jerome hanke (jhk)
2020-02-17 13:39:48 +00:00
parent bef4a3bad6
commit 0c4d808fd7
3 changed files with 23 additions and 2 deletions
+7
View File
@@ -109,6 +109,13 @@ class StockPicking(models.Model):
else:
picking.return_label_ids = False
def get_multiple_carrier_tracking(self):
self.ensure_one()
try:
return json.loads(self.carrier_tracking_url)
except ValueError:
return False
@api.depends('move_lines')
def _cal_weight(self):
for picking in self:
+8 -1
View File
@@ -14,7 +14,14 @@
Your tracking reference is
<strong>
%if object.carrier_tracking_url:
<a href="${object.carrier_tracking_url}" target="_blank">${object.carrier_tracking_ref}</a>.
% set multiple_carrier_tracking = object.get_multiple_carrier_tracking()
%if multiple_carrier_tracking:
% for line in multiple_carrier_tracking:
<br/><a href="${line[1]}" target="_blank">${line[0]}</a>
% endfor
%else:
<a href="${object.carrier_tracking_url}" target="_blank">${object.carrier_tracking_ref}</a>.
%endif
%else:
${object.carrier_tracking_ref}.
%endif
+8 -1
View File
@@ -204,7 +204,14 @@ msgid ""
" Your tracking reference is\n"
" <strong>\n"
" %if object.carrier_tracking_url:\n"
" <a href=\"${object.carrier_tracking_url}\" target=\"_blank\">${object.carrier_tracking_ref}</a>.\n"
" % set multiple_carrier_tracking = object.get_multiple_carrier_tracking()\n"
" %if multiple_carrier_tracking:\n"
" % for line in multiple_carrier_tracking:\n"
" <br/><a href=\"${line[1]}\" target=\"_blank\">${line[0]}</a>\n"
" % endfor\n"
" %else:\n"
" <a href=\"${object.carrier_tracking_url}\" target=\"_blank\">${object.carrier_tracking_ref}</a>.\n"
" %endif\n"
" %else:\n"
" ${object.carrier_tracking_ref}.\n"
" %endif\n"