From ce791a95efb160eecbe67cca6733d5d8319b521c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 24 Oct 2011 19:39:11 +0200 Subject: [PATCH 1/9] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 17511d5d63..10fabc3739 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -9,7 +9,7 @@ 'name_es_ES': 'Empresa', 'name_fr_FR': 'Société', 'name_nl_NL': 'Bedrijf', - 'version': '2.2.0', + 'version': '2.2.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From b27b411978cc2ace2aa57a590019ce7fdecc2c05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 28 Nov 2011 14:45:13 +0100 Subject: [PATCH 2/9] Fix Transaction.start to use keyword argument for context (transplanted from 10446f23d82c43ad582c16d13b5a5d61668e9807) --- tests/test_company.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/test_company.py b/tests/test_company.py index 946a176edd..d7041a348d 100644 --- a/tests/test_company.py +++ b/tests/test_company.py @@ -42,7 +42,8 @@ class CompanyTestCase(unittest.TestCase): ''' Create company. ''' - with Transaction().start(DB_NAME, USER, CONTEXT) as transaction: + with Transaction().start(DB_NAME, USER, + context=CONTEXT) as transaction: currency1_id = self.currency.search([ ('code', '=', 'cu1'), ], 0, 1, None)[0] @@ -58,7 +59,7 @@ class CompanyTestCase(unittest.TestCase): ''' Test company recursion. ''' - with Transaction().start(DB_NAME, USER, CONTEXT) as transaction: + with Transaction().start(DB_NAME, USER, context=CONTEXT): currency1_id = self.currency.search([ ('code', '=', 'cu1'), ], 0, 1, None)[0] @@ -83,7 +84,8 @@ class CompanyTestCase(unittest.TestCase): ''' Create employee. ''' - with Transaction().start(DB_NAME, USER, CONTEXT) as transaction: + with Transaction().start(DB_NAME, USER, + context=CONTEXT) as transaction: company1_id = self.company.search([ ('name', '=', 'B2CK'), ], 0, 1, None)[0] @@ -98,7 +100,8 @@ class CompanyTestCase(unittest.TestCase): ''' Test user company ''' - with Transaction().start(DB_NAME, USER, CONTEXT) as transaction: + with Transaction().start(DB_NAME, USER, + context=CONTEXT) as transaction: currency1_id = self.currency.search([ ('code', '=', 'cu1'), ], 0, 1, None)[0] From 30b1e1d6cd583326151610030dd1de73a6205817 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:40:16 +0100 Subject: [PATCH 3/9] Prepare release 2.2.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 45c5081be8..f9fcbce96b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.2.1 - 2011-12-26 +* Bug fixes (see mercurial logs for details) + Version 2.2.0 - 2011-10-24 * Bug fixes (see mercurial logs for details) * Add currency name in status bar From 0d309c0b8e18de38c354cf1a089d6ddf20d549e5 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:40:16 +0100 Subject: [PATCH 4/9] Added tag 2.2.1 for changeset b44a176814ff --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 833a69270d..1c871e057f 100644 --- a/.hgtags +++ b/.hgtags @@ -5,3 +5,4 @@ aa89745015508bf2db729e814fe37a3b12a0558a 1.0.0 27fc9297d4a365346542a1ff43b31730ddcd8ece 1.8.0 483849dc324eabf16c8e4c791cb741e687c71cf3 2.0.0 7aa07b715d5786dd42693d12f28bf4fc98d7f880 2.2.0 +b44a176814ffc81be91e7d0811bd4bbebc0e2979 2.2.1 From c67c68d75173a49e0f0788a9d1929e3e674ac3da Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:40:25 +0100 Subject: [PATCH 5/9] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 10fabc3739..4f592d2ecb 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -9,7 +9,7 @@ 'name_es_ES': 'Empresa', 'name_fr_FR': 'Société', 'name_nl_NL': 'Bedrijf', - 'version': '2.2.1', + 'version': '2.2.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From dba4d1d42138d9a68d63b1987b23f8deaee95436 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 23 Nov 2012 13:12:51 +0100 Subject: [PATCH 6/9] Missing query_string in search parameter of Property (transplanted from d6ce3cafb140e4abd4ce3b39a8cf4a7a43593f73) --- company.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/company.py b/company.py index 6e15d19278..1102651563 100644 --- a/company.py +++ b/company.py @@ -225,11 +225,12 @@ class Property(ModelSQL, ModelView): res['company'] = user.company.id return res - def search(self, domain, offset=0, limit=None, order=None, count=False): + def search(self, domain, offset=0, limit=None, order=None, count=False, + query_string=False): if Transaction().user == 0 and not 'user' in Transaction().context: domain = ['AND', domain[:], ('company', '=', False)] - return super(Property, self).search(domain, offset=offset, - limit=limit, order=order, count=count) + return super(Property, self).search(domain, offset=offset, limit=limit, + order=order, count=count, query_string=query_string) Property() From 7198cb56e322fef32ebc1ec891cc082f636c46e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 23 Dec 2012 16:58:24 +0100 Subject: [PATCH 7/9] Prepare release 2.2.2 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index f9fcbce96b..d6e6ac2c7d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.2.2 - 2012-12-23 +* Bug fixes (see mercurial logs for details) + Version 2.2.1 - 2011-12-26 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index 3d2324bfb3..26f578f363 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,6 +1,6 @@ -Copyright (C) 2008-2011 Cédric Krier. +Copyright (C) 2008-2012 Cédric Krier. Copyright (C) 2008-2011 Bertrand Chenal. -Copyright (C) 2008-2011 B2CK SPRL. +Copyright (C) 2008-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 c6432be11982f7bd77420349f3f56d6706b3de10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 23 Dec 2012 16:58:25 +0100 Subject: [PATCH 8/9] Added tag 2.2.2 for changeset a68575cfc3ef --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 1c871e057f..de232a7c23 100644 --- a/.hgtags +++ b/.hgtags @@ -6,3 +6,4 @@ aa89745015508bf2db729e814fe37a3b12a0558a 1.0.0 483849dc324eabf16c8e4c791cb741e687c71cf3 2.0.0 7aa07b715d5786dd42693d12f28bf4fc98d7f880 2.2.0 b44a176814ffc81be91e7d0811bd4bbebc0e2979 2.2.1 +a68575cfc3efd4b11c7c6054bad0c470e6243649 2.2.2 From 07fa7be83ae87b83d78acf9ff86aa84b232e1432 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 23 Dec 2012 16:58:36 +0100 Subject: [PATCH 9/9] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 4f592d2ecb..7688578f66 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -9,7 +9,7 @@ 'name_es_ES': 'Empresa', 'name_fr_FR': 'Société', 'name_nl_NL': 'Bedrijf', - 'version': '2.2.2', + 'version': '2.2.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',