Bhumi Thakkar (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/6.1-opw-575176-bth into
lp:openobject-addons/6.1.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-575176-bth/+merge/112539
Hello,
Click on meeting error is coming in command prompt 'day is out of range
for month' and 'TypeError: can't compare offset-naive and offset-aware
datetimes'.
1. Sales => Meetings => Meetings
2. Open any meeting and set reminder.
Observed: Error is coming in command prompt 'day is out of range for month' and
meetings can not open.
Expected: 'Meetings should open without any error.'
'day is out of range for month' this error is coming because date should pass
in list so passed in list. This error is solved but another error is coming
'TypeError: can't compare offset-naive and offset-aware datetimes'.
when rrule contains UNTIL keyword then should parse value of until keyword with
datetime and set untildate. which is not done when passed value in
get_recurrent_dates () function from do_run_scheduler () in base_calendar.py
file.
Thanks.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-575176-bth/+merge/112539
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/6.1-opw-575176-bth.
=== modified file 'base_calendar/base_calendar.py'
--- base_calendar/base_calendar.py 2012-03-05 14:35:54 +0000
+++ base_calendar/base_calendar.py 2012-06-28 11:00:27 +0000
@@ -830,7 +830,22 @@
if res_obj.rrule:
event_date = datetime.strptime(res_obj.date, '%Y-%m-%d %H:%M:%S')
- recurrent_dates = get_recurrent_dates(res_obj.rrule, res_obj.exdate, event_date, res_obj.exrule)
+ exdate = res_obj.exdate and res_obj.exdate.split(',') or []
+ rrule_str = res_obj.rrule
+ new_rrule_str = []
+ rrule_until_date = False
+ is_until = False
+ for rule in rrule_str.split(';'):
+ name, value = rule.split('=')
+ if name == "UNTIL":
+ is_until = True
+ value = parser.parse(value)
+ rrule_until_date = parser.parse(value.strftime("%Y-%m-%d %H:%M:%S"))
+ value = value.strftime("%Y%m%d%H%M%S")
+ new_rule = '%s=%s' % (name, value)
+ new_rrule_str.append(new_rule)
+ new_rrule_str = ';'.join(new_rrule_str)
+ recurrent_dates = get_recurrent_dates(str(new_rrule_str), exdate, event_date, res_obj.exrule)
trigger_interval = alarm.trigger_interval
if trigger_interval == 'days':
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
