diff --git a/addons/event/event.py b/addons/event/event.py
index e2b45f9d5ce..ffda827614e 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -178,7 +178,7 @@ class event_event(osv.osv):
"""
register_pool = self.pool.get('event.registration')
res = super(event_event, self).write(cr, uid, ids, vals, context=context)
- if vals.get('date_begin', False) or vals.get('mail_auto_confirm', False) or vals.get('mail_confirm', False):
+ if vals.get('date_begin', False) or vals.get('mail_confirm', False):
for event in self.browse(cr, uid, ids, context=context):
#change the deadlines of the registration linked to this event
register_values = {}
@@ -186,6 +186,8 @@ class event_event(osv.osv):
register_values['date_deadline'] = vals['date_begin']
#change the description of the registration linked to this event
+
+ """
if vals.get('mail_auto_confirm', False):
if vals['mail_auto_confirm']:
if 'mail_confirm' not in vals:
@@ -194,7 +196,7 @@ class event_event(osv.osv):
vals['mail_confirm'] = False
if 'mail_confirm' in vals:
register_values['description'] = vals['mail_confirm']
-
+"""
if register_values:
reg_ids = register_pool.search(cr, uid, [('event_id', '=', event.id)], context=context)
register_pool.write(cr, uid, reg_ids, register_values, context=context)
diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py
index 3f5ec427af3..cfdbfcf70c4 100644
--- a/addons/event/report/report_event_registration.py
+++ b/addons/event/report/report_event_registration.py
@@ -37,7 +37,7 @@ class report_event_registration(osv.osv):
('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
'event_id': fields.many2one('event.event', 'Event', required=True),
'draft_state': fields.integer(' # No of Draft Registrations', size=20),
- 'state': fields.integer(' # No of Draft Registrations', size=20),
+ 'average_subtotal': fields.integer('average_subtotal', size=20),
'confirm_state': fields.integer(' # No of Confirmed Registrations', size=20),
'register_max': fields.integer('Maximum Registrations'),
'nbevent': fields.integer('Number Of Events'),
@@ -84,6 +84,7 @@ class report_event_registration(osv.osv):
e.type AS type,
r.price_subtotal,
+ AVG(r.price_subtotal) AS average_subtotal,
e.register_max AS register_max,
e.state AS event_state,
r.state AS registration_state
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index 26e6b598517..5e48174c4a8 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -22,7 +22,8 @@
-
+
+
@@ -123,7 +124,6 @@
-