From 740bade659528424d2732c54af643d1272305b7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 13 May 2010 13:40:52 +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 c6cb50e1dd..01273f0be6 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Planeación de Proyectos', 'name_es_ES': 'Planificación de proyecto', 'name_fr_FR': 'Planification de projet', - 'version': '1.6.0', + 'version': '1.6.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 4b1fa64d5e5db516add559b8855b403c6a78eade Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 12 Sep 2011 12:44:46 +0200 Subject: [PATCH 02/10] Manage False value in requests Function field issue2140 (transplanted from c12347995ac236d306c66f0d44aefdd3ba663d9b) --- work.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/work.py b/work.py index 18d13a5226..4c58d38a9e 100644 --- a/work.py +++ b/work.py @@ -182,6 +182,8 @@ class Work(ModelSQL, ModelView): works = self.browse(cursor, user, ids, context=context) currents = dict((req.id, req) for work in works for req in work.requests) + if not value: + return for v in value: to_unlink = [] to_link = [] From 57e0a8603c2ed9ba50f75511ecb75b3bf67b25a5 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 13:55:27 +0200 Subject: [PATCH 03/10] Update COPYRIGHT --- COPYRIGHT | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 1ab70ffb0a..8d81a8fb63 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,6 +1,6 @@ -Copyright (C) 2009-2010 Bertrand Chenal. -Copyright (C) 2009-2010 Cédric Krier. -Copyright (C) 2009-2010 B2CK SPRL. +Copyright (C) 2009-2011 Bertrand Chenal. +Copyright (C) 2009-2011 Cédric Krier. +Copyright (C) 2009-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 ff589dc0216bada4d262de62f2c0e29d84dfd942 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:14:50 +0200 Subject: [PATCH 04/10] Prepare release 1.6.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 6761693051..c32977c198 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,2 +1,5 @@ +Version 1.6.1 - 2011-10-01 +* Bug fixes (see mercurial logs for details) + Version 1.6.0 - 2010-05-13 * Initial release From 9958cf7f3e2e5ce6c96ed83b1404c096e77361c9 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:14:50 +0200 Subject: [PATCH 05/10] Added tag 1.6.1 for changeset 729e4e4e23bb --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 6249a0c939..c26eca7fb7 100644 --- a/.hgtags +++ b/.hgtags @@ -1 +1,2 @@ 2f3087596765b0554b8c8f74e26cbd4bb9fe655a 1.6.0 +729e4e4e23bbe98eedb1218ca88b1bb2395d021c 1.6.1 From eaadebdfa0f7cae27e9154150642b6f40679163a Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:14:54 +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 01273f0be6..a07fb19628 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Planeación de Proyectos', 'name_es_ES': 'Planificación de proyecto', 'name_fr_FR': 'Planification de projet', - 'version': '1.6.1', + 'version': '1.6.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 2777b774957e0ed61d71bc4b167de283c3f45a73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 17 Oct 2012 16:30:38 +0200 Subject: [PATCH 07/10] Fix duration computation issue2827 (transplanted from 32fe04afe37c0978121f6fc22c777d45636c1fdb) --- work.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/work.py b/work.py index 4c58d38a9e..e676f7f54f 100644 --- a/work.py +++ b/work.py @@ -121,6 +121,7 @@ class Work(ModelSQL, ModelView): all_ids = list(set(all_ids)) works = self.browse(cursor, user, all_ids, context=context) + all_works = set(works) durations = {} id2work = {} @@ -139,15 +140,20 @@ class Work(ModelSQL, ModelView): durations[work.id] = work.effort / (total_allocation / 100.0) while leafs: - parents = set() for work_id in leafs: work = id2work[work_id] + all_works.remove(work) if not work.active: continue if work.parent and work.parent.id in durations: durations[work.parent.id] += durations[work_id] - parents.add(work.parent.id) - leafs = parents + next_leafs = set(w.id for w in all_works) + for work in all_works: + if not work.parent: + continue + if work.parent.id in next_leafs and work.parent in works: + next_leafs.remove(work.parent.id) + leafs = next_leafs res['duration'] = durations From 0e63424c242c7afebc9cd3cc7598e24b5f9a2873 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 20:22:46 +0100 Subject: [PATCH 08/10] Prepare release 1.6.2 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index c32977c198..efad4c5884 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.6.2 - 2012-11-05 +* Bug fixes (see mercurial logs for details) + Version 1.6.1 - 2011-10-01 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index 8d81a8fb63..259dafe4c7 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,6 +1,6 @@ Copyright (C) 2009-2011 Bertrand Chenal. -Copyright (C) 2009-2011 Cédric Krier. -Copyright (C) 2009-2011 B2CK SPRL. +Copyright (C) 2009-2012 Cédric Krier. +Copyright (C) 2009-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 82f0f23ea1283d334ed5e2094ea5bdaeb7bc0a7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 20:22:47 +0100 Subject: [PATCH 09/10] Added tag 1.6.2 for changeset 6ca25035eff1 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index c26eca7fb7..f94f941119 100644 --- a/.hgtags +++ b/.hgtags @@ -1,2 +1,3 @@ 2f3087596765b0554b8c8f74e26cbd4bb9fe655a 1.6.0 729e4e4e23bbe98eedb1218ca88b1bb2395d021c 1.6.1 +6ca25035eff188167bf56542eb64d127a229b9c0 1.6.2 From 4001222d5c335be605ea1d89dc129e33a6ef07b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 20:22:55 +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 a07fb19628..fb41151a07 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Planeación de Proyectos', 'name_es_ES': 'Planificación de proyecto', 'name_fr_FR': 'Planification de projet', - 'version': '1.6.2', + 'version': '1.6.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',