diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2010-08-24 14:47:00 +0200 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2010-08-24 14:47:00 +0200 |
| commit | ad4e36d09b3cf55b67acba2c55174527e12c8fcb (patch) | |
| tree | e7db67010def3c2c8f7aa13938d3a87aac3e114b /bin/addons/base/ir/workflow/workflow.py | |
| parent | 6a645c2b15b528b8c8489bbb93e0a7cfc2c6617e (diff) | |
| parent | 6c5a917b6c4bdd5cff097c66718ec4d60b07911e (diff) | |
merge
bzr revid: fp@tinyerp.com-20100824124700-mdefo6j77yaifhxc
Diffstat (limited to 'bin/addons/base/ir/workflow/workflow.py')
| -rw-r--r-- | bin/addons/base/ir/workflow/workflow.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/bin/addons/base/ir/workflow/workflow.py b/bin/addons/base/ir/workflow/workflow.py index 7518700a3c3..dae77781503 100644 --- a/bin/addons/base/ir/workflow/workflow.py +++ b/bin/addons/base/ir/workflow/workflow.py @@ -151,6 +151,7 @@ class wkf_transition(osv.osv): 'condition': fields.char('Condition', required=True, size=128), 'act_from': fields.many2one('workflow.activity', 'Source Activity', required=True, select=True, ondelete='cascade'), 'act_to': fields.many2one('workflow.activity', 'Destination Activity', required=True, select=True, ondelete='cascade'), + 'wkf_id': fields.related('act_from','wkf_id', type='many2one', relation='workflow', string='Workflow', select=True), } _defaults = { 'condition': lambda *a: 'True', |