odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX]: base_calendar: Fixed problem of editing recurrent event+ exporting attendee without email 

bzr revid: rpa@openerp.co.in-20100305092122-d6ujxcrmpk2ctyle
This commit is contained in:
rpa (Open ERP) 2010-03-05 14:51:22 +05:30
parent 110771a391
commit 33a87c8dea
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
addons/base_calendar/base_calendar.py
View File

@ -811,18 +811,18 @@ rule or repeating pattern for anexception to a recurrence set"),
'interval': lambda *x: 1,
}
def modify_this(self, cr, uid, ids, defaults, context=None, *args):
def modify_this(self, cr, uid, ids, defaults, real_date, context=None, *args):
ids = map(lambda x: base_calendar_id2real_id(x), ids)
datas = self.read(cr, uid, ids[0], context=context)
defaults.update({
'recurrent_uid': base_calendar_id2real_id(datas['id']),
'recurrent_id': defaults.get('date'),
'recurrent_id': defaults.get('date') or real_date,
'rrule_type': 'none',
'rrule': ''
})
exdate = datas['exdate'] and datas['exdate'].split(',') or []
if defaults.get('date'):
exdate.append(defaults.get('date'))
if real_date and defaults.get('date'):
exdate.append(real_date)
self.write(cr, uid, ids, {'exdate': ','.join(exdate)}, context=context)
new_id = self.copy(cr, uid, ids[0], default=defaults, context=context)
return new_id
@ -986,9 +986,13 @@ rule or repeating pattern for anexception to a recurrence set"),
new_ids = []
for id in select:
if len(str(id).split('-')) > 1:
data = self.read(cr, uid, id, ['date', 'date_deadline'])
self.modify_this(cr, uid, [id], vals, context)
continue
data = self.read(cr, uid, id, ['date', 'date_deadline', 'rrule', 'duration'])
if data.get('rrule'):
real_date = data.get('date')
data.update(vals)
new_id = self.modify_this(cr, uid, [id], data, real_date, context)
context.update({'active_id': new_id,'active_ids': [new_id]})
continue
id = base_calendar_id2real_id(id)
if not id in new_ids:
new_ids.append(id)

5
addons/caldav/caldav.py
View File

@ -804,7 +804,10 @@ class Attendee(CalDAV, osv.osv_memory):
cn_val = [str(attendee[a_val['field']])]
if cn_val:
attendee_add.params['CN'] = cn_val
attendee_add.value = 'MAILTO:' + attendee['email']
if not attendee['email']:
raise osv.except_osv(_('Error !'), _('Attendee must have an Email Id'))
elif attendee['email']:
attendee_add.value = 'MAILTO:' + attendee['email']
return vevent
Attendee()