From b0e033f261d65ab163666ce8a62ea5873b9e7b14 Mon Sep 17 00:00:00 2001 From: "Ashutosh Srivastava (Open ERP)" Date: Tue, 28 Jun 2011 15:55:36 +0530 Subject: [PATCH] [FIX] crm : Inconsistency when scheduling a call from an opportunity lp bug: https://launchpad.net/bugs/689566 fixed bzr revid: asr@tinyerp.com-20110628102536-cgjyefsqyme82qfk --- addons/crm/crm_phonecall.py | 2 +- addons/crm/wizard/crm_opportunity_to_phonecall.py | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py index c643d9db8af..1f4d7688fef 100644 --- a/addons/crm/crm_phonecall.py +++ b/addons/crm/crm_phonecall.py @@ -91,7 +91,7 @@ class crm_phonecall(crm_base, osv.osv): 'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), 'priority': crm.AVAILABLE_PRIORITIES[2][0], 'state': _get_default_state, - 'user_id': lambda self,cr,uid,ctx: uid, + #'user_id': lambda self,cr,uid,ctx: uid, 'active': 1, } diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall.py b/addons/crm/wizard/crm_opportunity_to_phonecall.py index af95dd5554b..4bd73cae8e9 100644 --- a/addons/crm/wizard/crm_opportunity_to_phonecall.py +++ b/addons/crm/wizard/crm_opportunity_to_phonecall.py @@ -126,7 +126,7 @@ class crm_opportunity2phonecall(osv.osv_memory): 'categ_id' : this.categ_id.id, 'description' : opp.description or False, 'date' : this.date, - 'section_id' : this.section_id.id or opp.section_id.id or False, + 'section_id' : this.section_id.id or False, 'partner_id': opp.partner_id and opp.partner_id.id or False, 'partner_address_id': opp.partner_address_id and opp.partner_address_id.id or False, 'partner_phone' : opp.phone or (opp.partner_address_id and opp.partner_address_id.phone or False), @@ -134,7 +134,9 @@ class crm_opportunity2phonecall(osv.osv_memory): 'priority': opp.priority, 'opportunity_id': opp.id } + new_case = phonecall_obj.create(cr, uid, vals, context=context) + if this.action == 'schedule': phonecall_obj.case_open(cr, uid, [new_case]) elif this.action == 'log': @@ -142,14 +144,15 @@ class crm_opportunity2phonecall(osv.osv_memory): value = { 'name': _('Phone Call'), - 'domain': "[('user_id','=',%s),('opportunity_id','=',%s)]" % (uid,opp.id), + #'domain': "[('user_id','=',%s),('opportunity_id','=',%s)]" % (uid,opp.id), 'view_type': 'form', 'view_mode': 'tree,form', 'res_model': 'crm.phonecall', 'res_id' : new_case, 'views': [(id3, 'form'), (id2, 'tree'), (False, 'calendar')], 'type': 'ir.actions.act_window', - 'search_view_id': res['res_id'] + 'search_view_id': res['res_id'], + 'context':context, } return value