[IMP] event: usability improvements

bzr revid: qdp-launchpad@openerp.com-20120227115809-qxz1ih4ykpo1ae2q

3 files changed, 7 insertions, 8 deletions

diff --git a/addons/event/event.py b/addons/event/event.py
index 310c7f90681..65572c35961 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -96,8 +96,7 @@ class event_event(osv.osv):
         reg_ids = registration.search(cr, uid, [('event_id','in',ids)], context=context)
         for event_reg in registration.browse(cr,uid,reg_ids,context=context):
             if event_reg.state == 'done':
-                raise osv.except_osv(_('Error!'),_("You have already done a registration please reset to draft if you want to cancel this event") )
-                return
+                raise osv.except_osv(_('Error!'),_("You have already set a registration for this event as 'Attended'. Please reset it to draft if you want to cancel this event.") )
         registration.write(cr, uid, reg_ids, {'state': 'cancel'}, context=context)
         return self.write(cr, uid, ids, {'state': 'cancel'}, context=context)
 
@@ -261,7 +260,7 @@ class event_registration(osv.osv):
         """
         res = self.write(cr, uid, ids, {'state': 'open'}, context=context)
         self.mail_user(cr, uid, ids)
-        self.message_append(cr, uid, ids,_('Statut'),body_text= _('Open'))
+        self.message_append(cr, uid, ids,_('State set to...'),body_text= _('Open'))
         return res
 
     def case_close(self, cr, uid, ids, context=None):
@@ -271,7 +270,7 @@ class event_registration(osv.osv):
             context = {}
         values = {'state': 'done', 'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')}
         res = self.write(cr, uid, ids, values)
-        self.message_append(cr, uid, ids,_('Statut'),body_text= _('Done'))
+        self.message_append(cr, uid, ids,_('State set to...'),body_text= _('Done'))
         return res
 
     # event uses add_note wizard from crm, which expects case_* methods
@@ -282,7 +281,7 @@ class event_registration(osv.osv):
     def case_cancel(self, cr, uid, ids, context=None):
         """ Cancel Registration
         """
-        self.message_append(cr, uid, ids,_('Statut'),body_text= _('Cancel'))
+        self.message_append(cr, uid, ids,_('State set to...'),body_text= _('Cancel'))
         return self.write(cr, uid, ids, {'state': 'cancel'})
 
     def button_reg_close(self, cr, uid, ids, context=None):
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 40bd934f37d..b081a9695a1 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -265,8 +265,8 @@
                     <field name="name"/>
                     <field name="email"/>
                     <field name="event_id" />
-                    <field name="nb_register" groups="base.group_extended"/>
-                    <field name="user_id"/>
+                    <field name="nb_register"/>
+                    <field name="user_id" groups="base.group_extended"/>
                     <field name="origin" groups="base.group_extended"/>
                     <field name="state"/>
                     <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index b4eef122554..01f7c9996fc 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -96,8 +96,8 @@
                     <group expand="1" string="Group By...">
                         <filter string="Participant / Contact" icon="terp-personal" context="{'group_by':'name_registration'}" help="Registration contact"/>
                         <filter string="Register" icon="terp-personal" context="{'group_by':'user_id_registration'}" help="Registration contact" groups="base.extended"/>
-                        <filter string="Event Responsible" name="user_id" icon="terp-personal" context="{'group_by': 'user_id'}"/>
                         <filter string="Speaker" name="speaker" icon="terp-personal+" context="{'group_by': 'speaker_id'}" groups="base.extended"/>
+                        <filter string="Event Responsible" name="user_id" icon="terp-personal" context="{'group_by': 'user_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Event" name="event" icon="terp-crm" context="{'group_by':'event_id', 'max_reg_event_visible':0}"/>
                         <filter string="Event Type" icon="terp-crm"  context="{'group_by':'event_type'}"/>