From f2c62186973e719c7f1f9e9fad727cbff87da3e1 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 19 Aug 2010 20:31:05 +0200 Subject: [PATCH] [IMP] email_template, marketing_campaign: ugly workaround for making sure we don't have trouble when the database layer returns unicode strings bzr revid: odo@openerp.com-20100819183105-cpopyej4p23xnyhv --- addons/email_template/email_template_account.py | 2 +- addons/marketing_campaign/marketing_campaign.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/email_template/email_template_account.py b/addons/email_template/email_template_account.py index 803d11eb105..62f49646cc6 100644 --- a/addons/email_template/email_template_account.py +++ b/addons/email_template/email_template_account.py @@ -211,7 +211,7 @@ class email_template_account(osv.osv): raise error try: if serv.has_extn('AUTH') or this_object.smtpuname or this_object.smtppass: - serv.login(this_object.smtpuname, this_object.smtppass) + serv.login(str(this_object.smtpuname), str(this_object.smtppass)) except Exception, error: raise error return serv diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py index f0d6af479e7..c1674f85cc3 100644 --- a/addons/marketing_campaign/marketing_campaign.py +++ b/addons/marketing_campaign/marketing_campaign.py @@ -461,7 +461,7 @@ class marketing_campaign_transition(osv.osv): transition = self.browse(cr, uid, ids[0], context) if transition.trigger != 'time': raise ValueError('Delta is only relevant for timed transiton') - return relativedelta(**{transition.interval_type: transition.interval_nbr}) + return relativedelta(**{str(transition.interval_type): transition.interval_nbr}) _columns = {