From 5a8d2480e441c799ccc03f8331c537264a4ae948 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sat, 14 Jul 2012 18:22:03 +0200
Subject: [PATCH] [FIX] meetings change

bzr revid: fp@openerp.com-20120714162203-fnnsbo7hpnduo29g
---
 addons/hr_recruitment/hr_recruitment.py       | 13 ++-----------
 addons/hr_recruitment/hr_recruitment_view.xml | 13 -------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index a3cd2f3a629..1caceeac137 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -296,13 +296,11 @@ class hr_applicant(base_stage, osv.Model):
         category = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_recruitment', 'categ_meet_interview', context)
         res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'base_calendar', 'action_crm_meeting', context)
         res['context'] = {
-            'default_applicant_id': applicant.id,
-            'default_partner_id': applicant.partner_id and applicant.partner_id.id or False,
+            'default_partner_ids': applicant.partner_id and [applicant.partner_id.id] or False,
             'default_user_id': uid,
-            'default_email_from': applicant.email_from,
             'default_state': 'open',
             'default_name': applicant.name,
-            'default_categ_id': category.id,
+            'default_categ_ids': category and [category.id] or False,
         }
         return res
 
@@ -532,11 +530,4 @@ class hr_job(osv.osv):
                 'nodestroy':True,
             }
 
-
-class crm_meeting(osv.osv):
-    _inherit = 'crm.meeting'
-    _columns = {
-        'applicant_id': fields.many2one('hr.applicant','Applicant'),
-    }
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 5569874e269..7881d6f1e37 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -8,7 +8,6 @@
             sequence="40" />
 
         <act_window
-            domain="[('applicant_id', '=', active_id)]"
             id="act_hr_applicant_to_meeting"
             name="Meetings"
             res_model="crm.meeting"
@@ -505,17 +504,5 @@
             action="hr_recruitment_source_action"
             sequence="10" groups="base.group_no_one"/>
 
-    <record model="ir.ui.view" id="view_crm_meeting_form">
-        <field name="name">CRM - Meetings Form</field>
-        <field name="model">crm.meeting</field>
-        <field name="type">form</field>
-        <field name="inherit_id" ref="base_calendar.view_crm_meeting_form"/>
-        <field name="arch" type="xml">
-            <field name="partner_id" position="before">
-                <field name="applicant_id" attrs="{'invisible': [('categ_id','!=',%(hr_recruitment.categ_meet_interview)d)]}"/>
-            </field>
-        </field>
-    </record>
-
     </data>
 </openerp>