From 67bb69500a43330dc604039e8d8f51d0e4b4870e Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Tue, 28 Aug 2012 17:45:45 +0530 Subject: [PATCH 01/46] [FIX]CRM:creating phone calls from lead sets partner,phone,mobile and sales team bzr revid: kbh@tinyerp.com-20120828121545-6vqvirfa99f3fnhe --- addons/crm/crm_lead.py | 51 ++++++++++++++++++++++++++++++++++++ addons/crm/crm_lead_view.xml | 12 ++------- 2 files changed, 53 insertions(+), 10 deletions(-) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 25a47ecbadc..8e31b17b189 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -717,6 +717,57 @@ class crm_lead(base_stage, osv.osv): self.write(cr, uid, [lead_id], value, context=context) return True + def phonecall_view(self, cr, uid, ids, call_summary, user_id=False, section_id=False, categ_id=False, context=None): + #Open the View for the Phone call for the leads + """ + This opens Phone Call views + @return :Dictionary value for Phone Call view + """ + if context is None: + context = {} + value = {} + data_obj = self.pool.get('ir.model.data') + if not categ_id: + res_id = data_obj._get_id(cr, uid, 'crm', 'categ_phone2') + if res_id: + categ_id = data_obj.browse(cr, uid, res_id, context=context).res_id + for lead in self.browse(cr, uid, ids, context=context): + if not section_id: + section_id = lead.section_id and lead.section_id.id or False + if not user_id: + user_id = lead.user_id and lead.user_id.id or False + # Get Phone Call views + tree_view = data_obj.get_object_reference(cr, uid, 'crm', 'crm_case_phone_tree_view') + form_view = data_obj.get_object_reference(cr, uid, 'crm', 'crm_case_phone_form_view') + search_view = data_obj.get_object_reference(cr, uid, 'crm', 'view_crm_case_phonecalls_filter') + context.update({ + 'default_duration': 1.0, + 'default_opportunity_id': lead.id, + 'default_user_id': user_id or False, + 'default_categ_id' : categ_id or False, + 'default_lead_id': lead.id, + 'default_name': lead.name, + 'default_partner_id': lead.partner_id and lead.partner_id.id or False, + 'default_partner_mobile': lead.mobile or (lead.partner_id and lead.partner_id.mobile or False), + 'default_section_id': section_id or False, + 'default_description': lead.description or False, + 'default_partner_phone': lead.phone or (lead.partner_id and lead.partner_id.phone or False), + }) + value = { + 'name': _('Phone Call'), + 'context': context, + 'view_type': 'form', + 'view_mode': 'form,tree', + 'res_model': 'crm.phonecall', + 'view_id': False, + 'context': context, + 'views': [(form_view and form_view[1] or False, 'form'),(tree_view and tree_view[1] or False, 'tree')], + 'type': 'ir.actions.act_window', + 'search_view_id': search_view and search_view[1] or False, + 'nodestroy': True + } + return value + def schedule_phonecall(self, cr, uid, ids, schedule_time, call_summary, desc, phone, contact_name, user_id=False, section_id=False, categ_id=False, action='schedule', context=None): """ action :('schedule','Schedule a call'), ('log','Log a call') diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 6a715893a17..049aa74fb75 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -105,14 +105,6 @@ -
-
From fbcedd51ac19b91bc235dd0064e12e489293a4b6 Mon Sep 17 00:00:00 2001 From: "Jalpesh Patel (OpenERP)" Date: Mon, 26 Nov 2012 14:15:16 +0530 Subject: [PATCH 02/46] [IMP] fix problem of Settings/ Database Structure/ Models: Create new model and in Field tab, Add item click on Serialization field it's given trace back bzr revid: pja@tinyerp.com-20121126084516-3ll6xqaq3pf1al4m --- openerp/addons/base/ir/ir_model_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/ir/ir_model_view.xml b/openerp/addons/base/ir/ir_model_view.xml index 01ff918662f..1b5d0cc3caf 100644 --- a/openerp/addons/base/ir/ir_model_view.xml +++ b/openerp/addons/base/ir/ir_model_view.xml @@ -44,7 +44,7 @@ - + From 21b1aa529591a54f96ee35c2828106bb23d77f4e Mon Sep 17 00:00:00 2001 From: dhr Date: Fri, 30 Nov 2012 11:30:20 +0530 Subject: [PATCH 03/46] [IMP]Get email on change of partner and made invitation tab visible to all users bzr revid: dhr@tinyerp.com-20121130060020-9pn7666r96dag2nc --- addons/base_calendar/base_calendar.py | 19 ++++++++++++++++++- addons/base_calendar/crm_meeting_view.xml | 4 ++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index d225c3f90d9..4c4e7a16876 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -384,9 +384,26 @@ property or property parameter."), 'cutype': 'individual', } + def copy(self, cr, uid, id, default=None, context=None): raise osv.except_osv(_('Warning!'), _('You cannot duplicate a calendar attendee.')) - + + def onchange_partner_id(self, cr, uid, ids, partner_id,context=None): + """ + Make entry on email and availbility on change of partner_id field. + @param cr: the current row, from the database cursor + @param uid: the current user's ID for security checks + @param ids: list of calendar attendee's IDs + @param partner_id: changed value of partner id + @param context: a standard dictionary for contextual values + @return: dictionary of values which put value in email and availability fields + """ + + if not partner_id: + return {'value': {'email': ''}} + partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context) + return {'value': {'email': partner.email}} + def get_ics_file(self, cr, uid, event_obj, context=None): """ Returns iCalendar file for the event invitation. diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml index 84c03d68dbd..77018898c84 100644 --- a/addons/base_calendar/crm_meeting_view.xml +++ b/addons/base_calendar/crm_meeting_view.xml @@ -171,10 +171,10 @@ - + - +