From 3e273b2a29fec0929939420f38d415f21ee5066e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 2 Nov 2010 13:43:09 +0100 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 8affe959d1..550b754e5f 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Hoja de Asistencia', 'name_es_ES': 'Partes de trabajo', 'name_fr_FR': 'Feuille de présence', - 'version': '1.8.0', + 'version': '1.8.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 45e93ebf4a6156e03a101ed0605c4f521849612a 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 13f8b1cb0f..5ab81a2cd1 100644 --- a/work.py +++ b/work.py @@ -71,7 +71,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 20b3a6ed4bcff3efb5f241a761038d4da1bb2192 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 1 Sep 2012 19:19:04 +0200 Subject: [PATCH 3/9] Prepare release 1.8.1 --- CHANGELOG | 3 +++ COPYRIGHT | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 562c4d6322..e9f8a1d58d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.8.1 - 2012-09-01 +* Bug fixes (see mercurial logs for details) + Version 1.8.0 - 2010-11-01 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index cca7db9317..6593055b4c 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,6 +1,6 @@ Copyright (C) 2008-2010 Cédric Krier. Copyright (C) 2008-2010 Bertrand Chenal. -Copyright (C) 2008-2010 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 fe368c431d84a6c19dbcf35c396840717ff3a3df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 1 Sep 2012 19:19:05 +0200 Subject: [PATCH 4/9] Added tag 1.8.1 for changeset 8905c78fc04d --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index d562b781a4..71a42e3e21 100644 --- a/.hgtags +++ b/.hgtags @@ -1,3 +1,4 @@ a32068d131a6872da6c87812f3fda96c5ad076bb 1.4.0 3d405f7a2a43e41869b7f438203d3a945b1d68f9 1.6.0 65577163f1e51a0e1385155cae93eb2900866f3b 1.8.0 +8905c78fc04db32bd0e118abf1efdb5c8ee3cf64 1.8.1 From abff38620ed8719586322c3347e8528374aaa214 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 1 Sep 2012 19:19:13 +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 550b754e5f..4a43ebff6a 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Hoja de Asistencia', 'name_es_ES': 'Partes de trabajo', 'name_fr_FR': 'Feuille de présence', - 'version': '1.8.1', + 'version': '1.8.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 01a30a79df4f7aff2c07bc973c4b39718ad90e23 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 e97b6edd8b..a1697f4ad1 100644 --- a/line.py +++ b/line.py @@ -17,7 +17,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 e4160653418d7cc20e3070ec102309e7cb5f89f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 20:17:13 +0100 Subject: [PATCH 7/9] Prepare release 1.8.2 --- CHANGELOG | 3 +++ COPYRIGHT | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index e9f8a1d58d..a234235cd2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.8.2 - 2012-11-05 +* Bug fixes (see mercurial logs for details) + Version 1.8.1 - 2012-09-01 * Bug fixes (see mercurial logs for details) diff --git a/COPYRIGHT b/COPYRIGHT index 6593055b4c..e3a3754ad8 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,4 +1,4 @@ -Copyright (C) 2008-2010 Cédric Krier. +Copyright (C) 2008-2012 Cédric Krier. Copyright (C) 2008-2010 Bertrand Chenal. Copyright (C) 2008-2012 B2CK SPRL. From 231ed6c5e20afd1077ea6b7a91fdc6139c0ad127 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 20:17:14 +0100 Subject: [PATCH 8/9] Added tag 1.8.2 for changeset dc497ed3a0ef --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 71a42e3e21..5ee2fec7f9 100644 --- a/.hgtags +++ b/.hgtags @@ -2,3 +2,4 @@ a32068d131a6872da6c87812f3fda96c5ad076bb 1.4.0 3d405f7a2a43e41869b7f438203d3a945b1d68f9 1.6.0 65577163f1e51a0e1385155cae93eb2900866f3b 1.8.0 8905c78fc04db32bd0e118abf1efdb5c8ee3cf64 1.8.1 +dc497ed3a0ef042f735ddc5a155754d538d77d5e 1.8.2 From 4b602d9e39fcb89cb55f0f435c9cd2046641e721 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 5 Nov 2012 20:17:23 +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 4a43ebff6a..f3a79656d2 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Hoja de Asistencia', 'name_es_ES': 'Partes de trabajo', 'name_fr_FR': 'Feuille de présence', - 'version': '1.8.2', + 'version': '1.8.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',