diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py index bda70c5bb1b..7df4a5b5f80 100644 --- a/addons/base_calendar/crm_meeting.py +++ b/addons/base_calendar/crm_meeting.py @@ -188,7 +188,6 @@ class crm_meeting(osv.Model): 'state': fields.selection([('tentative', 'Uncertain'),('cancelled', 'Cancelled'),('confirmed', 'Confirmed'),],'Status', readonly=True, track_visibility='onchange'), - #FIELD FOR RECURRENCY 'exdate': fields.text('Exception Date/Times', help="This property defines the list of date/time exceptions for a recurring calendar component."), 'rrule': fields.function(_get_rulestring, type='char', size=124, fnct_inv=_rrule_write, store=True, string='Recurrent Rule'), diff --git a/addons/hr_holidays/hr_holidays_demo.xml b/addons/hr_holidays/hr_holidays_demo.xml index de2f261dbfa..7be817b500b 100644 --- a/addons/hr_holidays/hr_holidays_demo.xml +++ b/addons/hr_holidays/hr_holidays_demo.xml @@ -26,7 +26,7 @@ remove - draft + tentative 3 @@ -37,7 +37,7 @@ add - draft + tentative 7