diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 0e57c7cfb66..301780282e7 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1150,8 +1150,9 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
                                 ('weekly', 'Weeks'),
                                 ('monthly', 'Months'),
                                 ('yearly', 'Years'), ], 'Frequency'),
-                                
-        'interval': fields.integer('Interval', help="Repeat every (Days/Week/Month/Year)"),
+          
+        'end_type' : fields.selection([('forever', 'Forever'), ('count', 'Fix amout of times'), ('end_date','End date')], 'Way to end reccurency'),
+        'interval': fields.integer('Repeat every', help="Repeat every (Days/Week/Month/Year)"),
         'count': fields.integer('Repeat', help="Repeat x times"),
         'mo': fields.boolean('Mon'),
         'tu': fields.boolean('Tue'),
@@ -1189,6 +1190,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
         return res
 
     _defaults = {
+            'end_type' : 'forever',
             'state': 'tentative',
             'class': 'public',
             'show_as': 'busy',
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index c27a50cf37b..9a61fda01bd 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -169,18 +169,21 @@
                         <group col="4" colspan="4" name="rrule">
                             <group col="4" colspan="4">
                                 <field name="rrule_type" string="Recurrency period"
-                                   attrs="{'readonly':[('recurrent_uid','!=',False)]}" />                               
-                                <label string="" colspan="2"/>                           
+                                   attrs="{'readonly':[('recurrent_uid','!=',False)]}" />
+                                <field name="interval" />                               
+                                                       
                                 
                                 <separator string="End of recurrency" colspan="4"/>
-                                <field name="count" attrs="{'readonly': [('end_date','!=',False)]}"/>
+                                <field name="end_type" />
                                 <label string=" " colspan="2" />
                                 <newline />
-                                <field name="end_date" attrs="{'readonly': [('count','!=',False)]}"/>
+                                <field name="count" attrs="{'invisible' : [('end_type', '!=', 'count')] }"/>
+                                <label string=" " colspan="2" />
+                                <newline />
+                                <field name="end_date" attrs="{'invisible' : [('end_type', '!=', 'end_date')] }"/>
                                 <newline />
                            
-                                <separator string="Repeat interval" colspan="4"/>
-                                <field name="interval" /> <label string="" colspan="2"/>
+                      
                             </group>
                             <group col="8" colspan="4" name="Select weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}">
                                 <separator string="Choose day where repeat the meeting" colspan="8"/>
@@ -200,13 +203,13 @@
                                 <group col="2" colspan="1">
                                     <field name="select1" />
                                 </group>
-                                <group col="2" colspan="1"
-                                    attrs="{'invisible' : [('select1','=','day')]}">
+                                <group col="2" colspan="1">
                                     <field name="day"
-                                        attrs="{'required' : [('select1','=','date'), ('rrule_type','=','monthly')]}" />
+                                        attrs="{'required' : [('select1','=','date'), ('rrule_type','=','monthly')],
+                                            'invisible' : ['|', ('select1','=','day'), ('rrule_type','!=','monthly')]}" />
                                 </group>
                                 <group col="3" colspan="1"
-                                    attrs="{'invisible' : [('select1','=','date'), ('rrule_type','=','monthly')]}">
+                                    attrs="{'invisible' : ['|', ('select1','=','date'), ('rrule_type','!=','monthly')]}">
                                     <field name="byday" string="The"
                                         attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')]}" />
                                     <field name="week_list" nolabel="1"