diff options
| author | Yannick Vaucher <yannick.vaucher@camptocamp.com> | 2011-09-27 10:37:33 +0200 |
|---|---|---|
| committer | Yannick Vaucher <yannick.vaucher@camptocamp.com> | 2011-09-27 10:37:33 +0200 |
| commit | 87512d290ffb1b4e246aebb718f83c59691ab16d (patch) | |
| tree | 39fcb17e966bdc86892b489fde7a0b00b7fd2ed5 /addons/process/process.py | |
| parent | 4772d465fd7c5df58ec7244deddd634426698477 (diff) | |
| parent | 6f7fea4b223cd57b324370efc8ff2a0dc84892e7 (diff) | |
[MRG] from trunk
bzr revid: yannick.vaucher@camptocamp.com-20110927083733-jywphc0ljz6t0qun
Diffstat (limited to 'addons/process/process.py')
| -rw-r--r-- | addons/process/process.py | 8 |
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): |
