diff --git a/addons/caldav/security/ir.model.access.csv b/addons/caldav/security/ir.model.access.csv
new file mode 100644
index 00000000000..74064f43d75
--- /dev/null
+++ b/addons/caldav/security/ir.model.access.csv
@@ -0,0 +1,13 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_basic_calendar_all","basic.calendar","model_basic_calendar","base.group_user",1,1,1,1
+"access_basic_calendar_event_all","basic.calendar.event","model_basic_calendar_event","base.group_user",1,1,1,0
+"access_basic_calendar_attendee_all","basic.calendar.attendee","model_basic_calendar_attendee","base.group_user",1,1,1,0
+"access_calendar_todo_all","basic.calendar.todo","model_basic_calendar_todo","base.group_user",1,1,1,0
+"access_basic_calendar_alarm_all","basic.calendar.alarm","model_basic_calendar_alarm","base.group_user",1,1,1,1
+"access_basic_calendar_lines","basic.calendar.lines","model_basic_calendar_lines","base.group_user",1,1,1,1
+"access_basic_calendar_attributes","basic.calendar.attributes","model_basic_calendar_attributes","base.group_user",1,1,1,1
+"access_basic_calendar_fields","basic.calendar.fields","model_basic_calendar_fields","base.group_user",1,1,1,1
+"access_basic_calendar_timezone","basic.calendar.timezone","model_basic_calendar_timezone","base.group_user",1,1,1,1
+"access_calendar_event_export","calendar.event.export","model_calendar_event_export","base.group_user",1,1,1,1
+"access_calendar_event_import","calendar.event.import","model_calendar_event_import","base.group_user",1,1,1,1
+"access_calendar_event_subscribe","calendar.event.subscribe","model_calendar_event_subscribe","base.group_user",1,1,1,1
diff --git a/addons/caldav/wizard/calendar_event_export_view.xml b/addons/caldav/wizard/calendar_event_export_view.xml
index 0a049e15083..48b6224c2c7 100644
--- a/addons/caldav/wizard/calendar_event_export_view.xml
+++ b/addons/caldav/wizard/calendar_event_export_view.xml
@@ -26,18 +26,7 @@
             <field name="view_mode">tree,form</field>
            <field name="view_id" ref="view_calendar_event_export"/> 
            <field name="target">new</field>
-           <field name="context">{'record_id':active_id}</field>
         </record>
-              
-<!--        <record id="action_calendar_event_export_values" model="ir.values">-->
-<!--            <field name="model_id" ref="caldav.model_basic_calendar" />-->
-<!--            <field name="object" eval="1" />-->
-<!--            <field name="name">Export .ics File</field>-->
-<!--            <field name="key2">client_action_multi</field>-->
-<!--            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_calendar_event_export'))"/>-->
-<!--            <field name="key">action</field> -->
-<!--            <field name="model">basic.calendar</field>-->
-<!--        </record>-->
 
 
     	<act_window id="action_calendar_event_export_values"
diff --git a/addons/caldav/wizard/calendar_event_import_view.xml b/addons/caldav/wizard/calendar_event_import_view.xml
index 1fbd89b2499..575da70bd41 100644
--- a/addons/caldav/wizard/calendar_event_import_view.xml
+++ b/addons/caldav/wizard/calendar_event_import_view.xml
@@ -44,18 +44,12 @@
             <field name="view_mode">tree,form</field>
            <field name="view_id" ref="view_calendar_event_import"/> 
            <field name="target">new</field>
-           <field name="context">{'record_id':active_id}</field>
         </record>
               
-        <record id="action_calendar_event_import_values" model="ir.values">
-            <field name="model_id" ref="caldav.model_basic_calendar" />
-            <field name="object" eval="1" />
-            <field name="name">Import .ics File</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_calendar_event_import'))"/>
-            <field name="key">action</field> 
-            <field name="model">basic.calendar</field>
-        </record>
-        
+        <act_window id="action_calendar_event_import_values"
+    		key2="client_action_multi" name="Import .ics File"
+    		res_model="calendar.event.import" src_model="basic.calendar"
+    		view_mode="form" target="new" view_type="form" />
+   		
     </data>
 </openerp>
diff --git a/addons/caldav/wizard/calendar_event_subscribe_view.xml b/addons/caldav/wizard/calendar_event_subscribe_view.xml
index 95c06c20f6e..c42834bfebc 100644
--- a/addons/caldav/wizard/calendar_event_subscribe_view.xml
+++ b/addons/caldav/wizard/calendar_event_subscribe_view.xml
@@ -44,18 +44,12 @@
             <field name="view_mode">tree,form</field>
            <field name="view_id" ref="view_calendar_event_subscribe"/> 
            <field name="target">new</field>
-           <field name="context">{'record_id':active_id}</field>
-        </record>
-              
-        <record id="action_calendar_event_subscribe_values" model="ir.values">
-            <field name="model_id" ref="caldav.model_basic_calendar" />
-            <field name="object" eval="1" />
-            <field name="name">Subscribe</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_calendar_event_subscribe'))"/>
-            <field name="key">action</field> 
-            <field name="model">basic.calendar</field>
         </record>
         
+        <act_window id="action_calendar_event_subscribe_values"
+    		key2="client_action_multi" name="Subscribe"
+    		res_model="calendar.event.subscribe" src_model="basic.calendar"
+    		view_mode="form" target="new" view_type="form" />
+        
     </data>
 </openerp>
\ No newline at end of file