merge

bzr revid: fp@tinyerp.com-20080917075113-x8mpx0v9qwx4e4na

diff --cc addons/process/process.py
index 832264a,580c51e..a89b6a6
--- 1/addons/process/process.py
--- 2/addons/process/process.py
+++ b/addons/process/process.py
@@@ -78,8 -81,10 +78,8 @@@ class process_process(osv.osv)
              if node.flow_start:
                  start.append(node.id)
  
-             for tr in node.transition_ids:
+             for tr in node.transition_out:
                  data = {}
 -                
                  data['name'] = tr.name
                  data['source'] = tr.source_node_id.id
                  data['target'] = tr.target_node_id.id
@@@ -88,11 -94,14 +88,12 @@@
                      button = {}
                      button['name'] = b.name
                      buttons.append(button)
 -
                  data['roles'] = roles = []
-                 for r in tr.role_ids:
-                     role = {}
-                     role['name'] = r.name
-                     roles.append(role)
+                 for r in tr.transition_ids:
+                     if r.role_id:
+                         role = {}
+                         role['name'] = r.role_id.name
+                         roles.append(role)
 -            
                  transitions[tr.id] = data
  
          g = tools.graph(nodes.keys(), map(lambda x: (x['source'], x['target']), transitions.values()))
@@@ -147,9 -164,11 +149,9 @@@ class process_transition(osv.osv)
          'source_node_id': fields.many2one('process.node', 'Source Node', required=True, ondelete='cascade'),
          'target_node_id': fields.many2one('process.node', 'Target Node', required=True, ondelete='cascade'),        
          'action_ids': fields.one2many('process.transition.action', 'transition_id', 'Buttons'),
-         'role_ids': fields.many2many('res.roles', 'process_transition_roles_rel', 'process_transition_id', 'role_id', 'Roles Required'),
+         'transition_ids': fields.many2many('workflow.transition', 'process_transition_ids', 'ptr_id', 'wtr_id', 'Workflow Transitions'),
          'note': fields.text('Description'),
      }
 -    _defaults = {
 -    }
  process_transition()
  
  class process_transition_action(osv.osv):

diff --cc addons/stock/stock_view.xml
Simple merge