diff --git a/addons/base_calendar/base_calendar_data.xml b/addons/base_calendar/base_calendar_data.xml
index 0e7250071c8..b15cd72874e 100644
--- a/addons/base_calendar/base_calendar_data.xml
+++ b/addons/base_calendar/base_calendar_data.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
-	<data noupdate="1">
+	<data noupdate="1">	
 		
-		<record model="basic.calendar" id="basic_calendar1">
-			<field name="name">OpenERP</field>
-		</record>
 
 		<!--		Event attributes-->
 
diff --git a/addons/caldav/caldav.py b/addons/caldav/caldav.py
index 5741f645b1e..5598236dd48 100644
--- a/addons/caldav/caldav.py
+++ b/addons/caldav/caldav.py
@@ -483,7 +483,8 @@ rule or repeating pattern for anexception to a recurrence set"),
         'caldav_alarm_id': fields.many2one('calendar.alarm', 'Alarm'), 
         'recurrent_uid': fields.integer('Recurrent ID'), 
         'recurrent_id': fields.datetime('Recurrent ID date'), 
-                }
+        'user_id': fields.many2one('res.users', 'Responsible'),
+    }
     
     _defaults = {
          'class': lambda *a: 'public', 
diff --git a/addons/caldav/caldav_data.xml b/addons/caldav/caldav_data.xml
index 295b05ba540..c8b20ac134b 100644
--- a/addons/caldav/caldav_data.xml
+++ b/addons/caldav/caldav_data.xml
@@ -129,381 +129,5 @@
 			<field eval="'do_run_scheduler'" name="function" />
 			<field eval="'(False,)'" name="args" />
 		</record>
-
-		<record model="basic.calendar.lines" id="calendar_lines_event">
-			<field name="name">vevent</field>
-			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
-			<field name="object_id" search="[('model','=','calendar.event')]" />
-		</record>
-		
-		<record model="basic.calendar.lines" id="calendar_lines_todo">
-			<field name="name">vtodo</field>
-			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
-			<field name="object_id" search="[('model','=','calendar.todo')]" />
-		</record>
-		
-		<record model="basic.calendar.lines" id="calendar_lines_alarm">
-			<field name="name">valarm</field>
-			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
-			<field name="object_id" search="[('model','=','calendar.alarm')]" />
-		</record>
-		
-		<record model="basic.calendar.lines" id="calendar_lines_attendee">
-			<field name="name">attendee</field>
-			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
-			<field name="object_id" search="[('model','=','calendar.attendee')]" />
-		</record>
-		
-		
-		
-<record model="basic.calendar.fields" id="map_event_1">
-    <field name="name" ref="base_calendar.field_event_uid"/>
-    <field name="type_id" ref="caldav.calendar_lines_event" />
-	<field name="field_id" search="[('name','=','id'),('model_id.model','=','calendar.event')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_event_2">
-    <field name="name" ref="base_calendar.field_event_recurrence-id"/>
-    <field name="type_id" ref="caldav.calendar_lines_event" />
-	<field name="field_id" search="[('name','=','recurrent_id'),('model_id.model','=','calendar.event')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_event_5">
-    <field name="name" ref="base_calendar.field_event_rrule"/>
-    <field name="type_id" ref="caldav.calendar_lines_event" />
-	<field name="field_id" search="[('name','=','rrule'),('model_id.model','=','calendar.event')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_event_6">
-    <field name="name" ref="base_calendar.field_event_dtend"/>
-    <field name="type_id" ref="caldav.calendar_lines_event" />
-	<field name="field_id" search="[('name','=','date_deadline'),('model_id.model','=','calendar.event')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_event_7">
-    <field name="name" ref="base_calendar.field_event_valarm"/>
-    <field name="type_id" ref="caldav.calendar_lines_event" />
-	<field name="field_id" search="[('name','=','caldav_alarm_id'),('model_id.model','=','calendar.event')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_event_9">
-    <field name="name" ref="base_calendar.field_event_location"/>
-    <field name="type_id" ref="caldav.calendar_lines_event" />
-	<field name="field_id" search="[('name','=','location'),('model_id.model','=','calendar.event')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_event_10">
-    <field name="name" ref="base_calendar.field_event_exrule"/>
-    <field name="type_id" ref="caldav.calendar_lines_event" />
-	<field name="field_id" search="[('name','=','exrule'),('model_id.model','=','calendar.event')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_event_12">
-    <field name="name" ref="base_calendar.field_event_exdate"/>
-    <field name="type_id" ref="caldav.calendar_lines_event" />
-	<field name="field_id" search="[('name','=','exdate'),('model_id.model','=','calendar.event')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_event_13">
-    <field name="name" ref="base_calendar.field_event_dtstamp"/>
-    <field name="type_id" ref="caldav.calendar_lines_event" />
-	<field name="field_id" search="[('name','=','date'),('model_id.model','=','calendar.event')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_event_14">
-    <field name="name" ref="base_calendar.field_event_description"/>
-    <field name="type_id" ref="caldav.calendar_lines_event" />
-	<field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.event')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_event_15">
-    <field name="name" ref="base_calendar.field_event_dtstart"/>
-    <field name="type_id" ref="caldav.calendar_lines_event" />
-	<field name="field_id" search="[('name','=','date'),('model_id.model','=','calendar.event')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_event_16">
-    <field name="name" ref="base_calendar.field_event_class"/>
-    <field name="type_id" ref="caldav.calendar_lines_event" />
-	<field name="field_id" search="[('name','=','class'),('model_id.model','=','calendar.event')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_event_18">
-    <field name="name" ref="base_calendar.field_event_created"/>
-    <field name="type_id" ref="caldav.calendar_lines_event" />
-	<field name="field_id" search="[('name','=','create_date'),('model_id.model','=','calendar.event')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_event_19">
-    <field name="name" ref="base_calendar.field_event_url"/>
-    <field name="type_id" ref="caldav.calendar_lines_event" />
-	<field name="field_id" search="[('name','=','caldav_url'),('model_id.model','=','calendar.event')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_event_20">
-    <field name="name" ref="base_calendar.field_event_summary"/>
-    <field name="type_id" ref="caldav.calendar_lines_event" />
-	<field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.event')]" />
-    <field name="fn">field</field>
-</record>
-
-
-
-<record model="basic.calendar.fields" id="map_todo_2">
-    <field name="name" ref="base_calendar.field_todo_exdate"/>
-    <field name="type_id" ref="caldav.calendar_lines_todo" />
-	<field name="field_id" search="[('name','=','exdate'),('model_id.model','=','calendar.todo')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_todo_4">
-    <field name="name" ref="base_calendar.field_todo_valarm"/>
-    <field name="type_id" ref="caldav.calendar_lines_todo" />
-	<field name="field_id" search="[('name','=','caldav_alarm_id'),('model_id.model','=','calendar.todo')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_todo_5">
-    <field name="name" ref="base_calendar.field_todo_description"/>
-    <field name="type_id" ref="caldav.calendar_lines_todo" />
-	<field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.todo')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_todo_6">
-    <field name="name" ref="base_calendar.field_todo_seq"/>
-    <field name="type_id" ref="caldav.calendar_lines_todo" />
-	<field name="field_id" search="[('name','=','sequence'),('model_id.model','=','calendar.todo')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_todo_7">
-    <field name="name" ref="base_calendar.field_todo_url"/>
-    <field name="type_id" ref="caldav.calendar_lines_todo" />
-	<field name="field_id" search="[('name','=','caldav_url'),('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" />
-	<field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.todo')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_todo_13">
-    <field name="name" ref="base_calendar.field_todo_location"/>
-    <field name="type_id" ref="caldav.calendar_lines_todo" />
-	<field name="field_id" search="[('name','=','location'),('model_id.model','=','calendar.todo')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_todo_14">
-    <field name="name" ref="base_calendar.field_todo_exrule"/>
-    <field name="type_id" ref="caldav.calendar_lines_todo" />
-	<field name="field_id" search="[('name','=','exrule'),('model_id.model','=','calendar.todo')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_todo_16">
-    <field name="name" ref="base_calendar.field_todo_dtstart"/>
-    <field name="type_id" ref="caldav.calendar_lines_todo" />
-	<field name="field_id" search="[('name','=','date'),('model_id.model','=','calendar.todo')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_todo_17">
-    <field name="name" ref="base_calendar.field_todo_rrule"/>
-    <field name="type_id" ref="caldav.calendar_lines_todo" />
-	<field name="field_id" search="[('name','=','rrule'),('model_id.model','=','calendar.todo')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_todo_18">
-    <field name="name" ref="base_calendar.field_todo_class"/>
-    <field name="type_id" ref="caldav.calendar_lines_todo" />
-	<field name="field_id" search="[('name','=','class'),('model_id.model','=','calendar.todo')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_todo_19">
-    <field name="name" ref="base_calendar.field_todo_uid"/>
-    <field name="type_id" ref="caldav.calendar_lines_todo" />
-	<field name="field_id" search="[('name','=','id'),('model_id.model','=','calendar.todo')]" />
-    <field name="fn">field</field>
-</record>
-
-
-
-<record model="basic.calendar.fields" id="map_alarm_1">
-    <field name="name" ref="base_calendar.field_alarm_attendee"/>
-    <field name="type_id" ref="caldav.calendar_lines_alarm" />
-	<field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','calendar.alarm')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_alarm_2">
-    <field name="name" ref="base_calendar.field_alarm_trigger_duration"/>
-    <field name="type_id" ref="caldav.calendar_lines_alarm" />
-	<field name="field_id" search="[('name','=','trigger_duration'),('model_id.model','=','res.alarm')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_alarm_3">
-    <field name="name" ref="base_calendar.field_alarm_description"/>
-    <field name="type_id" ref="caldav.calendar_lines_alarm" />
-	<field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.alarm')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_alarm_4">
-    <field name="name" ref="base_calendar.field_alarm_attach"/>
-    <field name="type_id" ref="caldav.calendar_lines_alarm" />
-	<field name="field_id" search="[('name','=','attach'),('model_id.model','=','calendar.alarm')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_alarm_5">
-    <field name="name" ref="base_calendar.field_alarm_trigger_occurs"/>
-    <field name="type_id" ref="caldav.calendar_lines_alarm" />
-	<field name="field_id" search="[('name','=','trigger_occurs'),('model_id.model','=','res.alarm')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_alarm_6">
-    <field name="name" ref="base_calendar.field_alarm_trigger_interval"/>
-    <field name="type_id" ref="caldav.calendar_lines_alarm" />
-	<field name="field_id" search="[('name','=','trigger_interval'),('model_id.model','=','res.alarm')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_alarm_7">
-    <field name="name" ref="base_calendar.field_alarm_summary"/>
-    <field name="type_id" ref="caldav.calendar_lines_alarm" />
-	<field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.alarm')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_alarm_8">
-    <field name="name" ref="base_calendar.field_alarm_duration"/>
-    <field name="type_id" ref="caldav.calendar_lines_alarm" />
-	<field name="field_id" search="[('name','=','duration'),('model_id.model','=','res.alarm')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_alarm_9">
-    <field name="name" ref="base_calendar.field_alarm_repeat"/>
-    <field name="type_id" ref="caldav.calendar_lines_alarm" />
-	<field name="field_id" search="[('name','=','repeat'),('model_id.model','=','res.alarm')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_alarm_10">
-    <field name="name" ref="base_calendar.field_alarm_action"/>
-    <field name="type_id" ref="caldav.calendar_lines_alarm" />
-	<field name="field_id" search="[('name','=','action'),('model_id.model','=','calendar.alarm')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_alarm_11">
-    <field name="name" ref="base_calendar.field_alarm_trigger_related"/>
-    <field name="type_id" ref="caldav.calendar_lines_alarm" />
-	<field name="field_id" search="[('name','=','trigger_related'),('model_id.model','=','res.alarm')]" />
-    <field name="fn">field</field>
-</record>
-
-
-<record model="basic.calendar.fields" id="map_attendee_1">
-    <field name="name" ref="base_calendar.field_attendee_cn"/>
-    <field name="type_id" ref="caldav.calendar_lines_attendee" />
-	<field name="field_id" search="[('name','=','cn'),('model_id.model','=','calendar.attendee')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_attendee_2">
-    <field name="name" ref="base_calendar.field_attendee_sent-by"/>
-    <field name="type_id" ref="caldav.calendar_lines_attendee" />
-	<field name="field_id" search="[('name','=','sent_by'),('model_id.model','=','calendar.attendee')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_attendee_3">
-    <field name="name" ref="base_calendar.field_attendee_language"/>
-    <field name="type_id" ref="caldav.calendar_lines_attendee" />
-	<field name="field_id" search="[('name','=','language'),('model_id.model','=','calendar.attendee')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_attendee_4">
-    <field name="name" ref="base_calendar.field_attendee_delegated-from"/>
-    <field name="type_id" ref="caldav.calendar_lines_attendee" />
-	<field name="field_id" search="[('name','=','delegated_from'),('model_id.model','=','calendar.attendee')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_attendee_5">
-    <field name="name" ref="base_calendar.field_attendee_member"/>
-    <field name="type_id" ref="caldav.calendar_lines_attendee" />
-	<field name="field_id" search="[('name','=','member'),('model_id.model','=','calendar.attendee')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_attendee_6">
-    <field name="name" ref="base_calendar.field_attendee_cutype"/>
-    <field name="type_id" ref="caldav.calendar_lines_attendee" />
-	<field name="field_id" search="[('name','=','cutype'),('model_id.model','=','calendar.attendee')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_attendee_7">
-    <field name="name" ref="base_calendar.field_attendee_role"/>
-    <field name="type_id" ref="caldav.calendar_lines_attendee" />
-	<field name="field_id" search="[('name','=','role'),('model_id.model','=','calendar.attendee')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_attendee_8">
-    <field name="name" ref="base_calendar.field_attendee_partstat"/>
-    <field name="type_id" ref="caldav.calendar_lines_attendee" />
-	<field name="field_id" search="[('name','=','state'),('model_id.model','=','calendar.attendee')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_attendee_9">
-    <field name="name" ref="base_calendar.field_attendee_delegated-to"/>
-    <field name="type_id" ref="caldav.calendar_lines_attendee" />
-	<field name="field_id" search="[('name','=','delegated_to'),('model_id.model','=','calendar.attendee')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_attendee_10">
-    <field name="name" ref="base_calendar.field_attendee_dir"/>
-    <field name="type_id" ref="caldav.calendar_lines_attendee" />
-	<field name="field_id" search="[('name','=','dir'),('model_id.model','=','calendar.attendee')]" />
-    <field name="fn">field</field>
-</record>
-
-<record model="basic.calendar.fields" id="map_attendee_11">
-    <field name="name" ref="base_calendar.field_attendee_rsvp"/>
-    <field name="type_id" ref="caldav.calendar_lines_attendee" />
-	<field name="field_id" search="[('name','=','rsvp'),('model_id.model','=','calendar.attendee')]" />
-    <field name="fn">field</field>
-</record>
-
-
 	</data>
 </openerp>
diff --git a/addons/crm/crm_meeting_data.xml b/addons/crm/crm_meeting_data.xml
index 789708c6a35..09566903d1c 100644
--- a/addons/crm/crm_meeting_data.xml
+++ b/addons/crm/crm_meeting_data.xml
@@ -25,33 +25,101 @@
 	    <record model="res.request.link" id="request_link_meeting">
 	        <field name="name">Case Meeting</field>
 	        <field name="object">crm.meeting</field>
-	    </record>
+	    </record>		
+		
 
-		<record model="basic.calendar.lines" id="caldav.calendar_lines_event">
+<!--		Event Attribute mapping for Calendar-->
+
+        <record model="basic.calendar" id="base_calendar.basic_calendar1">
+			<field name="name">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')]" />
+            <field name="domain">[('user_id','=', uid)]</field>
+		</record>
+
+        <record model="basic.calendar.lines" id="caldav.calendar_lines_alarm">
+			<field name="name">valarm</field>
+			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
+			<field name="object_id" search="[('model','=','calendar.alarm')]" />
 		</record>
 		
+		<record model="basic.calendar.lines" id="caldav.calendar_lines_attendee">
+			<field name="name">attendee</field>
+			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
+			<field name="object_id" search="[('model','=','calendar.attendee')]" />
+		</record>
+		
+		
+		
+        <record model="basic.calendar.fields" id="map_event_1">
+            <field name="name" ref="base_calendar.field_event_uid"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','id'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
 
-<!--		Event Attribute mapping-->
+        <record model="basic.calendar.fields" id="map_event_2">
+            <field name="name" ref="base_calendar.field_event_recurrence-id"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','recurrent_id'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
 
-		<record model="basic.calendar.fields" id="caldav.map_event_4">
+        <record model="basic.calendar.fields" id="map_event_4">
 			<field name="name" ref="base_calendar.field_event_attendee" />
 			<field name="type_id" ref="caldav.calendar_lines_event" />
 			<field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','crm.meeting')]" />
 			<field name="fn">field</field>
-		</record>
+		</record>		
 
+        <record model="basic.calendar.fields" id="map_event_5">
+            <field name="name" ref="base_calendar.field_event_rrule"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','rrule'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
 
-		<record model="basic.calendar.fields" id="map_event_8">
+        <record model="basic.calendar.fields" id="map_event_6">
+            <field name="name" ref="base_calendar.field_event_dtend"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','date_deadline'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_7">
+            <field name="name" ref="base_calendar.field_event_valarm"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','caldav_alarm_id'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_8">
 			<field name="name" ref="base_calendar.field_event_priority"/>
 		    <field name="type_id" ref="caldav.calendar_lines_event" />
 			<field name="field_id" search="[('name','=','priority'),('model_id.model','=','crm.meeting')]" />
 		    <field name="fn">field</field>
-		</record>
+		</record>	
 		
-		<record model="basic.calendar.fields" id="map_event_11">
+
+        <record model="basic.calendar.fields" id="map_event_9">
+            <field name="name" ref="base_calendar.field_event_location"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','location'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_10">
+            <field name="name" ref="base_calendar.field_event_exrule"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','exrule'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_11">
 			<field name="name" ref="base_calendar.field_event_status"/>
 		    <field name="type_id" ref="caldav.calendar_lines_event" />
 			<field name="field_id" search="[('name','=','state'),('model_id.model','=','crm.meeting')]" />
@@ -59,5 +127,220 @@
 		    <field name="fn">field</field>
 		</record>
 
+        <record model="basic.calendar.fields" id="map_event_12">
+            <field name="name" ref="base_calendar.field_event_exdate"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','exdate'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_13">
+            <field name="name" ref="base_calendar.field_event_dtstamp"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','date'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_14">
+            <field name="name" ref="base_calendar.field_event_description"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_15">
+            <field name="name" ref="base_calendar.field_event_dtstart"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','date'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_16">
+            <field name="name" ref="base_calendar.field_event_class"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','class'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_18">
+            <field name="name" ref="base_calendar.field_event_created"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','create_date'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_19">
+            <field name="name" ref="base_calendar.field_event_url"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','caldav_url'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_20">
+            <field name="name" ref="base_calendar.field_event_summary"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>       
+
+
+
+        <record model="basic.calendar.fields" id="map_alarm_1">
+            <field name="name" ref="base_calendar.field_alarm_attendee"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	        <field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','calendar.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_2">
+            <field name="name" ref="base_calendar.field_alarm_trigger_duration"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	        <field name="field_id" search="[('name','=','trigger_duration'),('model_id.model','=','res.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_3">
+            <field name="name" ref="base_calendar.field_alarm_description"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	        <field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_4">
+            <field name="name" ref="base_calendar.field_alarm_attach"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	        <field name="field_id" search="[('name','=','attach'),('model_id.model','=','calendar.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_5">
+            <field name="name" ref="base_calendar.field_alarm_trigger_occurs"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	        <field name="field_id" search="[('name','=','trigger_occurs'),('model_id.model','=','res.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_6">
+            <field name="name" ref="base_calendar.field_alarm_trigger_interval"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	        <field name="field_id" search="[('name','=','trigger_interval'),('model_id.model','=','res.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_7">
+            <field name="name" ref="base_calendar.field_alarm_summary"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	        <field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_8">
+            <field name="name" ref="base_calendar.field_alarm_duration"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	        <field name="field_id" search="[('name','=','duration'),('model_id.model','=','res.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_9">
+            <field name="name" ref="base_calendar.field_alarm_repeat"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	        <field name="field_id" search="[('name','=','repeat'),('model_id.model','=','res.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_10">
+            <field name="name" ref="base_calendar.field_alarm_action"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	        <field name="field_id" search="[('name','=','action'),('model_id.model','=','calendar.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_11">
+            <field name="name" ref="base_calendar.field_alarm_trigger_related"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	        <field name="field_id" search="[('name','=','trigger_related'),('model_id.model','=','res.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+
+        <record model="basic.calendar.fields" id="map_attendee_1">
+            <field name="name" ref="base_calendar.field_attendee_cn"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	        <field name="field_id" search="[('name','=','cn'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_2">
+            <field name="name" ref="base_calendar.field_attendee_sent-by"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	        <field name="field_id" search="[('name','=','sent_by'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_3">
+            <field name="name" ref="base_calendar.field_attendee_language"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	        <field name="field_id" search="[('name','=','language'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_4">
+            <field name="name" ref="base_calendar.field_attendee_delegated-from"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	        <field name="field_id" search="[('name','=','delegated_from'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_5">
+            <field name="name" ref="base_calendar.field_attendee_member"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	        <field name="field_id" search="[('name','=','member'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_6">
+            <field name="name" ref="base_calendar.field_attendee_cutype"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	        <field name="field_id" search="[('name','=','cutype'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_7">
+            <field name="name" ref="base_calendar.field_attendee_role"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	        <field name="field_id" search="[('name','=','role'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_8">
+            <field name="name" ref="base_calendar.field_attendee_partstat"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	        <field name="field_id" search="[('name','=','state'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_9">
+            <field name="name" ref="base_calendar.field_attendee_delegated-to"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	        <field name="field_id" search="[('name','=','delegated_to'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_10">
+            <field name="name" ref="base_calendar.field_attendee_dir"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	        <field name="field_id" search="[('name','=','dir'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_11">
+            <field name="name" ref="base_calendar.field_attendee_rsvp"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	        <field name="field_id" search="[('name','=','rsvp'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+		
+
 	</data>
 </openerp>
diff --git a/addons/project_calendar/project_calendar_data.xml b/addons/project_calendar/project_calendar_data.xml
index e4c333ca6e2..63b5e99333a 100644
--- a/addons/project_calendar/project_calendar_data.xml
+++ b/addons/project_calendar/project_calendar_data.xml
@@ -1,13 +1,17 @@
 <?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 model="basic.calendar" id="base_calendar.basic_calendar2">
+			<field name="name">meeting_todo</field>
 		</record>
 		
+        <record model="basic.calendar.lines" id="caldav.calendar_lines_todo">
+			<field name="name">vtodo</field>
+			<field name="calendar_id" ref="base_calendar.basic_calendar2" />
+			<field name="object_id" search="[('model','=','project.task')]" />
+            <field name="domain">[('user_id','=', uid)]</field>
+		</record>		
+		
 		<record model="basic.calendar.fields" id="map_todo_1">
 			<field name="name" ref="base_calendar.field_todo_status" />
 			<field name="type_id" ref="caldav.calendar_lines_todo" />
@@ -15,34 +19,430 @@
 			<field name="mapping">{'needs-action': 'draft', 'completed': 'done', 'in-process': 'open', 'cancelled': 'cancelled'}</field>
 			<field name="fn">field</field>
 		</record>
-		
-		<record model="basic.calendar.fields" id="map_todo_3">
+
+        <record model="basic.calendar.fields" id="map_todo_2">
+            <field name="name" ref="base_calendar.field_todo_exdate"/>
+            <field name="type_id" ref="caldav.calendar_lines_todo" />
+	        <field name="field_id" search="[('name','=','exdate'),('model_id.model','=','calendar.todo')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_todo_3">
 			<field name="name" ref="base_calendar.field_todo_attendee" />
 			<field name="type_id" ref="caldav.calendar_lines_todo" />
 			<field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','project.task')]" />
 			<field name="fn">field</field>
 		</record>
-		
-		<record model="basic.calendar.fields" id="map_todo_9">
+
+        <record model="basic.calendar.fields" id="map_todo_4">
+            <field name="name" ref="base_calendar.field_todo_valarm"/>
+            <field name="type_id" ref="caldav.calendar_lines_todo" />
+	        <field name="field_id" search="[('name','=','caldav_alarm_id'),('model_id.model','=','calendar.todo')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_todo_5">
+            <field name="name" ref="base_calendar.field_todo_description"/>
+            <field name="type_id" ref="caldav.calendar_lines_todo" />
+	        <field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.todo')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_todo_6">
+            <field name="name" ref="base_calendar.field_todo_seq"/>
+            <field name="type_id" ref="caldav.calendar_lines_todo" />
+	        <field name="field_id" search="[('name','=','sequence'),('model_id.model','=','calendar.todo')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_todo_7">
+            <field name="name" ref="base_calendar.field_todo_url"/>
+            <field name="type_id" ref="caldav.calendar_lines_todo" />
+	        <field name="field_id" search="[('name','=','caldav_url'),('model_id.model','=','calendar.todo')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_todo_9">
 		    <field name="name" ref="base_calendar.field_todo_percent"/>
 		    <field name="type_id" ref="caldav.calendar_lines_todo" />
 			<field name="field_id" search="[('name','=','progress'),('model_id.model','=','project.task')]" />
 			<field name="fn">field</field>
 		</record>
-		
-		<record model="basic.calendar.fields" id="map_todo_12">
+
+        <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" />
+	        <field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.todo')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_todo_12">
 			<field name="name" ref="base_calendar.field_event_priority"/>
 			<field name="type_id" ref="caldav.calendar_lines_todo" />
 			<field name="field_id" search="[('name','=','priority'),('model_id.model','=','project.task')]" />
 			<field name="fn">field</field>
 		</record>
-		
-		<record model="basic.calendar.fields" id="map_todo_15">
+
+        <record model="basic.calendar.fields" id="map_todo_13">
+            <field name="name" ref="base_calendar.field_todo_location"/>
+            <field name="type_id" ref="caldav.calendar_lines_todo" />
+	        <field name="field_id" search="[('name','=','location'),('model_id.model','=','calendar.todo')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_todo_14">
+            <field name="name" ref="base_calendar.field_todo_exrule"/>
+            <field name="type_id" ref="caldav.calendar_lines_todo" />
+	        <field name="field_id" search="[('name','=','exrule'),('model_id.model','=','calendar.todo')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_todo_15">
 		    <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">hours</field>
 		</record>
+
+        <record model="basic.calendar.fields" id="map_todo_16">
+            <field name="name" ref="base_calendar.field_todo_dtstart"/>
+            <field name="type_id" ref="caldav.calendar_lines_todo" />
+	        <field name="field_id" search="[('name','=','date'),('model_id.model','=','calendar.todo')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_todo_17">
+            <field name="name" ref="base_calendar.field_todo_rrule"/>
+            <field name="type_id" ref="caldav.calendar_lines_todo" />
+	        <field name="field_id" search="[('name','=','rrule'),('model_id.model','=','calendar.todo')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_todo_18">
+            <field name="name" ref="base_calendar.field_todo_class"/>
+            <field name="type_id" ref="caldav.calendar_lines_todo" />
+	        <field name="field_id" search="[('name','=','class'),('model_id.model','=','calendar.todo')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_todo_19">
+            <field name="name" ref="base_calendar.field_todo_uid"/>
+            <field name="type_id" ref="caldav.calendar_lines_todo" />
+	        <field name="field_id" search="[('name','=','id'),('model_id.model','=','calendar.todo')]" />
+            <field name="fn">field</field>
+        </record>	
+		
+
+        <record model="basic.calendar.lines" id="caldav.calendar_lines_event2">
+			<field name="name">vevent</field>
+			<field name="calendar_id" ref="base_calendar.basic_calendar2" />
+			<field name="object_id" search="[('model','=','crm.meeting')]" />
+            <field name="domain">[('user_id','=', uid)]</field>
+		</record>
+
+        <record model="basic.calendar.lines" id="caldav.calendar_lines_alarm2">
+			<field name="name">valarm</field>
+			<field name="calendar_id" ref="base_calendar.basic_calendar2" />
+			<field name="object_id" search="[('model','=','calendar.alarm')]" />
+		</record>
+		
+		<record model="basic.calendar.lines" id="caldav.calendar_lines_attendee2">
+			<field name="name">attendee</field>
+			<field name="calendar_id" ref="base_calendar.basic_calendar2" />
+			<field name="object_id" search="[('model','=','calendar.attendee')]" />
+		</record>
+		
+		
+		
+        <record model="basic.calendar.fields" id="map_event_1">
+            <field name="name" ref="base_calendar.field_event_uid"/>
+            <field name="type_id" ref="caldav.calendar_lines_event2" />
+	        <field name="field_id" search="[('name','=','id'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_2">
+            <field name="name" ref="base_calendar.field_event_recurrence-id"/>
+            <field name="type_id" ref="caldav.calendar_lines_event2" />
+	        <field name="field_id" search="[('name','=','recurrent_id'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_4">
+			<field name="name" ref="base_calendar.field_event_attendee" />
+			<field name="type_id" ref="caldav.calendar_lines_event2" />
+			<field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','crm.meeting')]" />
+			<field name="fn">field</field>
+		</record>		
+
+        <record model="basic.calendar.fields" id="map_event_5">
+            <field name="name" ref="base_calendar.field_event_rrule"/>
+            <field name="type_id" ref="caldav.calendar_lines_event2" />
+	        <field name="field_id" search="[('name','=','rrule'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_6">
+            <field name="name" ref="base_calendar.field_event_dtend"/>
+            <field name="type_id" ref="caldav.calendar_lines_event2" />
+	        <field name="field_id" search="[('name','=','date_deadline'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_7">
+            <field name="name" ref="base_calendar.field_event_valarm"/>
+            <field name="type_id" ref="caldav.calendar_lines_event2" />
+	        <field name="field_id" search="[('name','=','caldav_alarm_id'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_8">
+			<field name="name" ref="base_calendar.field_event_priority"/>
+		    <field name="type_id" ref="caldav.calendar_lines_event2" />
+			<field name="field_id" search="[('name','=','priority'),('model_id.model','=','crm.meeting')]" />
+		    <field name="fn">field</field>
+		</record>	
+		
+
+        <record model="basic.calendar.fields" id="map_event_9">
+            <field name="name" ref="base_calendar.field_event_location"/>
+            <field name="type_id" ref="caldav.calendar_lines_event2" />
+	        <field name="field_id" search="[('name','=','location'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_10">
+            <field name="name" ref="base_calendar.field_event_exrule"/>
+            <field name="type_id" ref="caldav.calendar_lines_event2" />
+	        <field name="field_id" search="[('name','=','exrule'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_11">
+			<field name="name" ref="base_calendar.field_event_status"/>
+		    <field name="type_id" ref="caldav.calendar_lines_event2" />
+			<field name="field_id" search="[('name','=','state'),('model_id.model','=','crm.meeting')]" />
+			<field name="mapping">{'tentative': 'draft', 'confirmed': 'open', 'cancelled': 'cancel'}</field>
+		    <field name="fn">field</field>
+		</record>
+
+        <record model="basic.calendar.fields" id="map_event_12">
+            <field name="name" ref="base_calendar.field_event_exdate"/>
+            <field name="type_id" ref="caldav.calendar_lines_event2" />
+	        <field name="field_id" search="[('name','=','exdate'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_13">
+            <field name="name" ref="base_calendar.field_event_dtstamp"/>
+            <field name="type_id" ref="caldav.calendar_lines_event2" />
+	        <field name="field_id" search="[('name','=','date'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_14">
+            <field name="name" ref="base_calendar.field_event_description"/>
+            <field name="type_id" ref="caldav.calendar_lines_event2" />
+	        <field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_15">
+            <field name="name" ref="base_calendar.field_event_dtstart"/>
+            <field name="type_id" ref="caldav.calendar_lines_event2" />
+	        <field name="field_id" search="[('name','=','date'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_16">
+            <field name="name" ref="base_calendar.field_event_class"/>
+            <field name="type_id" ref="caldav.calendar_lines_event2" />
+	        <field name="field_id" search="[('name','=','class'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_18">
+            <field name="name" ref="base_calendar.field_event_created"/>
+            <field name="type_id" ref="caldav.calendar_lines_event2" />
+	        <field name="field_id" search="[('name','=','create_date'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_19">
+            <field name="name" ref="base_calendar.field_event_url"/>
+            <field name="type_id" ref="caldav.calendar_lines_event2" />
+	        <field name="field_id" search="[('name','=','caldav_url'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_20">
+            <field name="name" ref="base_calendar.field_event_summary"/>
+            <field name="type_id" ref="caldav.calendar_lines_event2" />
+	        <field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>       
+
+
+
+        <record model="basic.calendar.fields" id="map_alarm_1">
+            <field name="name" ref="base_calendar.field_alarm_attendee"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm2" />
+	        <field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','calendar.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_2">
+            <field name="name" ref="base_calendar.field_alarm_trigger_duration"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm2" />
+	        <field name="field_id" search="[('name','=','trigger_duration'),('model_id.model','=','res.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_3">
+            <field name="name" ref="base_calendar.field_alarm_description"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm2" />
+	        <field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_4">
+            <field name="name" ref="base_calendar.field_alarm_attach"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm2" />
+	        <field name="field_id" search="[('name','=','attach'),('model_id.model','=','calendar.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_5">
+            <field name="name" ref="base_calendar.field_alarm_trigger_occurs"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm2" />
+	        <field name="field_id" search="[('name','=','trigger_occurs'),('model_id.model','=','res.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_6">
+            <field name="name" ref="base_calendar.field_alarm_trigger_interval"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm2" />
+	        <field name="field_id" search="[('name','=','trigger_interval'),('model_id.model','=','res.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_7">
+            <field name="name" ref="base_calendar.field_alarm_summary"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm2" />
+	        <field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_8">
+            <field name="name" ref="base_calendar.field_alarm_duration"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm2" />
+	        <field name="field_id" search="[('name','=','duration'),('model_id.model','=','res.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_9">
+            <field name="name" ref="base_calendar.field_alarm_repeat"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm2" />
+	        <field name="field_id" search="[('name','=','repeat'),('model_id.model','=','res.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_10">
+            <field name="name" ref="base_calendar.field_alarm_action"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm2" />
+	        <field name="field_id" search="[('name','=','action'),('model_id.model','=','calendar.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_11">
+            <field name="name" ref="base_calendar.field_alarm_trigger_related"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm2" />
+	        <field name="field_id" search="[('name','=','trigger_related'),('model_id.model','=','res.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+
+        <record model="basic.calendar.fields" id="map_attendee_1">
+            <field name="name" ref="base_calendar.field_attendee_cn"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee2" />
+	        <field name="field_id" search="[('name','=','cn'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_2">
+            <field name="name" ref="base_calendar.field_attendee_sent-by"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee2" />
+	        <field name="field_id" search="[('name','=','sent_by'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_3">
+            <field name="name" ref="base_calendar.field_attendee_language"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee2" />
+	        <field name="field_id" search="[('name','=','language'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_4">
+            <field name="name" ref="base_calendar.field_attendee_delegated-from"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee2" />
+	        <field name="field_id" search="[('name','=','delegated_from'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_5">
+            <field name="name" ref="base_calendar.field_attendee_member"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee2" />
+	        <field name="field_id" search="[('name','=','member'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_6">
+            <field name="name" ref="base_calendar.field_attendee_cutype"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee2" />
+	        <field name="field_id" search="[('name','=','cutype'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_7">
+            <field name="name" ref="base_calendar.field_attendee_role"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee2" />
+	        <field name="field_id" search="[('name','=','role'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_8">
+            <field name="name" ref="base_calendar.field_attendee_partstat"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee2" />
+	        <field name="field_id" search="[('name','=','state'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_9">
+            <field name="name" ref="base_calendar.field_attendee_delegated-to"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee2" />
+	        <field name="field_id" search="[('name','=','delegated_to'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_10">
+            <field name="name" ref="base_calendar.field_attendee_dir"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee2" />
+	        <field name="field_id" search="[('name','=','dir'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_11">
+            <field name="name" ref="base_calendar.field_attendee_rsvp"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee2" />
+	        <field name="field_id" search="[('name','=','rsvp'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+		
+		
+		
+		
+		
 		
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>