[MERGE] Merged Riken's branch for the fix on report_webkit in case the report template is missing or wrong path is supplied

bzr revid: jvo@tinyerp.com-20110615105020-9f89s1wj15z72nnl
This commit is contained in:
Jay Vora (OpenERP)
2011-06-15 16:20:20 +05:30
+1 -1
View File
@@ -247,7 +247,7 @@ class WebKitParser(report_sxw):
if report_xml.report_file :
path = addons.get_module_resource(report_xml.report_file)
if os.path.exists(path) :
if path and os.path.exists(path) :
template = file(path).read()
if not template and report_xml.report_webkit_data :
template = report_xml.report_webkit_data