From e2f99ee5a23e925f1f9fb701161ee4f033bec57a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 22 Oct 2012 22:59:20 +0200 Subject: [PATCH 1/9] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index 0732da85ae..bc0df45354 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.6.0 +version=2.6.1 depends: country ir From d3bc7a6d8a9cd5c134351a9a5fe1e036af153a13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 16 Apr 2013 15:19:25 +0200 Subject: [PATCH 2/9] No need to manage copy of one2many Copy of one2many is correctly managed since changeset aec785ab8362 (1.2.0) issue3142 review786002 (transplanted from 39c1466acf71ff37e35fea6faa00df10bf076c6f) --- party.py | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/party.py b/party.py index 1694c99766..c1e0c6e22d 100644 --- a/party.py +++ b/party.py @@ -179,17 +179,7 @@ class Party(ModelSQL, ModelView): default = {} default = default.copy() default['code'] = None - default['addresses'] = None - new_parties = [] - for party in parties: - new_party = super(Party, cls).copy(party, default=default) - Address.copy([x.id for x in new_party.addresses], - default={ - 'party': new_party.id, - }) - new_parties.append(new_party) - - return new_parties + return super(Party, cls).copy(parties, default=default) @classmethod def search_rec_name(cls, name, clause): From 5944723485d87fa19e4f875a4035798e2f062855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:25:54 +0200 Subject: [PATCH 3/9] Prepare release 2.6.1 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 23170cfb96..d8173eed39 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.6.1 - 2013-05-02 +* Bug fixes (see mercurial logs for details) + Version 2.6.0 - 2012-10-22 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index dfe7d1e0a9..89aabe7e8b 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,6 +1,6 @@ -Copyright (C) 2008-2012 Cédric Krier. +Copyright (C) 2008-2013 Cédric Krier. Copyright (C) 2008-2012 Bertrand Chenal. -Copyright (C) 2008-2012 B2CK SPRL. +Copyright (C) 2008-2013 B2CK SPRL. Copyright (C) 2008-2011 Udo Spallek. Copyright (C) 2008-2011 Korbinian Preisler. Copyright (C) 2008-2011 virtual things. From 99a1225103d43285b073e070b645af6961e68179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:25:55 +0200 Subject: [PATCH 4/9] Added tag 2.6.1 for changeset 17750b35cbaf --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 5cda76237c..f5382f9bbc 100644 --- a/.hgtags +++ b/.hgtags @@ -7,3 +7,4 @@ a4c1a5aed213b4c963534898d43f1cb378bc9db2 1.8.0 750217c386441e30d3b350de35c5d431239430ab 2.2.0 d87fcca036bdde2968bc8b5491d75fc8688c89c6 2.4.0 66972fdeac976f64470c30ba4098247a969123d3 2.6.0 +17750b35cbafa24c71578fc67fda88cd902957cd 2.6.1 From 207d3a389cb9ced9fd13b48fca195102f8419da8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:26:02 +0200 Subject: [PATCH 5/9] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index bc0df45354..7570ab30d4 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.6.1 +version=2.6.2 depends: country ir From 3a55c29ca25a8d897460f96e02d52b7c93793dca Mon Sep 17 00:00:00 2001 From: Guillem Barba Date: Mon, 30 Sep 2013 17:43:17 +0200 Subject: [PATCH 6/9] Fix domain concatenation between list and tuple issue3386 review1099002 (transplanted from 9182b1b3c332d52499c1395c83b7bec5e86a2e3e) --- address.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/address.py b/address.py index 3017b89fb8..7c03f7e74c 100644 --- a/address.py +++ b/address.py @@ -101,13 +101,13 @@ class Address(ModelSQL, ModelView): @classmethod def search_rec_name(cls, name, clause): addresses = cls.search(['OR', - ('zip',) + clause[1:], - ('city',) + clause[1:], - ('name',) + clause[1:], + ('zip',) + tuple(clause[1:]), + ('city',) + tuple(clause[1:]), + ('name',) + tuple(clause[1:]), ], order=[]) if addresses: return [('id', 'in', [address.id for address in addresses])] - return [('party',) + clause[1:]] + return [('party',) + tuple(clause[1:])] @classmethod def write(cls, addresses, vals): From f838b192516c168bb396883c5204656d09186a9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 17:32:58 +0100 Subject: [PATCH 7/9] Prepare release 2.6.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index d8173eed39..bc16bcaa1a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.6.2 - 2013-12-04 +* Bug fixes (see mercurial logs for details) + Version 2.6.1 - 2013-05-02 * Bug fixes (see mercurial logs for details) From 83821edce22e18c940d9f0992219bd6443eb1f65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 17:32:59 +0100 Subject: [PATCH 8/9] Added tag 2.6.2 for changeset aad7746f3320 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index f5382f9bbc..a91fdac552 100644 --- a/.hgtags +++ b/.hgtags @@ -8,3 +8,4 @@ a4c1a5aed213b4c963534898d43f1cb378bc9db2 1.8.0 d87fcca036bdde2968bc8b5491d75fc8688c89c6 2.4.0 66972fdeac976f64470c30ba4098247a969123d3 2.6.0 17750b35cbafa24c71578fc67fda88cd902957cd 2.6.1 +aad7746f3320c0ae040e6be87c51b61e56467b88 2.6.2 From b153e383f8e65d2805b601269bcc49e970ece5e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 4 Dec 2013 17:33:11 +0100 Subject: [PATCH 9/9] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index 7570ab30d4..c8971fcc9c 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.6.2 +version=2.6.3 depends: country ir