[tryton-debian-vcs] tryton-modules-project branch upstream-2.2 created. cb4dcff3f95d5764a9b075bfacee17ebf8bb2588

[Mathias Behrle]

The following commit has been merged in the upstream-2.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-project.git;a=commitdiff;h=cb4dcff3f95d5764a9b075bfacee17ebf8bb2588
commit cb4dcff3f95d5764a9b075bfacee17ebf8bb2588
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Feb 24 19:39:48 2013 +0100

    Adding upstream version 2.2.1.

diff --git a/CHANGELOG b/CHANGELOG
index db70548..b4966ed 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.1 - 2012-11-05
+* Bug fixes (see mercurial logs for details)
+
 Version 2.2.0 - 2011-10-24
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 2ff157b..b1d44e3 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2008-2011 Cédric Krier.
-Copyright (C) 2008-2011 B2CK SPRL.
+Copyright (C) 2008-2012 Cédric Krier.
+Copyright (C) 2008-2012 B2CK SPRL.
 Copyright (C) 2009-2011 Bertrand Chenal.
 
 This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index 3361dcb..43900c9 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond_project
-Version: 2.2.0
+Version: 2.2.1
 Summary: Project Module with:
     - Project management
 
diff --git a/__tryton__.py b/__tryton__.py
index 0664ecc..1d944e5 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
     'name_es_CO': 'Proyectos',
     'name_es_ES': 'Proyecto',
     'name_fr_FR': 'Projet',
-    'version': '2.2.0',
+    'version': '2.2.1',
     'author': 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
diff --git a/trytond_project.egg-info/PKG-INFO b/trytond_project.egg-info/PKG-INFO
index 412d685..5c18076 100644
--- a/trytond_project.egg-info/PKG-INFO
+++ b/trytond_project.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond-project
-Version: 2.2.0
+Version: 2.2.1
 Summary: Project Module with:
     - Project management
 
diff --git a/work.py b/work.py
index bfa4650..d8185fd 100644
--- a/work.py
+++ b/work.py
@@ -222,15 +222,20 @@ class Work(ModelSQL, ModelView):
                 leafs.add(work.id)
 
         while leafs:
-            parents = set()
             for work_id in leafs:
                 work = id2work[work_id]
+                works.remove(work)
                 if not work.active:
                     continue
                 if work.parent and work.parent.id in res:
                     res[work.parent.id] += res[work_id]
-                    parents.add(work.parent.id)
-            leafs = parents
+            next_leafs = set((w.id for w in works))
+            for work in 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
 
         return res
 
-- 
tryton-modules-project