From 7e4f7decdcdf77ac30abc9660c096e2ff89533ca Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Mon, 20 Dec 2010 11:33:19 +0100
Subject: [PATCH] [FIX] base_calendar_view last imp

bzr revid: tfr@openerp.com-20101220103319-mai8bpbuh2cr2xqh
---
 addons/base_calendar/base_calendar_view.xml | 46 ++++++++++-----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index a59cad8a09e..a1bd8db9d54 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -344,52 +344,52 @@
                                 </form>
                             </field>
                         </page>
-                   <page string="Recurrency Option" attrs="{'invisible':[('recurrency','=',False)]}">
+                    <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="interval" string="Repeat Times"/>
+                            <group col="4" colspan="4">
+                                <field name="rrule_type" string="Recurrency period"
+                                   attrs="{'readonly':[('recurrent_uid','!=',False)]}" />                               
+                                <label string="" colspan="2"/>                           
+                                
+                                <separator string="End of recurrency" colspan="4"/>
                                 <field name="count" attrs="{'readonly': [('end_date','!=',False)]}"/>
+                                <label string=" " colspan="2" />
+                                <newline />
                                 <field name="end_date" attrs="{'readonly': [('count','!=',False)]}"/>
+                                <newline />
+                           
+                                <separator string="Repeat interval" colspan="4"/>
+                                <field name="interval" /> <label string="" colspan="2"/>
                             </group>
-                            <group col="14" colspan="4" name="Select weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}">
+                            <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"/>
                                 <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"  attrs="{'invisible': [('rrule_type','=','daily_working')]}"/>
-                                <field name="su" colspan="1"  attrs="{'invisible': [('rrule_type','=','daily_working')]}"/>
+                                <field name="sa" colspan="1"  />
+                                <field name="su" colspan="1"  />
                                 <newline />
                             </group>
                             <group col="10" colspan="4"
-                                attrs="{'invisible' : [('rrule_type','!=','monthly'), ('rrule_type','!=','yearly')]}">
+                                attrs="{'invisible' : [('rrule_type','!=','monthly')]}">
+                                <separator string="Choose day in the month where repeat the meeting" colspan="12"/>
                                 <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')]}" />
+                                        attrs="{'required' : [('select1','=','date'), ('rrule_type','=','monthly')]}" />
                                 </group>
                                 <group col="3" colspan="1"
-                                    attrs="{'invisible' : [('select1','=','date')]}">
+                                    attrs="{'invisible' : [('select1','=','date'), ('rrule_type','=','monthly')]}">
                                     <field name="byday" string="The"
-                                        attrs="{'required' : [('select1','=','day')]}" />
+                                        attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')]}" />
                                     <field name="week_list" nolabel="1"
-                                        attrs="{'required' : [('select1','=','day')]}" />
-                                </group>
-                                <group col="1" colspan="1"
-                                    attrs="{'invisible' : [('rrule_type','!=','yearly')]}">
-                                    <field name="month_list" string="of"
-                                        colspan="1"
-                                        attrs="{'required' : [('rrule_type','=','yearly')]}" />
+                                        attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')]}" />
                                 </group>
                             </group>
                         </group>