Merge lp:~numerigraphe/openobject-server/6.0-report-image-path into lp:openobject-server/6.0

Proposed by Numérigraphe
Status: Merged
Approved by: Xavier ALT
Approved revision: 3311
Merged at revision: 3615
Proposed branch: lp:~numerigraphe/openobject-server/6.0-report-image-path
Merge into: lp:openobject-server/6.0
Diff against target: 10 lines (+1/-0)
1 file modified
bin/report/interface.py (+1/-0)
To merge this branch: bzr merge lp:~numerigraphe/openobject-server/6.0-report-image-path
Reviewer Review Type Date Requested Status
Xavier ALT (community) Approve
Review via email: mp+92241@code.launchpad.net

Description of the change

This is a backport of a fix made on the trunk to allow simpler image paths in reports.
Lionel Sausin.

To post a comment you must log in.
Revision history for this message
Xavier ALT (dex-phx) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/report/interface.py'
2--- bin/report/interface.py 2011-01-17 18:44:44 +0000
3+++ bin/report/interface.py 2012-02-09 10:18:33 +0000
4@@ -232,6 +232,7 @@
5 def _get_path(self):
6 ret = []
7 ret.append(self.tmpl.replace(os.path.sep, '/').rsplit('/',1)[0]) # Same dir as the report rml
8+ ret.append('addons')
9 ret.append(tools.config['root_path'])
10 return ret
11