From 99c9ce6d5cdd4e498ac85eebed3bf161f40a9e6d Mon Sep 17 00:00:00 2001
From: "Omar(Pexego),Anup(OpenERP)" <>
Date: Mon, 4 Oct 2010 17:54:35 +0530
Subject: [PATCH] [FIX] base_calendar,caldav : SQL queries Corrected

lp bug: https://launchpad.net/bugs/654480 fixed

bzr revid: ach@tinyerp.com-20101004122435-vsisrowq9fkk6zv6
---
 addons/base_calendar/base_calendar.py | 2 +-
 addons/caldav/calendar.py             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index b71e2daa447..7ccd07351f0 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -724,7 +724,7 @@ true, it will allow you to hide the event alarm information without removing it.
             if alarm_ids:
                 alarm_obj.unlink(cr, uid, alarm_ids)
                 cr.execute('Update %s set base_calendar_alarm_id=NULL, alarm_id=NULL\
-                            where id=%%d' % model_obj._table,(datas.id,))
+                            where id=%%s' % model_obj._table,(datas.id,))
         return True
 
 res_alarm()
diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py
index bcc624d6a67..d22fa98f6e4 100644
--- a/addons/caldav/calendar.py
+++ b/addons/caldav/calendar.py
@@ -716,7 +716,7 @@ class basic_calendar_line(osv.osv):
         """
 
         cr.execute("SELECT COUNT(id) FROM basic_calendar_lines \
-                                WHERE name='%s' AND calendar_id=%s", 
+                                WHERE name=%s AND calendar_id=%s", 
                                 (vals.get('name'), vals.get('calendar_id')))
         res = cr.fetchone()
         if res: