From c571ea9c37bf48b7aff748ba7d27358200c15121 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Fri, 19 Nov 2010 18:03:49 +0530
Subject: [PATCH 1/7] [FIX]: Fix demo data of caldav, document,document_ics,
 project_caldav

bzr revid: atp@tinyerp.co.in-20101119123349-tcenywju4nzv5kyk
---
 addons/caldav/caldav_setup.xml                | 16 ++--
 addons/crm_caldav/crm_caldav_data.xml         |  4 +-
 addons/crm_caldav/crm_caldav_setup.xml        | 92 +++++++++----------
 addons/document/document_view.xml             |  2 +-
 addons/document_ics/document_demo.xml         |  6 +-
 .../project_caldav/project_caldav_setup.xml   |  2 +-
 6 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/addons/caldav/caldav_setup.xml b/addons/caldav/caldav_setup.xml
index 084732cdb6d..ad45d1e5e6e 100644
--- a/addons/caldav/caldav_setup.xml
+++ b/addons/caldav/caldav_setup.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
         <!-- /calendars tree -->
-        <record id="document_directory_calendars0" model="document.directory">
+        <record id="document.dir_calendars" 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_directory_calendars0"/>
+            <field model="document.directory" name="parent_id" ref="document.dir_calendars"/>
             <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_directory_calendars0"/>
+            <field model="document.directory" name="parent_id" ref="document.dir_calendars"/>
             <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_directory_calendars0"/>
+            <field model="document.directory" name="parent_id" ref="document.dir_calendars"/>
             <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_directory_users0"/>
+            <field model="document.directory" name="dir_id" ref="document.dir_calendars"/>
             <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_directory_users0"/>
+            <field model="document.directory" name="parent_id" ref="document.dir_calendars"/>
             <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_directory_calendars0"/>
+            <field model="document.directory" name="parent_id" ref="document.dir_calendars"/>
             <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_directory_calendars0"/>
+            <field model="document.directory" name="dir_id" ref="document.dir_calendars"/>
             <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_data.xml b/addons/crm_caldav/crm_caldav_data.xml
index 89c072e6eb3..8347cd37eae 100644
--- a/addons/crm_caldav/crm_caldav_data.xml
+++ b/addons/crm_caldav/crm_caldav_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-	<data noupdate="1">
+    <data noupdate="1">
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/crm_caldav/crm_caldav_setup.xml b/addons/crm_caldav/crm_caldav_setup.xml
index 1a103f61811..8eafdd2f9e1 100644
--- a/addons/crm_caldav/crm_caldav_setup.xml
+++ b/addons/crm_caldav/crm_caldav_setup.xml
@@ -6,7 +6,7 @@
         <field eval="1" name="has_webcal"/>
         <field name="description">Meetings per user</field>
         <field name="calendar_color">#1E25FF</field>
-        <field model="document.directory" name="collection_id" ref="caldav.document_directory_c0"/>
+        <field model="document.directory" name="collection_id" ref="document.dir_calendars"/>
         <field name="type">vevent</field>
         <field name="name">Meetings</field>
     </record>
@@ -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" ref="base_calendar.model_calendar_attendee"/>
+        <field name="object_id" search="[('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" ref="base_calendar.model_calendar_alarm"/>
+        <field name="object_id" search="[('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','=', dctx_user_id)]</field>
+        <field name="domain">[('user_id','=', uid)]</field>
         <field name="name">vevent</field>
-        <field name="object_id" ref="crm.model_crm_meeting"/>
+        <field name="object_id" search="[('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" ref="base_calendar.field_calendar_alarm_attendee_ids"/>
+        <field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','calendar.alarm')]"/>
         <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" ref="base_calendar.field_res_alarm_trigger_duration"/>
+        <field name="field_id" search="[('name','=','trigger_duration'),('model_id.model','=','res.alarm')]" />
         <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" ref="base_calendar.field_calendar_alarm_description"/>
+        <field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.alarm')]"/>
         <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" ref="base_calendar.field_calendar_alarm_attach"/>
+        <field name="field_id" search="[('name','=','attach'),('model_id.model','=','calendar.alarm')]" />
         <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" ref="base_calendar.field_res_alarm_trigger_occurs"/>
+        <field name="field_id" search="[('name','=','trigger_occurs'),('model_id.model','=','res.alarm')]" />
         <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" ref="base_calendar.field_res_alarm_trigger_interval"/>
