diff --git a/addons/caldav/caldav_setup.xml b/addons/caldav/caldav_setup.xml
index 11172eb359f..b633f3b6b76 100644
--- a/addons/caldav/caldav_setup.xml
+++ b/addons/caldav/caldav_setup.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
         <!-- /calendars tree -->
-        <record id="document.dir_calendars" model="document.directory">
+        <record id="document_directory_calendars0" model="document.directory">
             <field name="domain">[]</field>
             <field eval="1" name="resource_find_all"/>
             <field eval="0" name="ressource_tree"/>
@@ -19,7 +19,7 @@
             <field eval="0" name="ressource_tree"/>
             <field name="user_id" eval="False"/>
             <field name="company_id" ref="base.main_company"/>
-            <field model="document.directory" name="parent_id" ref="document.dir_calendars"/>
+            <field model="document.directory" name="parent_id" ref="document_directory_calendars0"/>
             <field name="type">directory</field>
             <field eval="[(6,0,[])]" name="group_ids"/>
             <field name="name">resources</field>
@@ -30,7 +30,7 @@
             <field eval="0" name="ressource_tree"/>
             <field name="user_id" eval="False"/>
             <field name="company_id" ref="base.main_company"/>
-            <field model="document.directory" name="parent_id" ref="document.dir_calendars"/>
+            <field model="document.directory" name="parent_id" ref="document_directory_calendars0"/>
             <field name="type">ressource</field>
             <field name="ressource_type_id" ref="base.model_res_users"/>
             <field eval="[(6,0,[ref('base.group_system')])]" name="group_ids"/>
@@ -43,7 +43,7 @@
             <field name="user_id" eval="False"/>
             <field name="resource_field" ref="base.field_res_users_login"/>
             <field name="company_id" ref="base.main_company"/>
-            <field model="document.directory" name="parent_id" ref="document.dir_calendars"/>
+            <field model="document.directory" name="parent_id" ref="document_directory_calendars0"/>
             <field name="storage_id" ref="document.storage_default"/>
             <field name="type">ressource</field>
             <field name="ressource_type_id" ref="base.model_res_users"/>
@@ -51,7 +51,7 @@
             <field name="name">users</field>
         </record>
         <record id="document_directory_dctx_0" model="document.directory.dctx">
-            <field model="document.directory" name="dir_id" ref="document.dir_calendars"/>
+            <field model="document.directory" name="dir_id" ref="document_directory_calendars0"/>
             <field name="field">user_id</field>
             <field name="expr">res_id</field>
         </record>
@@ -60,7 +60,7 @@
             <field eval="1" name="resource_find_all"/>
             <field name="user_id" eval="False"/>
             <field name="company_id" ref="base.main_company"/>
-            <field model="document.directory" name="parent_id" ref="document.dir_calendars"/>
+            <field model="document.directory" name="parent_id" ref="document_directory_calendars0"/>
             <field name="storage_id" ref="document.storage_default"/>
             <field name="type">directory</field>
             <field eval="[(6,0,[])]" name="group_ids"/>
@@ -72,14 +72,14 @@
             <field eval="1" name="resource_find_all"/>
             <field eval="0" name="ressource_tree"/>
             <field name="company_id" ref="base.main_company"/>
-            <field model="document.directory" name="parent_id" ref="document.dir_calendars"/>
+            <field model="document.directory" name="parent_id" ref="document_directory_calendars0"/>
             <field name="storage_id" ref="document.storage_default"/>
             <field name="type">directory</field>
             <field eval="[(6,0,[])]" name="group_ids"/>
             <field name="name">groups</field>
         </record>
         <record id="document_webdav_dir_property_calendarhomeset0" model="document.webdav.dir.property">
-            <field model="document.directory" name="dir_id" ref="document.dir_calendars"/>
+            <field model="document.directory" name="dir_id" ref="document_directory_calendars0"/>
             <field name="namespace">urn:ietf:params:xml:ns:caldav</field>
             <!-- no parent, it is a global property -->
             <field name="name">calendar-home-set</field>
diff --git a/addons/crm_caldav/crm_caldav_setup.xml b/addons/crm_caldav/crm_caldav_setup.xml
index 0f9e1e009f2..1a103f61811 100644
--- a/addons/crm_caldav/crm_caldav_setup.xml
+++ b/addons/crm_caldav/crm_caldav_setup.xml
@@ -15,271 +15,271 @@
         <field name="calendar_id" ref="basic_calendar_meetings0"/>
         <field name="domain">[]</field>
         <field name="name">attendee</field>
