From 0b187cb005230b714f35b79f7fc18ec3fefac8ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Apr 2012 12:19:10 +0200 Subject: [PATCH 1/5] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 4b7bb86e93..5401500568 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -11,7 +11,7 @@ 'name_es_ES': 'Empresa', 'name_fr_FR': 'Société', 'name_nl_NL': 'Bedrijf', - 'version': '2.4.0', + 'version': '2.4.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 5a78e47b60fc84358ec1d6cb7bb7866a4c301f4f 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 2/5] 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 490fc7f1fc..56f0491246 100644 --- a/company.py +++ b/company.py @@ -259,11 +259,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', '=', None)] - 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 eb405ebda8e9c8f0ad5781c60fbbede1d25443c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 23 Dec 2012 16:50:51 +0100 Subject: [PATCH 3/5] Prepare release 2.4.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 656e2a12b6..617647e798 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.4.1 - 2012-12-23 +* Bug fixes (see mercurial logs for details) + Version 2.4.0 - 2012-04-23 * Bug fixes (see mercurial logs for details) * Allow to have more than one possible employee per user From f0a06522d524a7946873b390acc076227a321482 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 23 Dec 2012 16:50:52 +0100 Subject: [PATCH 4/5] Added tag 2.4.1 for changeset a504c13bcb70 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index fb5e45b04a..5d2c15fe52 100644 --- a/.hgtags +++ b/.hgtags @@ -6,3 +6,4 @@ aa89745015508bf2db729e814fe37a3b12a0558a 1.0.0 483849dc324eabf16c8e4c791cb741e687c71cf3 2.0.0 7aa07b715d5786dd42693d12f28bf4fc98d7f880 2.2.0 427063a0d8886012af119a572df82bbe774e25ca 2.4.0 +a504c13bcb704b5df936d67807ae6d8e6de3b570 2.4.1 From c04dce70f07cca8029d50316bf60ce1ee62aea8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 23 Dec 2012 16:51:00 +0100 Subject: [PATCH 5/5] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 5401500568..45789b0cf8 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -11,7 +11,7 @@ 'name_es_ES': 'Empresa', 'name_fr_FR': 'Société', 'name_nl_NL': 'Bedrijf', - 'version': '2.4.1', + 'version': '2.4.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',