From bf059e4aec30ff6a955c13cf53e887f4788b8a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 27 Apr 2011 23:48:15 +0200 Subject: [PATCH 01/10] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 619703ba4d..327eec9fa0 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.0.0', + 'version': '2.0.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 60317f44db5d568b3a8551e9ad2cccb736cad7a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 23 Jun 2011 16:47:21 +0200 Subject: [PATCH 02/10] Fix multi-company of Property when using root If user is root, we must use the user in context issue2054 review41006 (transplanted from 7147b97254308bb63d8d0ac75bbd98c64e509830) --- company.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/company.py b/company.py index adbeb6a0f9..162fee55ef 100644 --- a/company.py +++ b/company.py @@ -180,7 +180,10 @@ class Property(ModelSQL, ModelView): def _set_values(self, name, model, res_id, val, field_id): user_obj = self.pool.get('res.user') - user = user_obj.browse(Transaction().user) + user_id = Transaction().user + if user_id == 0: + user_id = Transaction().context.get('user', user_id) + user = user_obj.browse(user_id) res = super(Property, self)._set_values(name, model, res_id, val, field_id) if user: From 4d4169dc6fb827454c28d8d07cd439ffaec42e78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 20 Jul 2011 22:48:52 +0200 Subject: [PATCH 03/10] Property should work also with user in context (transplanted from ac92e421971e4ea19157fd3a900ce701a2f4df0d) --- company.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/company.py b/company.py index 162fee55ef..283e1ef407 100644 --- a/company.py +++ b/company.py @@ -191,7 +191,7 @@ class Property(ModelSQL, ModelView): return res def search(self, domain, offset=0, limit=None, order=None, count=False): - if Transaction().user == 0: + 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) From ee5a8f4fc28c5c757f654dee709ff67a4f6dd42d Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:17:40 +0200 Subject: [PATCH 04/10] Prepare release 2.0.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 1dbcd35a41..d37358994e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.0.1 - 2011-10-01 +* Bug fixes (see mercurial logs for details) + Version 2.0.0 - 2011-04-27 * Bug fixes (see mercurial logs for details) From 95182efc6f1d037a89963f7e2df60109a9560b02 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:17:40 +0200 Subject: [PATCH 05/10] Added tag 2.0.1 for changeset 6dd4d8f14ce0 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 0aa9751c50..34aee7b66a 100644 --- a/.hgtags +++ b/.hgtags @@ -4,3 +4,4 @@ aa89745015508bf2db729e814fe37a3b12a0558a 1.0.0 4c68b50339354d14f5b5bf54c3bc6b80702ee8db 1.6.0 27fc9297d4a365346542a1ff43b31730ddcd8ece 1.8.0 483849dc324eabf16c8e4c791cb741e687c71cf3 2.0.0 +6dd4d8f14ce0551d86f55905b563078d76eebd00 2.0.1 From 6cb113c62f7f8cb59ed75ddda09d910ac8e1caad Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:17:45 +0200 Subject: [PATCH 06/10] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 327eec9fa0..a7b27c2dc2 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.0.1', + 'version': '2.0.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 107eadbca4d3161a5cc49292cfe0977c18ea5c91 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 07/10] 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 283e1ef407..b5a68a6b92 100644 --- a/company.py +++ b/company.py @@ -190,11 +190,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 3cdff500aa59a36c31f2b4f9841aafbd18ed02b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 23 Dec 2012 17:02:37 +0100 Subject: [PATCH 08/10] Prepare release 2.0.2 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index d37358994e..c4ddaa3c83 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.0.2 - 2012-12-23 +* Bug fixes (see mercurial logs for details) + Version 2.0.1 - 2011-10-01 * 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 1b6a28a5b8f36598fa04e56eedb58eb63c6c01bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 23 Dec 2012 17:02:38 +0100 Subject: [PATCH 09/10] Added tag 2.0.2 for changeset 61cd94086281 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 34aee7b66a..3239463a99 100644 --- a/.hgtags +++ b/.hgtags @@ -5,3 +5,4 @@ aa89745015508bf2db729e814fe37a3b12a0558a 1.0.0 27fc9297d4a365346542a1ff43b31730ddcd8ece 1.8.0 483849dc324eabf16c8e4c791cb741e687c71cf3 2.0.0 6dd4d8f14ce0551d86f55905b563078d76eebd00 2.0.1 +61cd94086281e502328bfa077d0f02a1fc7d8037 2.0.2 From 4bef2338673b534b9064c34070fb158a66132692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 23 Dec 2012 17:02:45 +0100 Subject: [PATCH 10/10] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index a7b27c2dc2..c9a54c2c30 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.0.2', + 'version': '2.0.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',