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

[FIX] unmutable defaults in report

Browse Source 
bzr revid: ls@numerigraphe.fr-20111107154556-eofj5s55tkqntsty
This commit is contained in:
Numerigraphe - Lionel Sausin
2011-11-07 16:45:56 +01:00
parent b29e24b5d2
commit ae2be16844
5 changed files with 39 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openerp/report/render/rml2html/utils.py
+3 -1
View File
@@ -48,7 +48,9 @@ def tuple_int_get(node, attr_name, default=None):
def bool_get(value):
return (str(value)=="1") or (value.lower()=='yes')
def attr_get(node, attrs, dict={}):
def attr_get(node, attrs, dict=None):
if dict is None:
dict = {}
res = {}
for name in attrs:
if node.get(name):
openerp/report/render/rml2pdf/trml2pdf.py
+22 -8
View File
@@ -226,7 +226,9 @@ class _rml_styles(object,):
return style
class _rml_doc(object):
def __init__(self, node, localcontext, images={}, path='.', title=None):
def __init__(self, node, localcontext, images=None, path='.', title=None):
if images is None:
images = {}
self.localcontext = localcontext
self.etree = node
self.filename = self.etree.get('filename')
@@ -311,7 +313,9 @@ class _rml_doc(object):
self.canvas.save()
class _rml_canvas(object):
def __init__(self, canvas, localcontext, doc_tmpl=None, doc=None, images={}, path='.', title=None):
def __init__(self, canvas, localcontext, doc_tmpl=None, doc=None, images=None, path='.', title=None):
if images is None:
images = {}
self.localcontext = localcontext
self.canvas = canvas
self.styles = doc.styles
@@ -564,7 +568,9 @@ class _rml_canvas(object):
tags[n.tag](n)
class _rml_draw(object):
def __init__(self, localcontext ,node, styles, images={}, path='.', title=None):
def __init__(self, localcontext, node, styles, images=None, path='.', title=None):
if images is None:
images = {}
self.localcontext = localcontext
self.node = node
self.styles = styles
@@ -595,10 +601,12 @@ class _rml_Illustration(platypus.flowables.Flowable):
class _rml_flowable(object):
def __init__(self, doc, localcontext, images=None, path='.', title=None):
if images is None:
images = {}
self.localcontext = localcontext
self.doc = doc
self.styles = doc.styles
self.images = images or {}
self.images = images
self.path = path
self.title = title
self._logger = logging.getLogger('report.rml.flowable')
@@ -890,7 +898,9 @@ class TinyDocTemplate(platypus.BaseDocTemplate):
self.canv._pageNumber = 0
class _rml_template(object):
def __init__(self, localcontext, out, node, doc, images={}, path='.', title=None):
def __init__(self, localcontext, out, node, doc, images=None, path='.', title=None):
if images is None:
images = {}
if not localcontext:
localcontext={'internal_header':True}
self.localcontext = localcontext
@@ -951,12 +961,12 @@ class _rml_template(object):
fis.append(PageCount())
self.doc_tmpl.build(fis)
def parseNode(rml, localcontext=None,fout=None, images=None, path='.',title=None):
node = etree.XML(rml)
def parseNode(rml, localcontext=None, fout=None, images=None, path='.', title=None):
if localcontext is None:
localcontext = {}
if images is None:
images = {}
node = etree.XML(rml)
r = _rml_doc(node, localcontext, images, path, title=title)
#try to override some font mappings
try:
@@ -972,7 +982,11 @@ def parseNode(rml, localcontext=None,fout=None, images=None, path='.',title=None
r.render(fp)
return fp.getvalue()
def parseString(rml, localcontext = {},fout=None, images={}, path='.',title=None):
def parseString(rml, localcontext=None, fout=None, images=None, path='.', title=None):
if localcontext is None:
localcontext = {}
if images is None:
images = {}
node = etree.XML(rml)
r = _rml_doc(node, localcontext, images, path, title=title)
openerp/report/render/rml2pdf/utils.py
+3 -1
View File
@@ -179,7 +179,9 @@ def tuple_int_get(node, attr_name, default=None):
def bool_get(value):
return (str(value)=="1") or (value.lower()=='yes')
def attr_get(node, attrs, dict={}):
def attr_get(node, attrs, dict=None):
if dict is None:
dict = {}
res = {}
for name in attrs:
if node.get(name):
openerp/report/render/rml2txt/rml2txt.py
+8 -4
View File
@@ -375,7 +375,7 @@ class _rml_draw_style(object):
return ';'.join(['%s:%s' % (x[0],x[1]) for x in self.style[tag].items()])
class _rml_template(object):
def __init__(self, localcontext, out, node, doc, images={}, path='.', title=None):
def __init__(self, localcontext, out, node, doc, images=None, path='.', title=None):
self.localcontext = localcontext
self.frame_pos = -1
self.frames = []
@@ -465,7 +465,7 @@ class _rml_template(object):
return result
class _rml_doc(object):
def __init__(self, node, localcontext, images={}, path='.', title=None):
def __init__(self, node, localcontext, images=None, path='.', title=None):
self.localcontext = localcontext
self.etree = node
self.filename = self.etree.get('filename')
@@ -495,14 +495,18 @@ class _rml_doc(object):
self.result += '\n'
out.write( self.result)
def parseNode(rml, localcontext = {},fout=None, images={}, path='.',title=None):
def parseNode(rml, localcontext = {},fout=None, images=None, path='.',title=None):
if images is None:
images = {}
node = etree.XML(rml)
r = _rml_doc(node, localcontext, images, path, title=title)
fp = StringIO.StringIO()
r.render(fp)
return fp.getvalue()
def parseString(rml, localcontext = {},fout=None, images={}, path='.',title=None):
def parseString(rml, localcontext = {},fout=None, images=None, path='.',title=None):
if images is None:
images = {}
node = etree.XML(rml)
r = _rml_doc(node, localcontext, images, path, title=title)
if fout:
openerp/report/render/rml2txt/utils.py
+3 -1
View File
@@ -112,7 +112,9 @@ def tuple_int_get(node, attr_name, default=None):
def bool_get(value):
return (str(value)=="1") or (value.lower()=='yes')
def attr_get(node, attrs, dict={}):
def attr_get(node, attrs, dict=None):
if dict is None:
dict = {}
res = {}
for name in attrs:
if node.get(name):