From ec533327cb10b729932de59fe4f1176a46770f70 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Thu, 11 Feb 2010 18:28:55 +0530
Subject: [PATCH] [IMP]: crm_caldav: Changes according to names interchange of
 caldav and base_calendar

bzr revid: rpa@openerp.co.in-20100211125855-wvojg9r6uq8xkip1
---
 addons/crm_caldav/__init__.py                 |   2 +-
 addons/crm_caldav/__terp__.py                 |  14 +-
 .../{crm_meeting.py => crm_caldav.py}         |   0
 ...m_meeting_data.xml => crm_caldav_data.xml} | 182 +++++++++---------
 ...m_meeting_menu.xml => crm_caldav_menu.xml} |   2 +-
 ...m_meeting_view.xml => crm_caldav_view.xml} |  10 +-
 ...eting_wizard.xml => crm_caldav_wizard.xml} |   6 +-
 addons/project_calendar/__terp__.py           |   2 +-
 .../project_calendar_data.xml                 |  92 ++++-----
 .../project_calendar_view.xml                 |   4 +-
 .../project_calendar_wizard.xml               |   8 +-
 11 files changed, 160 insertions(+), 162 deletions(-)
 rename addons/crm_caldav/{crm_meeting.py => crm_caldav.py} (100%)
 rename addons/crm_caldav/{crm_meeting_data.xml => crm_caldav_data.xml} (61%)
 rename addons/crm_caldav/{crm_meeting_menu.xml => crm_caldav_menu.xml} (89%)
 rename addons/crm_caldav/{crm_meeting_view.xml => crm_caldav_view.xml} (92%)
 rename addons/crm_caldav/{crm_meeting_wizard.xml => crm_caldav_wizard.xml} (53%)

diff --git a/addons/crm_caldav/__init__.py b/addons/crm_caldav/__init__.py
index e0b36eaac3d..3c2ccf7917c 100644
--- a/addons/crm_caldav/__init__.py
+++ b/addons/crm_caldav/__init__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 
-import crm_meeting
+import crm_caldav
 
 
 
