changes for the image in html2html

bzr revid: dsh@tinyerp.com-20090520130245-asx882zycp64mytd

bin/report/render/html2html/html2html.py

@@ -49,6 +49,8 @@ class html2html(object):
                         src =  utils._process_text(self, new_child.get('name'))
                         if src :
                             new_child.set('src','data:image/gif;base64,%s'%src)
+                        else :
+                            new_child.getparent().remove(new_child)
                     new_child.text  = utils._process_text(self, child.text)
         self._node = copy.deepcopy(self.etree)
         for n in self._node:

bin/report/report_sxw.py

@@ -196,12 +196,21 @@ class rml_parse(object):
     def removeParentNode(self, tag=None):
         raise Exception('Skip')
 
-    def set_html_image(self,attach_id):
+    def set_html_image(self,id,model=None,field=None):
+        if not id :
+            return ''
+        if not model:
+            model = 'ir.attachment'
         try :
-            att_id = int(attach_id)
-            attachment = self.pool.get('ir.attachment').browse(self.cr,self.uid,att_id)
-            return attachment.datas
-        except :
+            id = int(id)
+            res = self.pool.get(model).read(self.cr,self.uid,id)
+            if field :
+                return res[field]
+            elif model =='ir.attachment' :
+                return res['datas']
+            else :
+                return ''
+        except Exception,e:
             return ''
 
     def setLang(self, lang):