+        <field name="field_id" search="[('name','=','trigger_interval'),('model_id.model','=','res.alarm')]" />
         <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" ref="base_calendar.field_calendar_alarm_name"/>
+        <field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.alarm')]"/>
         <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" ref="base_calendar.field_res_alarm_duration"/>
+        <field name="field_id" search="[('name','=','duration'),('model_id.model','=','res.alarm')]"/>
         <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" ref="base_calendar.field_res_alarm_repeat"/>
+        <field name="field_id" search="[('name','=','repeat'),('model_id.model','=','res.alarm')]" />
         <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" ref="base_calendar.field_calendar_alarm_action"/>
+        <field name="field_id" search="[('name','=','action'),('model_id.model','=','calendar.alarm')]" />
         <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" ref="base_calendar.field_res_alarm_trigger_related"/>
+        <field name="field_id" search="[('name','=','trigger_related'),('model_id.model','=','res.alarm')]"/>
         <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" ref="crm.field_crm_meeting_organizer"/>
+        <field name="field_id" search="[('name','=','organizer'),('model_id.model','=','calendar.event')]"/>
         <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" ref="base_calendar.field_calendar_event_id"/>
+        <field name="field_id" search="[('name','=','id'),('model_id.model','=','calendar.event')]"/>
         <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" ref="base_calendar.field_calendar_event_recurrent_id"/>
+        <field name="field_id" search="[('name','=','recurrent_id'),('model_id.model','=','calendar.event')]"/>
         <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" ref="base_calendar.field_calendar_event_vtimezone"/>
+        <field name="field_id" search="[('name','=','vtimezone'),('model_id.model','=','calendar.event')]"/>
         <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" ref="crm.field_crm_meeting_attendee_ids"/>
+        <field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','crm.meeting')]" />
         <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" ref="base_calendar.field_calendar_event_rrule"/>
+        <field name="field_id" search="[('name','=','rrule'),('model_id.model','=','calendar.event')]"/>
         <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" ref="base_calendar.field_calendar_event_date_deadline"/>
+        <field name="field_id" search="[('name','=','date_deadline'),('model_id.model','=','calendar.event')]"/>
         <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" ref="base_calendar.field_calendar_event_base_calendar_alarm_id"/>
+        <field name="field_id" search="[('name','=','base_calendar_alarm_id'),('model_id.model','=','calendar.event')]"/>
         <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" ref="base_calendar.field_calendar_event_location"/>
+        <field name="field_id" search="[('name','=','location'),('model_id.model','=','calendar.event')]"/>
         <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" ref="base_calendar.field_calendar_event_exrule"/>
+        <field name="field_id" search="[('name','=','exrule'),('model_id.model','=','calendar.event')]"/>
         <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" ref="crm.field_crm_meeting_state"/>
+        <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 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" ref="base_calendar.field_calendar_event_exdate"/>
+        <field name="field_id" search="[('name','=','exdate'),('model_id.model','=','calendar.event')]"/>
         <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" ref="base_calendar.field_calendar_event_date"/>
+        <field name="field_id" search="[('name','=','date'),('model_id.model','=','calendar.event')]"/>
         <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" ref="base_calendar.field_calendar_event_description"/>
+        <field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.event')]"/>
         <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" ref="base_calendar.field_calendar_event_date"/>
+        <field name="field_id" search="[('name','=','date'),('model_id.model','=','calendar.event')]"/>
         <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" ref="base_calendar.field_calendar_event_class"/>
+        <field name="field_id" search="[('name','=','class'),('model_id.model','=','calendar.event')]"/>
         <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" ref="base_calendar.field_calendar_event_create_date"/>
+        <field name="field_id" search="[('name','=','create_date'),('model_id.model','=','calendar.event')]"/>
         <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" ref="base_calendar.field_calendar_event_base_calendar_url"/>
+        <field name="field_id" search="[('name','=','base_calendar_url'),('model_id.model','=','calendar.event')]"/>
         <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" ref="base_calendar.field_calendar_event_name"/>
+        <field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.event')]"/>
         <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" ref="base_calendar.field_calendar_attendee_cn"/>
+        <field name="field_id" search="[('name','=','cn'),('model_id.model','=','calendar.attendee')]"/>
         <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" ref="base_calendar.field_calendar_attendee_sent_by"/>
+        <field name="field_id" search="[('name','=','sent_by'),('model_id.model','=','calendar.attendee')]"/>
         <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" ref="base_calendar.field_calendar_attendee_language"/>
