[IMP] crm: Improve the reccurrent meeting

bzr revid: sbh@tinyerp.com-20101213112723-5r5hvdpbsf4rwhs3

diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index cd6a147..9d4fba7 100644 (file)
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -73,6 +73,7 @@ class crm_meeting(crm_case, osv.osv):
                                     ('cancel', 'Cancelled'),
                                     ('done', 'Done')], 'State', \
                                     size=16, readonly=True),
+        'recurrency': fields.boolean('Recurrency', help="Recurrent Meeting"),                                    
         'edit_all': fields.boolean('Edit All', help="Edit all Occurrences  of recurrent Meeting."),         
     }
     def onchange_edit_all(self, cr, uid, ids, rrule_type,edit_all, context=None):

diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index e276c23..3aca781 100644 (file)
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -44,54 +44,10 @@
                     <field name="alarm_id" string="Reminder"
                         widget="selection" />
                     <group colspan="2" col="4" >
-                           <field name="rrule_type" string="Recurrency"
-                                colspan="1" attrs="{'readonly':[('recurrent_uid','!=',False)]}"/>
-                           <field name="edit_all" attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
+                                                 <field name="recurrency"/>      
+                           <field name="edit_all" attrs="{'invisible':[('recurrency','=', False)]}"
                                 on_change="onchange_edit_all(rrule_type,edit_all)"/>
-                    </group>
-                </group>
-                <group col="4" colspan="4" 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>
                 <notebook colspan="4">
@@ -210,7 +166,52 @@
                             </form>
                         </field>
                     </page>
-                </notebook>
+                     <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"/>
+                                       <field name="interval" />
+                                       <field name="end_date" />
+                                   </group>
+                                   <group col="5" colspan="5" 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>
+                                    </page>
+                               </notebook>
             </form>
         </field>
     </record>