Roles for Process transition.

bzr revid: ame@tinyerp.com-20080922131945-740do6g3tbo1ipls

diff --git a/addons/process/process.py b/addons/process/process.py
index 16c1680..73af1be 100644 (file)
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -169,6 +169,10 @@ class process_process(osv.osv):
                         role = {}
                         role['name'] = r.role_id.name
                         roles.append(role)
+                for r in tr.role_ids:
+                    role = {}
+                    role['name'] = r.name
+                    roles.append(role)
                 transitions[tr.id] = data
 
         g = tools.graph(nodes.keys(), map(lambda x: (x['source'], x['target']), transitions.values()))
@@ -238,6 +242,7 @@ class process_transition(osv.osv):
         'target_node_id': fields.many2one('process.node', 'Target Node', required=True, ondelete='cascade'),
         'action_ids': fields.one2many('process.transition.action', 'transition_id', 'Buttons'),
         'transition_ids': fields.many2many('workflow.transition', 'process_transition_ids', 'ptr_id', 'wtr_id', 'Workflow Transitions'),
+        'role_ids': fields.many2many('res.roles', 'process_transition_roles_rel', 'tid', 'rid', 'Roles'),
         'note': fields.text('Description', translate=True),
     }
 process_transition()

diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index 20015d1..d5ae44a 100644 (file)
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -63,6 +63,9 @@
                                                         </field>
                                                     </page>
                                                     <page string="Roles Required">
+                                                        <field name="role_ids" colspan="4" nolabel="1"/>
+                                                    </page>
+                                                    <page string="Roles from Workflow">
                                                         <field name="transition_ids" colspan="4" nolabel="1"/>
                                                     </page>
                                                     <page string="Extra Information">
@@ -189,6 +192,9 @@
                                         </field>
                                     </page>
                                     <page string="Roles Required">
+                                        <field name="role_ids" colspan="4" nolabel="1"/>
+                                    </page>
+                                    <page string="Roles from Workflow">
                                         <field name="transition_ids" colspan="4" nolabel="1"/>
                                     </page>
                                     <page string="Extra Information">
@@ -276,9 +282,13 @@
                             </form>
                         </field>
                     </page>
-                    <page string="Roles">
-                        <field name="transition_ids" nolabel="1" colspan="4"/>
-                    </page><page string="Notes">
+                    <page string="Roles Required">
+                        <field name="role_ids" colspan="4" nolabel="1"/>
+                    </page>
+                    <page string="Roles from Workflow">
+                        <field name="transition_ids" colspan="4" nolabel="1"/>
+                    </page>
+                    <page string="Notes">
                         <field name="note" nolabel="1" colspan="4"/>
                     </page>
                 </notebook>