From a2dcc919cea8e2bce788ab656c4d6674f2a67490 Mon Sep 17 00:00:00 2001
From: "tfr@openerp.com" <>
Date: Fri, 8 Jul 2011 15:35:02 +0200
Subject: [PATCH] [CLEAN] clean recurrent option view in task, but deactivate
 reccurency for task in openerp since it's not well implemented

bzr revid: tfr@openerp.com-20110708133502-gqdovbyhm717xdgx
---
 addons/project_caldav/project_caldav_view.xml | 64 +++++++++++--------
 1 file changed, 38 insertions(+), 26 deletions(-)

diff --git a/addons/project_caldav/project_caldav_view.xml b/addons/project_caldav/project_caldav_view.xml
index 57e9e75a53b..0d566be4619 100644
--- a/addons/project_caldav/project_caldav_view.xml
+++ b/addons/project_caldav/project_caldav_view.xml
@@ -65,7 +65,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="progress" position="after">
-                    <field name="recurrency"/>      
+                    <!--     Recurrency of task not well implemented for now, remove the option-->     
+                     <field name="recurrency" invisible="1"/>
                      <field name="edit_all" attrs="{'invisible':[('recurrency','=', False)]}"/>                    
                 </field>
             </field>
@@ -78,46 +79,57 @@
             <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="Recurrency Rule" colspan="8"/>
-                            <group col="6" colspan="4">
-                                <field name="interval" string="Repeat Times" attrs="{'readonly': [('end_date','!=',False)]}"/>
-                                <field name="count" attrs="{'readonly': [('end_date','!=',False)]}"/>
-                                <field name="end_date" attrs="{'invisible': [('readonly','!=',False)]}"/>
+                    <page string="Recurrency Option" attrs="{'invisible': [('recurrency','=',False)], 'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">
+                        <group col="4" colspan="4" name="rrule">
+                            <group col="4" colspan="4">
+                                <field name="rrule_type" string="Recurrency period" />
+                                <field name="interval" />                               
+                                                       
+                                
+                                <separator string="End of recurrency" colspan="4"/>
+                                <field name="end_type" />
+                                <label string=" " colspan="2" />
+                                <newline />
+                                <field name="count" attrs="{'invisible' : [('end_type', '!=', 'count')] }"/>
+                                <label string=" " colspan="2" />
+                                <newline />
+                                <field name="end_date" attrs="{'invisible' : [('end_type', '!=', 'end_date')], 'required': [('end_type', '=', 'end_date')]}"/>
+                                <newline />
+                           
+                      
                             </group>
-                            <group col="14" colspan="4" name="Select weekdays" 
-                                    attrs="{'invisible' :[('rrule_type','not in', ['weekly','daily_working'])]}">
+                            <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')]}">
+                            <group col="10" colspan="4"
+                                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" />
+                                    <field name="select1" />
                                 </group>
-                                <group col="2" colspan="1" attrs="{'invisible' : [('select1','=','day')]}">
-                                <field name="day" attrs="{'required' : [('select1','=','date')]}" />
+                                <group col="2" colspan="1">
+                                    <field name="day"
+                                        attrs="{'required' : [('select1','=','date'), ('rrule_type','=','monthly')],
+                                            'invisible' : [('select1','=','day')]}" />
                                 </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' : [('rrule_type','!=','yearly')]}">
-                                <field name="month_list" string="of" colspan="1" attrs="{'required' : [('rrule_type','=','yearly')]}" />
+                                <group col="3" colspan="1">
+                                    <field name="byday" string="The"
+                                        attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')], 'invisible' : [('select1','=','date')]}" />
+                                    <field name="week_list" nolabel="1"
+                                        attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')], 'invisible' : [('select1','=','date')]}" />
                                 </group>
                             </group>
                         </group>
+
                     </page>
                  </notebook>
             </field>