diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 30c8567adee..639d19db75f 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -14,7 +14,7 @@
+ attrs="{'required' : [('count','<=',0), ('freq', '!=', 'None')]}"/>
@@ -28,21 +28,31 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/caldav/common.py b/addons/caldav/common.py
index 9e7c592956c..c7d3a017c21 100644
--- a/addons/caldav/common.py
+++ b/addons/caldav/common.py
@@ -30,6 +30,9 @@ def caldevIDs2readIDs(caldev_ID = None):
return int(caldev_ID.split('-')[0])
return caldev_ID
+months = {1:"January", 2:"February", 3:"March", 4:"April", 5:"May", 6:"June", \
+ 7:"July", 8:"August", 9:"September", 10:"October", 11:"November", \
+ 12:"December"}
class crm_caldav_attendee(osv.osv):
_name = 'crm.caldav.attendee'
@@ -242,73 +245,98 @@ class set_rrule_wizard(osv.osv_memory):
_description = "Set RRULE"
_columns = {
- 'freq': fields.selection([('SECONDLY','SECONDLY'),\
- ('MINUTELY','MINUTELY'),\
- ('HOURLY', 'HOURLY'),\
- ('DAILY', 'DAILY'),\
- ('WEEKLY','WEEKLY'),\
- ('MONTHLY','MONTHLY'),\
- ('YEARLY','YEARLY')], 'Frequency', required=True),
- 'interval': fields.integer('Interval'),
- 'count': fields.integer('Count'),
- 'mo': fields.boolean('Mon'),
- 'tu': fields.boolean('Tue'),
- 'we': fields.boolean('Wed'),
- 'th': fields.boolean('Thu'),
- 'fr': fields.boolean('Fri'),
- 'sa': fields.boolean('Sat'),
- 'su': fields.boolean('Sun'),
- 'day': fields.integer('Day of month'),
+ 'freq': fields.selection([('None', 'No Repeat'), \
+ ('SECONDLY', 'SECONDLY'), \
+ ('MINUTELY', 'MINUTELY'), \
+ ('HOURLY', 'HOURLY'), \
+ ('DAILY', 'DAILY'), \
+ ('WEEKLY', 'WEEKLY'), \
+ ('MONTHLY', 'MONTHLY'), \
+ ('YEARLY', 'YEARLY')], 'Frequency', required=True),
+ 'interval': fields.integer('Interval'),
+ 'count': fields.integer('Count'),
+ 'mo': fields.boolean('Mon'),
+ 'tu': fields.boolean('Tue'),
+ 'we': fields.boolean('Wed'),
+ 'th': fields.boolean('Thu'),
+ 'fr': fields.boolean('Fri'),
+ 'sa': fields.boolean('Sat'),
+ 'su': fields.boolean('Sun'),
+ 'select1': fields.selection([('date', 'Date of month'), \
+ ('day', 'Day of month')], 'Select Option'),
+ 'day': fields.integer('Day of month'),
'week_list': fields.selection([('MO', 'Monday'), ('TU', 'Tuesday'), \
- ('WE', 'Wednesday'), ('TH', 'Thursday'),\
+ ('WE', 'Wednesday'), ('TH', 'Thursday'), \
('FR', 'Friday'), ('SA', 'Saturday'), \
- ('SU', 'Sunday')], 'Weekday' ),
+ ('SU', 'Sunday')], 'Weekday'),
'byday': fields.selection([('1', 'First'), ('2', 'Second'), \
('3', 'Third'), ('4', 'Fourth'), \
- ('5', 'Fifth'), ('-1', 'Last')], 'By day' ),
+ ('5', 'Fifth'), ('-1', 'Last')], 'By day'),
+ 'month_list': fields.selection(months.items(), 'Month'),
'end_date': fields.date('Repeat Until')
}
_defaults = {
'freq': lambda *x: 'DAILY',
+ 'select1': lambda *x: 'date',
+ 'interval': lambda *x: 1,
}
def add_rrule(self, cr, uid, ids, context={}):
- datas = self.read(cr, uid, ids[0])
+ datas = self.read(cr, uid, ids)[0]
if not context:
return {}
model = 'crm.case' # for now
obj = self.pool.get(model)
- rrule_string = 'TEMP-value'
+ res_obj = obj.browse(cr, uid, context['active_id'])[0]
+
weekdays = ['mo', 'tu', 'we', 'th', 'fr', 'sa', 'su']
weekstring = ''
monthstring = ''
+ yearstring = ''
# logic for computing rrule string
- if datas.get('interval') <= 0:
- raise osv.except_osv(_('Error!'),("Please select proper Interval"))
- if datas.get('day') > 31:
- raise osv.except_osv(_('Error!'),("Please select proper Day of month"))
freq = datas.get('freq')
+ if freq == 'None':
+ obj.write(cr, uid, [res_obj.id], {'rrule' : '', 'rdates': ''})
+ return {}
+ if datas.get('interval') <= 0:
+ raise osv.except_osv(_('Error!'), ("Please select proper Interval"))
+
if freq == 'WEEKLY':
byday = map(lambda x: x.upper(), filter(lambda x: datas.get(x) and x in weekdays, datas))
weekstring = ';BYDAY=' + ','.join(byday)
+
elif freq == 'MONTHLY':
byday = ''
+ if datas.get('select1')=='date' and (datas.get('day') < 1 or datas.get('day') > 31):
+ raise osv.except_osv(_('Error!'), ("Please select proper Day of month"))
if datas.get('byday') and datas.get('week_list'):
byday = ';BYDAY=' + datas.get('byday') + datas.get('week_list')
- monthstring = byday or (';BYMONTHDAY=' + str(datas.get('day')))
+ monthstring = byday or (';BYMONTHDAY=' + str(datas.get('day')))
+
+ elif freq == 'YEARLY':
+ bymonth = ''
+ byday = ''
+ if datas.get('select1')=='date' and (datas.get('day') < 1 or datas.get('day') > 31):
+ raise osv.except_osv(_('Error!'), ("Please select proper Day of month"))
+ if datas.get('byday') and datas.get('week_list'):
+ byday = ';BYDAY=' + datas.get('byday') + datas.get('week_list')
+ if datas.get('month_list'):
+ bymonth = ';BYMONTH=' + str(datas.get('month_list'))
+ bymonthday = ';BYMONTHDAY=' + str(datas.get('day'))
+ yearstring = bymonth + (datas.get('day') and bymonthday or '') + byday
+
if datas.get('end_date'):
datas['end_date'] = ''.join((re.compile('\d')).findall(datas.get('end_date'))) + '235959Z'
- enddate_info = (datas.get('count') and (';COUNT=' + str(datas.get('count'))) or '' ) +\
+ enddate = (datas.get('count') and (';COUNT=' + str(datas.get('count'))) or '') +\
((datas.get('end_date') and (';UNTIL=' + datas.get('end_date'))) or '')
rrule_string = 'FREQ=' + freq + weekstring + ';INTERVAL=' + \
- str(datas.get('interval')) + enddate_info + monthstring
+ str(datas.get('interval')) + enddate + monthstring + yearstring
# End logic
- res_obj = obj.browse(cr, uid, context['active_id'])[0]
obj.write(cr, uid, [res_obj.id], {'rrule' : rrule_string})
return {}