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

[REVERT] calendar: regresstion on recurrent due to rev: olt@tinyerp.com-20100924131709-cqsd1ut234ni6txn. so revert this revision work 

bzr revid: hmo@tinyerp.com-20101006063552-eqydv670c30teqob
This commit is contained in:
Harry (OpenERP) 2010-10-06 12:05:52 +05:30
parent 5a434b5935
commit da4288b900
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/base_calendar/base_calendar.py
View File

@ -1438,7 +1438,8 @@ true, it will allow you to hide the event alarm information without removing it.
res = super(calendar_event, self).search(cr, uid, args_without_date, \
offset, limit, order, context, count)
return self.get_recurrent_ids(cr, uid, res, start_date, until_date, limit)
res = self.get_recurrent_ids(cr, uid, res, start_date, until_date, limit)
return res
def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
"""
@ -1533,11 +1534,9 @@ true, it will allow you to hide the event alarm information without removing it.
if fields and 'date' not in fields:
fields.append('date')
real_ids = [item2 for item1, item2 in select]
event_values = dict([(res['id'], res) for res in super(calendar_event, self).read(cr, uid, real_ids, fields=fields, context=context, load=load)])
for base_calendar_id, real_id in select:
res = event_values[real_id]
#REVET: Revision ID: olt@tinyerp.com-20100924131709-cqsd1ut234ni6txn
res = super(calendar_event, self).read(cr, uid, real_id, fields=fields, context=context, load=load)
ls = base_calendar_id2real_id(base_calendar_id, with_date=res and res.get('duration', 0) or 0)
if not isinstance(ls, (str, int, long)) and len(ls) >= 2:
res['date'] = ls[1]