From eb8529e8623a221c4d17f8ef68d60161b2eb7d8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 11 May 2010 20:03:06 +0200 Subject: [PATCH 1/7] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 922693d9dc..fe6b695392 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Compañía', 'name_es_ES': 'Empresa', 'name_fr_FR': 'Société', - 'version': '1.6.0', + 'version': '1.6.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 36720ba74900401b045b96ac46aae6dc8301f90a 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 2/7] 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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/company.py b/company.py index 1ab1f84afe..c55dcf52ea 100644 --- a/company.py +++ b/company.py @@ -190,6 +190,10 @@ class Property(ModelSQL, ModelView): def _set_values(self, cursor, user_id, name, model, res_id, val, field_id, context=None): user_obj = self.pool.get('res.user') + if context is None: + context = {} + if user_id == 0: + user_id = context.get('user', user_id) user = user_obj.browse(cursor, user_id, user_id, context=context) res = super(Property, self)._set_values(cursor, user_id, name, model, res_id, val, field_id, context=context) From c4e3e0fc8a1d970a9af21dae2ed5e2d21f1f30ee 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 3/7] 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 c55dcf52ea..7d6ad3d282 100644 --- a/company.py +++ b/company.py @@ -203,7 +203,7 @@ class Property(ModelSQL, ModelView): def search(self, cursor, user, domain, offset=0, limit=None, order=None, context=None, count=False): - if user == 0: + if user == 0 and not 'user' in (context or {}): domain = ['AND', domain[:], ('company', '=', False)] return super(Property, self).search(cursor, user, domain, offset=offset, limit=limit, order=order, context=context, count=count) From 7df8b013c74aba357fb1798f9d26598841c3ca00 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 13:46:37 +0200 Subject: [PATCH 4/7] Update COPYRIGHT --- COPYRIGHT | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index cca7db9317..3d2324bfb3 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,6 +1,6 @@ -Copyright (C) 2008-2010 Cédric Krier. -Copyright (C) 2008-2010 Bertrand Chenal. -Copyright (C) 2008-2010 B2CK SPRL. +Copyright (C) 2008-2011 Cédric Krier. +Copyright (C) 2008-2011 Bertrand Chenal. +Copyright (C) 2008-2011 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 2c0be21f9dde58bfed098b9c7ae8f30528a19f65 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:14:39 +0200 Subject: [PATCH 5/7] Prepare release 1.6.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index d312d035ff..d26e8ca43c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.6.1 - 2011-10-01 +* Bug fixes (see mercurial logs for details) + Version 1.6.0 - 2010-05-11 * Bug fixes (see mercurial logs for details) From 60ffbd44c8871df477bee921a981abafc051e526 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:14:40 +0200 Subject: [PATCH 6/7] Added tag 1.6.1 for changeset 02848e55cec7 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 26eb633cba..ce16b58f14 100644 --- a/.hgtags +++ b/.hgtags @@ -2,3 +2,4 @@ aa89745015508bf2db729e814fe37a3b12a0558a 1.0.0 27c4b5fa4f91b62b97c5015a7773bc0abdc540a4 1.2.0 552d5ed72ea7c73e482e64d507a172073dcd7f4d 1.4.0 4c68b50339354d14f5b5bf54c3bc6b80702ee8db 1.6.0 +02848e55cec7fd949ce6a1919c0b0f7c3449219b 1.6.1 From e6f2f6384aa32555f971c376e69df5c8f347ba93 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:14:44 +0200 Subject: [PATCH 7/7] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index fe6b695392..2cf618211e 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Compañía', 'name_es_ES': 'Empresa', 'name_fr_FR': 'Société', - 'version': '1.6.1', + 'version': '1.6.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',