merge

bzr revid: fp@tinyerp.com-20080917153410-0g4w5vjjcyxkllh7

1 files changed, 5 insertions, 1 deletions

diff --git a/addons/process/process.py b/addons/process/process.py
index a89b6a6caaa..74b0d6fc036 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -59,12 +59,13 @@ class process_process(osv.osv):
             data['menu'] = (node.menu_id or None) and node.menu_id.name
             data['model'] = (node.model_id or None) and node.model_id.model
             data['kind'] = node.kind
+            data['notes'] = node.note
             data['active'] = 0
 
             if node.kind == "state" and node.model_id and node.model_id.model == res_model:
                 states = node.model_states
                 states = (states or []) and states.split(',')
-                data['active'] = (states and current_object.state in states) or not states
+                data['active'] = not states or current_object.state in states
 
             elif node.kind == "router":
                 #TODO:
@@ -83,10 +84,13 @@ class process_process(osv.osv):
                 data['name'] = tr.name
                 data['source'] = tr.source_node_id.id
                 data['target'] = tr.target_node_id.id
+                data['notes'] = tr.note
                 data['buttons'] = buttons = []
                 for b in tr.action_ids:
                     button = {}
                     button['name'] = b.name
+                    button['state'] = b.state
+                    button['action'] = b.action
                     buttons.append(button)
                 data['roles'] = roles = []
                 for r in tr.transition_ids: