From 1160cb86872b6cdb880542860bbb7be1d9a5785d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 27 Apr 2011 23:48:36 +0200 Subject: [PATCH 01/13] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 9839f92736..7e8f2818a8 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ 'name_es_CO': 'Planeación de Proyectos', 'name_es_ES': 'Planificación de proyecto', 'name_fr_FR': 'Planification de projet', - 'version': '2.0.0', + 'version': '2.0.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 9a028e47ba77c8fdc7e06527d8a1016d591661ab 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/13] 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 03e7666485d0463bf0f499f90fa84835c94eb6fa Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:17:51 +0200 Subject: [PATCH 03/13] Prepare release 2.0.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index e632ecd21e..e9a69142eb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.0.1 - 2011-10-01 +* Bug fixes (see mercurial logs for details) + Version 2.0.0 - 2011-04-27 * Bug fixes (see mercurial logs for details) From 58162559b9bbb251307348d2f59b2948ae4b938a Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:17:52 +0200 Subject: [PATCH 04/13] Added tag 2.0.1 for changeset 089608bc536f --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index c31cd6e854..e29df8f438 100644 --- a/.hgtags +++ b/.hgtags @@ -1,3 +1,4 @@ 2f3087596765b0554b8c8f74e26cbd4bb9fe655a 1.6.0 c45ec5ccc6fde4a739c85710cbf47d4b2e540b79 1.8.0 63252c1e067021c0f3a79ad22774e63b6bdf4505 2.0.0 +089608bc536f84c0e02993f7f77a998884950c94 2.0.1 From 40e3f8fbdae69cd094b899b40e0cee70f51dcfd5 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sat, 1 Oct 2011 14:17:55 +0200 Subject: [PATCH 05/13] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 7e8f2818a8..99bd337654 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ 'name_es_CO': 'Planeación de Proyectos', 'name_es_ES': 'Planificación de proyecto', 'name_fr_FR': 'Planification de projet', - 'version': '2.0.1', + 'version': '2.0.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 9c8f5870ed38a8e75bc5ecb2bc501c01871d7ad7 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 06/13] 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 a74beeceea9cbbe6574603b400a5c53f141d8ab2 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:38:22 +0100 Subject: [PATCH 07/13] Prepare release 2.0.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index e9a69142eb..ffd446ae77 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.0.2 - 2011-12-26 +* Bug fixes (see mercurial logs for details) + Version 2.0.1 - 2011-10-01 * Bug fixes (see mercurial logs for details) From e8a05bb06fc618d9906d2657d53b6d3795d436bb Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:38:22 +0100 Subject: [PATCH 08/13] Added tag 2.0.2 for changeset 0a7016be8b6a --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index e29df8f438..11bfea65c1 100644 --- a/.hgtags +++ b/.hgtags @@ -2,3 +2,4 @@ c45ec5ccc6fde4a739c85710cbf47d4b2e540b79 1.8.0 63252c1e067021c0f3a79ad22774e63b6bdf4505 2.0.0 089608bc536f84c0e02993f7f77a998884950c94 2.0.1 +0a7016be8b6a19ab2e8ae8e168f6733c9efa9799 2.0.2 From b9668f629c70dccb087b817b93d44a19e61310f8 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:38:26 +0100 Subject: [PATCH 09/13] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 99bd337654..d4892846d0 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ 'name_es_CO': 'Planeación de Proyectos', 'name_es_ES': 'Planificación de proyecto', 'name_fr_FR': 'Planification de projet', - 'version': '2.0.2', + 'version': '2.0.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 9f33ef3421d62f1f4040d77b269ef9fedb57c6b7 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 10/13] 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 7f613add5a65410ae42c9083cb2be9a0b049b246 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 20:02:35 +0100 Subject: [PATCH 11/13] Prepare release 2.0.3 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index ffd446ae77..2fc42a2dbe 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.0.3 - 2012-11-05 +* Bug fixes (see mercurial logs for details) + Version 2.0.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 607399610b4306266a83539da32e323ac836d384 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 20:02:36 +0100 Subject: [PATCH 12/13] Added tag 2.0.3 for changeset 53c0916449bd --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 11bfea65c1..2067d27c7c 100644 --- a/.hgtags +++ b/.hgtags @@ -3,3 +3,4 @@ c45ec5ccc6fde4a739c85710cbf47d4b2e540b79 1.8.0 63252c1e067021c0f3a79ad22774e63b6bdf4505 2.0.0 089608bc536f84c0e02993f7f77a998884950c94 2.0.1 0a7016be8b6a19ab2e8ae8e168f6733c9efa9799 2.0.2 +53c0916449bd0b028d70af8664dd838099d02bcb 2.0.3 From c81eb0b83530fabf4073e02a4dc73c3fd1251b1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 20:02:50 +0100 Subject: [PATCH 13/13] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index d4892846d0..0268332da2 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -7,7 +7,7 @@ 'name_es_CO': 'Planeación de Proyectos', 'name_es_ES': 'Planificación de proyecto', 'name_fr_FR': 'Planification de projet', - 'version': '2.0.3', + 'version': '2.0.4', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',