From 55e98db012d8e99ce2527775f9b80de5b794be80 Mon Sep 17 00:00:00 2001 From: pedrambiria Date: Fri, 14 Jan 2022 09:50:41 +0000 Subject: [PATCH] [FIX] delivery: send the expected carrier name to Amazon A modification made by Amazon on October 1st restricts the allowed values for the carrier name. Since it now expects it in a formatted state, this commit will allow Odoo to send the delivery type of the carrier rather than its name, which can be customized by the user. opw-2665099 closes odoo/odoo#84291 X-original-commit: 0b4530b124d4ac86dad34907c6d6b6e9ea69c7b6 Related: odoo/enterprise#24204 Signed-off-by: Antoine Vandevenne (anv) Signed-off-by: Morgane Demesmaeker --- addons/delivery/models/delivery_carrier.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/addons/delivery/models/delivery_carrier.py b/addons/delivery/models/delivery_carrier.py index 1e8bc4fe391..bd11fcfcc3a 100644 --- a/addons/delivery/models/delivery_carrier.py +++ b/addons/delivery/models/delivery_carrier.py @@ -144,6 +144,15 @@ class DeliveryCarrier(models.Model): def onchange_countries(self): self.state_ids = [(6, 0, self.state_ids.filtered(lambda state: state.id in self.country_ids.mapped('state_ids').ids).ids)] + def _get_delivery_type(self): + """Return the delivery type. + + This method needs to be overridden by a delivery carrier module if the delivery type is not + stored on the field `delivery_type`. + """ + self.ensure_one() + return self.delivery_type + # -------------------------- # # API for external providers # # -------------------------- #