pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] Merge bug fix

Browse Source 
bzr revid: sbh@tinyerp.com-20110106131523-u221up0dyj9liex4
This commit is contained in:
Sbh (OpenERP)
2011-01-06 18:45:23 +05:30
parent c738ec75ca 0001c0ad8e
commit 2b2bc25c13
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/base_report_designer/base_report_designer.py
+8 -5
View File
@@ -25,7 +25,7 @@ from StringIO import StringIO
import base64
import pooler
import addons
import sys
class report_xml(osv.osv):
_inherit = 'ir.actions.report.xml'
@@ -60,12 +60,15 @@ class report_xml(osv.osv):
def report_get(self, cr, uid, report_id, context=None):
report = self.browse(cr, uid, report_id, context=context)
reload(sys)
sys.setdefaultencoding( "latin-1" )
try:
sxw_data=(report.report_sxw_content).encode("iso-8859-1", "replace")
rml_data= (report.report_rml_content).encode("iso-8859-1", "replace")
except :
pass
return {
'file_type' : report.report_type,
'report_sxw_content': report.report_sxw_content and base64.encodestring(report.report_sxw_content) or False,
'report_rml_content': report.report_rml_content and base64.encodestring(report.report_rml_content) or False
'report_sxw_content': report.report_sxw_content and base64.encodestring(sxw_data) or False,
'report_rml_content': report.report_rml_content and base64.encodestring(rml_data) or False
}
report_xml()