[tryton-debian-vcs] tryton-modules-party branch upstream updated. upstream/4.2.1-1-g28217ac

[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.1-1-g28217ac

commit 28217ac77445b8e20533895d7e647cc43cb7150c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Jan 24 10:39:21 2017 +0100

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

diff --git a/CHANGELOG b/CHANGELOG
index ec96470..f4d9fbe 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.2.2 - 2017-01-22
+* Bug fixes (see mercurial logs for details)
+
 Version 4.2.1 - 2017-01-03
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index b8124d7..805d9c4 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2016 Cédric Krier.
+Copyright (C) 2008-2017 Cédric Krier.
 Copyright (C) 2008-2013 Bertrand Chenal.
-Copyright (C) 2008-2016 B2CK SPRL.
+Copyright (C) 2008-2017 B2CK SPRL.
 Copyright (C) 2008-2013 Udo Spallek.
 Copyright (C) 2008-2011 Korbinian Preisler.
 Copyright (C) 2008-2011 virtual things.
diff --git a/PKG-INFO b/PKG-INFO
index 80e6a6f..6230b10 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_party
-Version: 4.2.1
+Version: 4.2.2
 Summary: Tryton module with parties and addresses
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/address.py b/address.py
index cfd5b2d..c89be65 100644
--- a/address.py
+++ b/address.py
@@ -4,7 +4,7 @@
 from string import Template
 
 from sql import Null
-from sql.conditionals import Case
+from sql.conditionals import Case, Coalesce
 from sql.operators import Concat
 
 from trytond.model import ModelView, ModelSQL, MatchMixin, fields, \
@@ -69,7 +69,9 @@ class Address(sequence_ordered(), ModelSQL, ModelView):
 
         # Migration from 4.0: remove streetbis
         if table.column_exist('streetbis'):
-            value = Concat(sql_table.street, Concat('\n', sql_table.streetbis))
+            value = Concat(
+                Coalesce(sql_table.street, ''),
+                Concat('\n', Coalesce(sql_table.streetbis, '')))
             cursor.execute(*sql_table.update(
                     [sql_table.street],
                     [value]))
diff --git a/tryton.cfg b/tryton.cfg
index 21bd17e..0703327 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.2.1
+version=4.2.2
 depends:
     country
     ir
diff --git a/trytond_party.egg-info/PKG-INFO b/trytond_party.egg-info/PKG-INFO
index a067ece..6e07f6e 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.1
+Version: 4.2.2
 Summary: Tryton module with parties and addresses
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-party