[tryton-debian-vcs] tryton-modules-calendar-todo branch debian-jessie-2.8 updated. debian/2.8.0-3-3-gb9158e8

[Mathias Behrle]

The following commit has been merged in the debian-jessie-2.8 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-calendar-todo.git;a=commitdiff;h=debian/2.8.0-3-3-gb9158e8

commit b9158e8cef38881c8fd9d0c209d27084f151b513
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 11 19:08:17 2013 +0100

    Releasing debian version 2.8.1-1.

diff --git a/debian/changelog b/debian/changelog
index 0b0ed95..1da8569 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-calendar-todo (2.8.1-1) unstable; urgency=low
+
+  * Fixing the branch version in the watch file.
+  * Merging upstream version 2.8.1.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Wed, 11 Dec 2013 18:41:54 +0100
+
 tryton-modules-calendar-todo (2.8.0-3) unstable; urgency=low
 
   * Removing pydist-overrides, it is no more needed.
commit 5890418aca192cf35a25d9a75a780f89cb7655c2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 11 18:29:58 2013 +0100

    Merging upstream version 2.8.1.

diff --git a/CHANGELOG b/CHANGELOG
index 9735814..934c069 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.1 - 2013-12-04
+* Bug fixes (see mercurial logs for details)
+
 Version 2.8.0 - 2013-04-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index d954667..b4593c6 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_calendar_todo
-Version: 2.8.0
+Version: 2.8.1
 Summary: Tryton module to add TODO on CalDAV
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/todo.py b/todo.py
index 1a81bbc..1fa4703 100644
--- a/todo.py
+++ b/todo.py
@@ -191,7 +191,7 @@ class Todo(ModelSQL, ModelView):
 
     @classmethod
     def validate(cls, todos):
-        super(todos, cls).validate(todos)
+        super(Todo, cls).validate(todos)
         for todo in todos:
             todo.check_recurrence()
 
@@ -489,7 +489,7 @@ class Todo(ModelSQL, ModelView):
         if hasattr(vtodo, 'percent_complete'):
             res['percent_complete'] = int(vtodo.percent_complete.value)
         else:
-            res['percent_complete'] = None
+            res['percent_complete'] = 0
 
         if hasattr(vtodo, 'completed'):
             if not isinstance(vtodo.completed.value, datetime.datetime):
@@ -809,7 +809,7 @@ class Todo(ModelSQL, ModelView):
             vtodo.add('class')
             getattr(vtodo, 'class').value = self.classification.upper()
         elif getattr(vtodo, 'class').value.lower() in \
-                dict(self.classification.selection):
+                dict(self.__class__.classification.selection):
             getattr(vtodo, 'class').value = self.classification.upper()
         if self.location:
             if not hasattr(vtodo, 'location'):
diff --git a/tryton.cfg b/tryton.cfg
index aae9557..ab378aa 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.8.0
+version=2.8.1
 depends:
     calendar
     ir
diff --git a/trytond_calendar_todo.egg-info/PKG-INFO b/trytond_calendar_todo.egg-info/PKG-INFO
index fa2a896..c27f74a 100644
--- a/trytond_calendar_todo.egg-info/PKG-INFO
+++ b/trytond_calendar_todo.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-calendar-todo
-Version: 2.8.0
+Version: 2.8.1
 Summary: Tryton module to add TODO on CalDAV
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/webdav.py b/webdav.py
index 4fab749..d6a1ccc 100644
--- a/webdav.py
+++ b/webdav.py
@@ -29,13 +29,13 @@ class Collection:
                 calendar_id = cls.calendar(uri)
                 if not calendar_id:
                     return None
-            todo_ids = Todo.search([
+            todos = Todo.search([
                 ('calendar', '=', calendar_id),
                 ('uuid', '=', todo_uri[:-4]),
                 ('parent', '=', None),
                 ], limit=1)
-            if todo_ids:
-                return todo_ids[0]
+            if todos:
+                return todos[0].id
 
     @classmethod
     def _caldav_filter_domain_todo(cls, filter):
@@ -177,7 +177,7 @@ class Collection:
                     red_sql, red_ids = reduce_ids('id', sub_ids)
                     cursor.execute('SELECT id, '
                             'EXTRACT(epoch FROM create_date) '
-                        'FROM "' + Todo.__table__ + '" '
+                        'FROM "' + Todo._table + '" '
                         'WHERE ' + red_sql, red_ids)
                     for todo_id2, date in cursor.fetchall():
                         if todo_id2 == todo_id:
@@ -223,7 +223,7 @@ class Collection:
                     cursor.execute('SELECT COALESCE(parent, id), '
                             'MAX(EXTRACT(epoch FROM '
                             'COALESCE(write_date, create_date))) '
-                        'FROM "' + Todo.__table__ + '" '
+                        'FROM "' + Todo._table + '" '
                         'WHERE ' + red_id_sql + ' '
                             'OR ' + red_parent_sql + ' '
                         'GROUP BY parent, id', red_id_ids + red_parent_ids)
-- 
tryton-modules-calendar-todo