From 363fd1ca01676d0c35ffe9725222b04e2ac96cf4 Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Thu, 7 Jan 2010 18:27:38 +0530 Subject: [PATCH] [FIX]: crm, caldav: Minor Fixes bzr revid: rpa@openerp.co.in-20100107125738-q88b1ibi78758ha4 --- addons/caldav/common.py | 4 ++-- addons/crm/crm_meeting_menu.xml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/caldav/common.py b/addons/caldav/common.py index 80c1235b12e..19317c46c0a 100644 --- a/addons/caldav/common.py +++ b/addons/caldav/common.py @@ -283,8 +283,8 @@ are both optional, but if one occurs, so MUST the other"""), delta = datetime.timedelta(hours=vals['trigger_duration']) if vals['trigger_interval'] == 'MINUTES': delta = datetime.timedelta(minutes=vals['trigger_duration']) - trigger_date = dtstart + (vals['trigger_occurs'] == 'AFTER' and delta or -delta) - vals['trigger_date'] = trigger_date + trigger_date = dtstart + (vals['trigger_occurs'] == 'AFTER' and delta or -delta) + vals['trigger_date'] = trigger_date res = super(crm_caldav_alarm, self).create(cr, uid, vals, context) return res diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml index cc96a0f263f..794d4fc8b1d 100755 --- a/addons/crm/crm_meeting_menu.xml +++ b/addons/crm/crm_meeting_menu.xml @@ -86,7 +86,6 @@ -