Fixed process module.

[odoo/odoo.git] / addons / process / process.py

diff --git a/addons/process/process.py b/addons/process/process.py
index 86f96f7..18339da 100644 (file)
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -82,7 +82,7 @@ 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
@@ -96,9 +96,9 @@ class process_process(osv.osv):
                     buttons.append(button)
 
                 data['roles'] = roles = []
-                for r in tr.role_ids:
+                for r in tr.transition_ids:
                     role = {}
-                    role['name'] = r.name
+                    role['name'] = r.role_id.name
                     roles.append(role)
                     
                 transitions[tr.id] = data
@@ -145,7 +145,8 @@ class process_node(osv.osv):
         'model_id': fields.many2one('ir.model', 'Object', ondelete='set null'),
         'model_states': fields.char('States Expression', size=128),
         'flow_start': fields.boolean('Starting Flow'),
-        'transition_ids': fields.one2many('process.transition', 'target_node_id', 'Transitions'),
+        'transition_in': fields.one2many('process.transition', 'target_node_id', 'Starting Transitions'),
+        'transition_out': fields.one2many('process.transition', 'source_node_id', 'Ending Transitions'),
     }
     _defaults = {
         'kind': lambda *args: 'state',
@@ -162,7 +163,7 @@ 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 = {
@@ -192,7 +193,5 @@ class process_transition_action(osv.osv):
 process_transition_action()
 
 
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: