From 61977cb44b21b936b8a9c1eb166f79fb5fc1c46c Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 24 Feb 2012 17:29:04 +0100
Subject: [PATCH] [IMP] event: usability misc improvements

bzr revid: qdp-launchpad@openerp.com-20120224162904-rlhtte2uz2gxn7ss
---
 addons/event/event.py       |  2 +-
 addons/event/event_view.xml | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index a9bc1ce13a6..729477ad736 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -152,7 +152,7 @@ class event_event(osv.osv):
         return res
 
     _columns = {
-        'name': fields.char('Event Name', size=64, required=True, translate=True, readonly=False, states={'done': [('readonly', True)]}),
+        'name': fields.char('Name', size=64, required=True, translate=True, readonly=False, states={'done': [('readonly', True)]}),
         'user_id': fields.many2one('res.users', 'Responsible User', readonly=False, states={'done': [('readonly', True)]}),
         'type': fields.many2one('event.type', 'Type of Event', readonly=False, states={'done': [('readonly', True)]}),
         'register_max': fields.integer('Maximum Registrations', help="You can for each event define a maximum registration level. If you have too much registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index dae28eb1053..c36cc389b18 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -70,8 +70,8 @@
                                 <field name="phone"/>
                                 <field name="nb_register" />
                                 <field name="state"/>
-                                <button name="button_reg_close" string="participated" states="open" type="object" icon="gtk-apply"/>
                                 <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                                <button name="button_reg_close" string="Attented the Event" states="open" type="object" icon="gtk-jump-to"/>
                                 <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
                             </tree>
                             <form string="Registration">
@@ -90,8 +90,8 @@
                                         <separator string="" colspan="4"/>
                                         <newline/>
                                         <field name="state" select="1" colspan="2"/>
-                                        <button name="button_reg_close" string="participated" states="open" type="object" icon="gtk-apply"/>
                                         <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                                        <button name="button_reg_close" string="Attended the Event" states="open" type="object" icon="gtk-jump-to"/>
                                         <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
                                     </group>
                             </form>
@@ -115,9 +115,9 @@
                             <separator string="Registrations" colspan="2"/>
                             <field name="register_min"/>
                             <field name="register_max"/>
+                            <field name="register_prospect"/>
                             <field name="register_current"/>
                             <field name="register_attended"/>
-                            <field name="register_prospect"/>
                         </group>
                         <group col="2" colspan="2">
                             <separator string="Emails" colspan="2"/>
@@ -150,8 +150,8 @@
                     <field name="user_id"/>
                     <field name="state"/>
                     <button string="Confirm Event" help="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-                    <button string="Cancel Event" help="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
                     <button string="Event Done" help="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+                    <button string="Cancel Event" help="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
                     <button string="Set To Draft" help="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
                 </tree>
             </field>
@@ -215,7 +215,7 @@
                         <filter string="Event Type" icon="terp-crm"  context="{'group_by':'type'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Beginning Date" icon="terp-go-month"
+                        <filter string="Starting Date" icon="terp-go-month"
                             domain="[]" context="{'group_by':'date_begin'}"/>
                     </group>
                 </search>