From 37060d2b3b3492de32e39498ba3f17da60307260 Mon Sep 17 00:00:00 2001 From: "dsh (Open ERP)" Date: Wed, 10 Jun 2009 17:57:34 +0530 Subject: [PATCH 1/4] [FIX] fix &,<,> problem for html2html report bzr revid: dsh@tinyerp.com-20090610122734-0kq9vh870pmme4q3 --- bin/report/report_sxw.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py index fb5da04c04d..838e0d136d2 100644 --- a/bin/report/report_sxw.py +++ b/bin/report/report_sxw.py @@ -513,6 +513,6 @@ class report_sxw(report_rml, preprocess.report): create_doc = self.generators['html2html'] html = etree.tostring(create_doc(html_dom, html_parser.localcontext)) - return (html.replace('<', '<').replace('>', '>').replace('
',''), report_type) + return (html.replace('&','&').replace('<', '<').replace('>', '>').replace('
',''), report_type) From 58070343d25ca1aca32cd1bd10ada38a710e9447 Mon Sep 17 00:00:00 2001 From: "dsh (Open ERP)" Date: Wed, 10 Jun 2009 19:19:19 +0530 Subject: [PATCH 2/4] [FIX] fix &,<,> problem for html2html-url report bzr revid: dsh@tinyerp.com-20090610134919-x3hkueo10dlrqkn5 --- bin/report/render/html2html/html2html.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/bin/report/render/html2html/html2html.py b/bin/report/render/html2html/html2html.py index 1fc63572a0f..db6a1ea511c 100644 --- a/bin/report/render/html2html/html2html.py +++ b/bin/report/render/html2html/html2html.py @@ -74,11 +74,15 @@ class html2html(object): def url_modify(self,root): for n in root.getchildren(): - if n.text.find('=0 and n.text.find('style')<=0 : + if (n.text.find('=0 or n.text.find('<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 '' - href = n.text.split('=0: + t = '<a ' + else : + t = ' Date: Thu, 11 Jun 2009 14:49:36 +0530 Subject: [PATCH 3/4] [FIX] Account Module : Typo corrected lp bug: https://launchpad.net/bugs/385664 fixed bzr revid: jvo@tinyerp.com-20090611091936-9hxna6n3wz3oa5e7 --- bin/addons/base/ir/ir_ui_menu.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/addons/base/ir/ir_ui_menu.py b/bin/addons/base/ir/ir_ui_menu.py index 5715fc9ac78..75a3550250e 100644 --- a/bin/addons/base/ir/ir_ui_menu.py +++ b/bin/addons/base/ir/ir_ui_menu.py @@ -233,7 +233,7 @@ class ir_ui_menu(osv.osv): 'complete_name': fields.function(_get_full_name, method=True, string='Complete Name', type='char', size=128), 'icon': fields.selection(tools.icons, 'Icon', size=64), - 'icon_pict': fields.function(_get_icon_pict, method=True, type='picture'), + 'icon_pict': fields.function(_get_icon_pict, method=True, type='char', size=32), 'action': fields.function(_action, fnct_inv=_action_inv, method=True, type='reference', string='Action', selection=[ From e2be25ace5ac06c5f232661af3a3c787eb3cdc06 Mon Sep 17 00:00:00 2001 From: Olivier Laurent Date: Fri, 12 Jun 2009 09:43:52 +0200 Subject: [PATCH 4/4] [IMP] base: french translations bzr revid: olt@tinyerp.com-20090612074352-oxrvzxgfa40sg3v9 --- bin/addons/base/i18n/fr_FR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/addons/base/i18n/fr_FR.po b/bin/addons/base/i18n/fr_FR.po index f9522f6f185..2dbe33a00ad 100644 --- a/bin/addons/base/i18n/fr_FR.po +++ b/bin/addons/base/i18n/fr_FR.po @@ -680,7 +680,7 @@ msgstr "Facteur" #. module: base #: view:res.lang:0 msgid "%B - Full month name." -msgstr "%B - Nomd u mois complet." +msgstr "%B - Nom du mois complet." #. module: base #: field:ir.actions.report.xml,report_type:0