[MERGE]

bzr revid: olt@tinyerp.com-20090612074425-3n8krqi6bh8kfuos

1 files changed, 17 insertions, 1 deletions

diff --git a/bin/report/render/html2html/html2html.py b/bin/report/render/html2html/html2html.py
index 2cf5b147dd0..db6a1ea511c 100644
--- a/bin/report/render/html2html/html2html.py
+++ b/bin/report/render/html2html/html2html.py
@@ -71,8 +71,24 @@ class html2html(object):
             self._node.remove(n)
         process_text(self.etree, self._node)
         return self._node
+        
+    def url_modify(self,root):
+        for n in root.getchildren():
+            if (n.text.find('<a ')>=0 or n.text.find('&lt;a')>=0) and n.text.find('href')>=0 and n.text.find('style')<=0 :
+                node = (n.tag=='span' and n.getparent().tag=='u') and n.getparent().getparent() or ((n.tag=='span') and n.getparent()) or n
+                style = node.get('color') and "style='color:%s; text-decoration: none;'"%node.get('color') or ''
+                if n.text.find('&lt;a')>=0:
+                    t = '&lt;a '
+                else :
+                    t = '<a '
+                href = n.text.split(t)[-1]
+                n.text = ' '.join([t,style,href])
+            self.url_modify(n)
+        return root
 
 def parseString(node, localcontext = {}):
     r = html2html(node, localcontext)
-    return r.render()
+    root = r.render()
+    root = r.url_modify(root)
+    return root