diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py index 28f52bbc734..01d8da6d638 100644 --- a/addons/event/report/report_event_registration.py +++ b/addons/event/report/report_event_registration.py @@ -42,7 +42,7 @@ class report_event_registration(osv.osv): 'event_type': fields.many2one('event.type', 'Event Type'), 'registration_state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, required=True), 'event_state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, required=True), - 'user_id': fields.many2one('res.users', 'Responsible', readonly=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('Register',size=45, readonly=True), 'speaker_id': fields.many2one('res.partner', 'Speaker', readonly=True), diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml index a77e8511af0..bc6ac5f91fb 100644 --- a/addons/event/report/report_event_registration_view.xml +++ b/addons/event/report/report_event_registration_view.xml @@ -114,12 +114,7 @@ domain="[]" context="{'group_by':'year'}" help="Event Beginning Date"/> - - - - - diff --git a/addons/event/test/process/event_draft2done.yml b/addons/event/test/process/event_draft2done.yml index e9a6594b49b..5e269ffc112 100644 --- a/addons/event/test/process/event_draft2done.yml +++ b/addons/event/test/process/event_draft2done.yml @@ -30,9 +30,9 @@ I check that registration is "confirmed" - !assert {model: event.registration, id: event_registration1}: - - state == 'open', "event should be confirmed." + - state == 'open', "registration should be confirmed." - - I closed the registration + I close the registration - !python {model: event.registration}: | self.button_reg_close(cr, uid, [ref("event_registration1")],context=context) @@ -50,7 +50,7 @@ I Check that registration is cancelled - !assert {model: event.registration, id: event_registration2}: - - state == 'cancel', "event should be closed." + - state == 'cancel', "registration should be cancelled." - I confirm the event - @@ -85,5 +85,5 @@ I check if the event is cancelled - !assert {model: event.event, id: event_event}: - - state == 'cancel', "Event should be Closed." + - state == 'cancel', "Event should be cancelled."