diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 51b761250c5..a370ce9b64b 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -23,6 +23,7 @@ from datetime import datetime, timedelta
 from dateutil import parser
 from dateutil.rrule import *
 from osv import osv, fields
+from tools.translate import _
 import base64
 import pooler
 import re
@@ -177,6 +178,10 @@ class CalDAV(object):
         return vals
 
     def create_ics(self, cr, uid, datas, name, ical, context=None):
+        if not datas:
+            model = context.get('model', None)
+            war_str = "No data available" + (model and " for " + model) or "" 
+            raise osv.except_osv(_('Warning !'), _(war_str))
         for data in datas:
             vevent = ical.add(name)
             for field in self.__attribute__.keys():
diff --git a/addons/caldav/caldav_data.xml b/addons/caldav/caldav_data.xml
index fb464ab95d7..b909bf1dc82 100644
--- a/addons/caldav/caldav_data.xml
+++ b/addons/caldav/caldav_data.xml
@@ -340,13 +340,6 @@
     <field name="fn">field</field>
 </record>
 
-<record model="basic.calendar.fields" id="map_todo_10">
-    <field name="name" ref="base_calendar.field_todo_due"/>
-    <field name="type_id" ref="caldav.calendar_lines_todo" />
-	<field name="field_id" search="[('name','=','date_deadline'),('model_id.model','=','calendar.todo')]" />
-    <field name="fn">field</field>
-</record>
-
 <record model="basic.calendar.fields" id="map_todo_11">
     <field name="name" ref="base_calendar.field_todo_summary"/>
     <field name="type_id" ref="caldav.calendar_lines_todo" />
@@ -379,7 +372,7 @@
     <field name="name" ref="base_calendar.field_todo_duration"/>
     <field name="type_id" ref="caldav.calendar_lines_todo" />
 	<field name="field_id" search="[('name','=','planned_hours'),('model_id.model','=','calendar.todo')]" />
-    <field name="fn">field</field>
+    <field name="fn">hours</field>
 </record>
 
 <record model="basic.calendar.fields" id="map_todo_16">
diff --git a/addons/crm/crm_meeting_data.xml b/addons/crm/crm_meeting_data.xml
index 035a5c30175..e13346aed8a 100644
--- a/addons/crm/crm_meeting_data.xml
+++ b/addons/crm/crm_meeting_data.xml
@@ -27,6 +27,12 @@
 	        <field name="object">crm.meeting</field>
 	    </record>
 
+		<record model="basic.calendar.lines" id="caldav.calendar_lines_event">
+			<field name="name">vevent</field>
+			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
+			<field name="object_id" search="[('model','=','crm.meeting')]" />
+		</record>
+		
 
 <!--		Event Attribute mapping-->
 
diff --git a/addons/project_calendar/project_calendar_data.xml b/addons/project_calendar/project_calendar_data.xml
index b78931381b3..176feddd76f 100644
--- a/addons/project_calendar/project_calendar_data.xml
+++ b/addons/project_calendar/project_calendar_data.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0"?>
 <openerp>
 	<data noupdate="1">
-
+		
+		<record model="basic.calendar.lines" id="caldav.calendar_lines_todo">
+			<field name="name">vtodo</field>
+			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
+			<field name="object_id" search="[('model','=','project.task')]" />
+		</record>
+		
 		<record model="basic.calendar.fields" id="caldav.map_todo_1">
 			<field name="name" ref="base_calendar.field_todo_status" />
 			<field name="type_id" ref="caldav.calendar_lines_todo" />
@@ -35,7 +41,7 @@
 		    <field name="name" ref="base_calendar.field_todo_duration"/>
 		    <field name="type_id" ref="caldav.calendar_lines_todo" />
 			<field name="field_id" search="[('name','=','planned_hours'),('model_id.model','=','project.task')]" />
-			<field name="fn">field</field>
+			<field name="fn">hours</field>
 		</record>
 		
 	</data>