From fc3c469b3ae2ba5202460abb9ebcad095e9ca9ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 2 Nov 2010 13:43:01 +0100 Subject: [PATCH 01/14] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index f6eed5aa13..4a6fa51de7 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.8.0', + 'version': '1.8.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 4aba46158e7db47cb4e5f558b988e8502550593a 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/14] 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 c0f8b8e5ed..918129162c 100644 --- a/work.py +++ b/work.py @@ -178,6 +178,8 @@ class Work(ModelSQL, ModelView): works = self.browse(ids) 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 bc74ab0d561bc76e3f265416f1e0555e3a55393e Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 13:55:57 +0200 Subject: [PATCH 03/14] 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 80eb532e1671e03665d684d89cae20bda6b3de45 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:16:21 +0200 Subject: [PATCH 04/14] Prepare release 1.8.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index f1fa2df9a9..8f5fd6a0b0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.8.1 - 2011-10-01 +* Bug fixes (see mercurial logs for details) + Version 1.8.0 - 2010-11-01 * Bug fixes (see mercurial logs for details) From c7ac554d6a3ef3202a848bbf3b38faba0091218d Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:16:22 +0200 Subject: [PATCH 05/14] Added tag 1.8.1 for changeset 59bbb0167b3e --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 796ddf8f3a..621f528d8f 100644 --- a/.hgtags +++ b/.hgtags @@ -1,2 +1,3 @@ 2f3087596765b0554b8c8f74e26cbd4bb9fe655a 1.6.0 c45ec5ccc6fde4a739c85710cbf47d4b2e540b79 1.8.0 +59bbb0167b3e7a67313fd495682a66e1c792ee3d 1.8.1 From 242927b171bcb26742aba3715893e54ab357cca0 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:16:26 +0200 Subject: [PATCH 06/14] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 4a6fa51de7..edba0f6403 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.8.1', + 'version': '1.8.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From bf0eac77edc8df0c8ef8a88a105446a372adf956 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 28 Sep 2011 13:17:03 +0200 Subject: [PATCH 07/14] Add missing operators to requests issue2139 review102003 (transplanted from 0c2208b446fa0366300ca37fc523bf6ca0889ffd) --- work.py | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/work.py b/work.py index 918129162c..b6fb823e54 100644 --- a/work.py +++ b/work.py @@ -186,20 +186,34 @@ class Work(ModelSQL, ModelView): operator = v[0] target_ids = len(v) > 1 and v[1] or [] - if operator == 'set': + if operator == 'create': + to_link.append(request_obj.create(v[1])) + elif operator == 'write': + request_obj.write(v[1], v[2]) + elif operator == 'delete': + request_obj.delete(v[1]) + elif operator == 'delete_all': + target_ids = [] + for record_id in ids: + ref_ids = req_ref_obj.search([ + ('reference', '=', + 'project.work,%s' % record_id), + ]) + refs = req_ref_obj.browse(ref_ids) + target_ids.extend(ref.request.id for ref in refs) + request_obj.delete(target_ids) + elif operator == 'unlink': + to_unlink.extend((i for i in target_ids if i in currents)) + elif operator == 'add': + to_link.extend((i for i in target_ids if i not in + currents)) + elif operator == 'unlink_all': + to_unlink.extend(currents) + elif operator == 'set': to_link.extend((i for i in target_ids if i not in currents)) to_unlink.extend((i for i in currents if i not in target_ids)) - elif operator == 'add': - to_link.extend((i for i in target_ids if i not in - currents)) - elif operator == 'unlink': - to_unlink.extend((i for i in target_ids if i in currents)) - elif operator == 'unlink_all': - to_unlink.extend(currents) - elif operator == 'delete': - request_obj.delete(to_delete) else: raise Exception('Operation not supported') From 8bde2d28cdf43be6671bbe7046609bef7215e829 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:36:36 +0100 Subject: [PATCH 08/14] Prepare release 1.8.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 8f5fd6a0b0..7c58cb4bc9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.8.2 - 2011-12-26 +* Bug fixes (see mercurial logs for details) + Version 1.8.1 - 2011-10-01 * Bug fixes (see mercurial logs for details) From 3612ba2404693f4a09f61152a5019a67d25c0647 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:36:36 +0100 Subject: [PATCH 09/14] Added tag 1.8.2 for changeset 46c369a2679e --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 621f528d8f..36a5b247b7 100644 --- a/.hgtags +++ b/.hgtags @@ -1,3 +1,4 @@ 2f3087596765b0554b8c8f74e26cbd4bb9fe655a 1.6.0 c45ec5ccc6fde4a739c85710cbf47d4b2e540b79 1.8.0 59bbb0167b3e7a67313fd495682a66e1c792ee3d 1.8.1 +46c369a2679e52b4295b8c756ab2a4486590c44e 1.8.2 From 0f7b413777d2ab3b91bfea1d739aaa661170ced0 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:36:40 +0100 Subject: [PATCH 10/14] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index edba0f6403..446d619111 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.8.2', + 'version': '1.8.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 254c345666c7f6554a1dbc62a7dcb2f2e24b2f46 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 11/14] 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 b6fb823e54..c363d00db0 100644 --- a/work.py +++ b/work.py @@ -118,6 +118,7 @@ class Work(ModelSQL, ModelView): all_ids = list(set(all_ids)) works = self.browse(all_ids) + all_works = set(works) durations = {} id2work = {} @@ -136,15 +137,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 2d4dc44edfd982cebb9fe923202ac702847be030 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 20:12:17 +0100 Subject: [PATCH 12/14] Prepare release 1.8.3 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 7c58cb4bc9..4d1cfc8144 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.8.3 - 2012-11-05 +* Bug fixes (see mercurial logs for details) + Version 1.8.2 - 2011-12-26 * 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 2bdcb27975719ecdb0770cae1a6409442e37ea2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 20:12:18 +0100 Subject: [PATCH 13/14] Added tag 1.8.3 for changeset 38de378a7b41 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 36a5b247b7..9342eb2c2e 100644 --- a/.hgtags +++ b/.hgtags @@ -2,3 +2,4 @@ c45ec5ccc6fde4a739c85710cbf47d4b2e540b79 1.8.0 59bbb0167b3e7a67313fd495682a66e1c792ee3d 1.8.1 46c369a2679e52b4295b8c756ab2a4486590c44e 1.8.2 +38de378a7b412769df48424855cf5d25409ea673 1.8.3 From 22589713f552e49751e5e67cb413e81048f17508 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 20:12:31 +0100 Subject: [PATCH 14/14] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 446d619111..1aa560e679 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.8.3', + 'version': '1.8.4', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',