Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/7.0-opw-586086-rgo into lp:openobject-addons/7.0

  1. 7.0-opw-586086-rgo
  2. Merge into 7.0
Proposed by Ravi Gohil (OpenERP)
Status: Merged
Approved by: Naresh(OpenERP)
Approved revision: no longer in the source branch.
Merged at revision: 9222
Proposed branch: lp:~openerp-dev/openobject-addons/7.0-opw-586086-rgo
Merge into: lp:openobject-addons/7.0
Diff against target: 14 lines (+2/-1)
1 file modified
report_webkit/webkit_report.py (+2/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/7.0-opw-586086-rgo
Reviewer Review Type Date Requested Status
Naresh(OpenERP) (community) Approve
Niels Huylebroeck (community) Approve
Review via email: mp+148634@code.launchpad.net

Description of the change

Hi,

For better understanding of issue, please refer to the bug description of lp:1098602

I have fixed this issue by passing proper value for 'name' parameter of _get_source(...).

Kindly review the fix.

Thanks.

To post a comment you must log in.
Revision history for this message
Niels Huylebroeck (red15) :
review: Approve
Revision history for this message
Naresh(OpenERP) (nch-openerp) :
review: Approve
Revision history for this message
Martin Trigaux (OpenERP) (mat-openerp) wrote :

Thanks for the patch, merged into 7.0
revno: 9222 [merge]
revision-id: <email address hidden>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'report_webkit/webkit_report.py'
2--- report_webkit/webkit_report.py 2012-12-10 11:16:54 +0000
3+++ report_webkit/webkit_report.py 2013-02-15 09:00:27 +0000
4@@ -191,8 +191,9 @@
5 def translate_call(self, src):
6 """Translate String."""
7 ir_translation = self.pool.get('ir.translation')
8+ name = self.tmpl and 'addons/' + self.tmpl or None
9 res = ir_translation._get_source(self.parser_instance.cr, self.parser_instance.uid,
10- None, 'report', self.parser_instance.localcontext.get('lang', 'en_US'), src)
11+ name, 'report', self.parser_instance.localcontext.get('lang', 'en_US'), src)
12 if not res :
13 return src
14 return res