From 02dc420598f2f9ccdb4d8f6d45158dd33d305643 Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Tue, 7 Apr 2009 13:06:37 +0530 Subject: [PATCH 1/4] Bugfix : Account Analytic Lines domain failure bzr revid: jvo@tinyerp.com-20090407073637-jehh0n3v56rlt23a --- addons/account/project/project_view.xml | 2 +- addons/auction/auction_demo.xml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) 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/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 From 3a263e0e48c41cf5527fc7f462aa3ada7cdebc2e Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Tue, 7 Apr 2009 14:48:01 +0530 Subject: [PATCH 2/4] [FIX] Bug 309832 : Analytic account view corrected bzr revid: jvo@tinyerp.com-20090407091801-eode3zwbqvwp3aqk --- .../analytic_journal_billing_rate_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 - + From 7dc845ef116d5745dff4f95961e251c81dcad89f Mon Sep 17 00:00:00 2001 From: OnDemand Open Object User Date: Tue, 7 Apr 2009 10:16:26 +0000 Subject: [PATCH 3/4] [FIX] crm: fix mail formating bzr revid: odoo@saas-20090407101626-tnf07sl4nz2ahwc9 --- addons/crm/crm.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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): From b2ae2812e511f1f69b1823c086202b946b0d3c50 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Tue, 7 Apr 2009 14:00:13 +0200 Subject: [PATCH 4/4] [FIX] account: made the invoice date searchable bzr revid: christophe@tinyerp.com-20090407120013-x6bb6tacoj2u49vi --- addons/account/account_invoice_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@ - +