+        <field name="field_id" search="[('name','=','language'),('model_id.model','=','calendar.attendee')]"/>
         <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" ref="base_calendar.field_calendar_attendee_delegated_from"/>
+        <field name="field_id" search="[('name','=','delegated_from'),('model_id.model','=','calendar.attendee')]"/>
         <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" ref="base_calendar.field_calendar_attendee_member"/>
+        <field name="field_id" search="[('name','=','member'),('model_id.model','=','calendar.attendee')]"/>
         <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" ref="base_calendar.field_calendar_attendee_cutype"/>
+        <field name="field_id" search="[('name','=','cutype'),('model_id.model','=','calendar.attendee')]"/>
         <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" ref="base_calendar.field_calendar_attendee_role"/>
+        <field name="field_id" search="[('name','=','role'),('model_id.model','=','calendar.attendee')]"/>
         <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" ref="base_calendar.field_calendar_attendee_state"/>
+        <field name="field_id" search="[('name','=','state'),('model_id.model','=','calendar.attendee')]"/>
         <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" ref="base_calendar.field_calendar_attendee_delegated_to"/>
+        <field name="field_id" search="[('name','=','delegated_to'),('model_id.model','=','calendar.attendee')]"/>
         <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" ref="base_calendar.field_calendar_attendee_dir"/>
+        <field name="field_id" search="[('name','=','dir'),('model_id.model','=','calendar.attendee')]"/>
         <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" ref="base_calendar.field_calendar_attendee_rsvp"/>
+        <field name="field_id" search="[('name','=','rsvp'),('model_id.model','=','calendar.attendee')]"/>
         <field name="fn">field</field>
     </record>
 
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 544ad1694be..1c8a97edd8f 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -106,7 +106,7 @@
                             <field name="extension"/>
                             <field name="include_name"/>
                             <separator string="PDF Report" colspan="4"/>
-                            <field name="report_id" domain="[('model_id','=',parent.ressource_type_id)]"/>
+                            <field name="report_id" domain="[ ('type','=','ressource'),('model_id','=',parent.ressource_type_id)]"/>
                         </form>
                         <tree string="Contents">
                             <field name="sequence" string="Seq."/>
diff --git a/addons/document_ics/document_demo.xml b/addons/document_ics/document_demo.xml
index d3022a685e6..28ce92aebb6 100644
--- a/addons/document_ics/document_demo.xml
+++ b/addons/document_ics/document_demo.xml
@@ -2,9 +2,8 @@
 <openerp>
 <data noupdate="1">
 
-    <record model="crm.case.section" id="section_meeting">
-        <field name="name">Shared Calendar Meetings</field>
-        <field name="code">shcal</field>
+    <record model="document.directory" id="document.dir_calendars">
+        <field name="name">Calendars</field>
     </record>
 
     <record model="document.directory.content" id="dir_content_calendar">
@@ -12,6 +11,7 @@
         <field name="suffix">meetings</field>
         <field name="extension">.ics</field>
         <field name="include_name" eval="False"/>
+        <field name="directory_id" ref="document.dir_calendars"/>
         <field name="object_id" ref="crm.model_crm_meeting"/>
         <field name="ics_domain" eval="'[]'"/>
     </record>
diff --git a/addons/project_caldav/project_caldav_setup.xml b/addons/project_caldav/project_caldav_setup.xml
index 96d9c0ad3b6..40c9f93614f 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="caldav.document_directory_c0"/>
+        <field model="document.directory" name="collection_id" ref="document.dir_calendars"/>
         <field name="type">vtodo</field>
         <field name="name">Tasks</field>
     </record>

From 9cfd8f63a00155893670862f835bf3e6c38379e2 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Fri, 19 Nov 2010 18:34:14 +0530
Subject: [PATCH 2/7] [FIX]: Fix demo data problem of project_caldav module

bzr revid: atp@tinyerp.co.in-20101119130414-ouymliouqmzbx8fl
---
 .../document_ftp/test/document_ftp_test4.yml  |  1 -
 addons/document_webdav/webdav_setup.xml       |  2 +-
 addons/project_caldav/project_caldav_data.xml |  6 +-
 .../project_caldav/project_caldav_setup.xml   | 84 +++++++++----------
 4 files changed, 46 insertions(+), 47 deletions(-)

