From 9f0fdbdc528dc6371c29fc03f7dfd8b6115de9be Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Fri, 2 Apr 2010 14:19:26 +0530 Subject: [PATCH 1/2] [Fix] trml2pdf: set the Heading tag name bzr revid: sbh@tinyerp.com-20100402084926-vys4yshlxk5yx42z --- bin/report/render/rml2pdf/trml2pdf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py index 0574f563c90..fa1595e13a4 100644 --- a/bin/report/render/rml2pdf/trml2pdf.py +++ b/bin/report/render/rml2pdf/trml2pdf.py @@ -636,9 +636,9 @@ class _rml_flowable(object): styles = reportlab.lib.styles.getSampleStyleSheet() style = styles['Title'] return platypus.Paragraph(self._textual(node), style, **(utils.attr_get(node, [], {'bulletText':'str'}))) - elif re.match('^h([1-9]+[0-9]*)$', (node.text or '')): + elif re.match('^h([1-9]+[0-9]*)$', (node.tag or '')): styles = reportlab.lib.styles.getSampleStyleSheet() - style = styles['Heading'+str(node.get[1:])] + style = styles['Heading'+str(node.tag[1:])] return platypus.Paragraph(self._textual(node), style, **(utils.attr_get(node, [], {'bulletText':'str'}))) elif node.tag=='image': if not node.get('file'): From 32d41097f6f7a5b8750f24ceb834653b4877fce1 Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Fri, 2 Apr 2010 18:19:05 +0530 Subject: [PATCH 2/2] [FIX] Fields.function of type integer with multi attribute behaviour improved bzr revid: jvo@tinyerp.com-20100402124905-oqofyis9c7rr6fng --- bin/osv/fields.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/osv/fields.py b/bin/osv/fields.py index edf78156dcc..980b3ad67c6 100644 --- a/bin/osv/fields.py +++ b/bin/osv/fields.py @@ -699,7 +699,11 @@ class function(_column): if self._type == "integer": for r in res.keys(): # Converting value into string so that it does not affect XML-RPC Limits - res[r] = str(res[r]) + if isinstance(res[r],dict): # To treat integer values with _multi attribute + for record in res[r].keys(): + res[r][record] = str(res[r][record]) + else: + res[r] = str(res[r]) return res get_memory = get