diff -Nru tryton-modules-calendar-todo-2.8.0/CHANGELOG tryton-modules-calendar-todo-2.8.1/CHANGELOG --- tryton-modules-calendar-todo-2.8.0/CHANGELOG 2013-04-22 08:59:00.000000000 +0000 +++ tryton-modules-calendar-todo-2.8.1/CHANGELOG 2013-12-04 16:24:32.000000000 +0000 @@ -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 -Nru tryton-modules-calendar-todo-2.8.0/debian/changelog tryton-modules-calendar-todo-2.8.1/debian/changelog --- tryton-modules-calendar-todo-2.8.0/debian/changelog 2013-11-21 16:12:19.000000000 +0000 +++ tryton-modules-calendar-todo-2.8.1/debian/changelog 2014-06-26 15:51:42.000000000 +0000 @@ -1,8 +1,15 @@ -tryton-modules-calendar-todo (2.8.0-3ubuntu0~ppa1~saucy) saucy; urgency=low +tryton-modules-calendar-todo (2.8.1-1ubuntu0~ppa2~saucy) saucy; urgency=low * Ubuntu build - -- Ilya Melnikov Thu, 21 Nov 2013 21:28:38 +0600 + -- Ilya Melnikov Thu, 26 Jun 2014 21:22:33 +0600 + +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 Wed, 11 Dec 2013 18:41:54 +0100 tryton-modules-calendar-todo (2.8.0-3) unstable; urgency=low diff -Nru tryton-modules-calendar-todo-2.8.0/debian/control tryton-modules-calendar-todo-2.8.1/debian/control --- tryton-modules-calendar-todo-2.8.0/debian/control 2013-11-21 15:27:43.000000000 +0000 +++ tryton-modules-calendar-todo-2.8.1/debian/control 2014-06-26 14:44:27.000000000 +0000 @@ -1,8 +1,7 @@ Source: tryton-modules-calendar-todo Section: python Priority: optional -Maintainer: Ilya Melnikov -XSBC-Original-Maintainer: Debian Tryton Maintainers +Maintainer: Debian Tryton Maintainers Uploaders: Mathias Behrle Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools Standards-Version: 3.9.4 diff -Nru tryton-modules-calendar-todo-2.8.0/debian/watch tryton-modules-calendar-todo-2.8.1/debian/watch --- tryton-modules-calendar-todo-2.8.0/debian/watch 2013-04-23 03:14:02.000000000 +0000 +++ tryton-modules-calendar-todo-2.8.1/debian/watch 2014-06-26 14:44:27.000000000 +0000 @@ -1,2 +1,2 @@ version=3 -http://downloads.tryton.org/current/ .*trytond_calendar_todo-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) +http://downloads.tryton.org/2.8/ .*trytond_calendar_todo-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) diff -Nru tryton-modules-calendar-todo-2.8.0/PKG-INFO tryton-modules-calendar-todo-2.8.1/PKG-INFO --- tryton-modules-calendar-todo-2.8.0/PKG-INFO 2013-04-22 08:59:05.000000000 +0000 +++ tryton-modules-calendar-todo-2.8.1/PKG-INFO 2013-12-04 16:24:36.000000000 +0000 @@ -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 -Nru tryton-modules-calendar-todo-2.8.0/todo.py tryton-modules-calendar-todo-2.8.1/todo.py --- tryton-modules-calendar-todo-2.8.0/todo.py 2013-03-20 21:54:04.000000000 +0000 +++ tryton-modules-calendar-todo-2.8.1/todo.py 2013-11-28 22:31:03.000000000 +0000 @@ -191,7 +191,7 @@ @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 @@ 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 @@ 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 -Nru tryton-modules-calendar-todo-2.8.0/tryton.cfg tryton-modules-calendar-todo-2.8.1/tryton.cfg --- tryton-modules-calendar-todo-2.8.0/tryton.cfg 2013-04-22 08:58:54.000000000 +0000 +++ tryton-modules-calendar-todo-2.8.1/tryton.cfg 2013-04-22 10:23:50.000000000 +0000 @@ -1,5 +1,5 @@ [tryton] -version=2.8.0 +version=2.8.1 depends: calendar ir diff -Nru tryton-modules-calendar-todo-2.8.0/trytond_calendar_todo.egg-info/PKG-INFO tryton-modules-calendar-todo-2.8.1/trytond_calendar_todo.egg-info/PKG-INFO --- tryton-modules-calendar-todo-2.8.0/trytond_calendar_todo.egg-info/PKG-INFO 2013-04-22 08:59:04.000000000 +0000 +++ tryton-modules-calendar-todo-2.8.1/trytond_calendar_todo.egg-info/PKG-INFO 2013-12-04 16:24:35.000000000 +0000 @@ -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 -Nru tryton-modules-calendar-todo-2.8.0/webdav.py tryton-modules-calendar-todo-2.8.1/webdav.py --- tryton-modules-calendar-todo-2.8.0/webdav.py 2013-02-17 17:15:57.000000000 +0000 +++ tryton-modules-calendar-todo-2.8.1/webdav.py 2013-11-18 18:02:45.000000000 +0000 @@ -29,13 +29,13 @@ 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 @@ 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 @@ 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)