From 9cc036ed86f3241b5ac97faefa089ba02317e180 Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Fri, 4 Dec 2009 14:10:21 +0530 Subject: [PATCH] [IMP]: Changes in CRM , Merged caldav features in CRM bzr revid: rpa@tinyerp.com-20091204084021-ggb1i6da1vnwmble --- addons/crm/__init__.py | 1 + addons/crm/__terp__.py | 4 +- addons/crm/crm.py | 41 ++++ addons/crm/crm_caldav_view.xml | 101 +++++++++ addons/crm/crm_caldav_wizard.xml | 12 + addons/crm/crm_calendar.py | 299 +++++++++++++++++++++++++ addons/crm/crm_segmentation.py | 2 +- addons/crm/crm_view.xml | 37 +++ addons/crm/wizard/__init__.py | 2 + addons/crm/wizard/wizard_cal_export.py | 62 +++++ addons/crm/wizard/wizard_cal_import.py | 66 ++++++ 11 files changed, 625 insertions(+), 2 deletions(-) create mode 100644 addons/crm/crm_caldav_view.xml create mode 100644 addons/crm/crm_caldav_wizard.xml create mode 100644 addons/crm/crm_calendar.py create mode 100644 addons/crm/wizard/wizard_cal_export.py create mode 100644 addons/crm/wizard/wizard_cal_import.py diff --git a/addons/crm/__init__.py b/addons/crm/__init__.py index e2403aa29ab..260f3a31cae 100644 --- a/addons/crm/__init__.py +++ b/addons/crm/__init__.py @@ -21,6 +21,7 @@ import crm import crm_segmentation +import crm_calendar import report import wizard diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py index ef080317f53..149151ee4fd 100644 --- a/addons/crm/__terp__.py +++ b/addons/crm/__terp__.py @@ -44,7 +44,9 @@ The CRM module has a email gateway for the synchronisation interface between mails and Open ERP.""", 'author': 'Tiny', 'website': 'http://www.openerp.com', - 'depends': ['base'], + 'depends': ['base', + 'caldav' + ], 'init_xml': ['crm_data.xml'], 'update_xml': [ 'crm_wizard.xml', diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 84cf9a29498..0ade6b9edd0 100755 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -1099,5 +1099,46 @@ class crm_email_add_cc_wizard(osv.osv_memory): crm_email_add_cc_wizard() + +class crm_calendar_config_wizard(osv.osv_memory): + _name = 'crm.calendar.config_wizard' + _columns = { + 'name': fields.char('Name', size=64), + 'caldav': fields.boolean('Caldav Properties View', help="Manages the fields required for Caldav Properties.") + } + + def action_create(self, cr, uid, ids, context=None): + res = self.read(cr, uid, ids)[0] + idref = {} + if res['caldav']: + for fname in ('view', 'wizard'): + try: + fp = tools.file_open(os.path.join('crm', 'crm_caldav_' + fname + '.xml')) + except IOError, e: + fp = None + if fp: + tools.convert_xml_import(cr, 'crm', fp, idref, 'init', noupdate=True) + cr.commit() + + return { + 'view_type': 'form', + "view_mode": 'form', + 'res_model': 'ir.actions.configuration.wizard', + 'type': 'ir.actions.act_window', + 'target': 'new', + } + + def action_cancel(self, cr, uid, ids, context=None): + return { + 'view_type': 'form', + "view_mode": 'form', + 'res_model': 'ir.actions.configuration.wizard', + 'type': 'ir.actions.act_window', + 'target': 'new', + } + +crm_calendar_config_wizard() + + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/crm_caldav_view.xml b/addons/crm/crm_caldav_view.xml new file mode 100644 index 00000000000..05347fa5832 --- /dev/null +++ b/addons/crm/crm_caldav_view.xml @@ -0,0 +1,101 @@ + + + + + crm.case.caldav.attendee + caldav.attendee + form + +
+ + + + + + + + + + + + + +
+ + + crm.case.caldav.attendee + caldav.attendee + tree + + + + + + + + + + + + + + + + + + + crm.case.caldav.form + crm.case + form + + + + + + + + + + + + + + + + + + + + + + + + + + + + + crm.case.caldav.form1 + crm.case + form + + + + + + + + + crm.case.caldav.tree1 + crm.case + tree + + + + + + + + + + diff --git a/addons/crm/crm_caldav_wizard.xml b/addons/crm/crm_caldav_wizard.xml new file mode 100644 index 00000000000..6e72b13a217 --- /dev/null +++ b/addons/crm/crm_caldav_wizard.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/addons/crm/crm_calendar.py b/addons/crm/crm_calendar.py new file mode 100644 index 00000000000..5d7af597b9f --- /dev/null +++ b/addons/crm/crm_calendar.py @@ -0,0 +1,299 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2009 Tiny SPRL (). All Rights Reserved +# $Id$ +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +############################################################################## + +from osv import fields, osv +from time import strftime +import time +import base64 +import vobject +from dateutil.rrule import * +from dateutil import parser +from datetime import datetime +from time import strftime +from pytz import timezone +import tools + +class crm_section(osv.osv): + _name = 'crm.case.section' + _inherit = 'crm.case.section' + _description = 'Cases Section' + + def export_cal(self, cr, uid, ids, context={}): + # Set all property of CalDAV + self.export_ical() + + def import_cal(self, cr, uid, ids, context={}): + self.import_ical(cr, uid) + # get all property of CalDAV +crm_section() + +class caldav_attendee(osv.osv): + _name = 'caldav.attendee' + _description = 'Attendee information' + _rec_name = 'cutype' + + __attribute__ = { + 'cutype' : {'field':'cutype', 'type':'text'}, # Use: 0-1 Specify the type of calendar user specified by the property like "INDIVIDUAL"/"GROUP"/"RESOURCE"/"ROOM"/"UNKNOWN". + 'member' : {'field':'member', 'type':'text'}, # Use: 0-1 Specify the group or list membership of the calendar user specified by the property. + 'role' : {'field':'role', 'type':'text'}, # Use: 0-1 Specify the participation role for the calendar user specified by the property like "CHAIR"/"REQ-PARTICIPANT"/"OPT-PARTICIPANT"/"NON-PARTICIPANT" + 'partstat' : {'field':'partstat', 'type':'text'}, # Use: 0-1 Specify the participation status for the calendar user specified by the property. like use for VEVENT :- "NEEDS-ACTION"/"ACCEPTED"/"DECLINED"/"TENTATIVE"/"DELEGATED", use for VTODO :-"NEEDS-ACTION"/"ACCEPTED"/"DECLINED"/"TENTATIVE"/"DELEGATED"/"COMPLETED"/"IN-PROCESS" and use for VJOURNAL :- "NEEDS-ACTION"/"ACCEPTED"/"DECLINED". + 'rsvp' : {'field':'rsvp', 'type':'boolean'}, # Use: 0-1 Specify whether there is an expectation of a favor of a reply from the calendar user specified by the property value like TRUE / FALSE. + 'delegated-to' : {'field':'delegated_to', 'type':'char'}, # Use: 0-1 Specify the calendar users to whom the calendar user specified by the property has delegated participation. + 'delegated-from' : {'field':'delegated_from', 'type':'char'}, # Use: 0-1 Specify the calendar users that have delegated their participation to the calendar user specified by the property. + 'sent-by' : {'field':'sent_by', 'type':'text'}, # Use: 0-1 Specify the calendar user that is acting on behalf of the calendar user specified by the property. + 'cn' : {'field':'cn', 'type':'text'}, # Use: 0-1 Specify the common name to be associated with the calendar user specified by the property. + 'dir' : {'field':'dir', 'type':'text'}, # Use: 0-1 Specify reference to a directory entry associated with the calendar user specified by the property. + 'language' : {'field':'language', 'type':'text'}, # Use: 0-1 Specify the language for text values in a property or property parameter. + } + + _columns = { + 'cutype' : fields.selection([('INDIVIDUAL', 'INDIVIDUAL'), ('GROUP', 'GROUP'), \ + ('RESOURCE', 'RESOURCE'), ('ROOM', 'ROOM'), ('UNKNOWN', 'UNKNOWN') ], 'CUTYPE'), + 'member' : fields.char('Member', size=124), + 'role' : fields.selection([('CHAIR', 'CHAIR'), ('REQ-PARTICIPANT', 'REQ-PARTICIPANT'), \ + ('OPT-PARTICIPANT', 'OPT-PARTICIPANT'), ('NON-PARTICIPANT', 'NON-PARTICIPANT')], 'ROLE'), + 'partstat' : fields.selection([('NEEDS-ACTION', 'NEEDS-ACTION'), ('ACCEPTED', 'ACCEPTED'), \ + ('DECLINED', 'DECLINED'), ('TENTATIVE', 'TENTATIVE'), ('DELEGATED', 'DELEGATED')], 'PARTSTAT'), + 'rsvp' : fields.boolean('RSVP'), + 'delegated_to' : fields.char('DELEGATED-TO', size=124), + 'delegated_from' : fields.char('DELEGATED-FROM', size=124), + 'sent_by' : fields.char('SENT-BY', size=124), + 'cn' : fields.char('CN', size=124), + 'dir' : fields.char('DIR', size=124), + 'language' : fields.char('LANGUAGE', size=124), + } + +caldav_attendee() + +class crm_case(osv.osv): + _name = 'crm.case' + _inherit = 'crm.case' + _description = 'Cases' + + __attribute__ = { + 'class' : {'field':'class', 'type':'text'}, + 'created' : {'field':'create_date', 'type':'datetime'}, # keep none for now + 'description' : {'field':'description', 'type':'text'}, + 'dtstart' : {'field':'date', 'type':'datetime'}, + #'last-mod' : {'field':'write_date', 'type':'datetime'}, + 'location' : {'field':'location', 'type':'text'}, + 'organizer' : {'field':'partner_id', 'sub-field':'name', 'type':'many2one'}, + 'priority' : {'field':'priority', 'type':'int'}, + 'dtstamp' : {'field':'date', 'type':'datetime'}, + 'seq' : None, + 'status' : {'field':'state', 'type':'selection', 'mapping' : {'TENTATIVE' : 'draft', \ + 'CONFIRMED' : 'open' , 'CANCELLED' : 'cancel'}}, + 'summary' : {'field':'name', 'type':'text'}, + 'transp' : {'field':'transparent', 'type':'text'}, + 'uid' : {'field':'id', 'type':'text'}, + 'url' : {'field':'caldav_url', 'type':'text'}, + 'recurid' : None, +# 'attach' : {'field':'attachment_ids', 'sub-field':'datas', 'type':'list'}, + 'attendee' : {'field':'attendees', 'type':'text'}, +# 'categories' : {'field':'categ_id', 'sub-field':'name'}, +# 'categories' : {'field':None , 'sub-field':'name', 'type':'text'}, # keep none for now + 'comment' : None, + 'contact' : None, + 'exdate' : None, + 'exrule' : None, + 'rstatus' : None, + 'related' : None, + 'resources' : None, + 'rdate' : None, + 'rrule' : {'field':'rrule', 'type':'text'}, + 'x-openobject-id' : {'field':'id', 'type':'text'}, + 'x-openobject-model' : {'value':_name, 'type':'text'}, +# 'duration' : {'field':'duration'}, + 'dtend' : {'field':'date_closed', 'type':'datetime'}, + } + + def _get_location(self, cr, uid, ids, name, arg, context=None): + res = {} + for case in self.browse(cr, uid, ids): + if case.partner_address_id: + add = case.partner_address_id + st = add.street and add.street+',\n' or '' + st2 = add.street2 and add.street2+',\n' or '' + ct = add.city and add.city+',\n' or '' + zip = add.zip and add.zip or '' + country = add.country_id and add.country_id.name+',\n' or '' + res[case.id] = st + st2+ ct + country + zip + else: + res[case.id] = '' + return res + + def _get_rdates(self, cr, uid, ids, name, arg, context=None): + res = {} + context.update({'read':True}) + for case in self.read(cr, uid, ids, ['date', 'rrule'], context=context): + if case['rrule']: + rule = case['rrule'].split('\n')[0] + exdate = case['rrule'].split('\n')[1:] + event_obj = self.pool.get('caldav.event') + res[case['id']] = str(event_obj.get_recurrent_dates(str(rule), exdate, case['date'])) + return res + + _columns = { + 'categ_id': fields.many2many('crm.case.categ', 'crm_category_rel', 'case_id', 'category_id', 'Categories'), + 'class' : fields.selection([('PUBLIC', 'PUBLIC'), ('PRIVATE', 'PRIVATE'), \ + ('CONFIDENTIAL', 'CONFIDENTIAL')], 'Class'), + 'location' : fields.function(_get_location, method=True, store = True, string='Location', type='text'), + 'freebusy' : fields.text('FreeBusy'), + 'transparent' : fields.selection([('OPAQUE', 'OPAQUE'), ('TRANSPARENT', 'TRANSPARENT')], 'Trensparent'), + 'caldav_url' : fields.char('Caldav URL', size=34), +# 'attachment_ids' : function ("one2many from ir.attachemnt"), + 'attendee' : fields.text('Attendee'), #TODO : display dynamic view from text value + 'rrule' : fields.text('Recurrent Rule'), + 'rdates' : fields.function(_get_rdates, method=True, string='Recurrent Dates', \ + store=True, type='text'), + 'attendees': fields.many2many('caldav.attendee', 'crm_attendee_rel', 'case_id', 'attendee_id', 'Attendees'), + } + + _defaults = { + 'caldav_url': lambda *a: 'http://localhost:8080', + 'class': lambda *a: 'PUBLIC', + 'transparent': lambda *a: 'OPAQUE', + } + + def export_cal(self, cr, uid, ids, context={}): + crm_data = self.read(cr, uid, ids, []) + ical = vobject.iCalendar() + event_obj = self.pool.get('caldav.event') + for crm in crm_data: + ical.add('vevent') + vevent = ical.vevent + for key, val in self.__attribute__.items(): + if val == None or key == 'rrule': + continue + if val.has_key('field') and val.has_key('sub-field') and crm[val['field']] and crm[val['field']]: + vevent.add(key).value = crm[val['field']][1] + elif val.has_key('field') and crm[val['field']]: + if val['type'] == "text": + vevent.add(key).value = str(crm[val['field']]) + elif val['type'] == 'datetime' and crm[val['field']]: + vevent.add(key).value = datetime.strptime(crm[val['field']], "%Y-%m-%d %H:%M:%S") + if crm[self.__attribute__['rrule']['field']]: + startdate = datetime.strptime(crm['date'], "%Y-%m-%d %H:%M:%S") + if not startdate: + startdate = datetime.now() + rset1 = rrulestr(str(crm[event_obj.__attribute__['rrule']['field']]), dtstart=startdate, forceset=True) + vevent.rruleset = rset1 + + return ical.serialize().replace(vobject.icalendar.CRLF, vobject.icalendar.LF).strip() + + def import_cal(self, cr, uid, ids, data, context={}): + file_content = base64.decodestring(data['form']['file_path']) + event_obj = self.pool.get('caldav.event') + event_obj.__attribute__.update(self.__attribute__) + event_obj.import_ical(cr, uid, file_content) + vals = {} + for map_dict in event_obj.__attribute__: + map_val = event_obj.ical_get(map_dict, 'value') + field = event_obj.ical_get(map_dict, 'field') + field_type = event_obj.ical_get(map_dict, 'type') + if field and map_val: + if field_type == 'selection': + mapping =event_obj.__attribute__[map_dict].get('mapping', False) + if mapping: + map_val = mapping[map_val] + if field_type == 'many2one': + # TODO: Map field value to many2one object + continue # For now + vals[field] = map_val + # TODO: Select proper section + section_id = self.pool.get('crm.case.section').search(cr, uid, [])[0] + vals.update({'section_id' : section_id}) + vals.pop('id') + vals.pop('create_date') + case_id = self.create(cr, uid, vals) + return + + def search(self, cr, uid, args, offset=0, limit=None, order=None, + context=None, count=False): + res = super(crm_case, self).search(cr, uid, args, offset, + limit, order, context, count) + return res + + def write(self, cr, uid, ids, vals, context=None): + res = super(crm_case, self).write(cr, uid, ids, vals, context=context) + return res + + def browse(self, cr, uid, select, context=None, list_class=None, fields_process={}): + select = map(lambda x:int(str(x).split('-')[0]), select) + return super(crm_case, self).browse(cr, uid, select, context, list_class, fields_process) + + def read(self, cr, uid, ids, fields=None, context={}, + load='_classic_read'): + """ logic for recurrent event + example : 123-20091111170822""" + if context and context.has_key('read'): + return super(crm_case, self).read(cr, uid, ids, fields=fields, context=context, load=load) + ids = map(lambda x:int(str(x).split('-')[0]), ids) + res = super(crm_case, self).read(cr, uid, ids, fields=fields, context=context, load=load) + result = res + [] + read_ids = ",".join([str(x) for x in ids]) + cr.execute('select id,rrule,rdates from crm_case where id in (%s)' % read_ids) + rrules = filter(lambda x: not x['rrule']==None, cr.dictfetchall()) + rdates = [] + for data in rrules: + if data['rrule'] and data['rdates']: # delete 2nd condition at last + rdates = eval(data['rdates']) + for res_temp in res: + if res_temp['id'] == data['id']: + val = res_temp + if rdates: + result.remove(val) + + for rdate in rdates: + import re + idval = (re.compile('\d')).findall(rdate) + val['date'] = rdate + id = str(val['id']).split('-')[0] + val['id'] = id + '-' + ''.join(idval) + val1 = val.copy() + result += [val1] + return result + + def unlink(self, cr, uid, ids, context=None): + #TODO: Change RRULE + for id in ids: + if len(str(id).split('-')) > 1: + date_new = time.strftime("%Y-%m-%d %H:%M:%S", time.strptime(str(str(id).split('-')[1]), "%Y%m%d%H%M%S")) + for record in self.read(cr, uid, [str(id).split('-')[0]], ['date', 'rdates', 'rrule']): + if record['date'] == date_new: + self.write(cr, uid, [int(str(id).split('-')[0])], {'rrule' : record['rrule'] +"\n" + str(date_new)}) + else: + return super(crm_case, self).unlink(cr, uid, ids) +crm_case() + + +class ir_attachment(osv.osv): + _name = 'ir.attachment' + _inherit = 'ir.attachment' + + def search_count(self, cr, user, args, context=None): + args1 = [] + for arg in args: + args1.append(map(lambda x:str(x).split('-')[0], arg)) + return super(ir_attachment, self).search_count(cr, user, args1, context) + +ir_attachment() diff --git a/addons/crm/crm_segmentation.py b/addons/crm/crm_segmentation.py index 5457cd8a6dd..ef181f70221 100644 --- a/addons/crm/crm_segmentation.py +++ b/addons/crm/crm_segmentation.py @@ -36,7 +36,7 @@ class crm_segmentation(osv.osv): 'description': fields.text('Description'), 'categ_id': fields.many2one('res.partner.category', 'Partner Category', required=True, help='The partner category that will be added to partners that match the segmentation criterions after computation.'), 'exclusif': fields.boolean('Exclusive', help='Check if the category is limited to partners that match the segmentation criterions. If checked, remove the category from partners that doesn\'t match segmentation criterions'), - 'state': fields.selection([('not running','Not Running'),('running','Running')], 'Execution State', readonly=True), + 'state': fields.selection([('not running','Not Running'),('running','Running')], 'Execution Status', readonly=True), 'partner_id': fields.integer('Max Partner ID processed'), 'segmentation_line': fields.one2many('crm.segmentation.line', 'segmentation_id', 'Criteria', required=True), 'som_interval': fields.integer('Days per Periode', help="A period is the average number of days between two cycle of sale or purchase for this segmentation. It's mainly used to detect if a partner has not purchased or buy for a too long time, so we suppose that his state of mind has decreased because he probably bought goods to another supplier. Use this functionality for recurring businesses."), diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml index 0a163b37a19..aa60c289796 100755 --- a/addons/crm/crm_view.xml +++ b/addons/crm/crm_view.xml @@ -706,5 +706,42 @@ + + + + Configure Menu for Caldav Properites + crm.calendar.config_wizard + form + +
+ +