diff --git a/addons/crm_caldav/__terp__.py b/addons/crm_caldav/__terp__.py
index 19357a428be..4474506bcaa 100644
--- a/addons/crm_caldav/__terp__.py
+++ b/addons/crm_caldav/__terp__.py
@@ -33,19 +33,17 @@
 """, 
     'author': 'Tiny', 
     'website': 'http://www.openerp.com', 
-    'depends': ['base', 
-                        'caldav', 
-                        'crm', 
-                        'mail_gateway', 
+    'depends': ['base_calendar', 
+                        'crm'
                     ], 
     'init_xml': [ 
-                'crm_meeting_data.xml',                 
+                'crm_caldav_data.xml',                 
     ], 
 
     'update_xml': [        
-        'crm_meeting_wizard.xml', 
-        'crm_meeting_view.xml', 
-        'crm_meeting_menu.xml',         
+        'crm_caldav_wizard.xml', 
+        'crm_caldav_view.xml', 
+        'crm_caldav_menu.xml',         
     ],
     'demo_xml': [], 
     'installable': True, 
diff --git a/addons/crm_caldav/crm_meeting.py b/addons/crm_caldav/crm_caldav.py
similarity index 100%
rename from addons/crm_caldav/crm_meeting.py
rename to addons/crm_caldav/crm_caldav.py
diff --git a/addons/crm_caldav/crm_meeting_data.xml b/addons/crm_caldav/crm_caldav_data.xml
similarity index 61%
rename from addons/crm_caldav/crm_meeting_data.xml
rename to addons/crm_caldav/crm_caldav_data.xml
index ae7315da835..7b887e02092 100644
--- a/addons/crm_caldav/crm_meeting_data.xml
+++ b/addons/crm_caldav/crm_caldav_data.xml
@@ -9,81 +9,81 @@
 
 <!--		Event Attribute mapping for Calendar-->
 
-        <record model="basic.calendar" id="base_calendar.basic_calendar1">
+        <record model="basic.calendar" id="caldav.basic_calendar1">
 			<field name="name">Meetings</field>
 		</record>
 
-        <record model="basic.calendar.lines" id="caldav.calendar_lines_event">
+        <record model="basic.calendar.lines" id="base_calendar.calendar_lines_event">
 			<field name="name">vevent</field>
-			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
+			<field name="calendar_id" ref="caldav.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">
+        <record model="basic.calendar.lines" id="base_calendar.calendar_lines_alarm">
 			<field name="name">valarm</field>
-			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
+			<field name="calendar_id" ref="caldav.basic_calendar1" />
 			<field name="object_id" search="[('model','=','calendar.alarm')]" />
 		</record>
 		
-		<record model="basic.calendar.lines" id="caldav.calendar_lines_attendee">
+		<record model="basic.calendar.lines" id="base_calendar.calendar_lines_attendee">
 			<field name="name">attendee</field>
-			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
+			<field name="calendar_id" ref="caldav.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="name" ref="caldav.field_event_uid"/>
+            <field name="type_id" ref="base_calendar.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="name" ref="caldav.field_event_recurrence-id"/>
+            <field name="type_id" ref="base_calendar.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_3">
-            <field name="name" ref="base_calendar.field_event_vtimezone"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
+            <field name="name" ref="caldav.field_event_vtimezone"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_event" />
 	        <field name="field_id" search="[('name','=','vtimezone'),('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_event" />
+			<field name="name" ref="caldav.field_event_attendee" />
+			<field name="type_id" ref="base_calendar.calendar_lines_event" />
 			<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_event" />
+            <field name="name" ref="caldav.field_event_rrule"/>
+            <field name="type_id" ref="base_calendar.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="name" ref="caldav.field_event_dtend"/>
+            <field name="type_id" ref="base_calendar.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="name" ref="caldav.field_event_valarm"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','base_calendar_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="name" ref="caldav.field_event_priority"/>
+		    <field name="type_id" ref="base_calendar.calendar_lines_event" />
 			<field name="field_id" search="[('name','=','priority'),('model_id.model','=','crm.meeting')]" />
 		    <field name="fn">field</field>
 		    <field name="mapping">{'1': '1', '2': '2', '3': '2','4': '2', '5': '3', '6': '4', '7': '4', '8': '4', '9': '5'}</field>
@@ -91,79 +91,79 @@
 		
 
         <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="name" ref="caldav.field_event_location"/>
+            <field name="type_id" ref="base_calendar.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="name" ref="caldav.field_event_exrule"/>
+            <field name="type_id" ref="base_calendar.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="name" ref="caldav.field_event_status"/>
+		    <field name="type_id" ref="base_calendar.calendar_lines_event" />
 			<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_event" />
+            <field name="name" ref="caldav.field_event_exdate"/>
+            <field name="type_id" ref="base_calendar.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="name" ref="caldav.field_event_dtstamp"/>
+            <field name="type_id" ref="base_calendar.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="name" ref="caldav.field_event_description"/>
+            <field name="type_id" ref="base_calendar.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="name" ref="caldav.field_event_dtstart"/>
+            <field name="type_id" ref="base_calendar.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="name" ref="caldav.field_event_class"/>
+            <field name="type_id" ref="base_calendar.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="name" ref="caldav.field_event_created"/>
+            <field name="type_id" ref="base_calendar.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="name" ref="caldav.field_event_url"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','base_calendar_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="name" ref="caldav.field_event_summary"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_event" />
 	        <field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.event')]" />
             <field name="fn">field</field>
         </record>       
@@ -171,156 +171,156 @@
 
 
         <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="name" ref="caldav.field_alarm_attendee"/>
+            <field name="type_id" ref="base_calendar.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="name" ref="caldav.field_alarm_trigger_duration"/>
+            <field name="type_id" ref="base_calendar.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="name" ref="caldav.field_alarm_description"/>
+            <field name="type_id" ref="base_calendar.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="name" ref="caldav.field_alarm_attach"/>
+            <field name="type_id" ref="base_calendar.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="name" ref="caldav.field_alarm_trigger_occurs"/>
+            <field name="type_id" ref="base_calendar.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="name" ref="caldav.field_alarm_trigger_interval"/>
+            <field name="type_id" ref="base_calendar.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="name" ref="caldav.field_alarm_summary"/>
+            <field name="type_id" ref="base_calendar.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="name" ref="caldav.field_alarm_duration"/>
+            <field name="type_id" ref="base_calendar.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="name" ref="caldav.field_alarm_repeat"/>
+            <field name="type_id" ref="base_calendar.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="name" ref="caldav.field_alarm_action"/>
+            <field name="type_id" ref="base_calendar.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="name" ref="caldav.field_alarm_trigger_related"/>
+            <field name="type_id" ref="base_calendar.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="name" ref="caldav.field_attendee_cn"/>
+            <field name="type_id" ref="base_calendar.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="name" ref="caldav.field_attendee_sent-by"/>
+            <field name="type_id" ref="base_calendar.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="name" ref="caldav.field_attendee_language"/>
+            <field name="type_id" ref="base_calendar.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="name" ref="caldav.field_attendee_delegated-from"/>
+            <field name="type_id" ref="base_calendar.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="name" ref="caldav.field_attendee_member"/>
+            <field name="type_id" ref="base_calendar.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="name" ref="caldav.field_attendee_cutype"/>
+            <field name="type_id" ref="base_calendar.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="name" ref="caldav.field_attendee_role"/>
+            <field name="type_id" ref="base_calendar.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="name" ref="caldav.field_attendee_partstat"/>
+            <field name="type_id" ref="base_calendar.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="name" ref="caldav.field_attendee_delegated-to"/>
+            <field name="type_id" ref="base_calendar.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="name" ref="caldav.field_attendee_dir"/>
+            <field name="type_id" ref="base_calendar.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="name" ref="caldav.field_attendee_rsvp"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_attendee" />
 	        <field name="field_id" search="[('name','=','rsvp'),('model_id.model','=','calendar.attendee')]" />
             <field name="fn">field</field>
         </record>
diff --git a/addons/crm_caldav/crm_meeting_menu.xml b/addons/crm_caldav/crm_caldav_menu.xml
similarity index 89%
rename from addons/crm_caldav/crm_meeting_menu.xml
rename to addons/crm_caldav/crm_caldav_menu.xml
index 7c01fa3415d..afdf7241fbb 100644
--- a/addons/crm_caldav/crm_meeting_menu.xml
+++ b/addons/crm_caldav/crm_caldav_menu.xml
@@ -8,7 +8,7 @@
 	 	<field name="res_model">calendar.attendee</field>
 	 	<field name="view_type">form</field>
 	 	<field name="view_mode">tree,form</field>
-	 	<field name="view_id" ref="caldav.caldav_attendee_tree_view" />	 	
+	 	<field name="view_id" ref="base_calendar.base_calendar_attendee_tree_view" />	 	
         <field name="domain">[('ref','like','crm.meeting,')]</field>
 	 	<field name="context">{'default_sent_by_uid': uid}</field>
 	 </record>
diff --git a/addons/crm_caldav/crm_meeting_view.xml b/addons/crm_caldav/crm_caldav_view.xml
similarity index 92%
rename from addons/crm_caldav/crm_meeting_view.xml
rename to addons/crm_caldav/crm_caldav_view.xml
index 56eccd606cd..4cc55344534 100644
--- a/addons/crm_caldav/crm_meeting_view.xml
+++ b/addons/crm_caldav/crm_caldav_view.xml
@@ -14,12 +14,12 @@
                                 	on_change="onchange_rrule_type(rrule_type)"
                                 	colspan="1" attrs="{'readonly':[('recurrent_uid','!=',False)]}"/>
                                 <button string="Custom"
-                					name="%(caldav.action_calendar_custom_rrule_wizard)d"
+                					name="%(base_calendar.action_calendar_custom_rrule_wizard)d"
                 					icon="gtk-save-as" type="action" context="{'model' : 'crm.meeting'}"
                                     attrs="{'invisible': [('rrule_type','!=','custom')]}"
                                     />
                                 <button string="Edit" help="Edit only this Occurrency Meeting" attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
-                    			name="%(base_calendar.wizard_edit_this_event)d" icon="gtk-save"
+                    			name="%(caldav.wizard_edit_this_event)d" icon="gtk-save"
                     			type="action" context="{'model' : 'crm.meeting', 'date': date, 'date_deadline': date_deadline}" />
                         </group>
                         <field name="alarm_id" string="Reminder" widget="selection" /> 
@@ -37,7 +37,7 @@
                     <xpath expr="/form/notebook/page[@string='Meeting']" position="after">
                         <page string="Invitation Detail">
                 			<button string="Invite People"
-                				name="%(caldav.action_view_calendar_invite_attendee_wizard)d"
+                				name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
                 				icon="terp-partner" type="action"
                 				context="{'model' : 'crm.meeting', 'attendee_field':'attendee_ids'}" colspan="2"/>
                 			<field name="attendee_ids" colspan="4"
@@ -106,7 +106,7 @@
                 <field name="name">calendar.attendee.form.inherit</field>
                 <field name="model">calendar.attendee</field>
                 <field name="type">form</field>
-                <field name="inherit_id" ref="caldav.caldav_attendee_form_view"/>                
+                <field name="inherit_id" ref="base_calendar.base_calendar_attendee_form_view"/>                
                 <field name="arch" type="xml">
                     <field name="language" position="after">
                         <field name="categ_id" string="Event Type"/>
@@ -118,7 +118,7 @@
                 <field name="name">calendar.attendee.tree.inherit</field>
                 <field name="model">calendar.attendee</field>
                 <field name="type">tree</field>
-                <field name="inherit_id" ref="caldav.caldav_attendee_tree_view"/>                
+                <field name="inherit_id" ref="base_calendar.base_calendar_attendee_tree_view"/>                
                 <field name="arch" type="xml">
                     <field name="role" position="after">
                         <field name="categ_id" string="Event Type"/>
diff --git a/addons/crm_caldav/crm_meeting_wizard.xml b/addons/crm_caldav/crm_caldav_wizard.xml
similarity index 53%
rename from addons/crm_caldav/crm_meeting_wizard.xml
rename to addons/crm_caldav/crm_caldav_wizard.xml
index a0f517766f5..47c8e2eb4b2 100644
--- a/addons/crm_caldav/crm_meeting_wizard.xml
+++ b/addons/crm_caldav/crm_caldav_wizard.xml
@@ -2,13 +2,13 @@
 <openerp>
 	<data>
 		<wizard string="Import .ics File" model="crm.meeting"
-			name="calendar.event.import" id="base_calendar.wizard_cal_event_import" />
+			name="calendar.event.import" id="caldav.wizard_cal_event_import" />
 
 		<wizard string="Export .ics File" model="crm.meeting"
-			name="calendar.event.export" id="base_calendar.wizard_cal_event_export" />
+			name="calendar.event.export" id="caldav.wizard_cal_event_export" />
 
 		<wizard string="Edit this event" model="crm.meeting"
-			name="calendar.event.edit.this" id="base_calendar.wizard_edit_this_event"
+			name="calendar.event.edit.this" id="caldav.wizard_edit_this_event"
 			menu="False" />
 	</data>
 </openerp>
diff --git a/addons/project_calendar/__terp__.py b/addons/project_calendar/__terp__.py
index dc091369928..ba56a4a17b7 100644
--- a/addons/project_calendar/__terp__.py
+++ b/addons/project_calendar/__terp__.py
@@ -25,7 +25,7 @@
     "author" : "Tiny", 
     "category" : "Generic Modules/Others", 
     "description": """ Synchronize between Project task and Caldav Vtodo.""", 
-    "depends" : ["project", "caldav"], 
+    "depends" : ["project", "base_calendar"], 
     "init_xml" : ["project_calendar_data.xml"], 
     "demo_xml" : [], 
     "update_xml" : ["project_calendar_view.xml", 
diff --git a/addons/project_calendar/project_calendar_data.xml b/addons/project_calendar/project_calendar_data.xml
index 3db1fc0b30a..30a200b0315 100644
--- a/addons/project_calendar/project_calendar_data.xml
+++ b/addons/project_calendar/project_calendar_data.xml
@@ -2,19 +2,19 @@
 <openerp>
 	<data noupdate="1">
 
-        <record model="basic.calendar" id="base_calendar.basic_calendar2">
+        <record model="basic.calendar" id="caldav.basic_calendar2">
 			<field name="name">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="calendar_id" ref="caldav.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="name" ref="caldav.field_todo_status" />
 			<field name="type_id" ref="caldav.calendar_lines_todo" />
 			<field name="field_id" search="[('name','=','state'),('model_id.model','=','project.task')]" />
 			<field name="mapping">{'needs-action': 'draft', 'completed': 'done', 'in-process': 'open', 'cancelled': 'cancelled'}</field>
@@ -22,49 +22,49 @@
 		</record>
 
         <record model="basic.calendar.fields" id="map_todo_2">
-            <field name="name" ref="base_calendar.field_todo_exdate"/>
+            <field name="name" ref="caldav.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="name" ref="caldav.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_4">
-            <field name="name" ref="base_calendar.field_todo_valarm"/>
+            <field name="name" ref="caldav.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="field_id" search="[('name','=','base_calendar_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="name" ref="caldav.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="name" ref="caldav.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="name" ref="caldav.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="field_id" search="[('name','=','base_calendar_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="name" ref="caldav.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>
@@ -72,21 +72,21 @@
 	
 	
 		<record model="basic.calendar.fields" id="map_todo_10">
-	            <field name="name" ref="base_calendar.field_todo_vtimezone"/>
+	            <field name="name" ref="caldav.field_todo_vtimezone"/>
 	            <field name="type_id" ref="caldav.calendar_lines_todo" />
 		        <field name="field_id" search="[('name','=','vtimezone'),('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="name" ref="caldav.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="name" ref="caldav.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>
@@ -94,49 +94,49 @@
 		</record>
 
         <record model="basic.calendar.fields" id="map_todo_13">
-            <field name="name" ref="base_calendar.field_todo_location"/>
+            <field name="name" ref="caldav.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="name" ref="caldav.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="name" ref="caldav.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="name" ref="caldav.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="name" ref="caldav.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="name" ref="caldav.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="name" ref="caldav.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>
@@ -144,89 +144,89 @@
 		
         <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="calendar_id" ref="caldav.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="calendar_id" ref="caldav.basic_calendar2" />
 			<field name="object_id" search="[('model','=','calendar.attendee')]" />
 		</record>
 		
 
         <record model="basic.calendar.fields" id="map_alarm_1">
-            <field name="name" ref="base_calendar.field_alarm_attendee"/>
+            <field name="name" ref="caldav.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="name" ref="caldav.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="name" ref="caldav.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="name" ref="caldav.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="name" ref="caldav.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="name" ref="caldav.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="name" ref="caldav.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="name" ref="caldav.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="name" ref="caldav.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="name" ref="caldav.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="name" ref="caldav.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>
@@ -234,77 +234,77 @@
 
 
         <record model="basic.calendar.fields" id="map_attendee_1">
-            <field name="name" ref="base_calendar.field_attendee_cn"/>
+            <field name="name" ref="caldav.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="name" ref="caldav.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="name" ref="caldav.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="name" ref="caldav.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="name" ref="caldav.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="name" ref="caldav.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="name" ref="caldav.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="name" ref="caldav.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="name" ref="caldav.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="name" ref="caldav.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="name" ref="caldav.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>
diff --git a/addons/project_calendar/project_calendar_view.xml b/addons/project_calendar/project_calendar_view.xml
index 3bae9922bd9..d4fc7115491 100644
--- a/addons/project_calendar/project_calendar_view.xml
+++ b/addons/project_calendar/project_calendar_view.xml
@@ -11,7 +11,7 @@
 				<notebook position="inside">
 					<page string="Assignees Detail">
             			<button string="Assign Task"
-            				name="%(caldav.action_view_calendar_invite_attendee_wizard)d"
+            				name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
             				icon="terp-partner" type="action"
             				context="{'model' : 'project.task'}" colspan="2"/>
             			<field name="attendee_ids" colspan="4"
@@ -89,7 +89,7 @@
 					<field name="vtimezone" colspan="2" />
 					<field name="location" colspan="2" />
 					<field name="alarm_id" string="Reminder" widget="selection" />
-					<field name="caldav_url" widget="url" />
+					<field name="base_calendar_url" widget="url" />
 					<field name="rrule" invisible="1"/>
 				</field>
 			</field>
diff --git a/addons/project_calendar/project_calendar_wizard.xml b/addons/project_calendar/project_calendar_wizard.xml
index 7928ff3cdca..2bb677eea46 100644
--- a/addons/project_calendar/project_calendar_wizard.xml
+++ b/addons/project_calendar/project_calendar_wizard.xml
@@ -1,17 +1,17 @@
 <openerp>
 	<data>
 		<wizard string="Import .ics File" model="project.task"
-			name="calendar.event.import" id="base_calendar.wizard_cal_event_import" />
+			name="calendar.event.import" id="caldav.wizard_cal_event_import" />
 
 		<wizard string="Subscribe"
 			model="project.task" name="calendar.event.subscribe"
-			id="base_calendar.wizard_cal_event_subscribe" />
+			id="caldav.wizard_cal_event_subscribe" />
 
 		<wizard string="Export .ics File" model="project.task"
-			name="calendar.event.export" id="base_calendar.wizard_cal_event_export" />
+			name="calendar.event.export" id="caldav.wizard_cal_event_export" />
 
 		<wizard string="Edit this event" model="project.task"
-			name="calendar.event.edit.this" id="base_calendar.wizard_edit_this_event"
+			name="calendar.event.edit.this" id="caldav.wizard_edit_this_event"
 			menu="False" />
 
 	</data>