Merge lp:~jviares/openobject-client-kde/openobject-client-kde into lp:openobject-client-kde

Proposed by Vicente
Status: Needs review
Proposed branch: lp:~jviares/openobject-client-kde/openobject-client-kde
Merge into: lp:openobject-client-kde
Diff against target: 13 lines (+2/-1)
1 file modified
server-modules/jasper_reports/jasper_report.py (+2/-1)
To merge this branch: bzr merge lp:~jviares/openobject-client-kde/openobject-client-kde
Reviewer Review Type Date Requested Status
OpenObject KDE Client Team Pending
Review via email: mp+94731@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

1794. By Vicente

Con multiples addons_path fallaba al buscar la ruta del report.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'server-modules/jasper_reports/jasper_report.py'
2--- server-modules/jasper_reports/jasper_report.py 2011-10-24 06:47:25 +0000
3+++ server-modules/jasper_reports/jasper_report.py 2012-02-27 08:42:21 +0000
4@@ -172,7 +172,8 @@
5 return os.path.abspath(os.path.dirname(__file__))
6
7 def addonsPath(self):
8- return os.path.dirname( self.path() )
9+ return os.path.dirname( addons.get_module_resource(self.reportPath.split("/")[0]) )
10+
11
12 def systemUserName(self):
13 if os.name == 'nt':