Package: release.debian.org Severity: normal User: release.debian.org@packages.debian.org Usertags: unblock Dear release managers, please approve the upload of tryton-modules-timesheet_2.2.2-1. The new version contains the upstream bug fix release [1]. The fixes are for * Do not compute twice the children timesheets Mathias [1] http://news.tryton.org/2012/09/maintenance-releases-for-supported.html debdiff attached unblock: tryton-modules-timesheet/2.2.2-1
diff -Nru tryton-modules-timesheet-2.2.0/CHANGELOG tryton-modules-timesheet-2.2.1/CHANGELOG
--- tryton-modules-timesheet-2.2.0/CHANGELOG 2011-10-25 11:29:45.000000000 +0200
+++ tryton-modules-timesheet-2.2.1/CHANGELOG 2012-09-01 19:17:39.000000000 +0200
@@ -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 -Nru tryton-modules-timesheet-2.2.0/COPYRIGHT tryton-modules-timesheet-2.2.1/COPYRIGHT
--- tryton-modules-timesheet-2.2.0/COPYRIGHT 2011-07-06 09:57:43.000000000 +0200
+++ tryton-modules-timesheet-2.2.1/COPYRIGHT 2012-09-01 19:17:38.000000000 +0200
@@ -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
diff -Nru tryton-modules-timesheet-2.2.0/debian/changelog tryton-modules-timesheet-2.2.1/debian/changelog
--- tryton-modules-timesheet-2.2.0/debian/changelog 2012-06-30 18:35:28.000000000 +0200
+++ tryton-modules-timesheet-2.2.1/debian/changelog 2012-09-12 15:55:13.000000000 +0200
@@ -1,3 +1,9 @@
+tryton-modules-timesheet (2.2.1-1) unstable; urgency=low
+
+ * Merging upstream version 2.2.1.
+
+ -- Mathias Behrle <mathiasb@m9s.biz> Wed, 12 Sep 2012 15:55:13 +0200
+
tryton-modules-timesheet (2.2.0-2) unstable; urgency=low
[ Mathias Behrle ]
diff -Nru tryton-modules-timesheet-2.2.0/PKG-INFO tryton-modules-timesheet-2.2.1/PKG-INFO
--- tryton-modules-timesheet-2.2.0/PKG-INFO 2011-10-25 11:31:03.000000000 +0200
+++ tryton-modules-timesheet-2.2.1/PKG-INFO 2012-09-01 19:17:42.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_timesheet
-Version: 2.2.0
+Version: 2.2.1
Summary: Timesheet Module with:
- Work
- Timesheet line
diff -Nru tryton-modules-timesheet-2.2.0/trytond_timesheet.egg-info/PKG-INFO tryton-modules-timesheet-2.2.1/trytond_timesheet.egg-info/PKG-INFO
--- tryton-modules-timesheet-2.2.0/trytond_timesheet.egg-info/PKG-INFO 2011-10-25 11:31:03.000000000 +0200
+++ tryton-modules-timesheet-2.2.1/trytond_timesheet.egg-info/PKG-INFO 2012-09-01 19:17:42.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-timesheet
-Version: 2.2.0
+Version: 2.2.1
Summary: Timesheet Module with:
- Work
- Timesheet line
diff -Nru tryton-modules-timesheet-2.2.0/__tryton__.py tryton-modules-timesheet-2.2.1/__tryton__.py
--- tryton-modules-timesheet-2.2.0/__tryton__.py 2011-10-25 11:29:52.000000000 +0200
+++ tryton-modules-timesheet-2.2.1/__tryton__.py 2011-10-25 11:32:55.000000000 +0200
@@ -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/',
diff -Nru tryton-modules-timesheet-2.2.0/work.py tryton-modules-timesheet-2.2.1/work.py
--- tryton-modules-timesheet-2.2.0/work.py 2011-08-02 20:08:47.000000000 +0200
+++ tryton-modules-timesheet-2.2.1/work.py 2012-06-19 22:32:56.000000000 +0200
@@ -80,7 +80,7 @@
('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))
Attachment:
signature.asc
Description: PGP signature