[tryton-debian-vcs] tryton-modules-stock-package-shipping-ups branch debian-stretch-4.2 updated. debian/4.2.0-1-5-g8a0ce08

[Mathias Behrle]

The following commit has been merged in the debian-stretch-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=debian/4.2.0-1-5-g8a0ce08

commit 8a0ce0805984b78a3835c48915b200dedf787af3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Jul 2 17:08:22 2017 +0200

    Releasing debian version 4.2.1-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index e29c1df..95dbeee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-stock-package-shipping-ups (4.2.1-1) unstable; urgency=medium
+
+  * Add the actual upstream maintainer key to signing-key.asc.
+  * Setting the branch in the watch file to the fixed version 4.2.
+  * Merging upstream version 4.2.1.
+  * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Sun, 02 Jul 2017 17:08:22 +0200
+
 tryton-modules-stock-package-shipping-ups (4.2.0-1) unstable; urgency=medium
 
   * Initial commit (Closes: #847185).
commit ffaf94883c1f13fa07d7a680eeda9c86cf6c4214
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Jul 2 17:08:22 2017 +0200

    Updating copyright file.

diff --git a/debian/copyright b/debian/copyright
index d623b69..b343172 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
-Copyright: 2016 B2CK
-           2016 Nicolas Évrard
+Copyright: 2016-2017 B2CK
+           2016-2017 Nicolas Évrard
 License: GPL-3+
 
 Files: debian/*
commit 3f9f773565c27b56d61ac628704bfcb6d692a5b8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Jul 2 17:08:22 2017 +0200

    Merging upstream version 4.2.1.

diff --git a/CHANGELOG b/CHANGELOG
index 1c72ee3..beb93fd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,5 @@
+Version 4.2.1 - 2017-07-01
+* Bug fixes (see mercurial logs for details)
+
 Version 4.2.0 - 2016-11-28
 * Initial release
\ No newline at end of file
diff --git a/COPYRIGHT b/COPYRIGHT
index 0f0e2e0..fd60d86 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2016 B2CK.
-Copyright (C) 2016 Nicolas Évrard.
+Copyright (C) 2016-2017 B2CK.
+Copyright (C) 2016-2017 Nicolas Évrard.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index c27ce23..93ee01e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_stock_package_shipping_ups
-Version: 4.2.0
+Version: 4.2.1
 Summary: UPS connector for the Tryton application plateform
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/setup.cfg b/setup.cfg
index 861a9f5..8bfd5a1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,4 @@
 [egg_info]
 tag_build = 
 tag_date = 0
-tag_svn_revision = 0
 
diff --git a/stock.py b/stock.py
index 28f6b30..c6f07f6 100644
--- a/stock.py
+++ b/stock.py
@@ -85,7 +85,7 @@ class ShipmentOut:
                         break
                 else:
                     self.raise_user_error('phone_required', {
-                            'party': self.customer.rec_name,
+                            'party': party.rec_name,
                             })
             if not self.shipping_description:
                 if (any(p.type.ups_code != '01' for p in self.root_packages)
@@ -252,7 +252,7 @@ class CreateShippingUPS(Wizard):
                 'AddressLine': (address.street or '').splitlines(),
                 'City': address.city,
                 'PostalCode': address.zip,
-                'CountryCode': address.country.code,
+                'CountryCode': address.country.code if address.country else '',
                 },
             }
 
diff --git a/tryton.cfg b/tryton.cfg
index 0b7d53c..5fd6638 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.2.0
+version=4.2.1
 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 632e7a3..52f8d83 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.0
+Version: 4.2.1
 Summary: UPS connector for the Tryton application plateform
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-stock-package-shipping-ups