[tryton-debian-vcs] tryton-modules-project-plan branch upstream-2.6 created. c406dae9cae4973fcd68819ca120242ce49f9f1d
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:07:04 UTC 2013
The following commit has been merged in the upstream-2.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-project-plan.git;a=commitdiff;h=c406dae9cae4973fcd68819ca120242ce49f9f1d
commit c406dae9cae4973fcd68819ca120242ce49f9f1d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Aug 7 16:41:54 2013 +0200
Adding upstream version 2.6.3.
diff --git a/CHANGELOG b/CHANGELOG
index 9557c1c..650678d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.3 - 2013-07-22
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.2 - 2013-06-09
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 1648725..e606a68 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_project_plan
-Version: 2.6.2
+Version: 2.6.3
Summary: Tryton module to add planning capabilities on projects
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton.cfg b/tryton.cfg
index fbdb02d..06847d9 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.2
+version=2.6.3
depends:
ir
company
diff --git a/trytond_project_plan.egg-info/PKG-INFO b/trytond_project_plan.egg-info/PKG-INFO
index 637252f..5512798 100644
--- a/trytond_project_plan.egg-info/PKG-INFO
+++ b/trytond_project_plan.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-project-plan
-Version: 2.6.2
+Version: 2.6.3
Summary: Tryton module to add planning capabilities on projects
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/work.py b/work.py
index 1542015..cd39fc2 100644
--- a/work.py
+++ b/work.py
@@ -596,9 +596,8 @@ class Work:
yield sibling, delay
- parent = self.parent and self.parent.id or None
siblings = self.search([
- ('parent', '=', parent.id)
+ ('parent', '=', self.parent.id if self.parent else None)
])
refkey = get_key(self)
@@ -615,8 +614,8 @@ class Work:
'back_leveling_delay': delay,
})
- if parent:
- parent.compute_dates()
+ if self.parent:
+ self.parent.compute_dates()
@classmethod
def write(cls, works, values):
commit c12861fc975dddc9801c9c41081709a2f547277f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Jun 10 18:12:35 2013 +0200
Adding upstream version 2.6.2.
diff --git a/CHANGELOG b/CHANGELOG
index 286d4b8..9557c1c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.2 - 2013-06-09
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.1 - 2013-05-02
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 2ad35de..1648725 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_project_plan
-Version: 2.6.1
+Version: 2.6.2
Summary: Tryton module to add planning capabilities on projects
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton.cfg b/tryton.cfg
index d1ae4b5..fbdb02d 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.1
+version=2.6.2
depends:
ir
company
diff --git a/trytond_project_plan.egg-info/PKG-INFO b/trytond_project_plan.egg-info/PKG-INFO
index b72839a..637252f 100644
--- a/trytond_project_plan.egg-info/PKG-INFO
+++ b/trytond_project_plan.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-project-plan
-Version: 2.6.1
+Version: 2.6.2
Summary: Tryton module to add planning capabilities on projects
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/work.py b/work.py
index d71cc4b..1542015 100644
--- a/work.py
+++ b/work.py
@@ -484,7 +484,7 @@ class Work:
if constraint_finish:
late_finish = self.add_hours(work.company, constraint_finish,
- -work.back_leveling_delay)
+ -(work.back_leveling_delay or 0.0))
else:
late_finish = None
commit a263e63af7c8dedb6ba831c5022018b50254dd8e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat May 4 01:57:05 2013 +0200
Adding upstream version 2.6.1.
diff --git a/CHANGELOG b/CHANGELOG
index 13d6b8d..286d4b8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.1 - 2013-05-02
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.0 - 2012-10-22
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index fe93a1f..ff31dda 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
Copyright (C) 2009-2012 Bertrand Chenal.
-Copyright (C) 2009-2012 Cédric Krier.
-Copyright (C) 2009-2012 B2CK SPRL.
+Copyright (C) 2009-2013 Cédric Krier.
+Copyright (C) 2009-2013 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
diff --git a/PKG-INFO b/PKG-INFO
index 598237f..2ad35de 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_project_plan
-Version: 2.6.0
+Version: 2.6.1
Summary: Tryton module to add planning capabilities on projects
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton.cfg b/tryton.cfg
index 632593d..d1ae4b5 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.0
+version=2.6.1
depends:
ir
company
diff --git a/trytond_project_plan.egg-info/PKG-INFO b/trytond_project_plan.egg-info/PKG-INFO
index 56b1b75..b72839a 100644
--- a/trytond_project_plan.egg-info/PKG-INFO
+++ b/trytond_project_plan.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-project-plan
-Version: 2.6.0
+Version: 2.6.1
Summary: Tryton module to add planning capabilities on projects
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/work.py b/work.py
index 0708b8c..d71cc4b 100644
--- a/work.py
+++ b/work.py
@@ -110,8 +110,8 @@ class Work:
),
])
for req_ref in req_refs:
- _, work_id = req_ref.reference.split(',')
- requests[int(work_id)].append(req_ref.request.id)
+ work_id = req_ref.reference.id
+ requests[work_id].append(req_ref.request.id)
res['requests'] = requests
--
tryton-modules-project-plan
More information about the tryton-debian-vcs
mailing list