diff --git a/addons/document_ftp/test/document_ftp_test4.yml b/addons/document_ftp/test/document_ftp_test4.yml
index 4865d36c624..f05fac397bf 100644
--- a/addons/document_ftp/test/document_ftp_test4.yml
+++ b/addons/document_ftp/test/document_ftp_test4.yml
@@ -155,7 +155,6 @@
         from document_ftp import test_easyftp as te
         from cStringIO import StringIO
         ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Partners Testing/Pat 1/Partners of Test/Partner 1')
-        # TODO speed
         ftp.delete('pat1-dynamic.txt')
         ftp.close()        
     
diff --git a/addons/document_webdav/webdav_setup.xml b/addons/document_webdav/webdav_setup.xml
index 5621a77a5d7..6ea894b6a22 100644
--- a/addons/document_webdav/webdav_setup.xml
+++ b/addons/document_webdav/webdav_setup.xml
@@ -17,7 +17,7 @@
                 <field name="storage_id" ref="document.storage_default"/>
                 <field name="type">directory</field>
                 <field eval="[(6,0,[])]" name="group_ids"/>
-                <field name="name">Principals</field>
+                <field name="name">principals</field>
         </record>
 
         <record id="document_directory_groups0" model="document.directory">
diff --git a/addons/project_caldav/project_caldav_data.xml b/addons/project_caldav/project_caldav_data.xml
index fbec1dcd1d5..464a13201d0 100644
--- a/addons/project_caldav/project_caldav_data.xml
+++ b/addons/project_caldav/project_caldav_data.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
-	<data noupdate="1">       
+    <data noupdate="1">       
 
-	
-	</data>
+
+    </data>
 </openerp>
diff --git a/addons/project_caldav/project_caldav_setup.xml b/addons/project_caldav/project_caldav_setup.xml
index 40c9f93614f..f22aafb1807 100644
--- a/addons/project_caldav/project_caldav_setup.xml
+++ b/addons/project_caldav/project_caldav_setup.xml
@@ -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" ref="base_calendar.model_calendar_attendee"/>
+        <field name="object_id"  search="[('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" ref="base_calendar.model_calendar_alarm"/>
+        <field name="object_id" search="[('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','=', dctx_user_id)]</field>
+        <field name="domain">[('user_id','=', uid)]</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" ref="project.field_project_task_state"/>
+        <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>
         <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" ref="base_calendar.field_calendar_todo_exdate"/>
+        <field name="field_id" search="[('name','=','exdate'),('model_id.model','=','calendar.todo')]"/>
         <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" ref="project_caldav.field_project_task_attendee_ids"/>
+        <field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','project.task')]"/>
         <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" ref="base_calendar.field_calendar_todo_base_calendar_alarm_id"/>
+        <field name="field_id" search="[('name','=','base_calendar_alarm_id'),('model_id.model','=','calendar.todo')]"/>
         <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" ref="base_calendar.field_calendar_todo_description"/>
+        <field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.todo')]"/>
         <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" ref="base_calendar.field_calendar_todo_base_calendar_url"/>
+        <field name="field_id" search="[('name','=','base_calendar_url'),('model_id.model','=','calendar.todo')]"/>
         <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" ref="project.field_project_task_progress"/>
+        <field name="field_id" search="[('name','=','base_calendar_url'),('model_id.model','=','calendar.todo')]"/>
         <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" ref="base_calendar.field_calendar_todo_vtimezone"/>
+        <field name="field_id" search="[('name','=','vtimezone'),('model_id.model','=','calendar.todo')]"/>
         <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" ref="base_calendar.field_calendar_todo_name"/>
+        <field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.todo')]"/>
         <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" ref="project.field_project_task_priority"/>
+        <field name="field_id" search="[('name','=','priority'),('model_id.model','=','project.task')]"/>
         <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" ref="base_calendar.field_calendar_todo_location"/>
+        <field name="field_id" search="[('name','=','location'),('model_id.model','=','calendar.todo')]"/>
         <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" ref="base_calendar.field_calendar_todo_exrule"/>
+        <field name="field_id" search="[('name','=','exrule'),('model_id.model','=','calendar.todo')]"/>
         <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" ref="project.field_project_task_planned_hours"/>
+        <field name="field_id" search="[('name','=','planned_hours'),('model_id.model','=','project.task')]"/>
         <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" ref="base_calendar.field_calendar_todo_date"/>
+        <field name="field_id" search="[('name','=','date'),('model_id.model','=','calendar.todo')]"/>
         <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" ref="base_calendar.field_calendar_todo_rrule"/>
+        <field name="field_id" search="[('name','=','rrule'),('model_id.model','=','calendar.todo')]"/>
         <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" ref="base_calendar.field_calendar_todo_class"/>
