diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 1410c9bc5ac..d16ea4dcbf6 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -121,7 +121,7 @@ - + diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index ab84216de85..a417f14eca6 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -164,7 +164,7 @@ account.analytic.line form tree,form - [('account_id','child_of', active_id)] + [('account_id','child_of',[active_id])] {'account_id':active_id} diff --git a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml b/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml index 6653205c05f..3288ca9daf8 100644 --- a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml +++ b/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml @@ -32,7 +32,7 @@ account.analytic.account.form account.analytic.account form - + diff --git a/addons/auction/auction_demo.xml b/addons/auction/auction_demo.xml index 91185306bf9..4754e69be77 100644 --- a/addons/auction/auction_demo.xml +++ b/addons/auction/auction_demo.xml @@ -373,7 +373,6 @@ - bresslet 7 diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 2c6bed9bca2..55f116b626e 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -510,7 +510,7 @@ class crm_case(osv.osv): return True def format_body(self, body): - return tools.ustr((body or '').encode('ascii', 'replace')) + return (body or u'').encode('utf8', 'replace') def format_mail(self, case, body): data = { @@ -526,7 +526,7 @@ class crm_case(osv.osv): 'partner': (case.partner_id and case.partner_id.name) or '/', 'partner_email': (case.partner_address_id and case.partner_address_id.email) or '/', } - return self.format_body(body) % data + return self.format_body(body % data) def email_send(self, cr, uid, case, emails, body, context={}): body = self.format_mail(case, body) @@ -534,7 +534,10 @@ class crm_case(osv.osv): emailfrom = case.user_id.address_id.email else: emailfrom = case.section_id.reply_to - tools.email_send(emailfrom, emails, '['+str(case.id)+'] '+case.name, body, reply_to=case.section_id.reply_to, tinycrm=str(case.id)) + name = '[%d] %s' % (case.id, case.name.encode('utf8')) + reply_to = case.section_id.reply_to or False + if reply_to: reply_to = reply_to.encode('utf8') + tools.email_send(emailfrom, emails, name, body, reply_to=reply_to, tinycrm=str(case.id)) return True def __log(self, cr, uid, cases, keyword, context={}): if not self.pool.get('res.partner.event.type').check(cr, uid, 'crm_case_'+keyword):