From 713a90fdc54f1483a8f30bdd740dd4ba5cc3b400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 22 Oct 2012 22:59:42 +0200 Subject: [PATCH 01/13] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index 632593d4db..d1ae4b50b9 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.6.0 +version=2.6.1 depends: ir company From 3ce4ed9d9d4dd21e75427a0fbdfe7f32937e8637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 12 Mar 2013 10:42:24 +0100 Subject: [PATCH 02/13] Reference fields are instance now issue3058 review709003 (transplanted from 5369ef9c3addce5cdab279681918f1851dcba1a8) --- work.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/work.py b/work.py index 0708b8c8ae..d71cc4b2b9 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 From 213dbb3ceeff101384d0b99371293ab0e504808c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:28:45 +0200 Subject: [PATCH 03/13] Prepare release 2.6.1 --- CHANGELOG | 3 +++ COPYRIGHT | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 13d6b8d111..286d4b805b 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 fe93a1f47c..ff31dda375 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 From 5e2fe12c1b954a90cbae4577160a33d90866932c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:28:46 +0200 Subject: [PATCH 04/13] Added tag 2.6.1 for changeset 6b9f2c6b27fb --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 5039308124..22d0411f2d 100644 --- a/.hgtags +++ b/.hgtags @@ -4,3 +4,4 @@ c45ec5ccc6fde4a739c85710cbf47d4b2e540b79 1.8.0 a7f1fbbe39225f004b8414d4c6da362555b925e0 2.2.0 1fef9fef1462aa62cec8b96a3c2190896e52c27d 2.4.0 ff1148333f73fefead55cc6873396503510b4dfc 2.6.0 +6b9f2c6b27fb48fb2819b1292c90838c259eeb6a 2.6.1 From ca491c9a7fb74fdd421f0790af7dcb8bf1807d06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 2 May 2013 10:28:53 +0200 Subject: [PATCH 05/13] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index d1ae4b50b9..fbdb02d35a 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.6.1 +version=2.6.2 depends: ir company From f84e1dc993fa02f641d495fc2097d2a391e2db0a Mon Sep 17 00:00:00 2001 From: Albert Cervera i Areny Date: Thu, 2 May 2013 00:47:50 +0200 Subject: [PATCH 06/13] Avoid crash when back_leveling_delay is None. issue3195 review785002 (transplanted from fcd869cb3d0c35b2aa5907ef5ad4fe0202b8a8d8) --- work.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/work.py b/work.py index d71cc4b2b9..15420151e3 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 From 5fc711f114ef5ab4e6a0bfe245fd83cf504df922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 9 Jun 2013 22:48:33 +0200 Subject: [PATCH 07/13] Prepare release 2.6.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 286d4b805b..9557c1c18b 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) From 5dc5a0a3ccc434d873a19a0962e44868bfc9f910 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 9 Jun 2013 22:48:33 +0200 Subject: [PATCH 08/13] Added tag 2.6.2 for changeset 0cf66bce187d --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 22d0411f2d..e64a4bfbf9 100644 --- a/.hgtags +++ b/.hgtags @@ -5,3 +5,4 @@ a7f1fbbe39225f004b8414d4c6da362555b925e0 2.2.0 1fef9fef1462aa62cec8b96a3c2190896e52c27d 2.4.0 ff1148333f73fefead55cc6873396503510b4dfc 2.6.0 6b9f2c6b27fb48fb2819b1292c90838c259eeb6a 2.6.1 +0cf66bce187d0b8f1d2364652f990629112a0ea4 2.6.2 From 1a0767bdc58fb6897972e81e3a5c38f6e12b4386 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 9 Jun 2013 22:48:42 +0200 Subject: [PATCH 09/13] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index fbdb02d35a..06847d9766 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.6.2 +version=2.6.3 depends: ir company From 6bc33d0d3774ddfc5744e90ec885d2ae6f891572 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 7 Jun 2013 19:26:17 +0200 Subject: [PATCH 10/13] Fix wrong parent test in create_leveling issue3246 review920002 (transplanted from 7705e9587201bdb38970df1c69d6ad3e325474a8) --- work.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/work.py b/work.py index 15420151e3..cd39fc2059 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): From 27e2a4744b6d0b168ab1d77b00ec711f78856076 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 22 Jul 2013 11:51:19 +0200 Subject: [PATCH 11/13] Prepare release 2.6.3 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 9557c1c18b..650678df61 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) From 10d51c04037b3d4231caa8316aa38ef709fed2ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 22 Jul 2013 11:51:20 +0200 Subject: [PATCH 12/13] Added tag 2.6.3 for changeset 74998c74a16f --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index e64a4bfbf9..941e0b6673 100644 --- a/.hgtags +++ b/.hgtags @@ -6,3 +6,4 @@ a7f1fbbe39225f004b8414d4c6da362555b925e0 2.2.0 ff1148333f73fefead55cc6873396503510b4dfc 2.6.0 6b9f2c6b27fb48fb2819b1292c90838c259eeb6a 2.6.1 0cf66bce187d0b8f1d2364652f990629112a0ea4 2.6.2 +74998c74a16f65e6dc8a4b41e679eee7bf65dbac 2.6.3 From 00434af824a13adc5009b0a35ac2c6b50b439dda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 22 Jul 2013 11:51:42 +0200 Subject: [PATCH 13/13] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index 06847d9766..90c031741a 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=2.6.3 +version=2.6.4 depends: ir company