+        <field name="field_id" search="[('name','=','class'),('model_id.model','=','calendar.todo')]"/>
         <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" ref="base_calendar.field_calendar_todo_id"/>
+        <field name="field_id" search="[('name','=','id'),('model_id.model','=','calendar.todo')]"/>
         <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" ref="base_calendar.field_calendar_alarm_attendee_ids"/>
+        <field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','calendar.alarm')]"/>
         <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" ref="base_calendar.field_res_alarm_trigger_duration"/>
+        <field name="field_id" search="[('name','=','trigger_duration'),('model_id.model','=','res.alarm')]"/>
         <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" ref="base_calendar.field_calendar_alarm_description"/>
+        <field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.alarm')]"/>
         <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" ref="base_calendar.field_calendar_alarm_attach"/>
+        <field name="field_id" search="[('name','=','attach'),('model_id.model','=','calendar.alarm')]"/>
         <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" ref="base_calendar.field_res_alarm_trigger_occurs"/>
+        <field name="field_id" search="[('name','=','trigger_occurs'),('model_id.model','=','res.alarm')]"/>
         <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" ref="base_calendar.field_res_alarm_trigger_interval"/>
+        <field name="field_id"  search="[('name','=','trigger_interval'),('model_id.model','=','res.alarm')]"/>
         <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" ref="base_calendar.field_calendar_alarm_name"/>
+        <field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.alarm')]"/>
         <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" ref="base_calendar.field_res_alarm_duration"/>
+        <field name="field_id" search="[('name','=','duration'),('model_id.model','=','res.alarm')]"/>
         <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" ref="base_calendar.field_res_alarm_repeat"/>
+        <field name="field_id" search="[('name','=','repeat'),('model_id.model','=','res.alarm')]"/>
         <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" ref="base_calendar.field_calendar_alarm_action"/>
+        <field name="field_id" search="[('name','=','action'),('model_id.model','=','calendar.alarm')]"/>
         <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" ref="base_calendar.field_res_alarm_trigger_related"/>
+        <field name="field_id" search="[('name','=','trigger_related'),('model_id.model','=','res.alarm')]"/>
         <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" ref="base_calendar.field_calendar_attendee_cn"/>
+        <field name="field_id" search="[('name','=','cn'),('model_id.model','=','calendar.attendee')]"/>
         <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" ref="base_calendar.field_calendar_attendee_sent_by"/>
+        <field name="field_id" search="[('name','=','sent_by'),('model_id.model','=','calendar.attendee')]"/>
         <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" ref="base_calendar.field_calendar_attendee_language"/>
+        <field name="field_id" search="[('name','=','language'),('model_id.model','=','calendar.attendee')]"/>
         <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" ref="base_calendar.field_calendar_attendee_delegated_from"/>
+        <field name="field_id" search="[('name','=','delegated_from'),('model_id.model','=','calendar.attendee')]"/>
         <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" ref="base_calendar.field_calendar_attendee_member"/>
+        <field name="field_id" search="[('name','=','member'),('model_id.model','=','calendar.attendee')]"/>
         <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" ref="base_calendar.field_calendar_attendee_cutype"/>
+        <field name="field_id" search="[('name','=','cutype'),('model_id.model','=','calendar.attendee')]"/>
         <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" ref="base_calendar.field_calendar_attendee_role"/>
+        <field name="field_id" search="[('name','=','role'),('model_id.model','=','calendar.attendee')]"/>
         <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" ref="base_calendar.field_calendar_attendee_state"/>
+        <field name="field_id" search="[('name','=','state'),('model_id.model','=','calendar.attendee')]"/>
         <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" ref="base_calendar.field_calendar_attendee_delegated_to"/>
+        <field name="field_id" search="[('name','=','delegated_to'),('model_id.model','=','calendar.attendee')]"/>
         <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" ref="base_calendar.field_calendar_attendee_dir"/>
+        <field name="field_id" search="[('name','=','dir'),('model_id.model','=','calendar.attendee')]"/>
         <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" ref="base_calendar.field_calendar_attendee_rsvp"/>
+        <field name="field_id" search="[('name','=','rsvp'),('model_id.model','=','calendar.attendee')]"/>
         <field name="fn">field</field>
     </record>
 

From 9a3416b95f52a6ba38c0da16cdff2baae2baf6f1 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Mon, 22 Nov 2010 16:13:16 +0530
Subject: [PATCH 3/7] [FIX]: Fix some problem in caldav and Minor Improvement.

