[tryton-debian-vcs] tryton-modules-party branch upstream updated. upstream/4.2.0-1-g77e4e53

[Mathias Behrle]

The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-party.git;a=commitdiff;h=upstream/4.2.0-1-g77e4e53

commit 77e4e53cd6961f4d7d1e1ee06c6e5d1fa33c50a8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Jan 4 12:37:16 2017 +0100

    Adding upstream version 4.2.1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index 5c21b16..ec96470 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.2.1 - 2017-01-03
+* Bug fixes (see mercurial logs for details)
+
 Version 4.2.0 - 2016-11-28
 * Bug fixes (see mercurial logs for details)
 * Add format to phone numbers
diff --git a/PKG-INFO b/PKG-INFO
index 32f4a19..80e6a6f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_party
-Version: 4.2.0
+Version: 4.2.1
 Summary: Tryton module with parties and addresses
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/address.py b/address.py
index 5061b23..cfd5b2d 100644
--- a/address.py
+++ b/address.py
@@ -138,6 +138,11 @@ class Address(sequence_ordered(), ModelSQL, ModelView):
             'country': self.country.name if self.country else '',
             'country_code': self.country.code if self.country else '',
             }
+
+        # Map invalid substitutions district* to subdivision* on 4.2.
+        substitutions['district'] = substitutions['subdivision']
+        substitutions['district_code'] = substitutions['subdivision_code']
+
         if context.get('address_from_country') == self.country:
             substitutions['country'] = ''
         if context.get('address_with_party', False):
diff --git a/tryton.cfg b/tryton.cfg
index 9231baf..21bd17e 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.2.0
+version=4.2.1
 depends:
     country
     ir
diff --git a/trytond_party.egg-info/PKG-INFO b/trytond_party.egg-info/PKG-INFO
index 3b95dc9..a067ece 100644
--- a/trytond_party.egg-info/PKG-INFO
+++ b/trytond_party.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-party
-Version: 4.2.0
+Version: 4.2.1
 Summary: Tryton module with parties and addresses
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-party