From 38a5a760182f1b8786e7b349454ba4b834d9466e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 2 Nov 2010 13:42:56 +0100 Subject: [PATCH 1/6] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 3222f9152f..b9c981c82d 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ 'name_es_CO' : 'Terceros - SIRET', 'name_es_ES': 'Terceros - SIRET', 'name_fr_FR': 'Tiers - Siret', - 'version' : '1.8.0', + 'version' : '1.8.1', 'author' : 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 4b15f8aee99c32083b065b66a4b7cb3f3b3ec9e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Tr=C3=A9segnie?= Date: Thu, 19 Apr 2012 19:40:39 +0200 Subject: [PATCH 2/6] Add length check for SIREN and SIRET issue2342 review333001 (transplanted from 9e2eb48f66375d71717e6ca769bb7710c41aaaa5) --- address.py | 5 +++-- party.py | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/address.py b/address.py index e7e69c8c76..402c5ca9fa 100644 --- a/address.py +++ b/address.py @@ -36,8 +36,9 @@ class Address(Model): Check validity of SIRET ''' for address in self.browse(ids): - if address.siret and not luhn.validate(address.siret): - return False + if address.siret: + if len(address.siret) != 14 or not luhn.validate(address.siret): + return False return True Address() diff --git a/party.py b/party.py index b9fd5ffb13..4bab5bc958 100644 --- a/party.py +++ b/party.py @@ -26,8 +26,10 @@ class Party(Model): Check validity of SIREN ''' for party in self.browse(ids): - if party.siren and not luhn.validate(party.siren): - return False + if party.siren: + if len(party.siren) != 9 or not luhn.validate(party.siren): + return False + print party.addresses return True Party() From 10c507ccaf05871fa0891e682e4fd42f94544a3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 4 May 2012 18:36:23 +0200 Subject: [PATCH 3/6] Remove print statement (transplanted from 2817fb641765c90800e30ea437070e4f527e5b1e) --- party.py | 1 - 1 file changed, 1 deletion(-) diff --git a/party.py b/party.py index 4bab5bc958..33b42dd131 100644 --- a/party.py +++ b/party.py @@ -29,7 +29,6 @@ class Party(Model): if party.siren: if len(party.siren) != 9 or not luhn.validate(party.siren): return False - print party.addresses return True Party() From 7b1e11c22b73de145bd029d5269ca6ca5982f56c Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:05:50 +0200 Subject: [PATCH 4/6] Prepare release 1.8.1 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index b0edc7472d..d07986d491 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.8.1 - 2012-05-07 +* Bug fixes (see mercurial logs for details) + Version 1.8.0 - 2010-11-01 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index 0982dbce9e..0c3bbc5cb7 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,6 +1,6 @@ -Copyright (C) 2010 Cédric Krier. +Copyright (C) 2010-2012 Cédric Krier. Copyright (C) 2010 Bertrand Chenal. -Copyright (C) 2010 B2CK SPRL. +Copyright (C) 2010-2012 B2CK SPRL. 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 From 480d8c6473997a654765bb47c341437a82c64739 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:05:50 +0200 Subject: [PATCH 5/6] Added tag 1.8.1 for changeset 30c275d16f3c --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index fe2114e4ee..09a1421abb 100644 --- a/.hgtags +++ b/.hgtags @@ -1,3 +1,4 @@ 2140c037504737ef54a842e032582eacf508643b 1.4.0 1e4a81489ddeb895e18c572628969bea4e7b7f4a 1.6.0 0d99ac86e70b9f26f4f20284cefe4983f2fddfba 1.8.0 +30c275d16f3c0f67e393f00b9fb95dc1c312798d 1.8.1 From 4b0f526d240c9438973b55003ce0299d4ce1bd8b Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 7 May 2012 11:05:54 +0200 Subject: [PATCH 6/6] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index b9c981c82d..27d33c11a2 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ 'name_es_CO' : 'Terceros - SIRET', 'name_es_ES': 'Terceros - SIRET', 'name_fr_FR': 'Tiers - Siret', - 'version' : '1.8.1', + 'version': '1.8.2', 'author' : 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',