Fixed process module.
bzr revid: ame@tinyerp.com-20080916141907-vkwel89cgvqv9nuc
This commit is contained in:
Amit Mendapara
parent
721d1b8e21
commit
b372719e1f
|
|
@ -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:
|
||||
|
||||
|
|
|
|||
|
|
@ -33,8 +33,8 @@
|
|||
<field name="model_states"/>
|
||||
</group>
|
||||
<notebook colspan="4">
|
||||
<page string="Transitions">
|
||||
<field name="transition_ids" colspan="4" nolabel="1">
|
||||
<page string="Outgoing Transitions">
|
||||
<field name="transition_out" colspan="4" nolabel="1">
|
||||
<tree string="Transitions">
|
||||
<field name="name"/>
|
||||
<field name="target_node_id"/>
|
||||
|
|
@ -62,7 +62,7 @@
|
|||
</field>
|
||||
</page>
|
||||
<page string="Roles Required">
|
||||
<field name="role_ids" colspan="4" nolabel="1"/>
|
||||
<field name="transition_ids" colspan="4" nolabel="1"/>
|
||||
</page>
|
||||
<page string="Extra Information">
|
||||
<field name="note" colspan="4" nolabel="1"/>
|
||||
|
|
@ -130,30 +130,33 @@
|
|||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Process Transition">
|
||||
<field name="name" select="1"/>
|
||||
<newline/>
|
||||
<field name="source_node_id" select="1"/>
|
||||
<field name="target_node_id" select="1"/>
|
||||
<group string="Details">
|
||||
<field name="name" select="1"/>
|
||||
<newline/>
|
||||
<field name="source_node_id" select="1"/>
|
||||
<field name="target_node_id" select="1"/>
|
||||
</group>
|
||||
<notebook colspan="4">
|
||||
<page string="Actions">
|
||||
<field name="action_ids" nolabel="1" colspan="4">
|
||||
<tree string="Actions">
|
||||
<field name="name"/>
|
||||
<field name="state"/>
|
||||
<field name="action"/>
|
||||
</tree>
|
||||
<form string="Actions">
|
||||
<field name="name" colspan="4"/>
|
||||
<newline/>
|
||||
<field name="state"/>
|
||||
<field name="action"/>
|
||||
</form>
|
||||
</field>
|
||||
</page><page string="Roles">
|
||||
<field name="role_ids" nolabel="1" colspan="4"/>
|
||||
</page><page string="Notes">
|
||||
<field name="note" nolabel="1" colspan="4"/>
|
||||
</page>
|
||||
<page string="Actions">
|
||||
<field name="action_ids" nolabel="1" colspan="4">
|
||||
<tree string="Actions">
|
||||
<field name="name"/>
|
||||
<field name="state"/>
|
||||
<field name="action"/>
|
||||
</tree>
|
||||
<form string="Actions">
|
||||
<field name="name" colspan="4"/>
|
||||
<newline/>
|
||||
<field name="state"/>
|
||||
<field name="action"/>
|
||||
</form>
|
||||
</field>
|
||||
</page>
|
||||
<page string="Roles">
|
||||
<field name="transition_ids" nolabel="1" colspan="4"/>
|
||||
</page><page string="Notes">
|
||||
<field name="note" nolabel="1" colspan="4"/>
|
||||
</page>
|
||||
</notebook>
|
||||
</form>
|
||||
</field>
|
||||
|
|
@ -170,6 +173,5 @@
|
|||
action="action_process_transition_form"
|
||||
parent="menu_process"/>
|
||||
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
Loading…
Reference in New Issue