From efc8bb37a92fe2079eca0d163e7236b1fb33519f Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 10 Sep 2013 18:42:05 +0530
Subject: [PATCH] [IMP]Improve code for crm also

bzr revid: dbr@tinyerp.com-20130910131205-39cwpiik2ncs6wcn
---
 addons/base_calendar/crm_meeting.py     | 4 +++-
 addons/crm/crm_lead.py                  | 8 --------
 addons/crm/crm_meeting.py               | 8 --------
 addons/hr_recruitment/hr_recruitment.py | 1 -
 4 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index ba4b21a65d6..11e1794f862 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -68,7 +68,9 @@ class crm_meeting(osv.Model):
         if context is None:
             context = {}
         meeting_id = super(crm_meeting, self).create(cr, uid, vals, context=context)
-        if context.get('log_meeting_in_parent'):
+        parent_model = context.get('active_model',False)
+        parent_ids = context.get('active_ids', False)
+        if parent_model and parent_ids:
             self.log_meeting_in_parent(cr, uid, [meeting_id], context=context)
         return meeting_id
 
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index c4e2cbdc91d..260e634af9b 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -1008,14 +1008,6 @@ class crm_lead(format_address, osv.osv):
         message = _("%s a call for %s.%s") % (prefix, phonecall.date, suffix)
         return self.message_post(cr, uid, ids, body=message, context=context)
 
-    def log_meeting(self, cr, uid, ids, meeting_subject, meeting_date, duration, context=None):
-        if not duration:
-            duration = _('unknown')
-        else:
-            duration = str(duration)
-        message = _("Meeting scheduled at '%s'<br> Subject: %s <br> Duration: %s hour(s)") % (meeting_date, meeting_subject, duration)
-        return self.message_post(cr, uid, ids, body=message, context=context)
-
     def onchange_state(self, cr, uid, ids, state_id, context=None):
         if state_id:
             country_id=self.pool.get('res.country.state').browse(cr, uid, state_id, context).country_id.id
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index c31907bebe2..c65576f16c6 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -34,14 +34,6 @@ class crm_meeting(osv.Model):
         'opportunity_id': fields.many2one ('crm.lead', 'Opportunity', domain="[('type', '=', 'opportunity')]"),
     }
 
-    def create(self, cr, uid, vals, context=None):
-        res = super(crm_meeting, self).create(cr, uid, vals, context=context)
-        obj = self.browse(cr, uid, res, context=context)
-        if obj.opportunity_id:
-            self.pool.get('crm.lead').log_meeting(cr, uid, [obj.opportunity_id.id], obj.name, obj.date, obj.duration, context=context)
-        return res
-
-
 class calendar_attendee(osv.osv):
     """ Calendar Attendee """
 
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 1cb75c37953..344e10260de 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -295,7 +295,6 @@ class hr_applicant(osv.Model):
             'default_user_id': uid,
             'default_name': applicant.name,
             'default_categ_ids': category and [category.id] or False,
-            'log_meeting_in_parent': True,
         }
         return res