[tryton-debian-vcs] tryton-modules-calendar-scheduling branch debian-jessie-2.8 updated. debian/2.8.0-3-4-gab82a3f

[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-scheduling.git;a=commitdiff;h=debian/2.8.0-3-4-gab82a3f

commit ab82a3f84f470243b429d3f45b3628daabfe852b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon May 12 15:55:56 2014 +0200

    Releasing debian version 2.8.1-1.

diff --git a/debian/changelog b/debian/changelog
index 890bf82..7f219e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-calendar-scheduling (2.8.1-1) unstable; urgency=medium
+
+  * Fixing the branch version in the watch file.
+  * Merging upstream version 2.8.1.
+  * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Mon, 12 May 2014 15:55:56 +0200
+
 tryton-modules-calendar-scheduling (2.8.0-3) unstable; urgency=low
 
   * Removing pydist-overrides, it is no more needed.
commit 550b888a32f4484fa88112541923aafb68e85bcc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon May 12 15:55:53 2014 +0200

    Updating copyright file.

diff --git a/debian/copyright b/debian/copyright
index c27df9a..e4ddfa3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
-Copyright: 2009-2013 Cédric Krier
+Copyright: 2009-2014 Cédric Krier
            2009-2013 Bertrand Chenal
-           2009-2013 B2CK SPRL
+           2009-2014 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
commit 0c93c06f57525c0651fa8862155707dad47be00b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon May 12 15:55:53 2014 +0200

    Merging upstream version 2.8.1.

diff --git a/CHANGELOG b/CHANGELOG
index 4522186..f52b594 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.1 - 2014-05-07
+* Bug fixes (see mercurial logs for details)
+
 Version 2.8.0 - 2013-04-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index a005001..9d9d0a6 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2013 Cédric Krier.
+Copyright (C) 2009-2014 Cédric Krier.
 Copyright (C) 2009-2013 Bertrand Chenal.
-Copyright (C) 2009-2013 B2CK SPRL.
+Copyright (C) 2009-2014 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 575f0f7..73ade7f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_calendar_scheduling
-Version: 2.8.0
+Version: 2.8.1
 Summary: Tryton module to add scheduling support on CalDAV
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/__init__.py b/__init__.py
index 588e318..01d1f79 100644
--- a/__init__.py
+++ b/__init__.py
@@ -10,7 +10,6 @@ from .res import *
 def register():
     Pool.register(
         Event,
-        Attendee,
         EventAttendee,
         User,
         module='calendar_scheduling', type_='model')
diff --git a/calendar_.py b/calendar_.py
index 433c120..159363b 100644
--- a/calendar_.py
+++ b/calendar_.py
@@ -9,7 +9,7 @@ from trytond.tools import get_smtp_server
 from trytond.transaction import Transaction
 from trytond.pool import Pool, PoolMeta
 
-__all__ = ['Event', 'Attendee', 'EventAttendee']
+__all__ = ['Event', 'EventAttendee']
 __metaclass__ = PoolMeta
 
 
@@ -470,8 +470,7 @@ class Event:
             event.send_msg(owner_email, attendee_emails, msg, 'cancel')
 
 
-class Attendee:
-    __name__ = 'calendar.attendee'
+class AttendeeMixin:
     schedule_status = fields.Selection([
             ('', ''),
             ('1.0', '1.0'),
@@ -496,7 +495,7 @@ class Attendee:
 
     @classmethod
     def attendee2values(cls, attendee):
-        values = super(Attendee, cls).attendee2values(attendee)
+        values = super(AttendeeMixin, cls).attendee2values(attendee)
         if hasattr(attendee, 'schedule_status'):
             if attendee.schedule_status in dict(
                     cls.schedule_status.selection):
@@ -507,7 +506,7 @@ class Attendee:
         return values
 
     def attendee2attendee(self):
-        attendee = super(Attendee, self).attendee2attendee()
+        attendee = super(AttendeeMixin, self).attendee2attendee()
 
         if self.schedule_status:
             if hasattr(attendee, 'schedule_status_param'):
@@ -539,7 +538,8 @@ class Attendee:
         return attendee
 
 
-class EventAttendee:
+class EventAttendee(AttendeeMixin, object):
+    __metaclass__ = PoolMeta
     __name__ = 'calendar.event.attendee'
 
     @classmethod
diff --git a/tryton.cfg b/tryton.cfg
index 3d1c45e..b806736 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_scheduling.egg-info/PKG-INFO b/trytond_calendar_scheduling.egg-info/PKG-INFO
index f939a6e..8731b03 100644
--- a/trytond_calendar_scheduling.egg-info/PKG-INFO
+++ b/trytond_calendar_scheduling.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-calendar-scheduling
-Version: 2.8.0
+Version: 2.8.1
 Summary: Tryton module to add scheduling support on CalDAV
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-calendar-scheduling