From d2f4923d3e836da48b765ef6124d9abdbf12051e Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 19 Jan 2011 19:19:30 +0100 Subject: [PATCH] [FIX] Modified base_calendar to make test in project pass. bzr revid: nicolas.vanhoren@openerp.com-20110119181930-hcafgtyzp4x1v1xl --- addons/base_calendar/base_calendar.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index 7657e52cc6b..f7a67adae11 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -1417,13 +1417,14 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ @return: True """ #removing useless value - old_vals = self.read(cr, uid, ids[0] if type(ids) == list else ids, ['rrule'], context) - if not old_vals: - old_vals = {} - if not 'rrule' in old_vals: - old_vals["rrule"] = "" - if 'rrule' in vals and not vals['rrule'] and not old_vals['rrule']: - del vals['rrule'] + if type(ids) == int or (type(ids) == list and len(ids) > 0): + old_vals = self.read(cr, uid, ids[0] if type(ids) == list else ids, ['rrule'], context) + if not old_vals: + old_vals = {} + if not 'rrule' in old_vals: + old_vals["rrule"] = "" + if 'rrule' in vals and not vals['rrule'] and not old_vals['rrule']: + del vals['rrule'] if context is None: context = {}