From 2ffeb04046f1cb6173913fc7f6eb26b2b7298d69 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 24 Dec 2009 17:31:08 +0530
Subject: [PATCH] [IMP]: caldav,crm,project_calendar: Added wizard to change
 RRule

bzr revid: rpa@tinyerp.com-20091224120108-jpv931vjh3fetj3m
---
 addons/caldav/common.py                             | 8 ++++----
 addons/crm/crm_caldav_view.xml                      | 3 ++-
 addons/crm/crm_caldav_wizard.xml                    | 5 ++---
 addons/project_calendar/project_calendar_view.xml   | 6 +++++-
 addons/project_calendar/project_calendar_wizard.xml | 5 +++++
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/addons/caldav/common.py b/addons/caldav/common.py
index c7d3a017c21..cb6150bd3e1 100644
--- a/addons/caldav/common.py
+++ b/addons/caldav/common.py
@@ -284,12 +284,12 @@ class set_rrule_wizard(osv.osv_memory):
 
     def add_rrule(self, cr, uid, ids, context={}):
         datas = self.read(cr, uid, ids)[0]
-        if not context:
+        if not context or not context.get('model'):
             return {}
-        model = 'crm.case' # for now
+        else:
+            model = context.get('model')
         obj = self.pool.get(model)
         res_obj = obj.browse(cr, uid, context['active_id'])[0]
-        
         weekdays = ['mo', 'tu', 'we', 'th', 'fr', 'sa', 'su']
         weekstring = ''
         monthstring = ''
@@ -342,4 +342,4 @@ class set_rrule_wizard(osv.osv_memory):
 
 set_rrule_wizard()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/crm/crm_caldav_view.xml b/addons/crm/crm_caldav_view.xml
index b519f173479..b3ca3b69e39 100644
--- a/addons/crm/crm_caldav_view.xml
+++ b/addons/crm/crm_caldav_view.xml
@@ -104,7 +104,8 @@
             			<group string="Recurrency Details" col="5" colspan="4">
             				<button string="Change RRule"
             					name="%(caldav.action_view_caldav_set_rrule_wizard)d"
-            					icon="gtk-save-as" type="action" colspan="4"/>
+            					icon="gtk-save-as" type="action" colspan="4"
+            					context="{'model' : 'crm.case'}"/>
             				<group col="1" colspan="2">
             					<separator string="Recurrenet Rule" />
             					<field name="rrule" nolabel="1" />
diff --git a/addons/crm/crm_caldav_wizard.xml b/addons/crm/crm_caldav_wizard.xml
index 472f90fcdb3..7ff8d305640 100644
--- a/addons/crm/crm_caldav_wizard.xml
+++ b/addons/crm/crm_caldav_wizard.xml
@@ -9,8 +9,7 @@
 		/>
 		
 		<wizard string="Set RRULE" model="crm.case"
-			name="caldav.set.rrule" id="wizard_crm_set_rrule"
+			name="caldav.set.rrule" id="wizard_crm_set_rrule" menu="False"
 		/>
-		
 	</data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/project_calendar/project_calendar_view.xml b/addons/project_calendar/project_calendar_view.xml
index 6ed99321b13..bff9b08044c 100644
--- a/addons/project_calendar/project_calendar_view.xml
+++ b/addons/project_calendar/project_calendar_view.xml
@@ -109,7 +109,11 @@
             			<newline/>
             			<separator string="Location" colspan="4"/>
             			<field name="location" colspan="4" nolabel="1"/>
-            			<group string="Recurrency Details" col="4" colspan="4">
+            			<group string="Recurrency Details" col="5" colspan="4">
+            				<button string="Change RRule"
+            					name="%(caldav.action_view_caldav_set_rrule_wizard)d"
+            					icon="gtk-save-as" type="action" colspan="4"
+            					context="{'model' : 'project.task'}"/>
             				<group col="1" colspan="2">
             					<separator string="Recurrenet Rule" />
             					<field name="rrule" nolabel="1" />
diff --git a/addons/project_calendar/project_calendar_wizard.xml b/addons/project_calendar/project_calendar_wizard.xml
index 190adce3ce8..97410cade5c 100644
--- a/addons/project_calendar/project_calendar_wizard.xml
+++ b/addons/project_calendar/project_calendar_wizard.xml
@@ -8,5 +8,10 @@
 			name="caldav.project.export" id="wizard_project_cal_export"
 			multi="True"
 		/>
+		
+		<wizard string="Set RRULE" model="crm.case"
+			name="caldav.set.rrule" id="wizard_crm_set_rrule" menu="False"
+		/>
+
 	</data>
 </openerp>