Do not translate UPS code/service name

issue6029
review27831002
This commit is contained in:
Cédric Krier
2016-11-13 11:37:31 +01:00
parent 4925acd5dd
commit 2fdb0ea8a9
2 changed files with 4 additions and 4 deletions
+3 -3
View File
@@ -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')),
+1 -1
View File
@@ -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):