X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=addons%2Fevent%2Fevent_view.xml;h=b081a9695a1ea18d172e0f2efbb36e2f492ea2a3;hb=5fc9aad7e89c70d132f962ee82da2de08cff55fb;hp=185b1d33ec99df439d60d42ede7bc14c6011e403;hpb=a186491d9107d630bd2d3d4ebe30d4ade5d9d678;p=odoo%2Fodoo.git

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 185b1d3..b081a96 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-        <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="event_main_menu"/>
+        <menuitem name="Events Organisation" id="base.menu_event_main" parent="event_main_menu" />
 
     <!-- EVENTS  -->
 
@@ -14,6 +15,11 @@
             <field name="arch" type="xml">
                 <form string="Event Type">
                     <field name="name" select="1"/>
+                    <field name="default_reply_to"/>
+                    <field name="default_email_event"/>
+                    <field name="default_email_registration"/>
+                    <field name="default_registration_min"/>
+                    <field name="default_registration_max"/>
                 </form>
             </field>
         </record>
@@ -30,11 +36,12 @@
         </record>
 
         <record model="ir.actions.act_window" id="action_event_type">
+            <field name="name">Types of Events</field>
             <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" groups="base.group_extended"/>
-        <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_marketing_config_root" groups="base.group_extended"/>
+        <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"/>
 
     <!-- Events Organisation/CONFIGURATION/EVENTS -->
 
@@ -48,106 +55,75 @@
                         <field name="name"/>
                         <field name="date_begin"/>
                         <field name="date_end"/>
-                        <field name="type" widget="selection"/>
-                        <field name="language"/>
-                        <field name="parent_id"/>
+                        <field name="type" on_change="onchange_evnet_type(type,context)"/>
+                        <field name="user_id"/>
+                        <field name="address_id" />
                     </group>
                     <notebook colspan="4">
                     <page string="Event">
-                        <group colspan="4" col="4">
-                            <separator string="Invoice Information" colspan="4"/>
-                            <field name="product_id" on_change="onchange_product(product_id)" colspan="4"/>
-                            <field name="unit_price"/>
-                            <field name="pricelist_id" widget="selection" domain="[('type','=','sale')]" groups="base.group_extended"/>
-                        </group>
-                        <group colspan="2" col="2">
-                            <separator string="Contact" colspan="4"/>
-                            <field name="user_id"/>
-                            <field name="section_id" widget="selection" on_change="do_team_change(section_id)"/>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                        </group>
-                        <group colspan="2" col="2">
-                            <separator string="Location" colspan="4"/>
-                            <field name="country_id" />
-                            <field name="address_id" domain="[('country_id','=',country_id)]"/>
-
-                        </group>
                         <separator string="Description" colspan="4"/>
                         <field name="note" colspan="4" nolabel="1"/>
-                        <field name="state" select="1"/>
+                        <field name="registration_ids" colspan="4" nolabel="1">
+                            <tree string="Registration" editable="top">
+                                <field name="name" />
+                                <field name="email" />
+                                <field name="phone"/>
+                                <field name="nb_register" />
+                                <field name="state"/>
+                                <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">
+                                <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)" />
+                                <field name="name"/>
+                                <group colspan="4" col="4">
+                                <field name="email"/>
+                                <field name="phone"/>
+                                </group>
+                                <group colspan="4" col="4">
+                                    <field name="nb_register"/>
+                                </group>
+                                <group colspan="4" col="4">
+                                </group>
+                                    <group col="8" colspan="4">
+                                        <separator string="" colspan="4"/>
+                                        <newline/>
+                                        <field name="state" select="1" colspan="2"/>
+                                        <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>
+                            </field>
+                        <field name="state" select="1" widget="statusbar" statusbar_visible="draft,confirm,done"/>
                         <group col="4" colspan="2">
-                           <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
                            <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+                           <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
                            <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-                           <button string="Set To Draft" name="button_draft" states="confirm,cancel,done" type="object" icon="gtk-convert"/>
+                           <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
                         </group>
                     </page>
-                    <page string="Speakers">
+                    <page string="Speakers" groups="base.group_extended">
                         <field name="main_speaker_id" domain="[('speaker','=',True)]"/>
                         <field name="speaker_confirmed"/>
                         <separator string="Other Speakers" colspan="4"/>
                         <field name="speaker_ids" domain="[('speaker','=',True)]" colspan="4" nolabel="1"/>
                     </page>
