[FIX] calendar_view for web client

bzr revid: tfr@openerp.com-20110120161842-r54saad3yzekxkng

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 297003e..2c503c1 100644 (file)
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1457,6 +1457,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
                         'rrule_type': 'none',
                         'rrule': '',
                         'edit_all': False,
+                        'recurrency' : False,
                         })
                     
                     new_id = self.copy(cr, uid, real_event_id, default=data, context=context)

diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 3ae0a49..2524277 100644 (file)
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -205,14 +205,13 @@
                                 <group col="2" colspan="1">
                                     <field name="day"
                                         attrs="{'required' : [('select1','=','date'), ('rrule_type','=','monthly')],
-                                            'invisible' : ['|', ('select1','=','day'), ('rrule_type','!=','monthly')]}" />
+                                            'invisible' : [('select1','=','day')]}" />
                                 </group>
-                                <group col="3" colspan="1"
-                                    attrs="{'invisible' : ['|', ('select1','=','date'), ('rrule_type','!=','monthly')]}">
+                                <group col="3" colspan="1">
                                     <field name="byday" string="The"
-                                        attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')]}" />
+                                        attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')], 'invisible' : [('select1','=','date')]}" />
                                     <field name="week_list" nolabel="1"
-                                        attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')]}" />
+                                        attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')], 'invisible' : [('select1','=','date')]}" />
                                 </group>
                             </group>
                         </group>