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

[FIX] don't load page with non virtual id, event until 23:59:59 

bzr revid: tfr@openerp.com-20110419090716-eo930gq7noisu6lj
This commit is contained in:
tfr@openerp.com 2011-04-19 11:07:16 +02:00
parent 8bc29b9065
commit 73124b8784
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/base_calendar/base_calendar.py
View File

@ -54,6 +54,7 @@ def get_recurrent_dates(rrulestring, exdate, startdate=None, exrule=None):
if not exdate:
exdate = []
rset1 = rrule.rrulestr(str(rrulestring), dtstart=startdate, forceset=True)
for date in exdate:
datetime_obj = todate(date)
@ -1137,7 +1138,7 @@ rule or repeating pattern of time to exclude from the recurring rule."),
if name == "UNTIL":
is_until = True
value = parser.parse(value)
rrule_until_date = parser.parse(value.strftime("%Y-%m-%d"))
rrule_until_date = parser.parse(value.strftime("%Y-%m-%d %H:%M:%S"))
if until_date and until_date >= rrule_until_date:
until_date = rrule_until_date
if until_date:
@ -1433,7 +1434,6 @@ rule or repeating pattern of time to exclude from the recurring rule."),
res = False
for id in ids:
event_datas = self.read(cr, uid, [id], ['date', 'rrule', 'exdate'], context=context)[0]
print event_datas
event_id = event_datas['id']
if self.get_edit_all(cr, uid, event_id, vals=None):

8
addons/sync_google_calendar/wizard/wizard_import_calendar_events.py
View File

@ -289,13 +289,7 @@ class synchronize_google_calendar_events(osv.osv_memory):
meeting_ids += meeting
return {
'name': _('Meetings'),
'view_type': 'form',
'view_mode': 'tree,form',
'res_model': 'crm.meeting',
'context': context,
'views': [(False, 'calendar'),(False, 'tree'),(False, 'form')],
'type': 'ir.actions.act_window',
'type': 'ir.actions.act_window_close',
}
synchronize_google_calendar_events()