-                    <page string="Registrations">
-                        <field name="register_min"/>
-                        <field name="register_max"/>
-                        <field name="register_current"/>
-                        <field name="register_prospect"/>
-                        <field name="registration_ids" colspan="4" nolabel="1" readonly="1">
-                            <form string="Registration">
-                                <field name="name"/>
-                                <field name="date" string="Date"/>
-                                <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id,event_id)"/>
-                                <field name="partner_invoice_id" on_change="onchange_partner_invoice_id(event_id, partner_invoice_id)"/>
-                                <group colspan="4" col="4">
-                                    <field name="event_product"/>
-                                    <field name="nb_register"/>
-                                    <field name="unit_price"/>
-                                    <field name="price_subtotal"/>
-                                </group>
-                                <group col="8" colspan="4">
-                                    <separator string="" colspan="4"/>
-                                    <newline/>
-                                    <field name="state" select="1" colspan="2"/>
-                                    <button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
-                                    <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                    <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                                </group>
-                            </form>
-                            <tree string="Registration">
-                                    <field name="create_date" string="Registration Date"/>
-                                    <field name="partner_id" required="1" string="Partner" on_change="onchange_partner_id(partner_id,event_id)"/>
-                                    <field name="event_product"/>
-                                    <field name="nb_register"/>
-                                    <field name="unit_price"/>
-                                    <field name="price_subtotal"/>
-                                    <field name="state"/>
-                                    <button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
-                                    <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                    <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                            </tree>
-                        </field>
-                    </page>
-                    <page string="Mailing">
-                        <field name="reply_to" />
-                        <newline/>
-                        <group col="4" colspan="4">
-                            <group col="2" colspan="2">
-                                <separator string="Auto Registration Email" colspan="4"/>
-                                <field name="mail_auto_registr" colspan="4"/>
-                                <group colspan="4" attrs="{'readonly':[('mail_auto_registr','=',False)]}">
-                                    <separator string="Registration Email Body" colspan="4"/>
-                                    <field name="mail_registr" colspan="4" nolabel="1" />
-                                </group>
-                            </group>
-                            <group col="2" colspan="2">
-                                <separator string="Auto Confirmation Email" colspan="4"/>
-                                <field name="mail_auto_confirm" colspan="4"/>
-                                <group colspan="4" attrs="{'readonly':[('mail_auto_confirm','=',False)]}">
-                                    <separator string="Confirmation Email Body" colspan="4"/>
-                                    <field name="mail_confirm" nolabel="1" colspan="4"/>
-                                </group>
-                            </group>
+                    <page string="Extra Info">
+                        <group col="2" colspan="2">
+                            <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"/>
+                        </group>
+                        <group col="2" colspan="2">
+                            <separator string="Emails" colspan="2"/>
+                            <field name="reply_to"/>
+                            <field name="email_registration_id" domain="[('model_id','=',ref('event.event_registration'))]" groups="base.group_extended"/>
+                            <field name="email_confirmation_id" domain="[('model_id','=',ref('event.event_event'))]" groups="base.group_extended"/>
                         </group>
                     </page>
                     </notebook>
@@ -162,22 +138,21 @@
             <field name="model">event.event</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Events" colors="red:register_min>register_current;black:register_min&lt;=register_current">
+                <tree string="Events" colors="red:(register_min and register_min&gt;register_current) or (register_max and register_max&lt;register_current);grey:state=='cancel'">
                     <field name="name" string="Name"/>
-                    <field name="user_id"/>
-                    <field name="main_speaker_id"/>
-                    <field name="language"/>
                     <field name="type"/>
                     <field name="date_begin"/>
                     <field name="date_end"/>
-                    <field name="register_min"/>
                     <field name="register_current"/>
-                    <field name="section_id" invisible="context.get('invisible_section', True)"/>
+                    <field name="register_min"/>
+                    <field name="register_max" invisible="1"/>
+                    <field name="main_speaker_id" groups="base.extended"/>
+                    <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="Set To Draft" help="Set To Draft" name="button_draft" states="confirm,cancel,done" type="object" icon="gtk-convert"/>
+                    <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>
         </record>
@@ -190,9 +165,9 @@
             <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <calendar color="user_id" date_start="date_begin" string="Event Organization">
+                <calendar color="type" date_start="date_begin" date_stop="date_end" string="Event Organization">
                     <field name="name"/>
-                    <field name="type" widget="selection"/>
+                    <field name="type"/>
                 </calendar>
             </field>
         </record>