-        <field name="object_id" search="[('model','=','calendar.attendee')]"/>
+        <field name="object_id" ref="base_calendar.model_calendar_attendee"/>
     </record>
 
     <record id="basic_calendar_lines_valarm0" model="basic.calendar.lines">
         <field name="calendar_id" ref="basic_calendar_meetings0"/>
         <field name="domain">[]</field>
         <field name="name">valarm</field>
-        <field name="object_id" search="[('model','=','calendar.alarm')]"/>
+        <field name="object_id" ref="base_calendar.model_calendar_alarm"/>
     </record>
 
     <record id="basic_calendar_lines_vevent0" model="basic.calendar.lines">
         <field name="calendar_id" ref="basic_calendar_meetings0"/>
-        <field name="domain">[('user_id','=', uid)]</field>
+        <field name="domain">[('user_id','=', dctx_user_id)]</field>
         <field name="name">vevent</field>
-        <field name="object_id" search="[('model','=','crm.meeting')]"/>
+        <field name="object_id" ref="crm.model_crm_meeting"/>
     </record>
 
 
     <record id="basic_calendar_fields_1" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_alarm_attendee"/>
         <field name="type_id" ref="basic_calendar_lines_valarm0"/>
-        <field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','calendar.alarm')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_alarm_attendee_ids"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_2" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_alarm_trigger_duration"/>
         <field name="type_id" ref="basic_calendar_lines_valarm0"/>
-        <field name="field_id" search="[('name','=','trigger_duration'),('model_id.model','=','res.alarm')]" />
+        <field name="field_id" ref="base_calendar.field_res_alarm_trigger_duration"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_3" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_alarm_description"/>
         <field name="type_id" ref="basic_calendar_lines_valarm0"/>
-        <field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.alarm')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_alarm_description"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_4" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_alarm_attach"/>
         <field name="type_id" ref="basic_calendar_lines_valarm0"/>
-        <field name="field_id" search="[('name','=','attach'),('model_id.model','=','calendar.alarm')]" />
+        <field name="field_id" ref="base_calendar.field_calendar_alarm_attach"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_5" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_alarm_trigger_occurs"/>
         <field name="type_id" ref="basic_calendar_lines_valarm0"/>
-        <field name="field_id" search="[('name','=','trigger_occurs'),('model_id.model','=','res.alarm')]" />
+        <field name="field_id" ref="base_calendar.field_res_alarm_trigger_occurs"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_6" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_alarm_trigger_interval"/>
         <field name="type_id" ref="basic_calendar_lines_valarm0"/>
-        <field name="field_id" search="[('name','=','trigger_interval'),('model_id.model','=','res.alarm')]" />
+        <field name="field_id" ref="base_calendar.field_res_alarm_trigger_interval"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_7" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_alarm_summary"/>
         <field name="type_id" ref="basic_calendar_lines_valarm0"/>
-        <field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.alarm')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_alarm_name"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_8" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_alarm_duration"/>
         <field name="type_id" ref="basic_calendar_lines_valarm0"/>
-        <field name="field_id" search="[('name','=','duration'),('model_id.model','=','res.alarm')]"/>
+        <field name="field_id" ref="base_calendar.field_res_alarm_duration"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_9" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_alarm_repeat"/>
         <field name="type_id" ref="basic_calendar_lines_valarm0"/>
-        <field name="field_id" search="[('name','=','repeat'),('model_id.model','=','res.alarm')]" />
+        <field name="field_id" ref="base_calendar.field_res_alarm_repeat"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_10" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_alarm_action"/>
         <field name="type_id" ref="basic_calendar_lines_valarm0"/>
-        <field name="field_id" search="[('name','=','action'),('model_id.model','=','calendar.alarm')]" />
+        <field name="field_id" ref="base_calendar.field_calendar_alarm_action"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_11" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_alarm_trigger_related"/>
         <field name="type_id" ref="basic_calendar_lines_valarm0"/>
-        <field name="field_id" search="[('name','=','trigger_related'),('model_id.model','=','res.alarm')]"/>
+        <field name="field_id" ref="base_calendar.field_res_alarm_trigger_related"/>
         <field name="fn">field</field>
     </record>
 
     <record id="basic_calendar_fields_12" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_event_organizer"/>
         <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" search="[('name','=','organizer'),('model_id.model','=','calendar.event')]"/>
