From ad71a8d02d50e2cfd1dae16698a4793e25ea461e Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Mon, 16 Jun 2008 11:24:25 +0000 Subject: [PATCH] Bugfixes bzr revid: fp@tinyerp.com-e355c7dafbfc4332b05adcafbcc73f0403516932 --- bin/report/render/rml2pdf/trml2pdf.py | 3 ++- bin/workflow/wkf_expr.py | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py index 8e3b1d35585..25ec57ebb12 100755 --- a/bin/report/render/rml2pdf/trml2pdf.py +++ b/bin/report/render/rml2pdf/trml2pdf.py @@ -332,7 +332,8 @@ class _rml_canvas(object): if not node.hasAttribute('file'): if node.hasAttribute('name'): - s = self.images[node.getAttribute('name')] + image_data = self.images[node.getAttribute('name')] + s = StringIO.StringIO(image_data) else: import base64 image_data = base64.decodestring(node.firstChild.nodeValue) diff --git a/bin/workflow/wkf_expr.py b/bin/workflow/wkf_expr.py index 4e7dc549dd1..434e091f4da 100644 --- a/bin/workflow/wkf_expr.py +++ b/bin/workflow/wkf_expr.py @@ -70,6 +70,8 @@ class Env(dict): def _eval_expr(cr, ident, workitem, action): ret=False + print '***' + print action for line in action.split('\n'): uid=ident[0] model=ident[1] @@ -81,6 +83,7 @@ def _eval_expr(cr, ident, workitem, action): else: wf_service = netsvc.LocalService("object_proxy") env = Env(wf_service, cr, uid, model, ids) + print line ret = eval(line, env) return ret