@@ -220,51 +195,43 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Events">
-                    <group col="10" colspan="4">
-                        <filter icon="terp-check" string="Current" name="draft" domain="[('state','in',('draft', 'confirm'))]" help="Events in draft or confirmed state"/>
+                    <group>
+                        <filter icon="terp-check" string="Unconfirmed" name="draft" domain="[('state','=','draft')]" help="Events in New state"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
                         <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
+                        <field name="name"/>
+                        <field name="type" widget="selection"/>
                         <field name="user_id" widget="selection">
                         <filter icon="terp-personal"
                               string="My Events"
                                 help="My Events"
                               domain="[('user_id','=',uid)]"/>
                         </field>
-                        <field name="date_begin" select="1"/>
-                        <field name="state" select="1"/>
-                        <field name="section_id" default="context.get('section_id', False)" widget="selection" groups="base.group_extended">
-                          <filter icon="terp-personal+"
-                                  context="{'invisible_section': False}"
-                                  domain="[('section_id.user_id','=',uid)]"
-                                  groups="base.group_extended"
-                                  help="My Sales Team(s)"/>
-                        </field>
                     </group>
                     <newline/>
-                    <group expand="0" string="Group By..." colspan="4" col="12">
+                    <group expand="0" string="Group By...">
                         <filter string="Responsible"  icon="terp-personal" context="{'group_by': 'user_id'}"/>
                         <separator orientation="vertical"/>
                         <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>
             </field>
         </record>
 
-    <!-- Events Organisation/CONFIGURATION/EVENTS  -->
 
+        <!-- Events Organisation/CONFIGURATION/EVENTS  -->
        <record model="ir.actions.act_window" id="action_event_view">
            <field name="name">Events</field>
            <field name="type">ir.actions.act_window</field>
            <field name="res_model">event.event</field>
            <field name="view_type">form</field>
-           <field name="view_mode">tree,form,calendar,graph</field>
-           <field name="context">{"search_default_draft": "1", "search_default_section_id": section_id}</field>
+           <field name="view_mode">calendar,tree,form,graph</field>
            <field name="search_view_id" ref="view_event_search"/>
+           <field name="help">Event is the low level object used by meeting and others documents that should be synchronized with mobile devices or calendar applications through caldav. Most of the users should work in the Calendar menu, and not in the list of events.</field>
        </record>
 
       <act_window
@@ -272,8 +239,8 @@
             name="Registration"
             res_model="event.registration"
             src_model="event.event"
-            view_mode="tree,form,calendar,graph"
-            context="{'search_default_event_id': active_id}"
+            view_mode="calendar,tree,form,graph"
+            context="{'search_default_event_id': [active_id], 'default_event_id': active_id}"
             view_type="form"/>
 
       <act_window
@@ -282,29 +249,30 @@
             res_model="event.registration"
             src_model="res.partner"
             view_mode="tree,form,calendar,graph"
-            context="{'search_default_partner_id': [active_id]}"
+            context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}"
             view_type="form"/>
 
        <menuitem name="Events" id="menu_event_event" action="action_event_view" parent="base.menu_event_main" />
 
-    <!-- EVENTS/REGISTRATIONS/EVENTS  -->
-
-
+        <!-- EVENTS/REGISTRATIONS/EVENTS  -->
         <record model="ir.ui.view" id="view_event_registration_tree">
             <field name="name">event.registration.tree</field>
             <field name="model">event.registration</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Registration">
-                    <field name="partner_id"/>
-                    <field name="event_id"/>
+                <tree string="Registration" >
+                    <field name="create_date"/>
+                    <field name="name"/>
+                    <field name="email"/>
+                    <field name="event_id" />
                     <field name="nb_register"/>
-                    <field name="price_subtotal" sum="Total"/>
-                    <field name="user_id"/>
+                    <field name="user_id" groups="base.group_extended"/>
+                    <field name="origin" groups="base.group_extended"/>
                     <field name="state"/>
-                    <button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
-                    <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
                     <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                    <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>
         </record>
@@ -316,133 +284,70 @@
             <field name="arch" type="xml">
                 <form string="Registration">
                     <group col="6" colspan="4">
