From cd125d47f97dc108e891b55c86ba986904f34601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 7 Jul 2009 11:06:50 +0200 Subject: [PATCH 01/22] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 28382593c0..eae8670bb0 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Compañía', 'name_es_ES': 'Compañía', 'name_fr_FR': 'Compagnie', - 'version': '1.2.0', + 'version': '1.2.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 676fcf57c93110f0c8bf453978ff118e8a68356d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 27 Jul 2009 16:46:50 +0200 Subject: [PATCH 02/22] Remove version from INSTALL, it is in setup.py --- INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index f5c1f6dcc9..dbe8e52b6d 100644 --- a/INSTALL +++ b/INSTALL @@ -5,7 +5,7 @@ Prerequisites ------------- * Python 2.4 or later (http://www.python.org/) - * trytond 1.1.x (http://www.tryton.org/) + * trytond (http://www.tryton.org/) * trytond_party (http://www.tryton.org/) * trytond_currency (http://www.tryton.org/) From c41ca7d1edcef140f82d7c6673d04dd4a7456eb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Sep 2009 11:24:52 +0200 Subject: [PATCH 03/22] Add company to search domain for root user because he is skipped by ir.rule (transplanted from ec83757de74a0fbbdd3fedafd2af67f3ca4317c6) --- company.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/company.py b/company.py index 4f61e7bc9f..d60c380f48 100644 --- a/company.py +++ b/company.py @@ -194,6 +194,13 @@ class Property(ModelSQL, ModelView): res['company'] = user.company.id return res + def search(self, cursor, user, domain, offset=0, limit=None, order=None, + context=None, count=False): + if user == 0: + domain = ['AND', domain[:], ('company', '=', False)] + return super(Property, self).search(cursor, user, domain, offset=offset, + limit=limit, order=order, context=context, count=count) + Property() From a772759c02695bfa9f8efd01c504792895576679 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 2 Nov 2009 19:11:19 +0100 Subject: [PATCH 04/22] Fix company context domain when company is not in context (transplanted from 58960f08817109249eb5507cbcd5378f64046d49) --- company.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/company.py b/company.py index d60c380f48..d87d1fb9a0 100644 --- a/company.py +++ b/company.py @@ -182,7 +182,8 @@ User() class Property(ModelSQL, ModelView): _name = 'ir.property' company = fields.Many2One('company.company', 'Company', - domain="[('id', '=', context.get('company', 0))]") + domain="[('id', 'company', in context and '=' or '!=', " \ + "context.get('company', 0))]") def _set_values(self, cursor, user_id, name, model, res_id, val, field_id, context=None): @@ -207,7 +208,8 @@ Property() class Sequence(ModelSQL, ModelView): _name = 'ir.sequence' company = fields.Many2One('company.company', 'Company', - domain="[('id', '=', context.get('company', False))]") + domain="[('id', 'company' in context and '=' or '!=', " \ + "context.get('company', 0))]") def __init__(self): super(Sequence, self).__init__() From f7f1e81f8bab76bc4def3e5bf3102730593269b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Nov 2009 16:50:52 +0100 Subject: [PATCH 05/22] Prepare release 1.2.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index d28f483b7f..f6bb968017 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.2.1 - 2009-11-24 +* Bug fixes (see mercurial logs for details) + Version 1.2.0 - 2009-04-20 * Bug fixes (see mercurial logs for details) * Allow egg installation From 55d90d65f520800ccf4ec808f6bde5cef7aa27aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Nov 2009 16:50:57 +0100 Subject: [PATCH 06/22] Added tag 1.2.1 for changeset 6e5170b0670b --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 6551608b67..f1f6f2c018 100644 --- a/.hgtags +++ b/.hgtags @@ -1,2 +1,3 @@ aa89745015508bf2db729e814fe37a3b12a0558a 1.0.0 27c4b5fa4f91b62b97c5015a7773bc0abdc540a4 1.2.0 +6e5170b0670bcd0f5788f2f43187d55208126c46 1.2.1 From 902d994c48f69872777fbd8d1789846026211405 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Nov 2009 16:52:06 +0100 Subject: [PATCH 07/22] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index eae8670bb0..4ed87ce429 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Compañía', 'name_es_ES': 'Compañía', 'name_fr_FR': 'Compagnie', - 'version': '1.2.1', + 'version': '1.2.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 945f53bb0368738b24773764eabee2b3a36a658d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 4 Dec 2009 12:47:40 +0100 Subject: [PATCH 08/22] Fix typo --- company.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/company.py b/company.py index d87d1fb9a0..ebee550212 100644 --- a/company.py +++ b/company.py @@ -182,7 +182,7 @@ User() class Property(ModelSQL, ModelView): _name = 'ir.property' company = fields.Many2One('company.company', 'Company', - domain="[('id', 'company', in context and '=' or '!=', " \ + domain="[('id', 'company' in context and '=' or '!=', " \ "context.get('company', 0))]") def _set_values(self, cursor, user_id, name, model, res_id, val, field_id, From febe91c551879573cc1a000a740d97a47fb3e460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 9 Dec 2009 10:37:37 +0100 Subject: [PATCH 09/22] Prepare release 1.2.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index f6bb968017..cab50eac83 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.2.2 - 2009-12-09 +* Bug fixes (see mercurial logs for details) + Version 1.2.1 - 2009-11-24 * Bug fixes (see mercurial logs for details) From 38e8f536e461672ddfb284eba16a404705b8c75a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 9 Dec 2009 10:37:45 +0100 Subject: [PATCH 10/22] Added tag 1.2.2 for changeset 010dcd0b5367 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index f1f6f2c018..80ef29f77c 100644 --- a/.hgtags +++ b/.hgtags @@ -1,3 +1,4 @@ aa89745015508bf2db729e814fe37a3b12a0558a 1.0.0 27c4b5fa4f91b62b97c5015a7773bc0abdc540a4 1.2.0 6e5170b0670bcd0f5788f2f43187d55208126c46 1.2.1 +010dcd0b536764a4da2247b9cb1b1a685553120b 1.2.2 From 402ee1fd1990545b90821c54e67d51dfe40f1046 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 9 Dec 2009 10:58:57 +0100 Subject: [PATCH 11/22] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 4ed87ce429..32853cd6f8 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Compañía', 'name_es_ES': 'Compañía', 'name_fr_FR': 'Compagnie', - 'version': '1.2.2', + 'version': '1.2.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From d3b1c07a94cc9f8a80f966f902a63e5a50581bc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 25 Jan 2010 09:43:19 +0100 Subject: [PATCH 12/22] Update COPYRIGHT --- COPYRIGHT | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 313ec8105b..cca7db9317 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,6 +1,6 @@ -Copyright (C) 2008 Cédric Krier. -Copyright (C) 2008 Bertrand Chenal. -Copyright (C) 2008 B2CK SPRL. +Copyright (C) 2008-2010 Cédric Krier. +Copyright (C) 2008-2010 Bertrand Chenal. +Copyright (C) 2008-2010 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 089f4ec0435fbccb4c08a597b1fa5e6185feb185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 11 May 2010 19:54:39 +0200 Subject: [PATCH 13/22] Don't include .pyc from tests (transplanted from a8435f5710baf6b0903365075b1d2d8178bb9ea5) --- MANIFEST.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index c61b52dbb5..7b252be17b 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,10 +1,10 @@ include INSTALL include README include TODO -include COPYRIGHT include CHANGELOG +include COPYRIGHT include LICENSE include *.xml include *.odt include *.csv -include tests/* +include doc/* From 47edee068b45218b70c58172e60afdfdeb0964c9 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:11:49 +0100 Subject: [PATCH 14/22] Prepare release 1.2.3 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index cab50eac83..2d0e8f3d68 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.2.3 - 2010-11-02 +* Bug fixes (see mercurial logs for details) + Version 1.2.2 - 2009-12-09 * Bug fixes (see mercurial logs for details) From 351b7bf6e637e163b05a05aaf546259a6606cf12 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:11:49 +0100 Subject: [PATCH 15/22] Added tag 1.2.3 for changeset ecb1428f0d9c --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 80ef29f77c..c385dc4de7 100644 --- a/.hgtags +++ b/.hgtags @@ -2,3 +2,4 @@ aa89745015508bf2db729e814fe37a3b12a0558a 1.0.0 27c4b5fa4f91b62b97c5015a7773bc0abdc540a4 1.2.0 6e5170b0670bcd0f5788f2f43187d55208126c46 1.2.1 010dcd0b536764a4da2247b9cb1b1a685553120b 1.2.2 +ecb1428f0d9c180050ae4400a40d233ca053cc0a 1.2.3 From 5a70706d1bf887a7797254e725ff33d18eb624b0 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:11:49 +0100 Subject: [PATCH 16/22] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 32853cd6f8..9850949ef4 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Compañía', 'name_es_ES': 'Compañía', 'name_fr_FR': 'Compagnie', - 'version': '1.2.3', + 'version': '1.2.4', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 53908cd96409d19e7e87032a8871f41f03eb10e4 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 17/22] 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 ebee550212..6b8967e074 100644 --- a/company.py +++ b/company.py @@ -188,6 +188,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 9d21ee1fa66f5f19c5b8b57e185e58c2a083215f 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 18/22] 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 6b8967e074..c1206600c4 100644 --- a/company.py +++ b/company.py @@ -201,7 +201,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 84d12db5d627da86aa8b2e7eb7a03616ea2fa1cf Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 13:44:39 +0200 Subject: [PATCH 19/22] 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 d7c663f3e37101cc0c7616c6dbb3f55d4ae0a58e Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:12:22 +0200 Subject: [PATCH 20/22] Prepare release 1.2.4 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 2d0e8f3d68..02d21e753d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.2.4 - 2011-10-01 +* Bug fixes (see mercurial logs for details) + Version 1.2.3 - 2010-11-02 * Bug fixes (see mercurial logs for details) From b0af2299029c290144749ba3a9cb332d6a9db2b2 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:12:23 +0200 Subject: [PATCH 21/22] Added tag 1.2.4 for changeset 7e2fcac4fef2 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index c385dc4de7..cb4790e84d 100644 --- a/.hgtags +++ b/.hgtags @@ -3,3 +3,4 @@ aa89745015508bf2db729e814fe37a3b12a0558a 1.0.0 6e5170b0670bcd0f5788f2f43187d55208126c46 1.2.1 010dcd0b536764a4da2247b9cb1b1a685553120b 1.2.2 ecb1428f0d9c180050ae4400a40d233ca053cc0a 1.2.3 +7e2fcac4fef237c910f0555be68c7048bd230a59 1.2.4 From 6a55a50047f436b60fcfaba5e5f56ccdd04c1392 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:12:32 +0200 Subject: [PATCH 22/22] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 9850949ef4..72acd78e6d 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Compañía', 'name_es_ES': 'Compañía', 'name_fr_FR': 'Compagnie', - 'version': '1.2.4', + 'version': '1.2.5', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',