summaryrefslogtreecommitdiff
path: root/bin/addons/base/ir/workflow
diff options
context:
space:
mode:
authorxrg <>2009-11-20 20:01:04 +0530
committerHarry (Open ERP) <hmo@tinyerp.com>2009-11-20 20:01:04 +0530
commitdad1ff955b636ccbad687f2f3f731ee8f512bd6f (patch)
treee3405d96ef59f72094e5e300db24fb713e2b8838 /bin/addons/base/ir/workflow
parentb2a9a804ebf6c93ebe98751dd6b1008b8fe09306 (diff)
parentf566ea57a83bab87a8c7fa9743d190b4520c89e2 (diff)
[merge] merge from lp:~xrg/openobject-server/optimize-5.0 and removed some confilts
bzr revid: hmo@tinyerp.com-20091120143104-tb6136unkdw7yfy9
Diffstat (limited to 'bin/addons/base/ir/workflow')
-rw-r--r--bin/addons/base/ir/workflow/print_instance.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/bin/addons/base/ir/workflow/print_instance.py b/bin/addons/base/ir/workflow/print_instance.py
index e70be5bebbe..659c6b3d2ff 100644
--- a/bin/addons/base/ir/workflow/print_instance.py
+++ b/bin/addons/base/ir/workflow/print_instance.py
@@ -81,7 +81,10 @@ def graph_get(cr, graph, wkf_id, nested=False, workitem={}):
start = cr.fetchone()[0]
cr.execute("select 'subflow.'||name,id from wkf_activity where flow_stop=True and wkf_id=%s", (wkf_id,))
stop = cr.fetchall()
- stop = (stop[0][1], dict(stop))
+ if (stop):
+ stop = (stop[0][1], dict(stop))
+ else:
+ stop = ("stop",{})
return ((start,{}),stop)
@@ -143,7 +146,8 @@ showpage'''
else:
inst_id = inst_id[0]
graph = pydot.Dot(fontsize='16', label="""\\\n\\nWorkflow: %s\\n OSV: %s""" % (wkfinfo['name'],wkfinfo['osv']),
- size='10.7, 7.3', center='1', ratio='auto', rotate='90', rankdir='LR'
+ size='7.3, 10.1', center='1', ratio='auto', rotate='0', rankdir='TB',
+ ordering='out'
)
graph_instance_get(cr, graph, inst_id, data.get('nested', False))
ps_string = graph.create(prog='dot', format='ps')