[tryton-debian-vcs] tryton-modules-timesheet branch debian-squeeze-1.6 created. eb30d36a2ecf1ffd164c8255b908ba726652fe04

[Mathias Behrle]

The following commit has been merged in the debian-squeeze-1.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-timesheet.git;a=commitdiff;h=eb30d36a2ecf1ffd164c8255b908ba726652fe04
commit eb30d36a2ecf1ffd164c8255b908ba726652fe04
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Nov 20 21:29:14 2010 +0100

    Releasing debian version 1.6.1-0~50squeeze1.

diff --git a/debian/changelog b/debian/changelog
index fc8aa94..7b04ba9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-timesheet (1.6.1-0~50squeeze1) unstable; urgency=low
+
+  * Merging upstream version 1.6.1.
+  * Changing my email address.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Sat, 20 Nov 2010 21:26:51 +0100
+
 tryton-modules-timesheet (1.6.0-1) unstable; urgency=low
 
   [ Daniel Baumann ]
commit fe47426ae5a8d1b751caf3ae4f51b50cacffeab3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Nov 20 21:16:05 2010 +0100

    Changing my email address.

diff --git a/debian/control b/debian/control
index f3bd208..2838473 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
 Uploaders:
  Daniel Baumann <daniel at debian.org>,
- Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
+ Mathias Behrle <mathiasb at m9s.biz>
 Dm-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7), python, python-setuptools, python-support
 Standards-Version: 3.8.4
commit 40fc1586c984057b3b0db4b36bd90a8cb2b679d3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Nov 20 20:50:13 2010 +0100

    Merging upstream version 1.6.1.

diff --git a/CHANGELOG b/CHANGELOG
index 539164d..7b8f0ad 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.6.1 - 2010-11-02
+* Bug fixes (see mercurial logs for details)
+
 Version 1.6.0 - 2010-05-12
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index b1c0473..bef762b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond_timesheet
-Version: 1.6.0
+Version: 1.6.1
 Summary: Timesheet Module with:
     - Work
     - Timesheet line
diff --git a/__tryton__.py b/__tryton__.py
index b405171..61855eb 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.6.0',
+    'version': '1.6.1',
     'author': 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
diff --git a/line.py b/line.py
index 99fb530..614b1f4 100644
--- a/line.py
+++ b/line.py
@@ -149,7 +149,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'])
@@ -164,7 +164,7 @@ class HoursEmployee(ModelSQL, ModelView):
                     'employee, ' \
                     'SUM(COALESCE(hours, 0)) AS hours ' \
                 'FROM timesheet_line ' \
-                'WHERE True ' \
+                'WHERE %s ' \
                 + clause + \
                 'GROUP BY employee', args)
 
@@ -238,7 +238,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 + ' \
@@ -275,7 +276,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 + ' \
diff --git a/trytond_timesheet.egg-info/PKG-INFO b/trytond_timesheet.egg-info/PKG-INFO
index 63d0f5b..7e0c71c 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: 1.6.0
+Version: 1.6.1
 Summary: Timesheet Module with:
     - Work
     - Timesheet line
-- 
tryton-modules-timesheet