[tryton-debian-vcs] tryton-modules-stock-package-shipping-ups branch upstream-4.2 updated. upstream/4.2.1-1-g502ba01
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Dec 13 10:42:16 UTC 2017
The following commit has been merged in the upstream-4.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock-package-shipping-ups.git;a=commitdiff;h=upstream/4.2.1-1-g502ba01
commit 502ba01b5804a7f02e05be187f4a33a120352727
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Dec 12 19:05:40 2017 +0100
Adding upstream version 4.2.2.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index beb93fd..8045331 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.2.2 - 2017-12-04
+* Bug fixes (see mercurial logs for details)
+
Version 4.2.1 - 2017-07-01
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 93ee01e..b51258c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_stock_package_shipping_ups
-Version: 4.2.1
+Version: 4.2.2
Summary: UPS connector for the Tryton application plateform
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/stock.py b/stock.py
index c6f07f6..adb63b2 100644
--- a/stock.py
+++ b/stock.py
@@ -237,7 +237,7 @@ class CreateShippingUPS(Wizard):
return {
'RequestOption': 'validate',
'TransactionReference': {
- 'CustomerContext': shipment.number,
+ 'CustomerContext': (shipment.number or '')[:512],
},
}
@@ -249,9 +249,10 @@ class CreateShippingUPS(Wizard):
'AttentionName': (address.name[:35]
if address.name else party.name[:35]),
'Address': {
- 'AddressLine': (address.street or '').splitlines(),
- 'City': address.city,
- 'PostalCode': address.zip,
+ 'AddressLine': [l[:35]
+ for l in (address.street or '').splitlines()[:3]],
+ 'City': address.city[:30],
+ 'PostalCode': (address.zip or '')[:9],
'CountryCode': address.country.code if address.country else '',
},
}
@@ -328,7 +329,7 @@ class CreateShippingUPS(Wizard):
'ShipmentRequest': {
'Request': self.get_request_container(shipment),
'Shipment': {
- 'Description': shipment.shipping_description,
+ 'Description': (shipment.shipping_description or '')[:50],
'Shipper': shipper,
'ShipTo': self.get_shipping_party(shipment.customer,
shipment.delivery_address),
diff --git a/tryton.cfg b/tryton.cfg
index 5fd6638..9ab51ad 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.2.1
+version=4.2.2
depends:
ir
res
diff --git a/trytond_stock_package_shipping_ups.egg-info/PKG-INFO b/trytond_stock_package_shipping_ups.egg-info/PKG-INFO
index 52f8d83..90927ec 100644
--- a/trytond_stock_package_shipping_ups.egg-info/PKG-INFO
+++ b/trytond_stock_package_shipping_ups.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-stock-package-shipping-ups
-Version: 4.2.1
+Version: 4.2.2
Summary: UPS connector for the Tryton application plateform
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-stock-package-shipping-ups
More information about the tryton-debian-vcs
mailing list