From 77ba33003afa0e8047fdec65a101be8f968a200b Mon Sep 17 00:00:00 2001
From: jke-openerp <jke@openerp.com>
Date: Mon, 18 Nov 2013 09:15:57 +0100
Subject: [PATCH] rb r2g

bzr revid: jke@openerp.com-20131118081557-np5sxps572b578bg
---
 addons/base_calendar/crm_meeting.py     | 1 -
 addons/hr_holidays/hr_holidays_demo.xml | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

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 @@
       <field eval="time.strftime('%Y-%m-20')" name="date_from"/>
       <field eval="time.strftime('%Y-%m-22')" name="date_to"/>
       <field name="type">remove</field>
-      <field name="state">draft</field>
+      <field name="state">tentative</field>
       <field name="number_of_days_temp">3</field>
       <field name="employee_id" ref="hr.employee_fp"/>
     </record>
@@ -37,7 +37,7 @@
       <field eval="time.strftime('%Y-%m-23')" name="date_from"/>
       <field eval="time.strftime('%Y-%m-25')" name="date_to"/>
       <field name="type">add</field>
-      <field name="state">draft</field>
+      <field name="state">tentative</field>
       <field name="number_of_days_temp">7</field>
       <field name="employee_id" ref="hr.employee_fp"/>
     </record>