From 63d96511c773fcbfaaa3e26c4708b72a164fbbd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Fri, 14 Aug 2015 18:08:07 +0200
Subject: [PATCH] Fix identifier migration when both columns are empty

issue4906
review22371002
---
 party.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/party.py b/party.py
index 069f26bd9c..6509638e5e 100644
--- a/party.py
+++ b/party.py
@@ -233,9 +233,11 @@ class PartyIdentifier(ModelSQL, ModelView):
             cursor.execute(*party.select(
                     party.id, party.vat_number, party.vat_country,
                     where=(party.vat_number != Null)
-                    & (party.vat_country != Null)))
+                    | (party.vat_country != Null)))
             for party_id, number, country in cursor.fetchall():
                 code = (country or '') + (number or '')
+                if not code:
+                    continue
                 type = None
                 if vat.is_valid(code):
                     type = 'eu_vat'