bzr revid: atp@tinyerp.co.in-20101122104316-2veko2vubv3w9oml
---
 addons/caldav/caldav_setup.xml                  |  2 +-
 addons/document/document_view.xml               |  2 +-
 addons/document_ftp/test/document_ftp_test4.yml |  1 -
 addons/document_ics/document_data.xml           | 14 --------------
 addons/document_webdav/webdav_setup.xml         |  2 +-
 5 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/addons/caldav/caldav_setup.xml b/addons/caldav/caldav_setup.xml
index 084732cdb6d..e2e9d7eae5a 100644
--- a/addons/caldav/caldav_setup.xml
+++ b/addons/caldav/caldav_setup.xml
@@ -11,7 +11,7 @@
             <field name="storage_id" ref="document.storage_default"/>
             <field name="type">directory</field>
             <field eval="[(6,0,[])]" name="group_ids"/>
-            <field name="name">Calendars</field>
+            <field name="name">calendars</field>
         </record>
         <record id="document_directory_resources1" model="document.directory">
             <field name="domain">[]</field>
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 544ad1694be..1c8a97edd8f 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -106,7 +106,7 @@
                             <field name="extension"/>
                             <field name="include_name"/>
                             <separator string="PDF Report" colspan="4"/>
-                            <field name="report_id" domain="[('model_id','=',parent.ressource_type_id)]"/>
+                            <field name="report_id" domain="[ ('type','=','ressource'),('model_id','=',parent.ressource_type_id)]"/>
                         </form>
                         <tree string="Contents">
                             <field name="sequence" string="Seq."/>
diff --git a/addons/document_ftp/test/document_ftp_test4.yml b/addons/document_ftp/test/document_ftp_test4.yml
index 4865d36c624..f05fac397bf 100644
--- a/addons/document_ftp/test/document_ftp_test4.yml
+++ b/addons/document_ftp/test/document_ftp_test4.yml
@@ -155,7 +155,6 @@
         from document_ftp import test_easyftp as te
         from cStringIO import StringIO
         ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Partners Testing/Pat 1/Partners of Test/Partner 1')
-        # TODO speed
         ftp.delete('pat1-dynamic.txt')
         ftp.close()        
     
diff --git a/addons/document_ics/document_data.xml b/addons/document_ics/document_data.xml
index 55522621e17..7654fa26550 100644
--- a/addons/document_ics/document_data.xml
+++ b/addons/document_ics/document_data.xml
@@ -9,18 +9,4 @@
     </record>
 </data>
 
-	
-  <data noupdate="1">      
-      <record id="seq_type_crm_case_code" model="ir.sequence.type">
-          <field name="name">CRM Case Code</field>
-          <field name="code">crm.case</field>
-      </record>
-      <record id="seq_sale_order" model="ir.sequence">
-          <field name="name">CRM Case</field>
-          <field name="code">crm.case</field>
-          <field name="prefix">CASE</field>
-          <field name="padding">3</field>
-      </record>
-  </data>
-    
 </openerp>
diff --git a/addons/document_webdav/webdav_setup.xml b/addons/document_webdav/webdav_setup.xml
index 5621a77a5d7..6ea894b6a22 100644
--- a/addons/document_webdav/webdav_setup.xml
+++ b/addons/document_webdav/webdav_setup.xml
@@ -17,7 +17,7 @@
                 <field name="storage_id" ref="document.storage_default"/>
                 <field name="type">directory</field>
                 <field eval="[(6,0,[])]" name="group_ids"/>
-                <field name="name">Principals</field>
+                <field name="name">principals</field>
         </record>
 
         <record id="document_directory_groups0" model="document.directory">

From 26bca69726ed12089753e6fa32fe3d4c22bb2073 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Mon, 22 Nov 2010 17:12:07 +0530
Subject: [PATCH 4/7] [FIX]: fix res_id problem in caldav

bzr revid: atp@tinyerp.co.in-20101122114207-jay6auxto5m0rce4
---
 addons/caldav/caldav_setup.xml                | 16 ++--
 addons/crm_caldav/crm_caldav_setup.xml        | 90 +++++++++----------
 addons/document_ics/document_demo.xml         |  9 +-
 .../project_caldav/project_caldav_setup.xml   | 86 +++++++++---------
 4 files changed, 101 insertions(+), 100 deletions(-)

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>
 

From 4300e062290061625e8c52e73fb1e52694800809 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Mon, 22 Nov 2010 18:24:16 +0530
Subject: [PATCH 5/7] [FIX]

