diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index 80e7fbfed0c..b8342709220 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -153,7 +153,7 @@
             <field name="usage">menu</field>
             <field name="view_id" ref="board_crm_form"/>
         </record>
-         <menuitem id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/>
+        <menuitem id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/>
         <menuitem
             name="Sales Dashboard" parent="board.menu_dasboard"
             action="open_board_crm"
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 4f992622726..65a33e4835d 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -47,7 +47,6 @@
                            <field name="recurrency"/>      
                            <field name="edit_all" attrs="{'invisible':[('recurrency','=', False)]}"
                                 on_change="onchange_edit_all(rrule_type,edit_all)"/>
-
                     </group>
                 </group>
                 <notebook colspan="4">
@@ -166,16 +165,20 @@
                             </form>
                         </field>
                     </page>
-                     <page string="Recurrency Option" attrs="{'invisible':[('recurrency','=',False)]}">
-		                <group col="4" colspan="4" name="rrule">
-		                    <separator string=" Recurrency Rule" colspan="8"/>
-		                    <group col="3" colspan="2">
-		                      <field name="freq" string="Recurrency"/>
-		                      <newline/>
-		                      <field name="end_date" />
-		                      <field name="interval" string="Repeat Times"/>
+                    <page string="Recurrency Option" attrs="{'invisible':[('recurrency','=',False)]}">
+	                    <group col="4" colspan="4" name="rrule">
+	                        <group col="2" colspan="2">
+		                        <field name="rrule_type" string="Recurrency"
+	                                    attrs="{'readonly':[('recurrent_uid','!=',False)]}" colspan="2"/>
+	                            <label string="" colspan="2"/>
+	                        </group>
+		                    <separator string="Recurrency Rule" colspan="8"/>
+		                    <group col="6" colspan="4">
+		                        <field name="freq" />
+		                        <field name="interval" string="Repeat Times" attrs="{'invisible': [('end_date','!=',False)]}"/>
+		                        <field name="end_date" attrs="{'invisible': [('interval','!=',False)]}"/>
 		                    </group>
-		                    <group col="5" colspan="5" name="Select weekdays"
+		                    <group col="14" colspan="4" name="Select weekdays"
 		                        attrs="{'invisible' : [('freq','!=','weekly')]}">
 		                        <field name="mo" colspan="1" />
 		                        <field name="tu" colspan="1" />
@@ -212,8 +215,9 @@
 		                        </group>
 		                    </group>
 		                </group>
-		                     </page>
-		                </notebook>
+
+	                </page>
+                </notebook>
             </form>
         </field>
     </record>
diff --git a/addons/project_caldav/project_caldav.py b/addons/project_caldav/project_caldav.py
index f1a4bc73e4b..ef061bde08f 100644
--- a/addons/project_caldav/project_caldav.py
+++ b/addons/project_caldav/project_caldav.py
@@ -41,6 +41,8 @@ class project_task(osv.osv):
         'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
                                   help='If the task is created the state is \'Draft\'.\n If the task is started, the state becomes \'In Progress\'.\n If review is needed the task is in \'Pending\' state.\
                                   \n If the task is over, the states is set to \'Done\'.'),
