[tryton-debian-vcs] tryton-modules-calendar branch upstream-2.8 updated. upstream/2.8.3-1-g926386b

[Mathias Behrle]

The following commit has been merged in the upstream-2.8 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-calendar.git;a=commitdiff;h=upstream/2.8.3-1-g926386b

commit 926386b7201e4835040b3e3764be713ff58d4653
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Jul 15 12:42:46 2015 +0200

    Adding upstream version 2.8.5.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index ab6b276..a876ef2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+Version 2.8.5 - 2015-07-13
+* Bug fixes (see mercurial logs for details)
+
+Version 2.8.4 - 2015-05-22
+* Bug fixes (see mercurial logs for details)
+
 Version 2.8.3 - 2015-03-01
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index fe93d2b..d7d4072 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_calendar
-Version: 2.8.3
+Version: 2.8.5
 Summary: Tryton module for CalDAV
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/caldav.py b/caldav.py
index a5fd3b1..e32813a 100644
--- a/caldav.py
+++ b/caldav.py
@@ -298,7 +298,7 @@ def do_POST(self):
         except DAV_Error, exception:
             ec, _ = exception
             return self.send_status(ec)
-        self.send_body_chunks(DATA, '200', 'OK', 'OK')
+        self.send_body(DATA, 200, 'OK', 'OK')
         return
     return _prev_do_POST(self)
 
diff --git a/calendar_.py b/calendar_.py
index f94a62a..e8774d3 100644
--- a/calendar_.py
+++ b/calendar_.py
@@ -119,24 +119,6 @@ class Calendar(ModelSQL, ModelView):
             ical.vevent_list.extend(ical2.vevent_list)
         return ical
 
-    @property
-    def _fbtype(self):
-        '''
-        Return the freebusy type for give transparent and status
-        '''
-        if self.transp == 'opaque':
-            if not self.status or self.status == 'confirmed':
-                fbtype = 'BUSY'
-            elif self.status == 'cancelled':
-                fbtype = 'FREE'
-            elif self.status == 'tentative':
-                fbtype = 'BUSY-TENTATIVE'
-            else:
-                fbtype = 'BUSY'
-        else:
-            fbtype = 'FREE'
-        return fbtype
-
     @classmethod
     def freebusy(cls, calendar_id, dtstart, dtend):
         '''
@@ -544,6 +526,24 @@ class Event(ModelSQL, ModelView):
     def search_calendar_field(cls, name, clause):
         return [('calendar.' + name[9:],) + tuple(clause[1:])]
 
+    @property
+    def _fbtype(self):
+        '''
+        Return the freebusy type for give transparent and status
+        '''
+        if self.transp == 'opaque':
+            if not self.status or self.status == 'confirmed':
+                fbtype = 'BUSY'
+            elif self.status == 'cancelled':
+                fbtype = 'FREE'
+            elif self.status == 'tentative':
+                fbtype = 'BUSY-TENTATIVE'
+            else:
+                fbtype = 'BUSY'
+        else:
+            fbtype = 'FREE'
+        return fbtype
+
     @classmethod
     def validate(cls, events):
         super(Event, cls).validate(events)
diff --git a/tryton.cfg b/tryton.cfg
index 54e3c4c..d1b45fc 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.8.3
+version=2.8.5
 depends:
     ir
     res
diff --git a/trytond_calendar.egg-info/PKG-INFO b/trytond_calendar.egg-info/PKG-INFO
index 496a121..f99ed46 100644
--- a/trytond_calendar.egg-info/PKG-INFO
+++ b/trytond_calendar.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-calendar
-Version: 2.8.3
+Version: 2.8.5
 Summary: Tryton module for CalDAV
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-calendar