From 799cc969db05c34cc3a2471718e99ecfee4e5880 Mon Sep 17 00:00:00 2001
From: "ATP (Open ERP)" <>
Date: Thu, 11 Mar 2010 10:58:58 +0530
Subject: [PATCH] [IMP]: crm: changes related to base_calendar wizard changes

bzr revid: rpa@tinyerp.com-20100311052858-zel2jtsyeh270cey
---
 addons/crm/__terp__.py                          |  1 -
 addons/crm/crm_meeting_view.xml                 |  2 +-
 addons/crm/crm_meeting_wizard.xml               |  8 --------
 addons/project_caldav/project_caldav_wizard.xml | 13 -------------
 4 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 addons/crm/crm_meeting_wizard.xml

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 994f11f3212..80f0eef8758 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -67,7 +67,6 @@ between mails and Open ERP.""",
         'crm_lead_wizard.xml', 
         'crm_lead_view.xml', 
         'crm_lead_menu.xml', 
-        'crm_meeting_wizard.xml', 
         'crm_meeting_view.xml', 
         'crm_meeting_menu.xml', 
         'crm_phonecall_wizard.xml', 
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index a1f1cef502e..59bedbb3b6a 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -38,7 +38,7 @@
                            <field name="rrule_type" string="Recurrency"
                                 colspan="1" attrs="{'readonly':[('recurrent_uid','!=',False)]}"/>
                             <button string="Edit All" help="Edit all Ourrences of recurrent Meeting" attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
-                            name="%(wizard_edit_all_events)d" icon="gtk-edit"
+                            name="%(base_calendar.action_calendar_event_edit_all)d" icon="gtk-edit"
                             type="action" context="{'model' : 'crm.meeting', 'date': date, 'date_deadline': date_deadline}" />
                     </group>
 
diff --git a/addons/crm/crm_meeting_wizard.xml b/addons/crm/crm_meeting_wizard.xml
deleted file mode 100644
index 8d6b66b3f2d..00000000000
--- a/addons/crm/crm_meeting_wizard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-	<data>
-		<wizard string="Edit all events" model="crm.meeting"
-			name="calendar.event.edit.all" id="wizard_edit_all_events"
-			menu="False" />
-	</data>
-</openerp>
diff --git a/addons/project_caldav/project_caldav_wizard.xml b/addons/project_caldav/project_caldav_wizard.xml
index 2bb677eea46..53c78a99bf2 100644
--- a/addons/project_caldav/project_caldav_wizard.xml
+++ b/addons/project_caldav/project_caldav_wizard.xml
@@ -1,18 +1,5 @@
 <openerp>
 	<data>
-		<wizard string="Import .ics File" model="project.task"
-			name="calendar.event.import" id="caldav.wizard_cal_event_import" />
-
-		<wizard string="Subscribe"
-			model="project.task" name="calendar.event.subscribe"
-			id="caldav.wizard_cal_event_subscribe" />
-
-		<wizard string="Export .ics File" model="project.task"
-			name="calendar.event.export" id="caldav.wizard_cal_event_export" />
-
-		<wizard string="Edit this event" model="project.task"
-			name="calendar.event.edit.this" id="caldav.wizard_edit_this_event"
-			menu="False" />
 
 	</data>
 </openerp>