Unifield Addons

Merge lp:~unifield-team/unifield-addons/jfb-addons-uf-2220 into lp:unifield-addons

  1. jfb-addons-uf-2220
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4605
Proposed branch: lp:~unifield-team/unifield-addons/jfb-addons-uf-2220
Merge into: lp:unifield-addons
Diff against target: 21 lines (+2/-2)
1 file modified
report_webkit/webkit_report.py (+2/-2)
To merge this branch: bzr merge lp:~unifield-team/unifield-addons/jfb-addons-uf-2220
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+201411@code.launchpad.net
To post a comment you must log in.

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 2013-01-17 09:04:56 +0000
3+++ report_webkit/webkit_report.py 2014-01-13 13:52:52 +0000
4@@ -186,7 +186,8 @@
5 def translate_call(self, src):
6 """Translate String."""
7 ir_translation = self.pool.get('ir.translation')
8- res = ir_translation._get_source(self.parser_instance.cr, self.parser_instance.uid, self.report_xml.report_file and "addons/%s"%self.report_xml.report_file or self.name, 'report', self.localcontext.get('lang', 'en_US'), src)
9+ orig_file = self.report_xml.report_file or self.tmpl
10+ res = ir_translation._get_source(self.parser_instance.cr, self.parser_instance.uid, orig_file and "addons/%s"%orig_file or self.name, 'report', self.localcontext.get('lang', 'en_US'), src)
11 if not res :
12 return src
13 return res
14@@ -245,7 +246,6 @@
15 self.parser_instance.set_context(objs, data, ids, report_xml.report_type)
16
17 template = False
18-
19 if report_xml.report_file :
20 path = addons.get_module_resource(report_xml.report_file)
21 if path and os.path.exists(path) :

Subscribers

People subscribed via source and target branches

to all changes: