diff options
| author | Raphael Collet <rco@openerp.com> | 2014-07-06 16:44:26 +0200 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2014-07-06 17:05:41 +0200 |
| commit | cbe2dbb672a6c55d86f2e515f9d1cdfee426ef80 (patch) | |
| tree | d6ff62b719fce32392397783c961b734b1e4c50e /addons/event/report | |
| parent | d78192c489d3be66cd6487b39f5ce7ba4733a187 (diff) | |
[MERGE] new v8 api by rco
A squashed merge is required as the conversion of the apiculture branch from
bzr to git was not correctly done. The git history contains irrelevant blobs
and commits. This branch brings a lot of changes and fixes, too many to list
exhaustively.
- New orm api, objects are now used instead of ids
- Environements to encapsulates cr uid context while maintaining backward compatibility
- Field compute attribute is a new object oriented way to define function fields
- Shared browse record cache
- New onchange protocol
- Optional copy flag on fields
- Documentation update
- Dead code cleanup
- Lots of fixes
Diffstat (limited to 'addons/event/report')
| -rw-r--r-- | addons/event/report/report_event_registration.py | 43 |
1 files changed, 20 insertions, 23 deletions
diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py index c4a4dfd6b2d..7eb1d122846 100644 --- a/addons/event/report/report_event_registration.py +++ b/addons/event/report/report_event_registration.py @@ -19,34 +19,32 @@ # ############################################################################## -from openerp.osv import fields, osv +from openerp import models, fields from openerp import tools -class report_event_registration(osv.osv): + +class report_event_registration(models.Model): + """Events Analysis""" _name = "report.event.registration" - _description = "Events Analysis" - _auto = False - _columns = { - 'event_date': fields.datetime('Event Date', readonly=True), - 'event_id': fields.many2one('event.event', 'Event', required=True), - 'draft_state': fields.integer(' # No of Draft Registrations', size=20), - 'confirm_state': fields.integer(' # No of Confirmed Registrations', size=20), - 'seats_max': fields.integer('Max Seats'), - 'nbevent': fields.integer('Number of Registrations'), - 'event_type': fields.many2one('event.type', 'Event Type'), - 'registration_state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Attended'), ('cancel', 'Cancelled')], 'Registration State', readonly=True, required=True), - 'event_state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Event State', readonly=True, required=True), - 'user_id': fields.many2one('res.users', 'Event Responsible', readonly=True), - 'user_id_registration': fields.many2one('res.users', 'Register', readonly=True), - 'name_registration': fields.char('Participant / Contact Name',size=45, readonly=True), - 'company_id': fields.many2one('res.company', 'Company', readonly=True), - } _order = 'event_date desc' + _auto = False + + event_date = fields.Datetime('Event Date', readonly=True) + event_id = fields.Many2one('event.event', 'Event', required=True) + draft_state = fields.Integer(' # No of Draft Registrations') + confirm_state = fields.Integer(' # No of Confirmed Registrations') + seats_max = fields.Integer('Max Seats') + nbevent = fields.Integer('Number of Registrations') + event_type = fields.Many2one('event.type', 'Event Type') + registration_state = fields.Selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Attended'), ('cancel', 'Cancelled')], 'Registration State', readonly=True, required=True) + event_state = fields.Selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Event State', readonly=True, required=True) + user_id = fields.Many2one('res.users', 'Event Responsible', readonly=True) + user_id_registration = fields.Many2one('res.users', 'Register', readonly=True) + name_registration = fields.Char('Participant / Contact Name', readonly=True) + company_id = fields.Many2one('res.company', 'Company', readonly=True) def init(self, cr): - """ - Initialize the sql view for the event registration - """ + """Initialize the sql view for the event registration """ tools.drop_view_if_exists(cr, 'report_event_registration') # TOFIX this request won't select events that have no registration @@ -87,5 +85,4 @@ class report_event_registration(osv.osv): ) """) - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