bzr revid: atp@tinyerp.co.in-20101122125416-pj2ywaomkmfgvb0p
---
 addons/caldav/caldav_data.xml  |  6 +-----
 addons/caldav/caldav_setup.xml | 16 ++++++++--------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/addons/caldav/caldav_data.xml b/addons/caldav/caldav_data.xml
index a6ac41c4821..6fc20452fc6 100644
--- a/addons/caldav/caldav_data.xml
+++ b/addons/caldav/caldav_data.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0"?>
 <openerp>
     <data noupdate="1">
-        <record model="document.directory" id="document.dir_calendars">
-            <field name="name">Calendars</field>
-            <field name="calendar_collection">True</field>
-        </record>
+    
         <!--        Event attributes-->
-
         <record model="basic.calendar.attributes" id="field_event_comment">
             <field name="name">comment</field>
             <field name="type">vevent</field>
diff --git a/addons/caldav/caldav_setup.xml b/addons/caldav/caldav_setup.xml
index b633f3b6b76..11172eb359f 100644
--- a/addons/caldav/caldav_setup.xml
+++ b/addons/caldav/caldav_setup.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
         <!-- /calendars tree -->
-        <record id="document_directory_calendars0" model="document.directory">
+        <record id="document.dir_calendars" 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_directory_calendars0"/>
+            <field model="document.directory" name="parent_id" ref="document.dir_calendars"/>
             <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_directory_calendars0"/>
+            <field model="document.directory" name="parent_id" ref="document.dir_calendars"/>
             <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_directory_calendars0"/>
+            <field model="document.directory" name="parent_id" ref="document.dir_calendars"/>
             <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_directory_calendars0"/>
+            <field model="document.directory" name="dir_id" ref="document.dir_calendars"/>
             <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_directory_calendars0"/>
+            <field model="document.directory" name="parent_id" ref="document.dir_calendars"/>
             <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_directory_calendars0"/>
+            <field model="document.directory" name="parent_id" ref="document.dir_calendars"/>
             <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_directory_calendars0"/>
+            <field model="document.directory" name="dir_id" ref="document.dir_calendars"/>
             <field name="namespace">urn:ietf:params:xml:ns:caldav</field>
             <!-- no parent, it is a global property -->
             <field name="name">calendar-home-set</field>

From 377904e4ef519be2a25283bfee9d98c171c48f69 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Mon, 22 Nov 2010 20:56:47 +0530
Subject: [PATCH 6/7] [IMP]: Improvement in caldav setup file.

bzr revid: atp@tinyerp.co.in-20101122152647-oo13cjz2qm1vhgm3
---
 addons/caldav/caldav_setup.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/caldav/caldav_setup.xml b/addons/caldav/caldav_setup.xml
index 11172eb359f..26c73949af1 100644
--- a/addons/caldav/caldav_setup.xml
+++ b/addons/caldav/caldav_setup.xml
@@ -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_users0"/>
             <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_users0"/>
             <field name="storage_id" ref="document.storage_default"/>
             <field name="type">directory</field>
             <field eval="[(6,0,[])]" name="group_ids"/>

From b74a9e35b681035b54542e7e52797eefba452f98 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Wed, 24 Nov 2010 10:23:34 +0530
Subject: [PATCH 7/7] [ADD]: Add Calendar Directory and also crm_caldav_data
 and project_caldav_data.

bzr revid: atp@tinyerp.co.in-20101124045334-j88uz5hvm11u4evo
---
 addons/caldav/caldav_data.xml                 |   5 +
 addons/caldav/caldav_setup.xml                |  12 +-
 addons/crm_caldav/crm_caldav_data.xml         | 318 ++++++++++++++++++
 addons/document_ics/document_demo.xml         |   4 +
 addons/project_caldav/project_caldav_data.xml | 314 +++++++++++++++++
 5 files changed, 647 insertions(+), 6 deletions(-)

diff --git a/addons/caldav/caldav_data.xml b/addons/caldav/caldav_data.xml
index 6fc20452fc6..146b8f83476 100644
--- a/addons/caldav/caldav_data.xml
+++ b/addons/caldav/caldav_data.xml
@@ -2,6 +2,11 @@
 <openerp>
     <data noupdate="1">
     
+        <record model="document.directory" id="document.dir_calendars">
+            <field name="name">Calendars</field>
+            <field name="calendar_collection">True</field>
+        </record>    
+    
         <!--        Event attributes-->
         <record model="basic.calendar.attributes" id="field_event_comment">
             <field name="name">comment</field>
