From fce72f902ec557b7fe0f2349992944d86fd1e22e Mon Sep 17 00:00:00 2001 From: Goffin Simon Date: Tue, 29 May 2018 09:22:22 +0200 Subject: [PATCH] [FIX] delivery: Translate the delivery method on SO line In this way the name of a delivery method can be translated on a SO line. Inspired from function 'product_id_change' in model 'sale.order.line' where the description of a SO line must be in the language of the partner. opw:1849656 --- addons/delivery/i18n/delivery.pot | 3 +++ addons/delivery/models/delivery_carrier.py | 2 +- addons/delivery/models/sale_order.py | 3 +-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/addons/delivery/i18n/delivery.pot b/addons/delivery/i18n/delivery.pot index 4d08bd6aa45..1831a1ce58f 100644 --- a/addons/delivery/i18n/delivery.pot +++ b/addons/delivery/i18n/delivery.pot @@ -377,6 +377,7 @@ msgid "Fixed Price" msgstr "" #. module: delivery +#: model:delivery.carrier,name:delivery.free_delivery_carrier #: model:product.product,name:delivery.product_product_delivery #: model:product.template,name:delivery.product_product_delivery_product_template msgid "Free delivery charges" @@ -559,6 +560,7 @@ msgid "No price rule matching this order; delivery cost cannot be computed." msgstr "" #. module: delivery +#: model:delivery.carrier,name:delivery.normal_delivery_carrier #: model:product.product,name:delivery.product_product_delivery_normal #: model:product.template,name:delivery.product_product_delivery_normal_product_template msgid "Normal Delivery Charges" @@ -759,6 +761,7 @@ msgid "Stock Move" msgstr "" #. module: delivery +#: model:delivery.carrier,name:delivery.delivery_carrier #: model:product.product,name:delivery.product_product_delivery_poste #: model:product.template,name:delivery.product_product_delivery_poste_product_template msgid "The Poste" diff --git a/addons/delivery/models/delivery_carrier.py b/addons/delivery/models/delivery_carrier.py index cccbd2e0fe5..c279b762db9 100644 --- a/addons/delivery/models/delivery_carrier.py +++ b/addons/delivery/models/delivery_carrier.py @@ -33,7 +33,7 @@ class DeliveryCarrier(models.Model): # Internals for shipping providers # # -------------------------------- # - name = fields.Char(required=True) + name = fields.Char(required=True, translate=True) active = fields.Boolean(default=True) sequence = fields.Integer(help="Determine the display order", default=10) # This field will be overwritten by internal shipping providers by adding their own type (ex: 'fedex') diff --git a/addons/delivery/models/sale_order.py b/addons/delivery/models/sale_order.py index cea84ee491c..e2bcd1c2c1d 100644 --- a/addons/delivery/models/sale_order.py +++ b/addons/delivery/models/sale_order.py @@ -89,10 +89,9 @@ class SaleOrder(models.Model): taxes_ids = self.fiscal_position_id.map_tax(taxes, carrier.product_id, self.partner_id).ids # Create the sales order line - carrier_name = carrier.product_id.with_context(lang=self.partner_id.lang).name_get()[0][1] values = { 'order_id': self.id, - 'name': carrier_name, + 'name': carrier.with_context(lang=self.partner_id.lang).name, 'product_uom_qty': 1, 'product_uom': carrier.product_id.uom_id.id, 'product_id': carrier.product_id.id,