diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 5ef83f99cbe..50ed460729a 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -44,8 +44,7 @@ The CRM module has a email gateway for the synchronisation interface
 between mails and Open ERP.""", 
     'author': 'Tiny', 
     'website': 'http://www.openerp.com', 
-    'depends': ['base', 
-                        'caldav', 
+    'depends': ['base',                         
                         'process', 
                         'mail_gateway', 
                     ], 
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 192fcd7c94f..396c9758b07 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -21,6 +21,8 @@
 
 from osv import fields, osv
 import crm
+from datetime import datetime, timedelta
+from datetime import datetime, timedelta
 
 class crm_opportunity(osv.osv):
     _name = 'crm.opportunity'
@@ -32,7 +34,27 @@ class crm_meeting(osv.osv):
     _name = 'crm.meeting'
     _description = "Meeting Cases"
     _order = "id desc"
-    _inherit = ["crm.case", "calendar.event"]
+    _inherit = "crm.case"
+
+    def _get_duration(self, cr, uid, ids, name, arg, context):
+        res = {}
+        for event in self.browse(cr, uid, ids, context=context):
+            start = datetime.strptime(event.date, "%Y-%m-%d %H:%M:%S")
+            res[event.id] = 0
+            if event.date_deadline:
+                end = datetime.strptime(event.date_deadline[:19], "%Y-%m-%d %H:%M:%S")
+                diff = end - start
+                duration =  float(diff.days)* 24 + (float(diff.seconds) / 3600)
+                res[event.id] = round(duration, 2)
+        return res
+
+    def _set_duration(self, cr, uid, id, name, value, arg, context):
+        event = self.browse(cr, uid, id, context=context)
+        start = datetime.strptime(event.date, "%Y-%m-%d %H:%M:%S")
+        end = start + timedelta(hours=value)
+        cr.execute("UPDATE %s set date_deadline='%s' \
+                        where id=%s"% (self._table, end.strftime("%Y-%m-%d %H:%M:%S"), id))
+        return True
 
     _columns = {
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 
@@ -41,7 +63,8 @@ class crm_meeting(osv.osv):
                             ('object_id.model', '=', 'crm.meeting')]", \
             help='Category related to the section.Subdivide the CRM cases \
 independently or section-wise.'), 
-        'attendee_ids': fields.many2many('calendar.attendee', 'event_attendee_rel', 'event_id', 'attendee_id', 'Attendees'),
+        'duration': fields.function(_get_duration, method=True, \
+                                    fnct_inv=_set_duration, string='Duration'),        
         'phonecall_id':fields.many2one ('crm.phonecall', 'Phonecall'),        
         'opportunity_id':fields.many2one ('crm.opportunity', 'Opportunity'),
     }
diff --git a/addons/crm/crm_meeting_data.xml b/addons/crm/crm_meeting_data.xml
index 58982e4dc6c..0b8da1389bf 100644
--- a/addons/crm/crm_meeting_data.xml
+++ b/addons/crm/crm_meeting_data.xml
@@ -20,333 +20,6 @@
 	        <field name="name">Phone Call</field>
 	        <field name="section_id" ref="section_sales_department"/>
 	        <field name="object_id" search="[('model','=','crm.meeting')]" model="ir.model"/>
-	    </record>
-
-	    <record model="res.request.link" id="request_link_meeting">
-	        <field name="name">Case Meeting</field>
-	        <field name="object">crm.meeting</field>
-	    </record>		
-		
-
-<!--		Event Attribute mapping for Calendar-->
-
-        <record model="basic.calendar" id="base_calendar.basic_calendar1">
-			<field name="name">Meetings</field>
-		</record>
-
-        <record model="basic.calendar.lines" id="caldav.calendar_lines_event">
-			<field name="name">vevent</field>
-			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
-			<field name="object_id" search="[('model','=','crm.meeting')]" />
-            <field name="domain">[('user_id','=', uid)]</field>
-		</record>
-
-        <record model="basic.calendar.lines" id="caldav.calendar_lines_alarm">
-			<field name="name">valarm</field>
-			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
-			<field name="object_id" search="[('model','=','calendar.alarm')]" />
-		</record>
-		
-		<record model="basic.calendar.lines" id="caldav.calendar_lines_attendee">
-			<field name="name">attendee</field>
-			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
-			<field name="object_id" search="[('model','=','calendar.attendee')]" />
-		</record>
-		
-        <record model="basic.calendar.fields" id="map_event_1">
-            <field name="name" ref="base_calendar.field_event_uid"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','id'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_2">
-            <field name="name" ref="base_calendar.field_event_recurrence-id"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','recurrent_id'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-        
-        <record model="basic.calendar.fields" id="map_event_3">
-            <field name="name" ref="base_calendar.field_event_vtimezone"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','vtimezone'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_4">
-			<field name="name" ref="base_calendar.field_event_attendee" />
-			<field name="type_id" ref="caldav.calendar_lines_event" />
-			<field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','crm.meeting')]" />
-			<field name="fn">field</field>
-		</record>		
-
-        <record model="basic.calendar.fields" id="map_event_5">
-            <field name="name" ref="base_calendar.field_event_rrule"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','rrule'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_6">
-            <field name="name" ref="base_calendar.field_event_dtend"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','date_deadline'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_7">
-            <field name="name" ref="base_calendar.field_event_valarm"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','caldav_alarm_id'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_8">
-			<field name="name" ref="base_calendar.field_event_priority"/>
-		    <field name="type_id" ref="caldav.calendar_lines_event" />
-			<field name="field_id" search="[('name','=','priority'),('model_id.model','=','crm.meeting')]" />
-		    <field name="fn">field</field>
-		    <field name="mapping">{'1': '1', '2': '2', '3': '2','4': '2', '5': '3', '6': '4', '7': '4', '8': '4', '9': '5'}</field>
-		</record>	
-		
-
-        <record model="basic.calendar.fields" id="map_event_9">
-            <field name="name" ref="base_calendar.field_event_location"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','location'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_10">
-            <field name="name" ref="base_calendar.field_event_exrule"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','exrule'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_11">
-			<field name="name" ref="base_calendar.field_event_status"/>
-		    <field name="type_id" ref="caldav.calendar_lines_event" />
-			<field name="field_id" search="[('name','=','state'),('model_id.model','=','crm.meeting')]" />
-			<field name="mapping">{'tentative': 'draft', 'confirmed': 'open', 'cancelled': 'cancel'}</field>
-		    <field name="fn">field</field>
-		</record>
-
-        <record model="basic.calendar.fields" id="map_event_12">
-            <field name="name" ref="base_calendar.field_event_exdate"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','exdate'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_13">
-            <field name="name" ref="base_calendar.field_event_dtstamp"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','date'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_14">
-            <field name="name" ref="base_calendar.field_event_description"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_15">
-            <field name="name" ref="base_calendar.field_event_dtstart"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','date'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_16">
-            <field name="name" ref="base_calendar.field_event_class"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','class'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_18">
-            <field name="name" ref="base_calendar.field_event_created"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','create_date'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_19">
-            <field name="name" ref="base_calendar.field_event_url"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','caldav_url'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_20">
-            <field name="name" ref="base_calendar.field_event_summary"/>
-            <field name="type_id" ref="caldav.calendar_lines_event" />
-	        <field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>       
-
-
-
-        <record model="basic.calendar.fields" id="map_alarm_1">
-            <field name="name" ref="base_calendar.field_alarm_attendee"/>
-            <field name="type_id" ref="caldav.calendar_lines_alarm" />
-	        <field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','calendar.alarm')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_alarm_2">
-            <field name="name" ref="base_calendar.field_alarm_trigger_duration"/>
-            <field name="type_id" ref="caldav.calendar_lines_alarm" />
-	        <field name="field_id" search="[('name','=','trigger_duration'),('model_id.model','=','res.alarm')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_alarm_3">
-            <field name="name" ref="base_calendar.field_alarm_description"/>
-            <field name="type_id" ref="caldav.calendar_lines_alarm" />
-	        <field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.alarm')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_alarm_4">
-            <field name="name" ref="base_calendar.field_alarm_attach"/>
-            <field name="type_id" ref="caldav.calendar_lines_alarm" />
-	        <field name="field_id" search="[('name','=','attach'),('model_id.model','=','calendar.alarm')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_alarm_5">
-            <field name="name" ref="base_calendar.field_alarm_trigger_occurs"/>
-            <field name="type_id" ref="caldav.calendar_lines_alarm" />
-	        <field name="field_id" search="[('name','=','trigger_occurs'),('model_id.model','=','res.alarm')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_alarm_6">
-            <field name="name" ref="base_calendar.field_alarm_trigger_interval"/>
-            <field name="type_id" ref="caldav.calendar_lines_alarm" />
-	        <field name="field_id" search="[('name','=','trigger_interval'),('model_id.model','=','res.alarm')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_alarm_7">
-            <field name="name" ref="base_calendar.field_alarm_summary"/>
-            <field name="type_id" ref="caldav.calendar_lines_alarm" />
-	        <field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.alarm')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_alarm_8">
-            <field name="name" ref="base_calendar.field_alarm_duration"/>
-            <field name="type_id" ref="caldav.calendar_lines_alarm" />
-	        <field name="field_id" search="[('name','=','duration'),('model_id.model','=','res.alarm')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_alarm_9">
-            <field name="name" ref="base_calendar.field_alarm_repeat"/>
-            <field name="type_id" ref="caldav.calendar_lines_alarm" />
-	        <field name="field_id" search="[('name','=','repeat'),('model_id.model','=','res.alarm')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_alarm_10">
-            <field name="name" ref="base_calendar.field_alarm_action"/>
-            <field name="type_id" ref="caldav.calendar_lines_alarm" />
-	        <field name="field_id" search="[('name','=','action'),('model_id.model','=','calendar.alarm')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_alarm_11">
-            <field name="name" ref="base_calendar.field_alarm_trigger_related"/>
-            <field name="type_id" ref="caldav.calendar_lines_alarm" />
-	        <field name="field_id" search="[('name','=','trigger_related'),('model_id.model','=','res.alarm')]" />
-            <field name="fn">field</field>
-        </record>
-
-
-        <record model="basic.calendar.fields" id="map_attendee_1">
-            <field name="name" ref="base_calendar.field_attendee_cn"/>
-            <field name="type_id" ref="caldav.calendar_lines_attendee" />
-	        <field name="field_id" search="[('name','=','cn'),('model_id.model','=','calendar.attendee')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_attendee_2">
-            <field name="name" ref="base_calendar.field_attendee_sent-by"/>
-            <field name="type_id" ref="caldav.calendar_lines_attendee" />
-	        <field name="field_id" search="[('name','=','sent_by'),('model_id.model','=','calendar.attendee')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_attendee_3">
-            <field name="name" ref="base_calendar.field_attendee_language"/>
-            <field name="type_id" ref="caldav.calendar_lines_attendee" />
-	        <field name="field_id" search="[('name','=','language'),('model_id.model','=','calendar.attendee')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_attendee_4">
-            <field name="name" ref="base_calendar.field_attendee_delegated-from"/>
-            <field name="type_id" ref="caldav.calendar_lines_attendee" />
-	        <field name="field_id" search="[('name','=','delegated_from'),('model_id.model','=','calendar.attendee')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_attendee_5">
-            <field name="name" ref="base_calendar.field_attendee_member"/>
-            <field name="type_id" ref="caldav.calendar_lines_attendee" />
-	        <field name="field_id" search="[('name','=','member'),('model_id.model','=','calendar.attendee')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_attendee_6">
-            <field name="name" ref="base_calendar.field_attendee_cutype"/>
-            <field name="type_id" ref="caldav.calendar_lines_attendee" />
-	        <field name="field_id" search="[('name','=','cutype'),('model_id.model','=','calendar.attendee')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_attendee_7">
-            <field name="name" ref="base_calendar.field_attendee_role"/>
-            <field name="type_id" ref="caldav.calendar_lines_attendee" />
-	        <field name="field_id" search="[('name','=','role'),('model_id.model','=','calendar.attendee')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_attendee_8">
-            <field name="name" ref="base_calendar.field_attendee_partstat"/>
-            <field name="type_id" ref="caldav.calendar_lines_attendee" />
-	        <field name="field_id" search="[('name','=','state'),('model_id.model','=','calendar.attendee')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_attendee_9">
-            <field name="name" ref="base_calendar.field_attendee_delegated-to"/>
-            <field name="type_id" ref="caldav.calendar_lines_attendee" />
-	        <field name="field_id" search="[('name','=','delegated_to'),('model_id.model','=','calendar.attendee')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_attendee_10">
-            <field name="name" ref="base_calendar.field_attendee_dir"/>
-            <field name="type_id" ref="caldav.calendar_lines_attendee" />
-	        <field name="field_id" search="[('name','=','dir'),('model_id.model','=','calendar.attendee')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_attendee_11">
-            <field name="name" ref="base_calendar.field_attendee_rsvp"/>
-            <field name="type_id" ref="caldav.calendar_lines_attendee" />
-	        <field name="field_id" search="[('name','=','rsvp'),('model_id.model','=','calendar.attendee')]" />
-            <field name="fn">field</field>
-        </record>
-
-		
-
+	    </record>	    
 	</data>
 </openerp>
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index a4c894d7a0a..a52f3b5b297 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -116,22 +116,7 @@
         ALL MEETINGS
     -->
     <menuitem name="Meetings" id="menu_meeting_sale" parent="base.menu_base_partner" sequence="3"/>
-    <menuitem name="Meetings" id="menu_crm_case_categ_meet" action="crm_case_categ_meet" parent="menu_meeting_sale" sequence="1"/>
-
-    <record id="action_view_attendee_form" model="ir.actions.act_window">
-	 	<field name="name">Meeting Invitations</field>
-	 	<field name="type">ir.actions.act_window</field>
-	 	<field name="res_model">calendar.attendee</field>
-	 	<field name="view_type">form</field>
-	 	<field name="view_mode">tree,form</field>
-	 	<field name="view_id" ref="caldav.caldav_attendee_tree_view" />	 	
-        <field name="domain">[('ref','like','crm.meeting,')]</field>
-	 	<field name="context">{'default_sent_by_uid': uid}</field>
-	 </record>
-
-    <menuitem id="menu_attendee_invitations"
-			name="Meeting Invitations" parent="menu_meeting_sale"
-			sequence="10" action="action_view_attendee_form" />
+    <menuitem name="Meetings" id="menu_crm_case_categ_meet" action="crm_case_categ_meet" parent="menu_meeting_sale" sequence="1"/>    
     
 
     <record model="ir.actions.act_window" id="crm_case_category_act_meetall3">
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 78a0fc6e776..5adcf8856e6 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -24,84 +24,41 @@
         <field name="model">crm.meeting</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Meetings Form">            	
+            <form string="Meetings">            	
             	<group col="6" colspan="4">
                     <field name="name" select="1" string="Summary"
-            			colspan="4" />
-                    <field name="location" />
+            			colspan="4" />   
+                    <field name="categ_id"/>                 
             		<field name="date" string="Start Date" required="1" />
             		<field name="duration" widget="float_time" />
             		<field name="date_deadline" string="End Date" required="1" />
             		
-            		<field name="categ_id"/>
-                    <field name="alarm_id" string="Reminder" widget="selection" />
-            		<group colspan="2" col="3" attrs="{'readonly':[('recurrent_uid','!=',False)]}">
-                            <field name="rrule_type" string="Recurrency"
-                            	on_change="onchange_rrule_type(rrule_type)"
-                            	colspan="1" />
-                            <button string="Custom"
-            					name="%(caldav.action_calendar_custom_rrule_wizard)d"
-            					icon="gtk-save-as" type="action" context="{'model' : 'crm.meeting'}"
-                                attrs="{'readonly': [('rrule_type','!=','custom')]}"
-                                />
-                    </group>
-
+            		
             	</group>
             	<notebook colspan="4">
-            		<page string="Description">
+            		<page string="Meeting">
             			<separator string="Description" colspan="4" />
             			<field name="description" nolabel="1" colspan="4" />
-            		</page>
-            		<page string="Attendee Detail">
-            			<button string="Invite People"
-            				name="%(caldav.action_view_calendar_invite_attendee_wizard)d"
-            				icon="terp-partner" type="action"
-            				context="{'model' : 'crm.meeting', 'attendee_field':'attendee_ids'}" colspan="2"/>
-            			<field name="attendee_ids" colspan="4"
-            				nolabel="1" widget="one2many" mode="tree,form">
-            				<tree string="Atendee details" editable="top">
-            					<field name="email" />
-            					<field name="role" select="1" />
-            					<field name="state" />
-            				</tree>
-            				<form string="Atendee details">
-            					<notebook colspan="4">
-            						<page string="Details">
-            							<field name="email" />
-            							<field name="rsvp" select="1" />
-            							<field name="cutype" select="1" />
-            							<field name="role" select="1" />
-            							<separator colspan="4" string="" />
-            							<field name="state" />
-            						</page>
-            						<page string="Other">
-            							<field name="user_id"/>
-            							<field name="partner_address_id" select="1" />
-            							<newline />
-            						</page>
-            					</notebook>
-            				</form>
-            			</field>
-            		</page>
+                        <separator colspan="4"/>
+                        <group col="8" colspan="4">
+                            <field name="state" select="2"/>
+                            <button name="case_close" string="Done" states="open,draft,pending" type="object"  icon="gtk-close"/>
+                            <button name="case_open" string="Open" states="draft,pending" type="object"  icon="gtk-go-forward"/>
+                            <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
+                            <button name="case_pending" string="Pending" states="draft,open" type="object"  icon="gtk-media-pause"/>
+                            <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"  icon="gtk-go-up"/>
+                            <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"  icon="gtk-convert"/>
+                        </group>
+            		</page>            		
             		<page string="Other Information">
             			<field name="priority"/>
-            			<field name="show_as"/>            			
-            			<field name="class"/>
             			<field name="user_id" on_change="onchange_user_id(user_id)"/>
                         <field name="section_id" widget="selection"
-            			/>
-            			<field name="vtimezone"/>
-            			<field name="recurrent_id" invisible="1" />
-            			<field name="recurrent_uid" invisible="1" />
-            			<field name="rrule" invisible="1" />
+            			/>            			
             		</page>
             	</notebook>
-            	<group col="3" colspan="4" attrs="{'invisible':[('rrule_type','in', ('none', False))]}">
-            		<label string="" />
-            		<button string="Modify this Occurrence"
-            			name="%(base_calendar.wizard_edit_this_event)d" icon="gtk-save"
-            			type="action" context="{'model' : 'crm.meeting', 'date': date, 'date_deadline': date_deadline}" />
-            	</group>
+    
+                            	
             </form>
         </field>
     </record>
@@ -111,7 +68,7 @@
         <field name="model">crm.meeting</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Meetings Tree"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
+            <tree string="Meetings"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                 <field name="id" widget="char"/>
                 <field name="name" string="Title"/>
                 <field name="date" string="Meeting Date"/>
@@ -119,10 +76,7 @@
                 <field name="priority"/>
                 <field name="categ_id"/>
                 <field name="user_id"/>
-                <field name="state"/>
-                <button name="case_open" string="Confirm Meeting" states="draft,cancel,pending" type="object" icon="terp-crm"/>
-                <button name="case_cancel" string="Cancel Meeting" states="draft,open,pending" type="object" icon="gtk-cancel"/>
-                <button name="case_reset" string="Reset to Unconfirmed" states="done,open,cancel" type="object" icon="gtk-convert"/>
+                <field name="state"/>                
             </tree>
         </field>
     </record>
diff --git a/addons/crm/crm_meeting_wizard.xml b/addons/crm/crm_meeting_wizard.xml
index e53d3117ebb..41d8d37da0c 100644
--- a/addons/crm/crm_meeting_wizard.xml
+++ b/addons/crm/crm_meeting_wizard.xml
@@ -1,18 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 	<data>
-		<wizard string="Import .ics File" model="crm.meeting"
-			name="calendar.event.import" id="base_calendar.wizard_cal_event_import" />
-
-		<wizard string="Subscribe"
-			model="crm.meeting" name="calendar.event.subscribe"
-			id="base_calendar.wizard_cal_event_subscribe" />
-
-		<wizard string="Export .ics File" model="crm.meeting"
-			name="calendar.event.export" id="base_calendar.wizard_cal_event_export" />
-
-		<wizard string="Edit this event" model="crm.meeting"
-			name="calendar.event.edit.this" id="base_calendar.wizard_edit_this_event"
-			menu="False" />
+		
 	</data>
 </openerp>
diff --git a/addons/crm_caldav/__init__.py b/addons/crm_caldav/__init__.py
new file mode 100644
index 00000000000..e0b36eaac3d
--- /dev/null
+++ b/addons/crm_caldav/__init__.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+
+import crm_meeting
+
+
+
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/crm_caldav/__terp__.py b/addons/crm_caldav/__terp__.py
new file mode 100644
index 00000000000..19357a428be
--- /dev/null
+++ b/addons/crm_caldav/__terp__.py
@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Extened Module to Add CalDav future on Meeting',
+    'version': '1.0',
+    'category': 'Generic Modules/CRM & SRM',
+    'description': """
+    New Futures in Meeting:
+        *  Recurrent meeting
+        *  Alarms
+        *  Invitation facility
+        *  Share meeting with other calendar clients like sunbird         
+""", 
+    'author': 'Tiny', 
+    'website': 'http://www.openerp.com', 
+    'depends': ['base', 
+                        'caldav', 
+                        'crm', 
+                        'mail_gateway', 
+                    ], 
+    'init_xml': [ 
+                'crm_meeting_data.xml',                 
+    ], 
+
+    'update_xml': [        
+        'crm_meeting_wizard.xml', 
+        'crm_meeting_view.xml', 
+        'crm_meeting_menu.xml',         
+    ],
+    'demo_xml': [], 
+    'installable': True, 
+    'active': False,     
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_caldav/crm_meeting.py b/addons/crm_caldav/crm_meeting.py
new file mode 100644
index 00000000000..be7ba346c26
--- /dev/null
+++ b/addons/crm_caldav/crm_meeting.py
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from crm import crm
+class crm_meeting(osv.osv):
+    _name = 'crm.meeting'
+    _description = "Meetings"
+    _order = "id desc"
+    _inherit = ["crm.case", "calendar.event"]
+
+    _columns = { 
+        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 
+        'categ_id': fields.many2one('crm.case.categ', 'Category', \
+                            domain="[('section_id','=',section_id),\
+                            ('object_id.model', '=', 'crm.meeting')]", \
+            help='Category related to the section.Subdivide the CRM cases \
+independently or section-wise.'),            
+        'phonecall_id':fields.many2one ('crm.phonecall', 'Phonecall'),        
+        'opportunity_id':fields.many2one ('crm.opportunity', 'Opportunity'),       
+        'attendee_ids': fields.many2many('calendar.attendee', 'event_attendee_rel', 'event_id', 'attendee_id', 'Attendees'),
+        
+    }
+
+crm_meeting()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_caldav/crm_meeting_data.xml b/addons/crm_caldav/crm_meeting_data.xml
new file mode 100644
index 00000000000..ae7315da835
--- /dev/null
+++ b/addons/crm_caldav/crm_meeting_data.xml
@@ -0,0 +1,331 @@
+<?xml version="1.0"?>
+<openerp>
+	<data noupdate="1">
+
+        <record model="res.request.link" id="request_link_meeting">
+	        <field name="name">Case Meeting</field>
+	        <field name="object">crm.meeting</field>
+	    </record>        
+
+<!--		Event Attribute mapping for Calendar-->
+
+        <record model="basic.calendar" id="base_calendar.basic_calendar1">
+			<field name="name">Meetings</field>
+		</record>
+
+        <record model="basic.calendar.lines" id="caldav.calendar_lines_event">
+			<field name="name">vevent</field>
+			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
+			<field name="object_id" search="[('model','=','crm.meeting')]" />
+            <field name="domain">[('user_id','=', uid)]</field>
+		</record>
+
+        <record model="basic.calendar.lines" id="caldav.calendar_lines_alarm">
+			<field name="name">valarm</field>
+			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
+			<field name="object_id" search="[('model','=','calendar.alarm')]" />
+		</record>
+		
+		<record model="basic.calendar.lines" id="caldav.calendar_lines_attendee">
+			<field name="name">attendee</field>
+			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
+			<field name="object_id" search="[('model','=','calendar.attendee')]" />
+		</record>
+		
+        <record model="basic.calendar.fields" id="map_event_1">
+            <field name="name" ref="base_calendar.field_event_uid"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','id'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_2">
+            <field name="name" ref="base_calendar.field_event_recurrence-id"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','recurrent_id'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+        
+        <record model="basic.calendar.fields" id="map_event_3">
+            <field name="name" ref="base_calendar.field_event_vtimezone"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','vtimezone'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_4">
+			<field name="name" ref="base_calendar.field_event_attendee" />
+			<field name="type_id" ref="caldav.calendar_lines_event" />
+			<field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','crm.meeting')]" />
+			<field name="fn">field</field>
+		</record>		
+
+        <record model="basic.calendar.fields" id="map_event_5">
+            <field name="name" ref="base_calendar.field_event_rrule"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','rrule'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_6">
+            <field name="name" ref="base_calendar.field_event_dtend"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','date_deadline'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_7">
+            <field name="name" ref="base_calendar.field_event_valarm"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','caldav_alarm_id'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_8">
+			<field name="name" ref="base_calendar.field_event_priority"/>
+		    <field name="type_id" ref="caldav.calendar_lines_event" />
+			<field name="field_id" search="[('name','=','priority'),('model_id.model','=','crm.meeting')]" />
+		    <field name="fn">field</field>
+		    <field name="mapping">{'1': '1', '2': '2', '3': '2','4': '2', '5': '3', '6': '4', '7': '4', '8': '4', '9': '5'}</field>
+		</record>	
+		
+
+        <record model="basic.calendar.fields" id="map_event_9">
+            <field name="name" ref="base_calendar.field_event_location"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','location'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_10">
+            <field name="name" ref="base_calendar.field_event_exrule"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','exrule'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_11">
+			<field name="name" ref="base_calendar.field_event_status"/>
+		    <field name="type_id" ref="caldav.calendar_lines_event" />
+			<field name="field_id" search="[('name','=','state'),('model_id.model','=','crm.meeting')]" />
+			<field name="mapping">{'tentative': 'draft', 'confirmed': 'open', 'cancelled': 'cancel'}</field>
+		    <field name="fn">field</field>
+		</record>
+
+        <record model="basic.calendar.fields" id="map_event_12">
+            <field name="name" ref="base_calendar.field_event_exdate"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','exdate'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_13">
+            <field name="name" ref="base_calendar.field_event_dtstamp"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','date'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_14">
+            <field name="name" ref="base_calendar.field_event_description"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_15">
+            <field name="name" ref="base_calendar.field_event_dtstart"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','date'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_16">
+            <field name="name" ref="base_calendar.field_event_class"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','class'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_18">
+            <field name="name" ref="base_calendar.field_event_created"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','create_date'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_19">
+            <field name="name" ref="base_calendar.field_event_url"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','caldav_url'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_event_20">
+            <field name="name" ref="base_calendar.field_event_summary"/>
+            <field name="type_id" ref="caldav.calendar_lines_event" />
+	        <field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.event')]" />
+            <field name="fn">field</field>
+        </record>       
+
+
+
+        <record model="basic.calendar.fields" id="map_alarm_1">
+            <field name="name" ref="base_calendar.field_alarm_attendee"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	        <field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','calendar.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_2">
+            <field name="name" ref="base_calendar.field_alarm_trigger_duration"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	        <field name="field_id" search="[('name','=','trigger_duration'),('model_id.model','=','res.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_3">
+            <field name="name" ref="base_calendar.field_alarm_description"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	        <field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_4">
+            <field name="name" ref="base_calendar.field_alarm_attach"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	        <field name="field_id" search="[('name','=','attach'),('model_id.model','=','calendar.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_5">
+            <field name="name" ref="base_calendar.field_alarm_trigger_occurs"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	        <field name="field_id" search="[('name','=','trigger_occurs'),('model_id.model','=','res.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_6">
+            <field name="name" ref="base_calendar.field_alarm_trigger_interval"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	        <field name="field_id" search="[('name','=','trigger_interval'),('model_id.model','=','res.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_7">
+            <field name="name" ref="base_calendar.field_alarm_summary"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	        <field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_8">
+            <field name="name" ref="base_calendar.field_alarm_duration"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	        <field name="field_id" search="[('name','=','duration'),('model_id.model','=','res.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_9">
+            <field name="name" ref="base_calendar.field_alarm_repeat"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	        <field name="field_id" search="[('name','=','repeat'),('model_id.model','=','res.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_10">
+            <field name="name" ref="base_calendar.field_alarm_action"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	        <field name="field_id" search="[('name','=','action'),('model_id.model','=','calendar.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_alarm_11">
+            <field name="name" ref="base_calendar.field_alarm_trigger_related"/>
+            <field name="type_id" ref="caldav.calendar_lines_alarm" />
+	        <field name="field_id" search="[('name','=','trigger_related'),('model_id.model','=','res.alarm')]" />
+            <field name="fn">field</field>
+        </record>
+
+
+        <record model="basic.calendar.fields" id="map_attendee_1">
+            <field name="name" ref="base_calendar.field_attendee_cn"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	        <field name="field_id" search="[('name','=','cn'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_2">
+            <field name="name" ref="base_calendar.field_attendee_sent-by"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	        <field name="field_id" search="[('name','=','sent_by'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_3">
+            <field name="name" ref="base_calendar.field_attendee_language"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	        <field name="field_id" search="[('name','=','language'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_4">
+            <field name="name" ref="base_calendar.field_attendee_delegated-from"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	        <field name="field_id" search="[('name','=','delegated_from'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_5">
+            <field name="name" ref="base_calendar.field_attendee_member"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	        <field name="field_id" search="[('name','=','member'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_6">
+            <field name="name" ref="base_calendar.field_attendee_cutype"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	        <field name="field_id" search="[('name','=','cutype'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_7">
+            <field name="name" ref="base_calendar.field_attendee_role"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	        <field name="field_id" search="[('name','=','role'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_8">
+            <field name="name" ref="base_calendar.field_attendee_partstat"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	        <field name="field_id" search="[('name','=','state'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_9">
+            <field name="name" ref="base_calendar.field_attendee_delegated-to"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	        <field name="field_id" search="[('name','=','delegated_to'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_10">
+            <field name="name" ref="base_calendar.field_attendee_dir"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	        <field name="field_id" search="[('name','=','dir'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+        <record model="basic.calendar.fields" id="map_attendee_11">
+            <field name="name" ref="base_calendar.field_attendee_rsvp"/>
+            <field name="type_id" ref="caldav.calendar_lines_attendee" />
+	        <field name="field_id" search="[('name','=','rsvp'),('model_id.model','=','calendar.attendee')]" />
+            <field name="fn">field</field>
+        </record>
+
+		
+
+	</data>
+</openerp>
diff --git a/addons/crm_caldav/crm_meeting_menu.xml b/addons/crm_caldav/crm_meeting_menu.xml
new file mode 100644
index 00000000000..7c01fa3415d
--- /dev/null
+++ b/addons/crm_caldav/crm_meeting_menu.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<openerp>
+<data noupdate="1">    
+
+    <record id="action_view_attendee_form" model="ir.actions.act_window">
+	 	<field name="name">Meeting Invitations</field>
+	 	<field name="type">ir.actions.act_window</field>
+	 	<field name="res_model">calendar.attendee</field>
+	 	<field name="view_type">form</field>
+	 	<field name="view_mode">tree,form</field>
+	 	<field name="view_id" ref="caldav.caldav_attendee_tree_view" />	 	
+        <field name="domain">[('ref','like','crm.meeting,')]</field>
+	 	<field name="context">{'default_sent_by_uid': uid}</field>
+	 </record>
+
+    <menuitem id="menu_attendee_invitations"
+			name="Meeting Invitations" parent="crm.menu_meeting_sale"
+			sequence="10" action="action_view_attendee_form" /> 
+
+    
+</data>
+</openerp>
diff --git a/addons/crm_caldav/crm_meeting_view.xml b/addons/crm_caldav/crm_meeting_view.xml
new file mode 100644
index 00000000000..16e1423456a
--- /dev/null
+++ b/addons/crm_caldav/crm_meeting_view.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>	
+
+        <record id="meeting_form_view_inherit1" model="ir.ui.view">
+                <field name="name">CRM - Meetings Form Inherit1</field>
+                <field name="model">crm.meeting</field>
+                <field name="type">form</field>
+                <field name="inherit_id" ref="crm.crm_case_form_view_meet"/>                
+                <field name="arch" type="xml">
+                    <field name="date_deadline" position="after">                        
+                        <group colspan="2" col="4" >
+                                <field name="rrule_type" string="Recurrency"
+                                	on_change="onchange_rrule_type(rrule_type)"
+                                	colspan="1" attrs="{'readonly':[('recurrent_uid','!=',False)]}"/>
+                                <button string="Custom"
+                					name="%(caldav.action_calendar_custom_rrule_wizard)d"
+                					icon="gtk-save-as" type="action" context="{'model' : 'crm.meeting'}"
+                                    attrs="{'readonly': [('rrule_type','!=','custom')]}"
+                                    />
+                                <button string="Edit" help="Edit only this Occurrency Meeting" attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
+                    			name="%(base_calendar.wizard_edit_this_event)d" icon="gtk-save"
+                    			type="action" context="{'model' : 'crm.meeting', 'date': date, 'date_deadline': date_deadline}" />
+                        </group>
+                        <field name="alarm_id" string="Reminder" widget="selection" /> 
+                        <field name="location" />
+                    </field>
+                </field>
+        </record>
+
+        <record id="meeting_form_view_inherit2" model="ir.ui.view">
+                <field name="name">CRM - Meetings Form Inherit2</field>
+                <field name="model">crm.meeting</field>
+                <field name="type">form</field>
+                <field name="inherit_id" ref="crm.crm_case_form_view_meet"/>                
+                <field name="arch" type="xml">
+                    <xpath expr="/form/notebook/page[@string='Meeting']" position="after">
+                        <page string="Invitation Detail">
+                			<button string="Invite People"
+                				name="%(caldav.action_view_calendar_invite_attendee_wizard)d"
+                				icon="terp-partner" type="action"
+                				context="{'model' : 'crm.meeting', 'attendee_field':'attendee_ids'}" colspan="2"/>
+                			<field name="attendee_ids" colspan="4"
+                				nolabel="1" widget="one2many" mode="tree,form">
+                				<tree string="Invitation details" editable="top">
+                					<field name="email" />
+                					<field name="role" select="1" />
+                					<field name="state" />
+                				</tree>
+                				<form string="Invitation details">
+                					<notebook colspan="4">
+                						<page string="Details">
+                							<field name="email" />
+                							<field name="rsvp" select="1" />
+                							<field name="cutype" select="1" />
+                							<field name="role" select="1" />
+                							<separator colspan="4" string="" />
+                							<field name="state" />
+                						</page>
+                						<page string="Other">
+                							<field name="user_id"/>
+                							<field name="partner_address_id" select="1" />
+                							<newline />
+                						</page>
+                					</notebook>
+                				</form>
+                			</field>
+            		    </page>
+                    </xpath>
+                </field>
+        </record>
+
+
+        <record id="meeting_form_view_inherit3" model="ir.ui.view">
+                <field name="name">CRM - Meetings Form Inherit3</field>
+                <field name="model">crm.meeting</field>
+                <field name="type">form</field>
+                <field name="inherit_id" ref="crm.crm_case_form_view_meet"/>                
+                <field name="arch" type="xml">
+                    <xpath expr="/form/notebook/page[@string='Other Information']/field[@name='section_id']" position="after">
+                        <newline/>
+                        <field name="show_as"/>            			
+            			<field name="class"/>
+                        <field name="vtimezone"/>
+            			<field name="recurrent_id" invisible="1" />
+            			<field name="recurrent_uid" invisible="1" />
+            			<field name="rrule" invisible="1" />
+                    </xpath>
+                </field>
+        </record>
+	</data>
+</openerp>
diff --git a/addons/crm_caldav/crm_meeting_wizard.xml b/addons/crm_caldav/crm_meeting_wizard.xml
new file mode 100644
index 00000000000..e53d3117ebb
--- /dev/null
+++ b/addons/crm_caldav/crm_meeting_wizard.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>
+		<wizard string="Import .ics File" model="crm.meeting"
+			name="calendar.event.import" id="base_calendar.wizard_cal_event_import" />
+
+		<wizard string="Subscribe"
+			model="crm.meeting" name="calendar.event.subscribe"
+			id="base_calendar.wizard_cal_event_subscribe" />
+
+		<wizard string="Export .ics File" model="crm.meeting"
+			name="calendar.event.export" id="base_calendar.wizard_cal_event_export" />
+
+		<wizard string="Edit this event" model="crm.meeting"
+			name="calendar.event.edit.this" id="base_calendar.wizard_edit_this_event"
+			menu="False" />
+	</data>
+</openerp>