[tryton-debian-vcs] tryton-modules-calendar branch upstream-2.6 updated. upstream/2.6.5-1-g9b60b93

[Mathias Behrle]

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

commit 9b60b934e12820a230de50c58dbca54a5c7a8bb7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Jul 15 12:41:52 2015 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index 2f80a57..bae3c69 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.6 - 2015-05-22
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.5 - 2015-03-01
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 54b3a3d..a9bbafb 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_calendar
-Version: 2.6.5
+Version: 2.6.6
 Summary: Tryton module for CalDAV
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/caldav.py b/caldav.py
index ae205be..fcf4c77 100644
--- a/caldav.py
+++ b/caldav.py
@@ -297,7 +297,7 @@ def do_POST(self):
             DATA = '%s\n' % dc._get_caldav_post(uri, body, ct)
         except DAV_Error, (ec, dd):
             return self.send_status(ec)
-        self.send_body_chunks(DATA, '200', 'OK', 'OK')
+        self.send_body_chunks(DATA, 200, 'OK', 'OK')
         return
     return _prev_do_POST(self)
 
diff --git a/calendar_.py b/calendar_.py
index 9f3f7cb..6bdb102 100644
--- a/calendar_.py
+++ b/calendar_.py
@@ -114,24 +114,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):
         '''
@@ -543,6 +525,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
+
     def check_recurrence(self):
         '''
         Check the recurrence is not recurrent.
diff --git a/tryton.cfg b/tryton.cfg
index 84d5aaf..af8e113 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.5
+version=2.6.6
 depends:
     ir
     res
diff --git a/trytond_calendar.egg-info/PKG-INFO b/trytond_calendar.egg-info/PKG-INFO
index 73499b1..5004d4e 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.6.5
+Version: 2.6.6
 Summary: Tryton module for CalDAV
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-calendar