diff options
| author | Mahendra Barad <mba@openerp.com> | 2015-01-29 15:32:43 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2015-01-29 17:39:41 +0100 |
| commit | d9fa702d5e6183bfe57c3de9cab869dc3fa79718 (patch) | |
| tree | 92eec376839edd3ed634306e3836e547e247636e /addons/event/report | |
| parent | 5d53fbc8336ed1f13b999cc7b3699349ead818c9 (diff) | |
[IMP] event and event_* modules: onboarding improvements
event:
- added tip
- default subscription/reminder/thanks templates for registrations are now using
the reply_to defined on the event
- fixed check of available seats: use seats_availability field, unlimited events
should never trigger the constraint
- added a sequence on scheduled emails on events
- config: wording improvements
- various improvements in event, registration, event_mail and event_report views
event_sale:
- removed override of seats_max: should not depend on available seats in
tickets. Indeed you may have less available places than the sum of seats for
each ticket type, for example if you have 0-10 VIP and 0-20 Standard tickets
for a 20-seats event.
- removed a duplicated view override
- added a seats_availability field on tickets, same meaning as on event.
- improved event form view: registration tab is now replaced by the tickets tab
when tickets are used
website_event:
- better management of sold-out event in the front-end, when doing registrations
website_event_sale:
- removed register link on the event kanban view. There is no need to to from
the back-end to the front-end from the kanban view. The published button on the
event form view already allows to go to the front-end view on the event
- better management of sold-out event in the front-end, when doing registrations
- fixed a template that was in customize and should not
website_event_track:
- wording improvements
- small improvements in the front-end of tracks
Diffstat (limited to 'addons/event/report')
| -rw-r--r-- | addons/event/report/report_event_registration.py | 2 | ||||
| -rw-r--r-- | addons/event/report/report_event_registration_view.xml | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py index f30ddbf5785..b0d9c82a0b6 100644 --- a/addons/event/report/report_event_registration.py +++ b/addons/event/report/report_event_registration.py @@ -33,6 +33,7 @@ class report_event_registration(models.Model): 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') + cancel_state = fields.Integer(' # No of Cancelled Registrations') confirm_state = fields.Integer(' # No of Confirmed Registrations') seats_max = fields.Integer('Max Seats') nbevent = fields.Integer('Number of Events') @@ -62,6 +63,7 @@ class report_event_registration(models.Model): 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, + CASE WHEN r.state IN ('cancel') THEN count(r.event_id) ELSE 0 END AS cancel_state, e.type AS event_type, e.seats_max AS seats_max, e.state AS event_state, diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml index 16e9fbef562..454073671d2 100644 --- a/addons/event/report/report_event_registration_view.xml +++ b/addons/event/report/report_event_registration_view.xml @@ -7,7 +7,7 @@ <field name="model">report.event.registration</field> <field name="arch" type="xml"> <pivot string="Event on Registration" disable_linking="True"> - <field name="event_type" type="row"/> + <field name="event_id" type="row"/> <field name="event_date" interval="month" type="col"/> <field name="confirm_state" type="measure"/> </pivot> @@ -19,7 +19,7 @@ <field name="model">report.event.registration</field> <field name="arch" type="xml"> <graph string="Event on Registration"> - <field name="event_type"/> + <field name="event_id"/> <field name="event_date" interval="month"/> <field name="confirm_state" type="measure"/> </graph> |
