[MERGE] [FIX] base_calendar: when computing the reccurency of an event, skip if no...

Fix the calendar view so that the recurrency period is editable when checking the 'recurrency' checkbox

bzr revid: mat@openerp.com-20140307153610-seud49l3oh1nq836

diff --cc addons/base_calendar/base_calendar.py
Simple merge

diff --cc addons/base_calendar/base_calendar_view.xml
index 92ffad4,98bf9ed..84f9ea4
--- 1/addons/base_calendar/base_calendar_view.xml
--- 2/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@@ -161,8 -161,8 +161,7 @@@
                      <page string="Recurrency Option" attrs="{'invisible': [('recurrency','=',False)]}">
                          <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="{'readonly': [('recurrency','=',True)]}"/>
++                                <field name="rrule_type" string="Recurrency period" />
                                  <field name="interval"/>
                                  <separator string="End of Recurrence" colspan="4"/>
                                  <field name="end_type"/>