-                        <field name="event_id" on_change="onchange_event(event_id, partner_invoice_id)" domain="[('state','in',('draft','confirm'))]"/>
-                        <field name="create_date" string="Registration Date"/>
-                        <field name="name"/>
-                        <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id,event_id)" />
-                        <field name="user_id"/>
-                        <field name="tobe_invoiced"/>
+                        <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]"/>
+                        <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
+                        <field name="contact_id" attrs="{'readonly':[('state','!=', 'draft')]}" domain="[('partner_id','=',partner_id)]" on_change="onchange_contact_id(contact_id, context)"/>
+                        <field name="nb_register"/>
+                        <field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}"/>
+                        <field name="origin"/>
                     </group>
                     <notebook colspan="4">
-                        <page string="Registration">
-                            <field name="date" />
-                            <field name="date_deadline" />
+                        <page string="Additional Information">
                             <group colspan="2" col="2">
-                                <separator string="Registration Cost" colspan="4"/>
-                                <field name="nb_register"/>
-                                <field name="unit_price"/>
-                                <field name="price_subtotal"/>
+                                <separator string="Contact Information" colspan="2"/>
+                                <field name="name"/>
+                                <field name="email"/>
+                                <field name="phone"/>
+                            </group>
+                            <group colspan="2" col="2" groups="base.group_extended">
+                                <separator string="Dates" colspan="2"/>
+                                <field name="create_date"/>
+                                <field name="date_closed"/>
+                                <field name="event_begin_date" />
+                                <field name="event_end_date" />
                             </group>
-                            <group colspan="2" col="2" attrs="{'invisible':[('tobe_invoiced','=',False)]}">
-                                <separator string="Invoice" colspan="4"/>
-                                <field name="event_product" attrs="{'required':[('tobe_invoiced','=',True)]}"/>
-                                <field name="partner_invoice_id" attrs="{'required':[('tobe_invoiced','=',True)]}" on_change="onchange_partner_invoice_id(event_id, partner_invoice_id)"/>
-                                <field name="invoice_id"/>
-                           </group>
-                            <separator string="Description" colspan="4"/>
-                            <field name="description" colspan="4" nolabel="1"/>
+
                             <separator string="" colspan="4"/>
                             <group col="8" colspan="4">
-                                <field name="state" select="1" colspan="2"/>
+                                <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="Close Registration" states="open" type="object" icon="gtk-close"/>
-                                <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                            </group>
-                        </page>
-                        <page string="Extra Info">
-                            <separator string="Contact" colspan="4"/>
-                            <field name="contact_id" on_change="onchange_contact_id(contact_id, partner_id)" />
-                            <field name="email_from"/>
-                            <field name="badge_ids" colspan="4" nolabel="1">
-                                <tree string="Badges" editable="bottom">
-                                    <field name="name"/>
-                                    <field name="title"/>
-                                    <field name="address_id"/>
-                                </tree>
-                                <form string="Badges">
-                                    <field name="name"/>
-                                    <field name="title"/>
-                                    <field name="address_id"/>
-                                </form>
-                            </field>
-                            <group col="2" colspan="2" groups="base.group_extended">
-                               <separator string="Dates" colspan="2"/>
-                               <field name="date_closed"/>
-                            </group>
-                            <group col="2" colspan="2" groups="base.group_extended">
-                               <separator string="Misc" colspan="2"/>
-                               <field name="id"/>
-                               <field name="active"/>
+                                <button name="button_reg_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 string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" icon="gtk-convert"/>
                             </group>
                         </page>
                         <page string="Emails" groups="base.group_extended">
-                            <group colspan="4">
-                                 <field colspan="4" name="email_cc" string="CC" widget="char" size="512"/>
-                            </group>
-                            <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
+                            <field name="message_ids" colspan="4" nolabel="1" mode="tree">
                                 <tree string="History">
                                     <field name="display_text" string="History Information"/>
-                                    <field name="history" invisible="1"/>
+                                    <field name="reply_to" invisible="1"/>
                                     <button
-                                        string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
-                                        name="%(crm.action_crm_send_mail)d"
-                                        context="{'mail':'reply', 'model': 'event.registration', 'include_original' : True}"
+                                        string="Reply" attrs="{'invisible': [('reply_to', '=', False)]}"
+                                        name="%(mail.action_email_compose_message_wizard)d"
+                                        context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
                                         icon="terp-mail-replied" type="action" />
                                 </tree>