+        <field name="field_id" ref="crm.field_crm_meeting_organizer"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_13" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_event_uid"/>
         <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" search="[('name','=','id'),('model_id.model','=','calendar.event')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_event_id"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_14" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_event_recurrence-id"/>
         <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" search="[('name','=','recurrent_id'),('model_id.model','=','calendar.event')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_event_recurrent_id"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_15" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_event_vtimezone"/>
         <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" search="[('name','=','vtimezone'),('model_id.model','=','calendar.event')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_event_vtimezone"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_16" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_event_attendee"/>
         <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','crm.meeting')]" />
+        <field name="field_id" ref="crm.field_crm_meeting_attendee_ids"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_17" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_event_rrule"/>
         <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" search="[('name','=','rrule'),('model_id.model','=','calendar.event')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_event_rrule"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_18" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_event_dtend"/>
         <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" search="[('name','=','date_deadline'),('model_id.model','=','calendar.event')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_event_date_deadline"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_19" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_event_valarm"/>
         <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" search="[('name','=','base_calendar_alarm_id'),('model_id.model','=','calendar.event')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_event_base_calendar_alarm_id"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_20" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_event_location"/>
         <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" search="[('name','=','location'),('model_id.model','=','calendar.event')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_event_location"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_21" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_event_exrule"/>
         <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" search="[('name','=','exrule'),('model_id.model','=','calendar.event')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_event_exrule"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_22" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_event_status"/>
         <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" search="[('name','=','state'),('model_id.model','=','crm.meeting')]"/>
+        <field name="field_id" ref="crm.field_crm_meeting_state"/>
         <field name="mapping">{'tentative': 'draft', 'confirmed': 'open', 'cancelled': 'cancel'}</field>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_23" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_event_exdate"/>
         <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" search="[('name','=','exdate'),('model_id.model','=','calendar.event')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_event_exdate"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_24" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_event_dtstamp"/>
         <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" search="[('name','=','date'),('model_id.model','=','calendar.event')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_event_date"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_25" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_event_description"/>
         <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.event')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_event_description"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_26" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_event_dtstart"/>
         <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" search="[('name','=','date'),('model_id.model','=','calendar.event')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_event_date"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_27" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_event_class"/>
         <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" search="[('name','=','class'),('model_id.model','=','calendar.event')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_event_class"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_28" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_event_created"/>
         <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" search="[('name','=','create_date'),('model_id.model','=','calendar.event')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_event_create_date"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_29" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_event_url"/>
         <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" search="[('name','=','base_calendar_url'),('model_id.model','=','calendar.event')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_event_base_calendar_url"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_30" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_event_summary"/>
         <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.event')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_event_name"/>
         <field name="fn">field</field>
     </record>
 
     <record id="basic_calendar_fields_31" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_attendee_cn"/>
         <field name="type_id" ref="basic_calendar_lines_attendee0"/>
-        <field name="field_id" search="[('name','=','cn'),('model_id.model','=','calendar.attendee')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_cn"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_32" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_attendee_sent-by"/>
         <field name="type_id" ref="basic_calendar_lines_attendee0"/>
-        <field name="field_id" search="[('name','=','sent_by'),('model_id.model','=','calendar.attendee')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_sent_by"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_33" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_attendee_language"/>
         <field name="type_id" ref="basic_calendar_lines_attendee0"/>
-        <field name="field_id" search="[('name','=','language'),('model_id.model','=','calendar.attendee')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_language"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_34" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_attendee_delegated-from"/>
         <field name="type_id" ref="basic_calendar_lines_attendee0"/>
-        <field name="field_id" search="[('name','=','delegated_from'),('model_id.model','=','calendar.attendee')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_delegated_from"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_35" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_attendee_member"/>
         <field name="type_id" ref="basic_calendar_lines_attendee0"/>
-        <field name="field_id" search="[('name','=','member'),('model_id.model','=','calendar.attendee')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_member"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_36" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_attendee_cutype"/>
         <field name="type_id" ref="basic_calendar_lines_attendee0"/>
-        <field name="field_id" search="[('name','=','cutype'),('model_id.model','=','calendar.attendee')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_cutype"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_37" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_attendee_role"/>
         <field name="type_id" ref="basic_calendar_lines_attendee0"/>
-        <field name="field_id" search="[('name','=','role'),('model_id.model','=','calendar.attendee')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_role"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_38" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_attendee_partstat"/>
         <field name="type_id" ref="basic_calendar_lines_attendee0"/>
-        <field name="field_id" search="[('name','=','state'),('model_id.model','=','calendar.attendee')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_state"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_39" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_attendee_delegated-to"/>
         <field name="type_id" ref="basic_calendar_lines_attendee0"/>
-        <field name="field_id" search="[('name','=','delegated_to'),('model_id.model','=','calendar.attendee')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_delegated_to"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_40" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_attendee_dir"/>
         <field name="type_id" ref="basic_calendar_lines_attendee0"/>
-        <field name="field_id" search="[('name','=','dir'),('model_id.model','=','calendar.attendee')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_dir"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_41" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_attendee_rsvp"/>
         <field name="type_id" ref="basic_calendar_lines_attendee0"/>
-        <field name="field_id" search="[('name','=','rsvp'),('model_id.model','=','calendar.attendee')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_rsvp"/>
         <field name="fn">field</field>
     </record>
 
diff --git a/addons/document_ics/document_demo.xml b/addons/document_ics/document_demo.xml
index 28ce92aebb6..17989b963ba 100644
--- a/addons/document_ics/document_demo.xml
+++ b/addons/document_ics/document_demo.xml
@@ -2,10 +2,11 @@
 <openerp>
 <data noupdate="1">
 
-    <record model="document.directory" id="document.dir_calendars">
-        <field name="name">Calendars</field>
-    </record>
-
+    <record model="crm.case.section" id="section_meeting">
+        <field name="name">Shared Calendar Meetings</field>
+        <field name="code">shcal</field>
+    </record> 
+    
     <record model="document.directory.content" id="dir_content_calendar">
         <field name="name">Calendars</field>
         <field name="suffix">meetings</field>
diff --git a/addons/project_caldav/project_caldav_setup.xml b/addons/project_caldav/project_caldav_setup.xml
index f22aafb1807..96d9c0ad3b6 100644
--- a/addons/project_caldav/project_caldav_setup.xml
+++ b/addons/project_caldav/project_caldav_setup.xml
@@ -5,7 +5,7 @@
         <field eval="1" name="has_webcal"/>
         <field name="description">Tasks per user</field>
         <field name="calendar_color">#FFEF74</field>
-        <field model="document.directory" name="collection_id" ref="document.dir_calendars"/>
+        <field model="document.directory" name="collection_id" ref="caldav.document_directory_c0"/>
         <field name="type">vtodo</field>
         <field name="name">Tasks</field>
     </record>
@@ -14,17 +14,17 @@
         <field model="basic.calendar" name="calendar_id" ref="basic_calendar_tasks0"/>
         <field name="domain">[]</field>
         <field name="name">attendee</field>
-        <field name="object_id"  search="[('model','=','calendar.attendee')]"/>
+        <field name="object_id" ref="base_calendar.model_calendar_attendee"/>
     </record>
     <record id="basic_calendar_lines_valarm0" model="basic.calendar.lines">
         <field model="basic.calendar" name="calendar_id" ref="basic_calendar_tasks0"/>
         <field name="domain">[]</field>
         <field name="name">valarm</field>
-        <field name="object_id" search="[('model','=','calendar.alarm')]"/>
+        <field name="object_id" ref="base_calendar.model_calendar_alarm"/>
     </record>
     <record id="basic_calendar_lines_vtodo0" model="basic.calendar.lines">
         <field model="basic.calendar" name="calendar_id" ref="basic_calendar_tasks0"/>
-        <field name="domain">[('user_id','=', uid)]</field>
+        <field name="domain">[('user_id','=', dctx_user_id)]</field>
         <field name="name">vtodo</field>
         <field name="object_id" ref="project.model_project_task"/>
     </record>
@@ -32,239 +32,239 @@
     <record id="basic_calendar_fields_0" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_todo_status"/>
         <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
-        <field name="field_id"  search="[('name','=','state'),('model_id.model','=','project.task')]"/>
+        <field name="field_id" ref="project.field_project_task_state"/>
         <field name="mapping">{'needs-action': 'draft', 'completed': 'done', 'in-process': 'open', 'cancelled': 'cancelled'}</field>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_1" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_todo_exdate"/>
         <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
-        <field name="field_id" search="[('name','=','exdate'),('model_id.model','=','calendar.todo')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_todo_exdate"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_2" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_todo_attendee"/>
         <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
-        <field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','project.task')]"/>
+        <field name="field_id" ref="project_caldav.field_project_task_attendee_ids"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_3" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_todo_valarm"/>
         <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
-        <field name="field_id" search="[('name','=','base_calendar_alarm_id'),('model_id.model','=','calendar.todo')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_todo_base_calendar_alarm_id"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_4" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_todo_description"/>
         <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
-        <field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.todo')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_todo_description"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_5" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_todo_url"/>
         <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
-        <field name="field_id" search="[('name','=','base_calendar_url'),('model_id.model','=','calendar.todo')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_todo_base_calendar_url"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_6" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_todo_percent"/>
         <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
-        <field name="field_id" search="[('name','=','base_calendar_url'),('model_id.model','=','calendar.todo')]"/>
+        <field name="field_id" ref="project.field_project_task_progress"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_7" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_todo_vtimezone"/>
         <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
-        <field name="field_id" search="[('name','=','vtimezone'),('model_id.model','=','calendar.todo')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_todo_vtimezone"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_8" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_todo_summary"/>
         <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
-        <field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.todo')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_todo_name"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_9" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_event_priority"/>
         <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
-        <field name="field_id" search="[('name','=','priority'),('model_id.model','=','project.task')]"/>
+        <field name="field_id" ref="project.field_project_task_priority"/>
         <field name="mapping">{'1': '0', '2': '1', '3': '1','4': '1', '5': '2', '6': '3', '7': '3', '8': '3', '9': '4'}</field>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_10" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_todo_location"/>
         <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
-        <field name="field_id" search="[('name','=','location'),('model_id.model','=','calendar.todo')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_todo_location"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_11" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_todo_exrule"/>
         <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
-        <field name="field_id" search="[('name','=','exrule'),('model_id.model','=','calendar.todo')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_todo_exrule"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_12" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_todo_duration"/>
         <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
-        <field name="field_id" search="[('name','=','planned_hours'),('model_id.model','=','project.task')]"/>
+        <field name="field_id" ref="project.field_project_task_planned_hours"/>
         <field name="fn">hours</field>
     </record>
     <record id="basic_calendar_fields_13" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_todo_dtstart"/>
         <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
-        <field name="field_id" search="[('name','=','date'),('model_id.model','=','calendar.todo')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_todo_date"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_14" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_todo_rrule"/>
         <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
-        <field name="field_id" search="[('name','=','rrule'),('model_id.model','=','calendar.todo')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_todo_rrule"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_15" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_todo_class"/>
         <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
-        <field name="field_id" search="[('name','=','class'),('model_id.model','=','calendar.todo')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_todo_class"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_16" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_todo_uid"/>
         <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
-        <field name="field_id" search="[('name','=','id'),('model_id.model','=','calendar.todo')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_todo_id"/>
         <field name="fn">field</field>
     </record>
 
     <record id="basic_calendar_fields_17" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_alarm_attendee"/>
         <field name="type_id" ref="basic_calendar_lines_valarm0"/>
-        <field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','calendar.alarm')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_alarm_attendee_ids"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_18" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_alarm_trigger_duration"/>
         <field name="type_id" ref="basic_calendar_lines_valarm0"/>
-        <field name="field_id" search="[('name','=','trigger_duration'),('model_id.model','=','res.alarm')]"/>
+        <field name="field_id" ref="base_calendar.field_res_alarm_trigger_duration"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_19" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_alarm_description"/>
         <field name="type_id" ref="basic_calendar_lines_valarm0"/>
-        <field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.alarm')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_alarm_description"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_20" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_alarm_attach"/>
         <field name="type_id" ref="basic_calendar_lines_valarm0"/>
-        <field name="field_id" search="[('name','=','attach'),('model_id.model','=','calendar.alarm')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_alarm_attach"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_21" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_alarm_trigger_occurs"/>
         <field name="type_id" ref="basic_calendar_lines_valarm0"/>
-        <field name="field_id" search="[('name','=','trigger_occurs'),('model_id.model','=','res.alarm')]"/>
+        <field name="field_id" ref="base_calendar.field_res_alarm_trigger_occurs"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_22" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_alarm_trigger_interval"/>
         <field name="type_id" ref="basic_calendar_lines_valarm0"/>
-        <field name="field_id"  search="[('name','=','trigger_interval'),('model_id.model','=','res.alarm')]"/>
+        <field name="field_id" ref="base_calendar.field_res_alarm_trigger_interval"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_23" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_alarm_summary"/>
         <field name="type_id" ref="basic_calendar_lines_valarm0"/>
-        <field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.alarm')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_alarm_name"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_24" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_alarm_duration"/>
         <field name="type_id" ref="basic_calendar_lines_valarm0"/>
-        <field name="field_id" search="[('name','=','duration'),('model_id.model','=','res.alarm')]"/>
+        <field name="field_id" ref="base_calendar.field_res_alarm_duration"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_25" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_alarm_repeat"/>
         <field name="type_id" ref="basic_calendar_lines_valarm0"/>
-        <field name="field_id" search="[('name','=','repeat'),('model_id.model','=','res.alarm')]"/>
+        <field name="field_id" ref="base_calendar.field_res_alarm_repeat"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_226" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_alarm_action"/>
         <field name="type_id" ref="basic_calendar_lines_valarm0"/>
-        <field name="field_id" search="[('name','=','action'),('model_id.model','=','calendar.alarm')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_alarm_action"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_27" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_alarm_trigger_related"/>
         <field name="type_id" ref="basic_calendar_lines_valarm0"/>
-        <field name="field_id" search="[('name','=','trigger_related'),('model_id.model','=','res.alarm')]"/>
+        <field name="field_id" ref="base_calendar.field_res_alarm_trigger_related"/>
         <field name="fn">field</field>
     </record>
 
     <record id="basic_calendar_fields_28" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_attendee_cn"/>
         <field name="type_id" ref="basic_calendar_lines_attendee0"/>
-        <field name="field_id" search="[('name','=','cn'),('model_id.model','=','calendar.attendee')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_cn"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_29" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_attendee_sent-by"/>
         <field name="type_id" ref="basic_calendar_lines_attendee0"/>
-        <field name="field_id" search="[('name','=','sent_by'),('model_id.model','=','calendar.attendee')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_sent_by"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_30" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_attendee_language"/>
         <field name="type_id" ref="basic_calendar_lines_attendee0"/>
-        <field name="field_id" search="[('name','=','language'),('model_id.model','=','calendar.attendee')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_language"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_31" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_attendee_delegated-from"/>
         <field name="type_id" ref="basic_calendar_lines_attendee0"/>
-        <field name="field_id" search="[('name','=','delegated_from'),('model_id.model','=','calendar.attendee')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_delegated_from"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_32" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_attendee_member"/>
         <field name="type_id" ref="basic_calendar_lines_attendee0"/>
-        <field name="field_id" search="[('name','=','member'),('model_id.model','=','calendar.attendee')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_member"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_33" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_attendee_cutype"/>
         <field name="type_id" ref="basic_calendar_lines_attendee0"/>
-        <field name="field_id" search="[('name','=','cutype'),('model_id.model','=','calendar.attendee')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_cutype"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_34" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_attendee_role"/>
         <field name="type_id" ref="basic_calendar_lines_attendee0"/>
-        <field name="field_id" search="[('name','=','role'),('model_id.model','=','calendar.attendee')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_role"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_35" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_attendee_partstat"/>
         <field name="type_id" ref="basic_calendar_lines_attendee0"/>
-        <field name="field_id" search="[('name','=','state'),('model_id.model','=','calendar.attendee')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_state"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_36" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_attendee_delegated-to"/>
         <field name="type_id" ref="basic_calendar_lines_attendee0"/>
-        <field name="field_id" search="[('name','=','delegated_to'),('model_id.model','=','calendar.attendee')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_delegated_to"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_37" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_attendee_dir"/>
         <field name="type_id" ref="basic_calendar_lines_attendee0"/>
-        <field name="field_id" search="[('name','=','dir'),('model_id.model','=','calendar.attendee')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_dir"/>
         <field name="fn">field</field>
     </record>
     <record id="basic_calendar_fields_38" model="basic.calendar.fields">
         <field name="name" ref="caldav.field_attendee_rsvp"/>
         <field name="type_id" ref="basic_calendar_lines_attendee0"/>
-        <field name="field_id" search="[('name','=','rsvp'),('model_id.model','=','calendar.attendee')]"/>
+        <field name="field_id" ref="base_calendar.field_calendar_attendee_rsvp"/>
         <field name="fn">field</field>
     </record>