From b04ceae8e8aa733d7c103135d7f67b5f50d22b3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 25 Oct 2011 11:32:58 +0200 Subject: [PATCH 1/9] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 35fe4070b2..38a08a47e7 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -8,7 +8,7 @@ 'name_es_ES': 'Partes de trabajo', 'name_fr_FR': 'Feuille de présence', 'name_nl_NL': 'Tijdregistratie', - 'version': '2.2.0', + 'version': '2.2.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From f3262cb3a3352773531100a458d436dd2d1b941e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20=C3=89vrard?= Date: Tue, 15 May 2012 10:31:09 +0200 Subject: [PATCH 2/9] Do not compute twice the children timesheets review355001 (transplanted from 973bf618edb04399e9c86ba07054b455c7adb79f) --- work.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/work.py b/work.py index 4e32e2a742..2671816106 100644 --- a/work.py +++ b/work.py @@ -80,7 +80,7 @@ class Work(ModelSQL, ModelView): ('parent', 'child_of', ids), ]) # force inactive ids to be in all_ids - all_ids = all_ids + ids + all_ids = list(set(all_ids + ids)) clause = "SELECT work, sum(hours) FROM timesheet_line "\ "WHERE work IN (%s) "\ % ",".join(('%s',) * len(all_ids)) From e32a3d8247f7f231dff875fd225113e589ca3a6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 1 Sep 2012 19:17:40 +0200 Subject: [PATCH 3/9] Prepare release 2.2.1 --- CHANGELOG | 3 +++ COPYRIGHT | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index e519b5a0ec..331ee8885c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.2.1 - 2012-09-01 +* Bug fixes (see mercurial logs for details) + Version 2.2.0 - 2011-10-25 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index 3d2324bfb3..f654cd75bb 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,6 +1,6 @@ Copyright (C) 2008-2011 Cédric Krier. Copyright (C) 2008-2011 Bertrand Chenal. -Copyright (C) 2008-2011 B2CK SPRL. +Copyright (C) 2008-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 d947ec8e7b675decd4668c1fe3f0d8aadf8f7dc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 1 Sep 2012 19:17:41 +0200 Subject: [PATCH 4/9] Added tag 2.2.1 for changeset 58e1dc32837a --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 199e8edc54..8773fd9400 100644 --- a/.hgtags +++ b/.hgtags @@ -3,3 +3,4 @@ a32068d131a6872da6c87812f3fda96c5ad076bb 1.4.0 65577163f1e51a0e1385155cae93eb2900866f3b 1.8.0 24d03108a830bc2b71924432ebcb32dfd6f5b2e0 2.0.0 1d020661487e0ddc14d2825aa66ec6772e66010c 2.2.0 +58e1dc32837aab3a9da69ca7298b47222be185bb 2.2.1 From 6190ced9d827b35d25bfd619416e314053afdb86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 1 Sep 2012 19:17:49 +0200 Subject: [PATCH 5/9] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 38a08a47e7..ea76f6b2b0 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -8,7 +8,7 @@ 'name_es_ES': 'Partes de trabajo', 'name_fr_FR': 'Feuille de présence', 'name_nl_NL': 'Tijdregistratie', - 'version': '2.2.1', + 'version': '2.2.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 87367761e85402542467d5c95aaaefae7595565d Mon Sep 17 00:00:00 2001 From: Robin Baumgartner Date: Tue, 11 Sep 2012 10:11:11 +0200 Subject: [PATCH 6/9] Fix wrong domain on timesheet.line work issue2774 review514002 (transplanted from c5fa12b43c498571cce76c65f19642e37613425a) --- line.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/line.py b/line.py index b3107dc91a..d8dcd1a67a 100644 --- a/line.py +++ b/line.py @@ -19,7 +19,7 @@ class Line(ModelSQL, ModelView): hours = fields.Float('Hours', digits=(16, 2), required=True) work = fields.Many2One('timesheet.work', 'Work', required=True, select=1, domain=[ - ('timesheet_available', '=', 'True'), + ('timesheet_available', '=', True), ]) description = fields.Char('Description') From 6a5c8ec30661f2ea5d674a46b63b390f069d1cb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 23 Dec 2012 16:58:52 +0100 Subject: [PATCH 7/9] Prepare release 2.2.2 --- CHANGELOG | 3 +++ COPYRIGHT | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 331ee8885c..27c57db497 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 2.2.2 - 2012-12-23 +* Bug fixes (see mercurial logs for details) + Version 2.2.1 - 2012-09-01 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index f654cd75bb..26f578f363 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,4 +1,4 @@ -Copyright (C) 2008-2011 Cédric Krier. +Copyright (C) 2008-2012 Cédric Krier. Copyright (C) 2008-2011 Bertrand Chenal. Copyright (C) 2008-2012 B2CK SPRL. From 84f5fce49eb79267a1cd183f266fd0b7024869ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 23 Dec 2012 16:58:53 +0100 Subject: [PATCH 8/9] Added tag 2.2.2 for changeset 02e1b864de25 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 8773fd9400..8cc1a86bb8 100644 --- a/.hgtags +++ b/.hgtags @@ -4,3 +4,4 @@ a32068d131a6872da6c87812f3fda96c5ad076bb 1.4.0 24d03108a830bc2b71924432ebcb32dfd6f5b2e0 2.0.0 1d020661487e0ddc14d2825aa66ec6772e66010c 2.2.0 58e1dc32837aab3a9da69ca7298b47222be185bb 2.2.1 +02e1b864de257ce10e17ab96792fe31558acf3e2 2.2.2 From de689761a790be9fa07f5eb44bd86e9ee6dcfd0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 23 Dec 2012 16:59:00 +0100 Subject: [PATCH 9/9] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index ea76f6b2b0..3e11fdb98b 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -8,7 +8,7 @@ 'name_es_ES': 'Partes de trabajo', 'name_fr_FR': 'Feuille de présence', 'name_nl_NL': 'Tijdregistratie', - 'version': '2.2.2', + 'version': '2.2.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',