diff --git a/addons/caldav/caldav_setup.xml b/addons/caldav/caldav_setup.xml
index 26c73949af1..e2e9d7eae5a 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"/>
@@ -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_data.xml b/addons/crm_caldav/crm_caldav_data.xml
index 8347cd37eae..0e28af56dca 100644
--- a/addons/crm_caldav/crm_caldav_data.xml
+++ b/addons/crm_caldav/crm_caldav_data.xml
@@ -2,5 +2,323 @@
 <openerp>
     <data noupdate="1">
 
+<!--        Event Attribute mapping for Calendar-->
+
+        <record model="basic.calendar" id="caldav.basic_calendar1">
+            <field name="name">Meetings</field>
+            <field name="collection_id" ref="document.dir_calendars"></field>
+            <field name="type">vevent</field>
+        </record>
+
+        <record model="basic.calendar.lines" id="base_calendar.calendar_lines_event">
+            <field name="name">vevent</field>
+            <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="base_calendar.calendar_lines_alarm">
+            <field name="name">valarm</field>
+            <field name="calendar_id" ref="caldav.basic_calendar1" />
+            <field name="object_id" search="[('model','=','calendar.alarm')]" />
+        </record>
+
+        <record model="basic.calendar.lines" id="base_calendar.calendar_lines_attendee">
+            <field name="name">attendee</field>
+            <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_0">
+            <field name="name" ref="caldav.field_event_organizer"/>
+            <field name="type_id" ref="base_calendar.calendar_lines_event" />
+            <field name="field_id" search="[('name','=','organizer'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_1">
+            <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="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="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="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="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="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="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_9">
+            <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="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="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="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="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="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="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="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="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="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="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>
+
+
+
+        <record model="basic.calendar.fields" id="map_alarm_1">
+            <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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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>
+
     </data>
 </openerp>
diff --git a/addons/document_ics/document_demo.xml b/addons/document_ics/document_demo.xml
index 17989b963ba..191903858ed 100644
--- a/addons/document_ics/document_demo.xml
+++ b/addons/document_ics/document_demo.xml
@@ -7,6 +7,10 @@
         <field name="code">shcal</field>
     </record> 
     
+    <record model="document.directory" id="document.dir_calendars">
+        <field name="name">Calendars</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_data.xml b/addons/project_caldav/project_caldav_data.xml
index 464a13201d0..35f0ab1d773 100644
--- a/addons/project_caldav/project_caldav_data.xml
+++ b/addons/project_caldav/project_caldav_data.xml
@@ -2,6 +2,320 @@
 <openerp>
     <data noupdate="1">       
 
+        <record model="basic.calendar" id="caldav.basic_calendar2">
+        <field name="name">Tasks</field>
+        <field name="collection_id" ref="document.dir_calendars"></field>
+        <field name="type">vtodo</field>
+        </record>
+        
+        <record model="basic.calendar.lines" id="caldav.calendar_lines_todo">
+            <field name="name">vtodo</field>
+            <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="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>
+            <field name="fn">field</field>
+        </record>
 
+        <record model="basic.calendar.fields" id="map_todo_2">
+            <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="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="caldav.field_todo_valarm"/>
+            <field name="type_id" ref="caldav.calendar_lines_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="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>
+
+        <!-- Sequence is not impemented right. 
+        See http://tools.ietf.org/html/rfc5545#section-3.8.7.4
+        Disabling..
+    
+        <record model="basic.calendar.fields" id="map_todo_6">
+            <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="caldav.field_todo_url"/>
+            <field name="type_id" ref="caldav.calendar_lines_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="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>
+        </record>
+    
+    
+        <record model="basic.calendar.fields" id="map_todo_10">
+            <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="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="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>
+            <field name="mapping">{'1': '0', '2': '1', '3': '1','4': '1', '5': '2', '6': '3', '7': '3', '8': '3', '9': '4'}</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_todo_13">
+            <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="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="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="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="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="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="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>
+        </record>   
+        
+        <record model="basic.calendar.lines" id="caldav.calendar_lines_alarm2">
+            <field name="name">valarm</field>
+            <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="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="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="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="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="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="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="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="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="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="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="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="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>
+        </record>
+
+
+        <record model="basic.calendar.fields" id="map_attendee_1">
+            <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="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="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="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="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="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="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="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="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="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="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>
+        </record>
+        
     </data>
 </openerp>