From 564719993b136940b868d45a5650b5a92f0baebd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 20 Oct 2009 19:49: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 96e474caf3..25346a7bf6 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.4.0', + 'version': '1.4.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From f38f2485ada03028685f2c0f0fc1dad9b692a3d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 24 Nov 2009 18:35:36 +0100 Subject: [PATCH 2/9] Added tag 1.4.0 for changeset a32068d131a6 --- .hgtags | 1 + 1 file changed, 1 insertion(+) create mode 100644 .hgtags diff --git a/.hgtags b/.hgtags new file mode 100644 index 0000000000..17868546dc --- /dev/null +++ b/.hgtags @@ -0,0 +1 @@ +a32068d131a6872da6c87812f3fda96c5ad076bb 1.4.0 From 3a0c651a80d847e67ab8db0e00165c9f6d9a61e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 25 Jan 2010 09:36:40 +0100 Subject: [PATCH 3/9] Update COPYRIGHT --- COPYRIGHT | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 2afd2a7ae6..52ffea3329 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,5 +1,6 @@ -Copyright (C) 2008 Cédric Krier. -Copyright (C) 2008 B2CK SPRL. +Copyright (C) 2008-2010 Cédric Krier. +Copyright (C) 2008-2010 Betrand Chenal. +Copyright (C) 2008-2010 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 58778995a78af735af5e0c22616cc2be82259f4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 12 May 2010 20:11:36 +0200 Subject: [PATCH 4/9] Don't include .pyc from tests (transplanted from 85f0fbf7ff4d1604811ab359f28333a866a8c3d6) --- MANIFEST.in | 1 - 1 file changed, 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index b2a140eeeb..dcb2afa6dc 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -7,5 +7,4 @@ include LICENSE include *.xml include *.odt include *.csv -include tests/* include doc/* From 6fa2877cb0a3114c1e6af207a6620e244d23f169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 1 Jul 2010 20:47:30 +0200 Subject: [PATCH 5/9] Don't hardcode True in SQL query to be backend independent (transplanted from b3049d9567504f6101db3ecbefa5623d2e086bf6) --- line.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/line.py b/line.py index 7862f3a358..79f61b46ce 100644 --- a/line.py +++ b/line.py @@ -152,7 +152,7 @@ class HoursEmployee(ModelSQL, ModelView): if context is None: context = {} clause = ' ' - args = [] + args = [True] if context.get('start_date'): clause += 'AND date >= %s ' args.append(context['start_date']) @@ -167,7 +167,7 @@ class HoursEmployee(ModelSQL, ModelView): 'employee, ' \ 'SUM(COALESCE(hours, 0)) AS hours ' \ 'FROM timesheet_line ' \ - 'WHERE True ' \ + 'WHERE %s ' \ + clause + \ 'GROUP BY employee', args) From 63f149742f40135a9bd4dd63f68042940c9e4770 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 19 Sep 2010 17:11:49 +0200 Subject: [PATCH 6/9] Fix column name in table_query for issue1676 (transplanted from 589aecaaadbd19f3833cfde26f56987fa532913e) --- line.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/line.py b/line.py index 79f61b46ce..9036068229 100644 --- a/line.py +++ b/line.py @@ -247,7 +247,8 @@ class HoursEmployeeWeekly(ModelSQL, ModelView): def table_query(self, context=None): type_name = FIELDS[self.year._type].sql_type(self.year)[0] return ('SELECT id, create_uid, create_date, write_uid, write_date, ' \ - 'CAST(year AS ' + type_name + '), week, employee, hours ' \ + 'CAST(year AS ' + type_name + ') AS year, week, ' \ + 'employee, hours ' \ 'FROM (' 'SELECT EXTRACT(WEEK FROM date) + ' \ 'EXTRACT(YEAR FROM date) * 100 + ' \ @@ -284,7 +285,8 @@ class HoursEmployeeMonthly(ModelSQL, ModelView): def table_query(self, context=None): type_name = FIELDS[self.year._type].sql_type(self.year)[0] return ('SELECT id, create_uid, create_date, write_uid, write_date, ' \ - 'CAST(year AS ' + type_name + '), month, employee, hours ' \ + 'CAST(year AS ' + type_name + ') AS year, month, ' \ + 'employee, hours ' \ 'FROM (' 'SELECT EXTRACT(MONTH FROM date) + ' \ 'EXTRACT(YEAR FROM date) * 100 + ' \ From 55cbab2be7f9c02668763ce47830b0faa4a33905 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:12:59 +0100 Subject: [PATCH 7/9] Prepare release 1.4.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 931601ea62..37cc247db7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,2 +1,5 @@ +Version 1.4.1 - 2010-11-02 +* Bug fixes (see mercurial logs for details) + Version 1.4.0 - 2009-10-19 * Initial release From 8748a3754a40508badfc0f3f3677fda5c15a7abf Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:12:59 +0100 Subject: [PATCH 8/9] Added tag 1.4.1 for changeset 829e4fac2226 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 17868546dc..646310aa62 100644 --- a/.hgtags +++ b/.hgtags @@ -1 +1,2 @@ a32068d131a6872da6c87812f3fda96c5ad076bb 1.4.0 +829e4fac222620901a7753044ba5fa328002d855 1.4.1 From 37a21ca93249905286bfef2ad076df41e35312ee Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:13: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 25346a7bf6..d489b0c670 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.4.1', + 'version': '1.4.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',