diff --git a/addons/caldav/caldav.py b/addons/caldav/caldav.py
index 224d1ba176c..730bfda816a 100644
--- a/addons/caldav/caldav.py
+++ b/addons/caldav/caldav.py
@@ -22,8 +22,9 @@
 from document_webdav import webdav
 import tools
 from DAV.propfind import PROPFIND
-
-
+import urlparse
+urlparse.uses_netloc.append('caldav')
+urlparse.uses_netloc.append('caldavs')
 super_mk_prop_response = webdav.mk_prop_response
 def mk_prop_response(self,uri,good_props,bad_props,doc):            
     res = super_mk_prop_response(self, uri,good_props,bad_props,doc)    
diff --git a/addons/caldav/caldav_node.py b/addons/caldav/caldav_node.py
index ffc300836b7..d747078081d 100644
--- a/addons/caldav/caldav_node.py
+++ b/addons/caldav/caldav_node.py
@@ -62,7 +62,7 @@ class node_calendar_collection(nodes.node_dir):
     def get_dav_props(self, cr):                
         return self.PROPS
 
-    def get_dav_eprop(self,cr, ns, propname):   
+    def get_dav_eprop(self,cr, ns, propname):         
         if self.M_NS.has_key(ns):
             prefix = self.M_NS[ns]
         else:
@@ -84,7 +84,7 @@ class node_calendar_collection(nodes.node_dir):
         return None
 
     def _file_get(self,cr, nodename=False):
-        return []
+        return []   
 
 
     def get_domain(self, cr, filters):        
@@ -231,7 +231,7 @@ class node_calendar(nodes.node_class):
 
         try:
             m = getattr(self, mname)
-            r = m(cr)
+            r = m(cr)            
             return r
         except AttributeError, e:
             print 'Property %s not supported' % propname
@@ -239,10 +239,11 @@ class node_calendar(nodes.node_class):
         return None
 
 
-    def get_data(self, cr, fil_obj = None):        
+    def get_data(self, cr, fil_obj = None):            
         uid = self.context.uid
         calendar_obj = self.context._dirobj.pool.get('basic.calendar')
-        return calendar_obj.export_cal(cr, uid, [self.calendar_id])        
+        res = calendar_obj.export_cal(cr, uid, [self.calendar_id])        
+        return res
 
     def get_data_len(self, cr, fil_obj = None):        
         return self.content_length
@@ -257,9 +258,9 @@ class node_calendar(nodes.node_class):
 
 
     
-    def _get_caldav_calendar_data(self, cr):
-        res = self.get_data(cr)
-
+    def _get_caldav_calendar_data(self, cr):        
+        return self.get_data(cr)
+        
 
     def _get_caldav_calendar_description(self, cr):
         uid = self.context.uid
diff --git a/addons/document/nodes.py b/addons/document/nodes.py
index e10d0934eef..85c71f88b6d 100644
--- a/addons/document/nodes.py
+++ b/addons/document/nodes.py
@@ -257,8 +257,11 @@ class node_dir(node_database):
                     pass
 
     
-    #def get_data(self,cr):
-    #    return ''
+    def get_data(self,cr):
+        res = ''
+        for child in self.children(cr):
+            res += child.get_data(cr)        
+        return res
 
     
 
diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index 1b77ea67832..d8b369b5ecf 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -100,8 +100,8 @@ class openerp_dav_handler(dav_interface):
         if not node:
             cr.close()
             raise DAV_NotFound
-        res = node.get_dav_eprop(cr,ns,propname)
-        cr.close()       
+        res = node.get_dav_eprop(cr,ns,propname)        
+        cr.close()        
         return res    
 
     def get_db(self,uri):