From 9d3512c3126c6cc98c7fe212e4bb48564fce5a10 Mon Sep 17 00:00:00 2001 From: "uco (OpenERP)" Date: Fri, 5 Mar 2010 19:45:00 +0530 Subject: [PATCH 01/40] [ADD]: Added remaining object in security file. bzr revid: uco@tinyerp.co.in-20100305141500-akzd0p22yhvzxkaw --- addons/crm/security/ir.model.access.csv | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv index e6c961a4c35..c3888951d4c 100644 --- a/addons/crm/security/ir.model.access.csv +++ b/addons/crm/security/ir.model.access.csv @@ -31,3 +31,5 @@ "access_crm_lead_report_user","crm.lead.report","model_crm_lead_report","crm.group_crm_user",1,0,0,0 "access_crm_phonecall_report_user","crm.phonecall.report","model_crm_phonecall_report","crm.group_crm_user",1,0,0,0 "access_crm_opportunity_report_user","crm.opportunity.report","model_crm_opportunity_report","crm.group_crm_user",1,0,0,0 +"access_report_crm_case_service_dashboard","report.crm.case.service.dashboard","model_report_crm_case_service_dashboard","crm.group_crm_user",1,0,0,0 + From e5f3ead146ae9fd9acbfacb79d41010b3ab19718 Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Mon, 8 Mar 2010 10:53:33 +0530 Subject: [PATCH 02/40] [FIX]: base_calendar: Fixed some minor problems for delegation bzr revid: rpa@openerp.co.in-20100308052333-tvn2nvxnc1a3bby6 --- addons/base_calendar/base_calendar.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index 18b27820766..8bdfd4019d6 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -226,7 +226,9 @@ class invite_attendee_wizard(osv.osv_memory): if type == 'internal': user_obj = self.pool.get('res.users') - for user_id in datas.get('user_ids', []): + if not datas.get('user_ids'): + raise osv.except_osv(_('Error!'), ("Please select any User")) + for user_id in datas.get('user_ids'): user = user_obj.browse(cr, uid, user_id) vals.update({'user_id': user_id, 'email': user.address_id.email}) @@ -251,10 +253,6 @@ class invite_attendee_wizard(osv.osv_memory): 'parent_ids' : [(4, att.id)], 'ref': att.ref }) - att_id = att_obj.create(cr, uid, vals) - if model_field: - obj.write(cr, uid, res_obj.id, {model_field: [(4, att_id)]}) - if datas.get('send_mail'): if not mail_to: name = map(lambda x: x[1], filter(lambda x: type==x[0], \ @@ -263,7 +261,9 @@ class invite_attendee_wizard(osv.osv_memory): Address to send mail") % (name[0])) att_obj._send_mail(cr, uid, [att_id], mail_to, \ email_from=tools.config.get('email_from', False)) - + att_id = att_obj.create(cr, uid, vals) + if model_field: + obj.write(cr, uid, res_obj.id, {model_field: [(4, att_id)]}) return {} @@ -313,12 +313,14 @@ class calendar_attendee(osv.osv): if name == 'delegated_to': todata = [] for parent in attdata.parent_ids: - todata.append('MAILTO:' + parent.email) + if parent.email: + todata.append('MAILTO:' + parent.email) result[id][name] = ', '.join(todata) if name == 'delegated_from': fromdata = [] for child in attdata.child_ids: - fromdata.append('MAILTO:' + child.email) + if child.email: + fromdata.append('MAILTO:' + child.email) result[id][name] = ', '.join(fromdata) if name == 'event_date': if attdata.ref: From 1f8c9782862debe499fc96dddf74b07ad2c13ce1 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Mon, 8 Mar 2010 11:30:48 +0530 Subject: [PATCH 03/40] [Add] add wizard of crm_phonecall2phonecall bzr revid: sbh@tinyerp.com-20100308060048-a5qqd4zf3qwdfvek --- addons/crm/__terp__.py | 4 +- addons/crm/wizard/__init__.py | 1 + addons/crm/wizard/crm_phonecall2phonecall.py | 73 +++++++++++++++++++ addons/crm/wizard/crm_phonecall2phonecall.xml | 33 +++++++++ 4 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 addons/crm/wizard/crm_phonecall2phonecall.py create mode 100644 addons/crm/wizard/crm_phonecall2phonecall.xml diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py index 994f11f3212..7a248005578 100644 --- a/addons/crm/__terp__.py +++ b/addons/crm/__terp__.py @@ -61,8 +61,10 @@ between mails and Open ERP.""", ], 'update_xml': [ + 'wizard/crm_phonecall2phonecall.xml', 'crm_wizard.xml', - 'crm_view.xml', + 'crm_view.xml', + 'crm_action_rule_view.xml', 'crm_lead_wizard.xml', 'crm_lead_view.xml', diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py index 62be2041d98..73c4596a145 100644 --- a/addons/crm/wizard/__init__.py +++ b/addons/crm/wizard/__init__.py @@ -26,6 +26,7 @@ import crm_phonecall_wizard import wizard_crm_send_email import wizard_crm_new_send_email import wizard_history_event +import crm_phonecall2phonecall # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/wizard/crm_phonecall2phonecall.py b/addons/crm/wizard/crm_phonecall2phonecall.py new file mode 100644 index 00000000000..81f11d2f95b --- /dev/null +++ b/addons/crm/wizard/crm_phonecall2phonecall.py @@ -0,0 +1,73 @@ +# -*- encoding: utf-8 -*- +############################################################################################ +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2009 Tiny SPRL (). All Rights Reserved +# Copyright (C) 2008-2009 AJM Technologies S.A. (. +# +############################################################################################ +############################################################################################ + +from osv import osv, fields +import netsvc +import time +import tools +import mx.DateTime +from tools import config +from tools.translate import _ +import tools + +class crm_phonecall2phonecall(osv.osv_memory): + _name = 'crm.phonecall2phonecall' + _description = 'Phonecall To Phonecall' + + def action_cancel(self, cr, uid, ids, context=None): + return {'type':'ir.actions.act_window_close'} + + def action_apply(self, cr, uid, ids, context=None): + this = self.browse(cr, uid, ids)[0] + + record_id = context and context.get('record_id', False) or False + print ">>>>>>>>>>",record_id + values={} + values['name']=this.name + values['user_id']=this.user_id and this.user_id.id + values['category_id']=this.category_id and this.category_id.id + values['section_id']=this.section_id and this.section_id.id or False, + values['description']=this.notes + phonecall_proxy = self.pool.get('crm.phonecall') + phonecall_id = phonecall_proxy.create(cr, uid, values, context=context) + value = { + 'name': _('Phone Call'), + 'view_type': 'form', + 'view_mode': 'form', + 'res_model': 'crm.phonecall', + 'view_id': False, + 'type': 'ir.actions.act_window', + 'res_id': phonecall_id + } + return value + + _columns = { + 'name' : fields.char('Name', size=64, required=True, select=1), + 'user_id' : fields.many2one('res.users',"Assign To"), + 'deadline': fields.datetime('Deadline', readonly=True), + 'category_id' : fields.many2one('crm.case.categ','Category',domain="[('object_id.model', '=', ''crm.phonecall')]"), + 'section_id':fields.many2one('crm.case.section','Section Id'), + 'notes' : fields.text('Notes'), + } +crm_phonecall2phonecall() \ No newline at end of file diff --git a/addons/crm/wizard/crm_phonecall2phonecall.xml b/addons/crm/wizard/crm_phonecall2phonecall.xml new file mode 100644 index 00000000000..ea30368243e --- /dev/null +++ b/addons/crm/wizard/crm_phonecall2phonecall.xml @@ -0,0 +1,33 @@ + + + + + crm.phonecall2phonecall.form + crm.phonecall2phonecall + form + +
+ + + + + + +