From 8c13c6a8807f2ad4c9caec93151f8e8d11173487 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 20 Oct 2009 19:42:37 +0200 Subject: [PATCH 01/16] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index fe76f56e5a..cb7f497534 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.4.0', + 'version': '1.4.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 114ae1744236b0f65159229feda258fed9bdb1b5 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 02/16] 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 096e5ef2f8..7abb4eb2d1 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 e6dd13ab39161fa425b5b5ddb355d6520188fdf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Nov 2009 16:47:28 +0100 Subject: [PATCH 03/16] Prepare release 1.4.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 7431e33c02..17937a72f8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.4.1 - 2009-11-24 +* Bug fixes (see mercurial logs for details) + Version 1.4.0 - 2009-10-19 * Bug fixes (see mercurial logs for details) * Remove monkey patch for CompanyReport From c713eac8ab1b3c0cc7a72ff912d5a9b85a5fbd49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Nov 2009 16:47:33 +0100 Subject: [PATCH 04/16] Added tag 1.4.1 for changeset 21141f380cf1 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 2afa8cf6d1..1416fe9079 100644 --- a/.hgtags +++ b/.hgtags @@ -1,3 +1,4 @@ aa89745015508bf2db729e814fe37a3b12a0558a 1.0.0 27c4b5fa4f91b62b97c5015a7773bc0abdc540a4 1.2.0 552d5ed72ea7c73e482e64d507a172073dcd7f4d 1.4.0 +21141f380cf1df0fddc1994c5d3daa7f511b99be 1.4.1 From e3f1d3cbad04ea3d080916261a642639dafd9334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Nov 2009 16:49:31 +0100 Subject: [PATCH 05/16] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index cb7f497534..d9050daf85 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.4.1', + 'version': '1.4.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 96a510d717028fdfe6ca499a553e35732c2711cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 25 Jan 2010 09:25:36 +0100 Subject: [PATCH 06/16] 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 d5156da297a86220ff3a5437a648f3194b0dc856 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 07/16] 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 601faededd845588c2d1f5b67a4e9f57fb08e958 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:12:24 +0100 Subject: [PATCH 08/16] Prepare release 1.4.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 17937a72f8..670d829ce4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.4.2 - 2010-11-02 +* Bug fixes (see mercurial logs for details) + Version 1.4.1 - 2009-11-24 * Bug fixes (see mercurial logs for details) From 121836a2d9e10368efc82854fceabbc5116535cf Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:12:25 +0100 Subject: [PATCH 09/16] Added tag 1.4.2 for changeset dd9ffbc9f15f --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 1416fe9079..447c6c47d5 100644 --- a/.hgtags +++ b/.hgtags @@ -2,3 +2,4 @@ aa89745015508bf2db729e814fe37a3b12a0558a 1.0.0 27c4b5fa4f91b62b97c5015a7773bc0abdc540a4 1.2.0 552d5ed72ea7c73e482e64d507a172073dcd7f4d 1.4.0 21141f380cf1df0fddc1994c5d3daa7f511b99be 1.4.1 +dd9ffbc9f15f7255be0a9a7f3a3ed9c01b90c00e 1.4.2 From f9ab83cf2c38fd9886f1796425187cd63f3b6b2a Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:12:27 +0100 Subject: [PATCH 10/16] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index d9050daf85..1ed1bf7294 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.4.2', + 'version': '1.4.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 8b42caa6143a1329b27f231bb1f430bdddbbfe26 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 11/16] 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 7abb4eb2d1..5c8c6eb16e 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 0492939869b2fd80ffe9f6d703af5693d329457c 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 12/16] 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 5c8c6eb16e..029d1e84fb 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 343f066b541643efeea4d5e6141316cffb732aba Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 13:45:55 +0200 Subject: [PATCH 13/16] 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 5e7a77af9288e6a9c56ec621ff72a927506ff8ae Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:13:35 +0200 Subject: [PATCH 14/16] Prepare release 1.4.3 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 670d829ce4..0a9acf6d80 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.4.3 - 2011-10-01 +* Bug fixes (see mercurial logs for details) + Version 1.4.2 - 2010-11-02 * Bug fixes (see mercurial logs for details) From 86f2d94b15f1e36748f8eb7004e943cea4ef27ec Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:13:35 +0200 Subject: [PATCH 15/16] Added tag 1.4.3 for changeset 1cc95d3da44a --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 447c6c47d5..6b32c445fe 100644 --- a/.hgtags +++ b/.hgtags @@ -3,3 +3,4 @@ aa89745015508bf2db729e814fe37a3b12a0558a 1.0.0 552d5ed72ea7c73e482e64d507a172073dcd7f4d 1.4.0 21141f380cf1df0fddc1994c5d3daa7f511b99be 1.4.1 dd9ffbc9f15f7255be0a9a7f3a3ed9c01b90c00e 1.4.2 +1cc95d3da44af204510ca674618a8e461819ad73 1.4.3 From 0fbc9a4e0bde0e3e8b928efde64850fc65b1235b Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:13:40 +0200 Subject: [PATCH 16/16] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 1ed1bf7294..9bd28fee10 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.4.3', + 'version': '1.4.4', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',