diff options
| author | Raphael Collet <rco@openerp.com> | 2014-01-20 13:59:53 +0100 |
|---|---|---|
| committer | Raphael Collet <rco@openerp.com> | 2014-01-20 13:59:53 +0100 |
| commit | 16028dedfd1db44013c8a30dac86096bcad0b8d4 (patch) | |
| tree | 5e22e40916cfcefcb7975bd40e82e0e9ace52611 | |
| parent | 77457bd8b2763013623936be27edcbcd7edfa551 (diff) | |
[FIX] calendar: function field of type 'selection' must be given a selection parameter
bzr revid: rco@openerp.com-20140120125953-zk6iwkvye4reansl
| -rw-r--r-- | addons/calendar/calendar.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py index aede7757514..6162d3cb8cf 100644 --- a/addons/calendar/calendar.py +++ b/addons/calendar/calendar.py @@ -100,8 +100,15 @@ class calendar_attendee(osv.Model): result[id][name] = attdata.event_id.date_deadline return result + STATE_SELECTION = [ + ('needsAction', 'Needs Action'), + ('tentative', 'Uncertain'), + ('declined', 'Declined'), + ('accepted', 'Accepted'), + ] + _columns = { - 'state': fields.selection([('needsAction', 'Needs Action'), ('tentative', 'Uncertain'), ('declined', 'Declined'), ('accepted', 'Accepted')], 'Status', readonly=True, help="Status of the attendee's participation"), + 'state': fields.selection(STATE_SELECTION, 'Status', readonly=True, help="Status of the attendee's participation"), 'cn': fields.function(_compute_data, string='Common name', type="char", multi='cn', store=True), 'partner_id': fields.many2one('res.partner', 'Contact', readonly="True"), 'email': fields.char('Email', help="Email of Invited Person"), @@ -799,7 +806,7 @@ class calendar_event(osv.Model): 'state': fields.selection([('draft', 'Unconfirmed'), ('open', 'Confirmed')], string='Status', readonly=True, track_visibility='onchange'), 'name': fields.char('Meeting Subject', required=True, states={'done': [('readonly', True)]}), 'is_attendee': fields.function(_compute, string='Attendee', type="boolean", multi='attendee'), - 'attendee_status': fields.function(_compute, string='Attendee Status', type="selection", multi='attendee'), + 'attendee_status': fields.function(_compute, string='Attendee Status', type="selection", selection=calendar_attendee.STATE_SELECTION, multi='attendee'), 'display_time': fields.function(_compute, string='Event Time', type="char", multi='attendee'), 'date': fields.datetime('Date', states={'done': [('readonly', True)]}, required=True, track_visibility='onchange'), 'date_deadline': fields.datetime('End Date', states={'done': [('readonly', True)]}, required=True,), |