+        'recurrency': fields.boolean('Recurrency', help="Recurrent Tasks"),                                    
+        'edit_all': fields.boolean('Edit All', help="Edit all Occurrences  of recurrent Task."),
     }
     _defaults = {
         'state': 'draft',
diff --git a/addons/project_caldav/project_caldav_view.xml b/addons/project_caldav/project_caldav_view.xml
index cfd27ce4240..f2ebedd538d 100644
--- a/addons/project_caldav/project_caldav_view.xml
+++ b/addons/project_caldav/project_caldav_view.xml
@@ -57,7 +57,7 @@
                 </field>
             </field>
         </record>
-
+        
         <record id="view_project_caldav_task_form2" model="ir.ui.view">
             <field name="name">project.task.caldav.form2</field>
             <field name="model">project.task</field>
@@ -65,64 +65,69 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="progress" position="after">
-                    <group colspan="2" col="4" >
-                           <field name="rrule_type" string="Recurrency" colspan="1" attrs="{'readonly':[('recurrent_uid','!=',False)]}"/>
-                           <button string="Edit All"
-                               help="Edit all Ourrences of recurrent Task"
-                               attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
-                               name="open_task" icon="gtk-edit"
-                               type="object" />
-                           <button string="Exclude range" groups="base.group_extended"
-                                help="Add Exception Rule"
-                                name="%(base_calendar.action_base_calendar_set_exrule)d" icon="gtk-zoom-out"  type="action"
-                                context="{'model' : 'project.task'}"
-                                attrs="{'invisible':[('rrule_type','in', ('none', False))]}"/>
-                    </group>
-                    <newline/>
-                    <group col="4" colspan="6" name="rrule" attrs="{'invisible': [('rrule_type','!=','custom')]}">
-                        <separator string="Custom Recurrency Rule" colspan="8"/>
-                        <group col="8" colspan="4">
-                        <field name="interval" />
-                        <field name="freq" />
-                        <field name="count" />
-                        <field name="end_date" />
-                        </group>
-                        <group col="14" colspan="4" name="Select weekdays" 
-                                attrs="{'invisible': [('freq','=','weekly')]}">
-                        <field name="mo" colspan="1" />
-                        <field name="tu" colspan="1" />
-                        <field name="we" colspan="1" />
-                        <field name="th" colspan="1" />
-                        <field name="fr" colspan="1" />
-                        <field name="sa" colspan="1" />
-                        <field name="su" colspan="1" />
-                        <newline />
-                        </group>
-                        <group col="10" colspan="4" attrs="{'invisible': [('freq','!=','monthly'), ('freq','!=','yearly')]}">
-                            <group col="2" colspan="1">
-                            <field name="select1" />
-                            </group>
-                            <group col="2" colspan="1" attrs="{'invisible' : [('select1','=','day')]}">
-                            <field name="day" attrs="{'required' : [('select1','=','date')]}" />
-                            </group>
-                            <group col="3" colspan="1" attrs="{'invisible' : [('select1','=','date')]}">
-                            <field name="byday" string="The" attrs="{'required' : [('select1','=','day')]}" />
-                            <field name="week_list" nolabel="1" attrs="{'required' : [('select1','=','day')]}" />
-                            </group>
-                            <group col="1" colspan="1" attrs="{'invisible' : [('freq','!=','yearly')]}">
-                            <field name="month_list" string="of" colspan="1" attrs="{'required' : [('freq','=','yearly')]}" />
-                            </group>
-                        </group>
-                    </group>
+                    <field name="recurrency"/>      
+                    <field name="edit_all" attrs="{'invisible':[('recurrency','=', False)]}"/>
                 </field>
             </field>
         </record>
 
-    <record id="view_project_caldav_task_form3" model="ir.ui.view">
+        <record id="view_project_caldav_task_form3" model="ir.ui.view">
             <field name="name">project.task.caldav.form3</field>
             <field name="model">project.task</field>
             <field name="inherit_id" ref="project.view_task_form2" />
             <field name="type">form</field>
+            <field name="arch" type="xml">
+                <notebook colspan="4" position="inside">
+                    <page string="Recurrency Option" attrs="{'invisible':[('recurrency','=',False)]}">
+	                    <group colspan="2" col="4" >
+	                         <field name="rrule_type" string="Recurrency" colspan="1" attrs="{'readonly':[('recurrent_uid','!=',False)]}"/>
+	                    </group>
+	                    <newline/>
+	                    <group col="4" colspan="6" name="rrule">
+	                        <separator string="Custom Recurrency Rule" colspan="8"/>
+	                        <group col="6" colspan="4">
+		                        <field name="freq" />
+                                <field name="interval" string="Repeat Times" attrs="{'invisible': [('end_date','!=',False)]}"/>
+                                <field name="end_date" attrs="{'invisible': [('interval','!=',False)]}"/>
+	                        </group>
+	                        <group col="14" colspan="4" name="Select weekdays" 
+	                                attrs="{'invisible': [('freq','!=','weekly')]}">
+		                        <field name="mo" colspan="1" />
+		                        <field name="tu" colspan="1" />
+		                        <field name="we" colspan="1" />
+		                        <field name="th" colspan="1" />
+		                        <newline/>
+		                        <field name="fr" colspan="1" />
+		                        <field name="sa" colspan="1" />
+		                        <field name="su" colspan="1" />
+		                        <newline />
+	                        </group>
+	                        <group col="10" colspan="4" attrs="{'invisible': [('freq','!=','monthly'), ('freq','!=','yearly')]}">
+	                            <group col="2" colspan="1">
+	                            <field name="select1" />
+	                            </group>
+	                            <group col="2" colspan="1" attrs="{'invisible' : [('select1','=','day')]}">
+	                            <field name="day" attrs="{'required' : [('select1','=','date')]}" />
+	                            </group>
+	                            <group col="3" colspan="1" attrs="{'invisible' : [('select1','=','date')]}">
+	                            <field name="byday" string="The" attrs="{'required' : [('select1','=','day')]}" />
+	                            <field name="week_list" nolabel="1" attrs="{'required' : [('select1','=','day')]}" />
+	                            </group>
+	                            <group col="1" colspan="1" attrs="{'invisible' : [('freq','!=','yearly')]}">
+	                            <field name="month_list" string="of" colspan="1" attrs="{'required' : [('freq','=','yearly')]}" />
+	                            </group>
+	                        </group>
+	                    </group>
+                    </page>
+                 </notebook>
+            </field>
+        </record>
+
+    <record id="view_project_caldav_task_form4" model="ir.ui.view">
+            <field name="name">project.task.caldav.form4</field>
+            <field name="model">project.task</field>
+            <field name="inherit_id" ref="project.view_task_form2" />
+            <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="partner_id" position="after">
                     <field name="vtimezone" colspan="2" />