diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index 9555bef2f41..75182c8c07f 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -998,6 +998,7 @@ class calendar_event(osv.osv): if datas.get('count', 0) < 0: raise osv.except_osv(_('Warning!'), _('Count can not be Negative')) result[event] = self.compute_rule_string(datas) + print 'result of rrule', result return result _columns = { @@ -1129,12 +1130,14 @@ rule or repeating pattern of time to exclude from the recurring rule."), start_date = event_date exdate = data['exdate'] and data['exdate'].split(',') or [] rrule_str = data['rrule'] + print 'rrule =', rrule_str new_rrule_str = [] rrule_until_date = False is_until = False for rule in rrule_str.split(';'): name, value = rule.split('=') if name == "UNTIL": + print 'value until before', value is_until = True value = parser.parse(value) rrule_until_date = parser.parse(value.strftime("%Y-%m-%d")) @@ -1142,6 +1145,7 @@ rule or repeating pattern of time to exclude from the recurring rule."), until_date = rrule_until_date if until_date: value = until_date.strftime("%Y%m%d%H%M%S") + print 'value until after', value new_rule = '%s=%s' % (name, value) new_rrule_str.append(new_rule) if not is_until and until_date: @@ -1150,6 +1154,7 @@ rule or repeating pattern of time to exclude from the recurring rule."), new_rule = '%s=%s' % (name, value) new_rrule_str.append(new_rule) new_rrule_str = ';'.join(new_rrule_str) + print "new rrule", new_rrule_str rdates = get_recurrent_dates(str(new_rrule_str), exdate, start_date, data['exrule']) for r_date in rdates: @@ -1194,11 +1199,11 @@ rule or repeating pattern of time to exclude from the recurring rule."), def get_end_date(datas): if datas.get('end_date'): - datas['end_date'] = ''.join((re.compile('\d')).findall(datas.get('end_date'))) + 'T235959Z' + datas['end_date_new'] = ''.join((re.compile('\d')).findall(datas.get('end_date'))) + 'T235959Z' return (datas.get('end_type') == 'count' and (';COUNT=' + str(datas.get('count'))) or '') +\ - ((datas.get('end_date') and datas.get('end_type') == 'end_date' and (';UNTIL=' + datas.get('end_date'))) or '') - + ((datas.get('end_date_new') and datas.get('end_type') == 'end_date' and (';UNTIL=' + datas.get('end_date_new'))) or '') + freq=datas.get('rrule_type') if freq == 'none': return '' @@ -1218,8 +1223,6 @@ rule or repeating pattern of time to exclude from the recurring rule."), def search(self, cr, uid, args, offset=0, limit=0, order=None, context=None, count=False): - print "limit begin", limit - print "count", count args_without_date = [] start_date = False until_date = False @@ -1278,7 +1281,6 @@ rule or repeating pattern of time to exclude from the recurring rule."), for event_id in select: real_event_id = base_calendar_id2real_id(event_id) - if(self.get_edit_all(cr, uid, event_id, vals=vals)): event_id = real_event_id diff --git a/addons/sync_google_calendar/wizard/wizard_import_calendar_events.py b/addons/sync_google_calendar/wizard/wizard_import_calendar_events.py index a97aafcbdab..df09ed9d0d9 100644 --- a/addons/sync_google_calendar/wizard/wizard_import_calendar_events.py +++ b/addons/sync_google_calendar/wizard/wizard_import_calendar_events.py @@ -65,7 +65,7 @@ def _get_rules(self, datas): new_val['end_date'] = until.strftime('%Y-%m-%d') new_val['end_type'] = 'end_date' datas.pop('UNTIL') - + if datas.get('COUNT'): new_val['count'] = datas.get('COUNT') new_val['end_type'] = 'count' @@ -274,7 +274,6 @@ class synchronize_google_calendar_events(osv.osv_memory): return { 'name': _('Meetings'), - 'domain': "[('id','in', ["+','.join(map(str,meeting_ids))+"])]", 'view_type': 'form', 'view_mode': 'tree,form', 'res_model': 'crm.meeting',