odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

small chagnes for the html2html 

bzr revid: dsh@tinyerp.com-20090511073858-sff7m3ojtk2b8z57
This commit is contained in:
dsh (Open ERP) 2009-05-11 13:08:58 +05:30
parent aeb27427ec
commit 2bbab69820
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/netsvc.py
View File

@ -232,6 +232,7 @@ class OpenERPDispatcher:
self.log('service', service_name)
self.log('method', method)
self.log('params', params)
print "Terp Calling",service_name,method,params
result = LocalService(service_name)(method, *params)
self.log('result', result)
return result

27
bin/report/report_sxw.py
View File

@ -199,10 +199,7 @@ class rml_parse(object):
def set_html_image(self,attach_id):
try :
att_id = int(attach_id)
print att_id
attachment = self.pool.get('ir.attachment').browse(self.cr,self.uid,att_id)
print attachment
print attachment.datas
return attachment.datas
except :
return ''
@ -502,22 +499,22 @@ class report_sxw(report_rml, preprocess.report):
def create_single_html2html(self, cr, uid, ids, data, report_xml, context={}):
context = context.copy()
report_type = 'html'
context['parents'] = html_parents
rml = report_xml.report_rml_content
rml_parser = self.parser(cr, uid, self.name2, context)
rml_parser.parents = html_parents
rml_parser.tag = sxw_tag
context['parents'] = html_parents
html = report_xml.report_rml_content
html_parser = self.parser(cr, uid, self.name2, context)
html_parser.parents = html_parents
html_parser.tag = sxw_tag
objs = self.getObjects(cr, uid, ids, context)
rml_parser.set_context(objs, data, ids, report_type)
html_parser.set_context(objs, data, ids, report_type)
html_dom = etree.HTML(html)
html_dom = self.preprocess_rml(html_dom,'html2html')
rml_dom = etree.HTML(rml)
rml_dom = self.preprocess_rml(rml_dom,'html2html')
create_doc = self.generators['html2html']
html = etree.tostring(create_doc(rml_dom, rml_parser.localcontext))
html = etree.tostring(create_doc(html_dom, html_parser.localcontext))
return (html, report_type)
return (html.replace('&lt;', '<').replace('&gt;', '>').replace('</br>',''), report_type)