From 20a57cc0734e2c56e56b5168624f294e1d912076 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Wed, 9 Oct 2013 16:31:08 +0530
Subject: [PATCH 1/2] [FIX] the tracebck when create recurrent event from Sales
 &gt; Configuration &gt; Calendar &gt; Events menu.

bzr revid: fka@tinyerp.com-20131009110108-7htob9yoj5hlao75
---
 addons/base_calendar/base_calendar_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 92ffad4be9a..74c60194aba 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -162,7 +162,7 @@
                         <group col="4" colspan="4" name="rrule">
                             <group col="4" colspan="4">
                                 <field name="rrule_type" string="Recurrency period"
-                                   attrs="{'readonly':[('recurrent_id','!=',False)]}"/>
+                                   attrs="{'required': [('recurrency','==',True)]}"/>
                                 <field name="interval"/>
                                 <separator string="End of Recurrence" colspan="4"/>
                                 <field name="end_type"/>

From 88cff57e9576bff0c064611f713168e3a1d6f4a1 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Thu, 10 Oct 2013 12:07:40 +0530
Subject: [PATCH 2/2] [IMP] assign 'rel_date' variable in
 _set_recurrency_end_date()

bzr revid: fka@tinyerp.com-20131010063740-vngt52ivsu3fc3sh
---
 addons/base_calendar/base_calendar.py       | 5 ++++-
 addons/base_calendar/base_calendar_view.xml | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 5db1662b70c..4433495f791 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1588,6 +1588,7 @@ rule or repeating pattern of time to exclude from the recurring rule."),
 
     def _set_recurrency_end_date(self, data, context=None):
         end_date = data.get('end_date')
+        rel_date = False
         if data.get('recurrency') and data.get('end_type') in ('count', unicode('count')):
             data_date_deadline = datetime.strptime(data.get('date_deadline'), '%Y-%m-%d %H:%M:%S')
             if data.get('rrule_type') in ('daily', unicode('count')):
@@ -1598,7 +1599,9 @@ rule or repeating pattern of time to exclude from the recurring rule."),
                 rel_date = relativedelta(months=data.get('count')+1)
             elif data.get('rrule_type') in ('yearly', unicode('yearly')):
                 rel_date = relativedelta(years=data.get('count')+1)
-            end_date = data_date_deadline + rel_date
+            end_date = data_date_deadline
+            if rel_date:
+                end_date += rel_date
         return end_date
 
     def create(self, cr, uid, vals, context=None):
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 74c60194aba..98bf9edb09c 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -162,7 +162,7 @@
                         <group col="4" colspan="4" name="rrule">
                             <group col="4" colspan="4">
                                 <field name="rrule_type" string="Recurrency period"
-                                   attrs="{'required': [('recurrency','==',True)]}"/>
+                                   attrs="{'readonly': [('recurrency','=',True)]}"/>
                                 <field name="interval"/>
                                 <separator string="End of Recurrence" colspan="4"/>
                                 <field name="end_type"/>