summaryrefslogtreecommitdiff
path: root/addons/process/process.py
diff options
context:
space:
mode:
authorNaresh (OpenERP) <nch@tinyerp.com>2011-09-30 12:11:49 +0530
committerNaresh (OpenERP) <nch@tinyerp.com>2011-09-30 12:11:49 +0530
commit2a6792c0570a3a2cbeb4b5cfe4a8a505266d4b7b (patch)
tree189feea3933dea616b2d595238fa845d03730b6a /addons/process/process.py
parent044e4f4c1a6c3be56d8efc581bb4520f6fedf251 (diff)
parent8507f7cc4a446da13a83abf5ff711a730bc60e8c (diff)
[MERGE FROM TRUNK]
bzr revid: nch@tinyerp.com-20110930064149-a2y60ijkltffoync
Diffstat (limited to 'addons/process/process.py')
-rw-r--r--addons/process/process.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/addons/process/process.py b/addons/process/process.py
index 72c8bce10b4..524a3236e7b 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -84,12 +84,12 @@ class process_process(osv.osv):
process = pool.get('process.process').browse(cr, uid, id, context=context)
name = process.name
- resource = None
+ resource = False
state = 'N/A'
expr_context = {}
states = {}
- perm = None
+ perm = False
if res_model:
states = dict(pool.get(res_model).fields_get(cr, uid, context=context).get('state', {}).get('selection', {}))
@@ -242,7 +242,9 @@ class process_process(osv.osv):
for k, v in nodes.items():
y = v['y']
v['y'] = min(y - miny + 10, y)
-
+
+ nodes = dict([str(n_key), n_val] for n_key, n_val in nodes.iteritems())
+ transitions = dict([str(t_key), t_val] for t_key, t_val in transitions.iteritems())
return dict(name=name, resource=resource, state=state, perm=perm, notes=notes, nodes=nodes, transitions=transitions)
def copy(self, cr, uid, id, default=None, context=None):