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

merging from trunk server 

bzr revid: mga@tinyerp.com-20090601101419-wkfesmoaddfpufxf
This commit is contained in:
Mantavya Gajjar 2009-06-01 15:44:19 +05:30
parent 31ff33c49b 74b2bb3e40
commit 5aa4677718
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/report/render/html2html/html2html.py
View File

@ -58,8 +58,10 @@ class html2html(object):
output = cStringIO.StringIO(base64.decodestring(src))
img = ImageReader(output)
(width,height) = img.getSize()
new_child.set('width',str(width))
new_child.set('height',str(height))
if not new_child.get('width'):
new_child.set('width',str(width))
if not new_child.get('height') :
new_child.set('height',str(height))
else :
new_child.getparent().remove(new_child)
new_child.text = utils._process_text(self, child.text)

2
bin/report/report_sxw.py
View File

@ -196,7 +196,7 @@ class rml_parse(object):
def removeParentNode(self, tag=None):
raise Exception('Skip')
def set_html_image(self,id,model=None,field=None):
def set_html_image(self,id,model=None,field=None,context=None):
if not id :
return ''
if not model: