diff options
| author | MVA <mva@openerp.com> | 2012-01-09 16:53:47 +0100 |
|---|---|---|
| committer | MVA <mva@openerp.com> | 2012-01-09 16:53:47 +0100 |
| commit | debfe254dd418d2cb8c3f8a6aa9eb6a2b3ccee31 (patch) | |
| tree | 5d3e26198ea198e37164299a2e19f2a77c59e7e6 | |
| parent | c913d46c495aa5c07645ec9497e0518ad7962a79 (diff) | |
[ADD] change the dashboard eventregistration
bzr revid: mva@openerp.com-20120109155347-jnw3hq6ilj0x7rmg
| -rw-r--r-- | addons/event/event.py | 6 | ||||
| -rw-r--r-- | addons/event/report/report_event_registration.py | 3 | ||||
| -rw-r--r-- | addons/event/report/report_event_registration_view.xml | 4 |
3 files changed, 8 insertions, 5 deletions
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 @@ <field name="confirm_state"/> <field name="registration_state" invisible="1"/> <field name="user_id_registration" invisible="1"/> - <field name="price_subtotal" invisible="1"/> + <field name="price_subtotal"/> + <field name="average_subtotal"/> <field name="register_max" invisible="context.get('max_reg_event_visible', True)"/> <field name="company_id" invisible="1"/> <field name="product_id" invisible="1"/> @@ -123,7 +124,6 @@ <newline/> <group expand="1" string="Group By Registration..."> <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'registration_state'}" help="Events States"/> - <filter string="price_subtotal" icon="terp-stock_effects-object-colorize" context="{'group_by':'price_subtotal'}" help="Events States"/> <filter string="user" icon="terp-stock_effects-object-colorize" context="{'group_by':'user_id_registration'}" help="Events States"/> </group> |