pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE]

Browse Source 
bzr revid: christophe@tinyerp.com-20090612110221-6e40fork6um5f20h
This commit is contained in:
Christophe Simonis
2009-06-12 13:02:21 +02:00
parent 60cf794c7d 725a31135e
commit 6dbb10e531
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/addons/base/i18n/fr_FR.po
+1 -1
View File
@@ -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
bin/addons/base/ir/ir_ui_menu.py
+1 -1
View File
@@ -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=[
bin/report/render/html2html/html2html.py
+7 -3
View File
@@ -74,11 +74,15 @@ class html2html(object):
def url_modify(self,root):
for n in root.getchildren():
if n.text.find('<a ')>=0 and n.text.find('style')<=0 :
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 ''
href = n.text.split('<a ')[-1]
n.text = ' '.join(['<a ',style,href])
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
bin/report/report_sxw.py
+1 -1
View File
@@ -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('&lt;', '<').replace('&gt;', '>').replace('</br>',''), report_type)
return (html.replace('&amp;','&').replace('&lt;', '<').replace('&gt;', '>').replace('</br>',''), report_type)