[tryton-debian-vcs] tryton-modules-timesheet branch upstream-2.2 created. f681792f8e641f00e824827965dbef7f3da75808

[Mathias Behrle]

The following commit has been merged in the upstream-2.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-timesheet.git;a=commitdiff;h=f681792f8e641f00e824827965dbef7f3da75808
commit f681792f8e641f00e824827965dbef7f3da75808
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Feb 24 19:46:23 2013 +0100

    Adding upstream version 2.2.2.

diff --git a/CHANGELOG b/CHANGELOG
index 331ee88..27c57db 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 f654cd7..26f578f 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.
 
diff --git a/PKG-INFO b/PKG-INFO
index 4eff3d9..7735c68 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond_timesheet
-Version: 2.2.1
+Version: 2.2.2
 Summary: Timesheet Module with:
     - Work
     - Timesheet line
diff --git a/__tryton__.py b/__tryton__.py
index 38a08a4..ea76f6b 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 at b2ck.com',
     'website': 'http://www.tryton.org/',
diff --git a/line.py b/line.py
index b3107dc..d8dcd1a 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')
 
diff --git a/trytond_timesheet.egg-info/PKG-INFO b/trytond_timesheet.egg-info/PKG-INFO
index 602e375..9c323fa 100644
--- a/trytond_timesheet.egg-info/PKG-INFO
+++ b/trytond_timesheet.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond-timesheet
-Version: 2.2.1
+Version: 2.2.2
 Summary: Timesheet Module with:
     - Work
     - Timesheet line
commit 063413faff997f4e12e46fe647b136baaa4eb3f5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Sep 12 15:53:57 2012 +0200

    Adding upstream version 2.2.1.

diff --git a/CHANGELOG b/CHANGELOG
index e519b5a..331ee88 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 3d2324b..f654cd7 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
diff --git a/PKG-INFO b/PKG-INFO
index ed7202c..4eff3d9 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -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 --git a/__tryton__.py b/__tryton__.py
index 35fe407..38a08a4 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 at b2ck.com',
     'website': 'http://www.tryton.org/',
diff --git a/trytond_timesheet.egg-info/PKG-INFO b/trytond_timesheet.egg-info/PKG-INFO
index 4d00859..602e375 100644
--- a/trytond_timesheet.egg-info/PKG-INFO
+++ b/trytond_timesheet.egg-info/PKG-INFO
@@ -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 --git a/work.py b/work.py
index 4e32e2a..2671816 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))
-- 
tryton-modules-timesheet