-                                <form string="History">
-                                    <group col="4" colspan="4">
-                                        <field name="email_from"/>
-                                        <field name="date"/>
-                                        <field name="email_to" widget="char" size="512"/>
-                                        <field name="email_cc" widget="char" size="512"/>
-                                        <field name="name" colspan="4" widget="char" size="512"/>
-                                        <field name="history" invisible="1"/>
-                                    </group>
-                                    <notebook colspan="4">
-                                        <page string="Details">
-                                            <group attrs="{'invisible': [('history', '!=', True)]}">
-                                                <field name="description" colspan="4" nolabel="1" height="250"/>
-                                                <button colspan="4"
-                                                    string="Reply"
-                                                    name="%(crm.action_crm_send_mail)d"
-                                                    context="{'mail':'reply', 'model': 'event.registration', 'include_original' : True}"
-                                                    icon="terp-mail-replied" type="action" />
-                                            </group>
-                                            <group attrs="{'invisible': [('history', '=', True)]}">
-                                                <field name="display_text" colspan="4" nolabel="1"  height="250"/>
-                                            </group>
-                                        </page>
-                                        <page string="Attachments">
-                                            <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
-                                        </page>
-                                    </notebook>
-                                </form>
                             </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="%(crm.action_crm_send_mail)d"
-                                context="{'mail':'new', 'model': 'event.registration'}"
-                                icon="terp-mail-message-new" type="action" />
+                            <button string="Send New Email"
+                                name="%(mail.action_email_compose_message_wizard)d"
+                                icon="terp-mail-message-new" type="action"/>
                            </page>
+
                     </notebook>
                 </form>
             </field>
         </record>
 
- <!-- Calendar view of event registration -->
-
+         <!-- Calendar view of event registration -->
         <record id="view_event_registration_calendar" model="ir.ui.view">
             <field name="name">event.registration.calendar</field>
             <field name="model">event.registration</field>
             <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <calendar color="event_id" date_start="date" date_delay="duration" string="Event Registration">
+                <calendar color="event_id" date_start="date" date_stop="date_closed" string="Event Registration">
                     <field name="event_id"/>
-                    <field name="partner_invoice_id"/>
+                    <field name="name"/>
                 </calendar>
             </field>
         </record>
@@ -454,42 +359,43 @@
             <field name="arch" type="xml">
                 <graph string="Registration" type="bar" orientation="horizontal">
                     <field name="event_id"/>
-                    <field name = "nb_register" operator="+"/>
+                    <field name= "nb_register" operator="+"/>
                 </graph>
             </field>
         </record>
 
 
-<!-- Search view of event registration form-->
-
+        <!-- Search view of event registration -->
         <record model="ir.ui.view" id="view_registration_search">
             <field name="name">Registrations</field>
             <field name="model">event.registration</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Event Registration">
-                    <group col="12" colspan="4">
-                        <filter icon="terp-check" string="Current" name="draft" domain="[('state','in',('draft', 'open'))]" help="Registrations in unconfirmed or confirmed state"/>
+                    <group>
+                        <filter icon="terp-check" string="New" name="draft" domain="[('state','=','draft')]" help="Registrations in unconfirmed state"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','open')]" help="Confirmed registrations"/>
                         <separator orientation="vertical"/>
-                        <field name="partner_id" />
                         <field name="event_id" widget="selection"/>
-                        <field name="user_id" widget="selection">
+                        <field name="name" string="Participant"
+                            filter_domain="['|','|','|', ('name','ilike',self), ('contact_id','ilike',self), ('partner_id','ilike',self), ('email','ilike',self)]"/>
+                        <field name="user_id" groups="base.group_extended">
                         <filter icon="terp-personal"
                               string="My Registrations"
                                 help="My Registrations"
                               domain="[('user_id','=',uid)]"/>
                         </field>
-                        <field name="state" select="1"/>
+                        <field name="origin" groups="base.group_extended"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Responsible"  icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" groups="base.group_extended"/>
                         <separator orientation="vertical"/>
                         <filter string="Event" icon="terp-crm" domain="[]" context="{'group_by':'event_id'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                    </group>
+
                 </search>
             </field>
         </record>
@@ -500,7 +406,7 @@
           <field name="view_type">form</field>
           <field name="domain"></field>
           <field name="view_mode">tree,form,calendar,graph</field>
-          <field name="context">{"search_default_draft": "1"}</field>
+          <field name="context">{}</field>
           <field name="search_view_id" ref="view_registration_search"/>
         </record>
 
@@ -508,6 +414,8 @@
             name="Registrations"
             id="menu_action_registration" parent="base.menu_event_main"
             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>