diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index cdaca2c294e..388b204d176 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -76,11 +76,7 @@
                                     on_change="onchange_dates(date,False,date_deadline)"/>
                             </group>
                             <group>
-<<<<<<< TREE
-                                <field name="user_id"/>
-=======
                                 <field name="user_id" groups="base.group_no_one" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'base.group_sale_salesman_all_leads']}"/>
->>>>>>> MERGE-SOURCE
                                 <field name="categ_ids" widget="many2many_tags"/>
                                 <field name="location"/>
                                 <field name="organizer" groups="base.group_no_one"/>
diff --git a/addons/portal_hr_employees/hr_employee.py b/addons/portal_hr_employees/hr_employee.py
index 52d01170a2a..bb81f7d71ea 100644
--- a/addons/portal_hr_employees/hr_employee.py
+++ b/addons/portal_hr_employees/hr_employee.py
@@ -56,3 +56,16 @@ class hr_employee(osv.osv):
     _defaults = {
         'visibility': 'private',
     }
+
+class calendar_attendee(osv.osv):
+    _inherit = 'calendar.attendee'
+    
+    def create(self, cr, uid, vals, context=None):
+        user_pool = self.pool.get('res.users')
+        if vals.get('partner_id'):
+            users = user_pool.search_read(cr, uid, [('partner_id','=', vals.get('partner_id'))],['employee_ids'], context=context)
+        for user in users:
+            if user['employee_ids']:
+                vals['state'] = 'accepted'
+        return super(calendar_attendee, self).create(cr, uid, vals, context=context)
+