diff options
| author | Paramjit Singh Sahota <psa@openerp.com> | 2014-07-16 14:38:10 +0530 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2014-10-09 10:09:06 +0200 |
| commit | ca862e7b852996cb44c444b5725beca8a5d8ae65 (patch) | |
| tree | 57f6aa7f5de2da399c3469c14220e236d84d5453 /addons/event/report | |
| parent | b7eb97c39ebd7b667e1691eeea72f716fa11b420 (diff) | |
[IMP] event: Split Ticket: registration are now for one attendee only.
Registration are now for one attendee only. When buying several seats for an event
you have now one registration for each attendee.
event: nb_register field is removed; as well as unnecessary user_id and it subscribe /
unsubscribe behavior. Also slighly cleaned some views.
event_sale: do not auto confirm registrations linked to a draft sale order. Note: strange
origin is a char field, not a sale_order_id. Added a small wizard to edit attendees
data when confirming a sale order containing event related lines.
website_event: when buying free tickets, ask for attendee details. Added template,
controllers to handle that behavior.
website_event_sale: when buying tickets, ask for attendee details. Events ecommerce
should be better integrated with online events, using inheritance to add details
instead of being very different.
Diffstat (limited to 'addons/event/report')
| -rw-r--r-- | addons/event/report/report_event_registration.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py index 5e56ce5cb2f..d1a9b5c40b8 100644 --- a/addons/event/report/report_event_registration.py +++ b/addons/event/report/report_event_registration.py @@ -29,6 +29,7 @@ class report_event_registration(models.Model): _order = 'event_date desc' _auto = False + create_date = fields.Datetime('Creation Date', readonly=True) 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') @@ -40,7 +41,6 @@ class report_event_registration(models.Model): 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) @@ -54,14 +54,14 @@ class report_event_registration(models.Model): e.id::varchar || '/' || coalesce(r.id::varchar,'') AS id, e.id AS event_id, e.user_id AS user_id, - r.user_id AS user_id_registration, r.name AS name_registration, + r.create_date AS create_date, e.company_id AS company_id, e.date_begin AS event_date, count(r.id) AS nbevent, - sum(r.nb_register) AS nbregistration, - CASE WHEN r.state IN ('draft') THEN r.nb_register ELSE 0 END AS draft_state, - CASE WHEN r.state IN ('open','done') THEN r.nb_register ELSE 0 END AS confirm_state, + count(r.event_id) AS nbregistration, + CASE WHEN r.state IN ('draft') THEN count(r.event_id) ELSE 0 END AS draft_state, + CASE WHEN r.state IN ('open','done') THEN count(r.event_id) ELSE 0 END AS confirm_state, e.type AS event_type, e.seats_max AS seats_max, e.state AS event_state, @@ -72,10 +72,8 @@ class report_event_registration(models.Model): GROUP BY event_id, - user_id_registration, r.id, registration_state, - r.nb_register, event_type, e.id, e.date_begin, |
