diff --git a/bin/addons/base/ir/ir_ui_view.py b/bin/addons/base/ir/ir_ui_view.py
index b59ddbf720f..a092f2b2f45 100644
--- a/bin/addons/base/ir/ir_ui_view.py
+++ b/bin/addons/base/ir/ir_ui_view.py
@@ -172,10 +172,10 @@ class view(osv.osv):
             for t in _Arrow_Obj.read(cr,uid, a[_Destination_Field],[]):
                 transitions.append((a['id'], t[des_node][0]))
                 tres[str(t['id'])] = (a['id'],t[des_node][0])
-#                if t['signal']:
-#                    signal[str(t['id'])] = t['signal']
-#                else:
-#                    signal[str(t['id'])] = t['condition']
+                if t['signal']:
+                    signal[str(t['id'])] = t['signal']
+                else:
+                    signal[str(t['id'])] = t['condition']
         g  = graph(nodes, transitions, no_ancester)
         g.process(start)
         g.scale(*scale)
@@ -184,8 +184,7 @@ class view(osv.osv):
         for node in nodes_name:
             results[str(node[0])] = result[node[0]]
             results[str(node[0])]['name'] = node[1]
-        return {'nodes': results, 'transitions': tres}
-#        return {'nodes': results, 'transitions': tres, 'signal' : signal}
+        return {'nodes': results, 'transitions': tres, 'signal' : signal}
 view()
 
 class view_sc(osv.osv):
diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml
index 435d0f3d61f..5cc8933c698 100644
--- a/bin/addons/base/ir/workflow/workflow_view.xml
+++ b/bin/addons/base/ir/workflow/workflow_view.xml
@@ -33,7 +33,7 @@
 				  <node object="workflow.activity" shape="circle" bgcolor="red">
 				    <field name="name"/>
 				  </node>
-				  <arrow object="workflow.transition" source="activity_from" destination="activity_to">
+				  <arrow object="workflow.transition" source="act_from" destination="act_to">
 				    <field name="name"/>
 				  </arrow>
 				</diagram>