[IMP] event: usability improvements

[odoo/odoo.git] / addons / event / event_view.xml

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index f5d405d..b081a96 100644 (file)
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -2,11 +2,8 @@
 <openerp>
     <data>
 
-        <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
-        <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17"/>
-
-        <menuitem name="Events Organisation" id="base.menu_event_main" parent="base.marketing_menu" />
-        <menuitem name="Events" id="base.menu_event_association" parent="base.menu_association" />
+       <menuitem  name="Events" id="event_main_menu"/>
+        <menuitem name="Events Organisation" id="base.menu_event_main" parent="event_main_menu" />
 
     <!-- EVENTS  -->
 
@@ -43,11 +40,8 @@
             <field name="res_model">event.type</field>
             <field name="view_type">form</field>
         </record>
-        <menuitem name="Configuration" id="base.menu_marketing_config_root" parent="base.marketing_menu" sequence="30"/>
-        <menuitem name="Configuration" id="base.menu_marketing_config_association" parent="base.menu_association" sequence="30"/>
-
+        <menuitem name="Configuration" id="base.menu_marketing_config_root" parent="event_main_menu" sequence="30"/>
         <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_marketing_config_root"/>
-        <menuitem name="Events Type" id="menu_event_type_association" action="action_event_type" parent="base.menu_marketing_config_association"/>
 
     <!-- Events Organisation/CONFIGURATION/EVENTS -->
 
@@ -76,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="case_open" string="Confirm Registration" states="draft" 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">
@@ -96,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="case_open" string="Confirm Registration" states="draft" 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>
@@ -121,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"/>
@@ -156,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>
@@ -221,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>
@@ -259,8 +253,6 @@
             view_type="form"/>
 
        <menuitem name="Events" id="menu_event_event" action="action_event_view" parent="base.menu_event_main" />
-       <menuitem name="Events" id="menu_event_event_assiciation" action="action_event_view" parent="base.menu_event_association" />
-
 
         <!-- EVENTS/REGISTRATIONS/EVENTS  -->
         <record model="ir.ui.view" id="view_event_registration_tree">
@@ -273,13 +265,13 @@
                     <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"/>
-                    <button name="case_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                    <button name="case_close" string="Attended" states="open" type="object" icon="gtk-apply"/>
+                    <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                    <button name="_close" string="Attended" states="open" type="object" icon="gtk-apply"/>
                     <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" icon="gtk-convert"/>
                 </tree>
             </field>
@@ -320,7 +312,7 @@
                                 <field name="state" select="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
                                 <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
                                 <button name="button_reg_close" string="Attended" states="open" type="object" icon="gtk-apply"/>
-                                <button name="case_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                                <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
                                 <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" icon="gtk-convert"/>
                             </group>
                         </page>
@@ -336,10 +328,6 @@
                                         icon="terp-mail-replied" type="action" />
                                 </tree>
                             </field>
-                            <button string="Add Internal Note"
-                                name="%(crm.action_crm_add_note)d"
-                                context="{'model': 'crm.lead' }"
-                                icon="terp-document-new" type="action" />
                             <button string="Send New Email"
                                 name="%(mail.action_email_compose_message_wizard)d"
                                 icon="terp-mail-message-new" type="action"/>
@@ -427,11 +415,7 @@
             id="menu_action_registration" parent="base.menu_event_main"
             action="action_registration"/>
 
-        <menuitem
-            name="Registrations"
-            id="menu_action_registration_association" parent="base.menu_event_association"
-            action="action_registration"/>
 
-        <menuitem name="Reporting" id="base.menu_report_association" parent="base.marketing_menu" sequence="20"/>
+        <menuitem name="Reporting" id="base.menu_report_association" parent="event_main_menu" sequence="20"/>
     </data>
 </openerp>