From 2fdb0ea8a9f37b75c7f0163ae5010ad050aedb3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sun, 13 Nov 2016 11:37:31 +0100
Subject: [PATCH] Do not translate UPS code/service name

issue6029
review27831002
---
 carrier.py | 6 +++---
 stock.py   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/carrier.py b/carrier.py
index 239d62dc1e..0595105669 100644
--- a/carrier.py
+++ b/carrier.py
@@ -61,7 +61,7 @@ class Carrier:
             ('85', 'UPS Today Express'),
             ('86', 'UPS Today Express Saver'),
             ('96', 'UPS Worldwide Express Freight'),
-            ], 'Service Type', sort=False,
+            ], 'Service Type', sort=False, translate=False,
         states={
             'required': Eval('shipping_service') == 'ups',
             'invisible': Eval('shipping_service') != 'ups',
@@ -74,7 +74,7 @@ class Carrier:
             ('ZPL', 'ZPL'),
             ('GIF', 'GIF'),
             ('STARPL', 'Star Printer'),
-            ], 'Label Image Format', sort=False,
+            ], 'Label Image Format', sort=False, translate=False,
         states={
             'required': Eval('shipping_service') == 'ups',
             'invisible': Eval('shipping_service') != 'ups',
@@ -84,7 +84,7 @@ class Carrier:
             (None, ''),
             ('6', '6'),
             ('8', '8'),
-            ], 'Label Height', sort=False,
+            ], 'Label Height', sort=False, translate=False,
         states={
             'required': ((Eval('shipping_service') == 'ups')
                 & (Eval('ups_label_image_format') != 'GIF')),
diff --git a/stock.py b/stock.py
index f82a6d442b..28f6b30170 100644
--- a/stock.py
+++ b/stock.py
@@ -49,7 +49,7 @@ class PackageType:
             ('65', 'Media Mail'),
             ('66', 'BPM Flat'),
             ('67', 'Standard Flat'),
-            ], 'UPS Code')
+            ], 'UPS Code', sort=False, translate=False)
 
     @classmethod
     def default_ups_code(cls):