odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[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
This commit is contained in:
Olivier Dony 2010-08-19 20:31:05 +02:00
parent d6c822190f
commit f2c6218697
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/email_template/email_template_account.py
View File

@ -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

2
addons/marketing_campaign/marketing_campaign.py
View File

@ -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 = {